From nobody Mon Apr 15 03:44:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VHtMQ1L0bz5Hdkh; Mon, 15 Apr 2024 03:44:18 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VHtMQ0qHDz4R5m; Mon, 15 Apr 2024 03:44:18 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713152658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A/4wxyGtCnIikCGaqX4flPSlPS7eTHPLsPv69DRSlt0=; b=o+nF9a4Em79QAHOyhlCoBvS8QFuUY9LNJEsqAu+4WHMnHGkiAFD9gIkDe1ps1jfnZFEvv/ J9BzgV0bjcNGAblORHMGY3B8NZ4LWgiMtl+Cz9y8NOlJGMyARZ548h1d4+4iGV1r8ZB42f 9frLZRplMz32rAxIjf6gLw9/LfaETmkYxX2QfGDr0ylVcWZVA+y8IYHUrtoo0JmYyco15k PJRD1lUtA/8bbBlcGwE4u7/pbsw/H81PkLukwfzmqom0ir9qAEMk8gVOi+uknwLdV4Qv98 pgkeBH0P761SggbylgHSSaTK/JVrZQdWJXVWPFffqsGQqsfxw+Gg/hq3xP9XXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713152658; a=rsa-sha256; cv=none; b=Bi+mQSFCF1cyaRslFsHZayysKkwq9yOrl5dcD1pdWOpkHdhSrn8ndnoD9zgBAPgedmdRE1 ExXMDD+bfbHEfdvSg9EpESmcZ9pGkHXQtYTRFE8vh3RwdJn6vaC6td0Gs9foE4aXznCzHT 40aPIpe1iZFtgPcpsx8Ix3jh5dQNnW9dI5ZiYrjb9/dY00u9gC3b7bsGwOnlnFB5+YejZO vpI8L0RTzC8OvQDHndOzM89XLl0uTLK9FY8BKNp2/ZMW3Pnb0LHFBZMPXRZGS1eLn76tL4 lR7cIf0wXd0UQ/utVQgv8KlznPU0sz666ZtArCQq5azfXwv5PJB9yyRgxJplyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713152658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A/4wxyGtCnIikCGaqX4flPSlPS7eTHPLsPv69DRSlt0=; b=k7hYB113Txygqo+4VKHjoPQ/jAiUDoCS6neY2MY1H0joiIPBX+FQPqitQ4TRns7j+/e88+ 7a8LhN0Tu22OfjBoZCJE3a0Vhrs7XBsRr2r5ujX+MMc2k4uqmKzThsOSMmKBAWtI8uJWRl Skvg+iIMkfqkDzI/2S1BBu7yCUAjRQYA9g96aGv/1GAvymtAPaFoQNxpbTMUhqDrzJTpgF 8nsIijM5RZXwGySlFWIZ00uI5ootHTy3hl6w8lhrksZNFNTSmZhKcd4FhRxs4hT4Rox85S vsdKLkNR4KboDvwXDwUx4xxR8X1S4HJmmziwQqs0n3a5buai6dfvxIp9jyLhlA== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VHtMP4fX8zfmw; Mon, 15 Apr 2024 03:44:17 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <6114cce6-dd6e-478f-97af-1a2813f29332@FreeBSD.org> Date: Sun, 14 Apr 2024 22:44:15 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: bc0c6c9cf3a9 - main - freebsd-update: Add check for kernel modules Content-Language: en-US To: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202404141746.43EHkobl002927@gitrepo.freebsd.org> From: Kyle Evans In-Reply-To: <202404141746.43EHkobl002927@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 4/14/24 12:46, Fernando Apesteguía wrote: > The branch main has been updated by fernape: > > URL: https://cgit.FreeBSD.org/src/commit/?id=bc0c6c9cf3a9f9a54dbdd92dd8f1f65ff8092d17 > > commit bc0c6c9cf3a9f9a54dbdd92dd8f1f65ff8092d17 > Author: Fernando Apesteguía > AuthorDate: 2023-04-19 16:08:47 +0000 > Commit: Fernando Apesteguía > CommitDate: 2024-04-14 17:46:23 +0000 > > freebsd-update: Add check for kernel modules > > People get confused when some software (VirtualBox, etc) does not work as > expected (or at all) after a major upgrade. > > We have a nice way to deal with this when using sources, namely including > PORTS_MODULES in /etc/make.conf, but we lack something similar for binary > updates. > > This patch retrieves a list of kernel modules installed from packages and > advises the user to recompile from ports to avoid problems. > > Approved by: zlei@ > Differential Revision: https://reviews.freebsd.org/D39695 > --- > usr.sbin/freebsd-update/freebsd-update.sh | 58 +++++++++++++++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh > index 4a6a8d78330b..d1cd46963a6c 100644 > --- a/usr.sbin/freebsd-update/freebsd-update.sh > +++ b/usr.sbin/freebsd-update/freebsd-update.sh > @@ -655,6 +655,63 @@ fetch_setup_verboselevel () { > esac > } > > +# Check if there are any kernel modules installed from ports. > +# In that case warn the user that a rebuild from ports (i.e. not from > +# packages) might need necessary for the modules to work in the new release. > +upgrade_check_kmod_ports() { > + local mod_name > + local modules > + local pattern > + local pkg_name > + local port_name > + local report > + local w > + > + if ! command -v pkg >/dev/null; then > + echo "Skipping kernel modules check. pkg(8) not present." > + return > + fi > + > + # Most modules are in /boot/modules but we should actually look > + # in every path configured in module_path > + search_files="/boot/defaults/loader.conf /boot/loader.conf" Woof... this is inherently quite fragile, and it completely ignores how loader.conf are actually processed. The final module_path will always get passed to the kernel via kenv(1) and exposed as kern.module_path, please strongly consider just grabbing it from one of them instea . Thanks, Kyle Evans From nobody Mon Apr 15 05:47:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VHx5H747hz5Hpw5; Mon, 15 Apr 2024 05:47: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 4VHx5H6RbRz4byx; Mon, 15 Apr 2024 05:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713160035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zx3YJs7zVChXiZBZUqG3USwc+ocp21tQNla6TNGRu1o=; b=Mehu+RwAjFJawbpSYnASAodj+LSkTK63lC3LYIJJw4noP7PXgPJ87pjTJN2NINvHhITqiv OY/EJAGgD388f5Fg3rffwPUmYSeyGweL1XvFF0+BJndhW0Zbxy8qHRh04aGCQFHCCbH9t7 ujpx8YU5Dkbh4LFj5NQf/LtX81EgluyPRKNQpYbINEMtcwsXHKAsF9seitRVYfyZGfjRAk 8sKnBR4fGM/eOJfDwW8DQtUgA9g6JoF5/QI1CM8BrnUQvWRroHFAXjorBlbARyNPkOxiGT Wt8gLCsduPTh5gXRdWdfehwuVddg7+Fz1F6BJN4nLfsmMUo8W7iMHRMfih6ZDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713160035; a=rsa-sha256; cv=none; b=atS6XAbjr1unML4HP52is6XrXU9et25YP6DDsS///QZlYmdACA7a3gYxb3yOxMK2oqpBdp +ap7cGrjxf5aASJNpoGSrChWOumyAEBWqicnXCv79UQo7voy1ZWCWCh+GbrlsQIBEHyOsE PZvO4fWf44a9a+JNdxRFu4m9PvEeuutlaH4dcwABlbh42PRHOF9Yb1ywUumDxXEZkUEjVb t00oc3bKyHgCgwvkQR/ch88zFf6nuSWI4F2HMSqjDC9oM16NwPOW2mSUL/5K8CWnEltOFm piMWxrszAT4g9IR9t3oe6LSfXcQBz3j2/9wCW3nj7vrXuWei1lFvUIxLCm4JJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713160035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zx3YJs7zVChXiZBZUqG3USwc+ocp21tQNla6TNGRu1o=; b=QWJoSkH0gPKEC9Lo3nwHfXMCFi8YFsst1MHHbn+zBD/0xcscq+1FF3R/n/4fih4xJHkOTR sZlROqROwM5KuOBCiYIVzatdn88w8fIwyqtCMtmR5b8YlXDD24J8FuD5+qxSu+90jIrqgC o3XUTDAMZdNkUiwjmPEmgnp/X1z32qI2wg+Yx1Uvzwb+UuvxJi+qd8l2zBiyc8raUG/cO1 3womTjNde3NEVMA2FOOx5JsC41632Fw5Yx0t8TddCGfO3HBO7tVtKdutxPZEsG9Q2ghPvy y+IuStoSiGBkm6XQBzeJFOiF9hiv1teungN6qh6oh+KfJgPpZfXOFNn71s9j/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VHx5H5c7xzngN; Mon, 15 Apr 2024 05:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43F5lFea019737; Mon, 15 Apr 2024 05:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43F5lF1Y019734; Mon, 15 Apr 2024 05:47:15 GMT (envelope-from git) Date: Mon, 15 Apr 2024 05:47:15 GMT Message-Id: <202404150547.43F5lF1Y019734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Zhilin Subject: git: 1dd1a696c58f - main - snd_hda: Add the full Intel Meteor/Arrow/Lunar Lake HD Audio PCI IDs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mizhka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dd1a696c58fb275aa0e01666d57861eeb51878d Auto-Submitted: auto-generated The branch main has been updated by mizhka: URL: https://cgit.FreeBSD.org/src/commit/?id=1dd1a696c58fb275aa0e01666d57861eeb51878d commit 1dd1a696c58fb275aa0e01666d57861eeb51878d Author: Michael Zhilin AuthorDate: 2024-04-13 09:57:59 +0000 Commit: Michael Zhilin CommitDate: 2024-04-15 05:45:47 +0000 snd_hda: Add the full Intel Meteor/Arrow/Lunar Lake HD Audio PCI IDs This is based off the Linux file sound/hda/intel-dsp-config.c. Tested on: Lenovo Thinkbook 16 G6+ IMH MFC after: 3 days Reviewed by: markj, christos Differential Revision: https://reviews.freebsd.org/D44777 Sponsored by: Postgres Professional --- sys/dev/sound/pci/hda/hdac.c | 4 ++++ sys/dev/sound/pci/hda/hdac.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 704bcad3822c..f3dff2052b51 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -118,6 +118,10 @@ static const struct { { HDA_INTEL_ALLKPS, "Intel Alder Lake-PS", 0, 0 }, { HDA_INTEL_RPTLK1, "Intel Raptor Lake-P", 0, 0 }, { HDA_INTEL_RPTLK2, "Intel Raptor Lake-P", 0, 0 }, + { HDA_INTEL_MTL, "Intel Meteor Lake-P", 0, 0 }, + { HDA_INTEL_ARLS, "Intel Arrow Lake-S", 0, 0 }, + { HDA_INTEL_ARL, "Intel Arrow Lake", 0, 0 }, + { HDA_INTEL_LNLP, "Intel Lunar Lake-P", 0, 0 }, { HDA_INTEL_82801F, "Intel 82801F", 0, 0 }, { HDA_INTEL_63XXESB, "Intel 631x/632xESB", 0, 0 }, { HDA_INTEL_82801G, "Intel 82801G", 0, 0 }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 53c101f3119b..4dd589ed2a09 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -98,6 +98,10 @@ #define HDA_INTEL_CMLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x02c8) #define HDA_INTEL_CMLKH HDA_MODEL_CONSTRUCT(INTEL, 0x06c8) #define HDA_INTEL_TGLK HDA_MODEL_CONSTRUCT(INTEL, 0xa0c8) +#define HDA_INTEL_MTL HDA_MODEL_CONSTRUCT(INTEL, 0x7e28) +#define HDA_INTEL_ARLS HDA_MODEL_CONSTRUCT(INTEL, 0x7f50) +#define HDA_INTEL_ARL HDA_MODEL_CONSTRUCT(INTEL, 0x7728) +#define HDA_INTEL_LNLP HDA_MODEL_CONSTRUCT(INTEL, 0xa828) #define INTEL_A100ID_SUBVENDOR HDA_MODEL_CONSTRUCT(INTEL, 0xa100) #define INTEL_D400ID_SUBVENDOR HDA_MODEL_CONSTRUCT(INTEL, 0xd400) #define INTEL_D401ID_SUBVENDOR HDA_MODEL_CONSTRUCT(INTEL, 0xd401) From nobody Mon Apr 15 05:47:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VHx5K08wkz5Hpt2; Mon, 15 Apr 2024 05: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 4VHx5J6jRpz4bb8; Mon, 15 Apr 2024 05:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713160036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YhxB6gBRSswxocyVXE1Q5ogYAU2l6mQhN2YBnhGR+BY=; b=I58nXLno7PL8Tq9+2/OtoYeFDblAn/Av1Ggm/wiIymkoyk8vyA7yQfSjY9hvF8XsK7VtVp VhToFiOqVQhOYpiBbeBIgJXsGV16r5HNiNj5eRmAYou7msSCNn8avp/eXvV14Ozx2S7ORD Nmn3b/3vuuaf+V1GwXPUZqijVLHlbpzIU2wTLvmlxns+KQIYzH+fe7Gcke2vJ/njUubUvT Gmbj2tU4Gk+EMAPguhdNOt6LA3Zr00BT8TiGAJx2sjbFZGxNm1B21Gexy+SU8CGCJxaA6a bWapPca+EF1sVEE7H+zIY+Sc4m5037ynzroYe15WGo0AP0OO8uncFPGYfOPzwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713160036; a=rsa-sha256; cv=none; b=Jq6rCJjq5Gl53WSA5+uaVgK7rr2N5pUUbdVRZfWJa0NqVGQ4jI51dVRHfEegGmvRTfJwAg orjiyHPU/07L2fCbJf9dxRSO8lMOGScMWkhGCrpdKRK+kaGlNgpYKdLmh6Z+567rMK+yok dcQvnNBGOv/1sVvKl43nbJRavisP1lrt/dv+/QApQbuW1qv1CAyPWAH8OQ2VF5OuqBN/Dg cGABX6u8jpsVAb6Do0ysTwjqvm9abCRX+egFKISuUhWtNKq/a2Sp6Yk7wyXqu/IvS0U+Kc z18ro2gIaSqNX/ABPMFA/3bSzhseiHF3m1XDi5h9beZ2CTC1ZCAl9wzHWuxrRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713160036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YhxB6gBRSswxocyVXE1Q5ogYAU2l6mQhN2YBnhGR+BY=; b=tNXRSwV6eXnFkLL9icwpyka+gRa01EKWeDeeH1N5dekitXAfec8dCxGtp2c5fhmUE5mDGu p+iADOJwJUMdL1qWVMkxL2L6psFL+GFp7EpIgoVMXA6Wbs7besrwRHyndp9vWi88hYCSuZ 0hO5kWmGitqFAJaRL6uLqcm5l1s90F9mDNMD4WlM3OIgRokGeDreO33npBWIX+QgIE6IE1 YuDAeFNjmMB+PCVMkfTbmqUq1mlGW+DC0NZ59tru0N3QQxn/ZmODXqqg/jQDQOsbn8C3ED ocTdlYW1hZYfm9Ba+hZFmiTE/UWH1FKINyzo6vwzKLhuWsHi/mza4u5TUhWygQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VHx5J6K3DznGF; Mon, 15 Apr 2024 05: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 43F5lG35019786; Mon, 15 Apr 2024 05: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 43F5lG25019783; Mon, 15 Apr 2024 05:47:16 GMT (envelope-from git) Date: Mon, 15 Apr 2024 05:47:16 GMT Message-Id: <202404150547.43F5lG25019783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Zhilin Subject: git: bed0b2146faa - main - snd_hda: fix "duplicated free" on module unloading List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mizhka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bed0b2146faa2e9a445d9f9196c7b46f50034631 Auto-Submitted: auto-generated The branch main has been updated by mizhka: URL: https://cgit.FreeBSD.org/src/commit/?id=bed0b2146faa2e9a445d9f9196c7b46f50034631 commit bed0b2146faa2e9a445d9f9196c7b46f50034631 Author: Michael Zhilin AuthorDate: 2024-04-13 09:59:24 +0000 Commit: Michael Zhilin CommitDate: 2024-04-15 05:46:43 +0000 snd_hda: fix "duplicated free" on module unloading This is trivial fix of hdacc_detach to avoid duplicated free on snd_hda unloading. The first try of detaching (kldunload) may results into "device busy" error, but codec->fgs is freed by detach. Second try attempts to free codec->fgs again and system panicks. Here is example: pcm0: unregister: channel pcm0:virtual:dsp0.vp0 busy (pid 3428) pulseaudio[3428] [oss] module-oss.c: DSP shutdown. pcm0: detached hdaa0: detached panic: Duplicate free of 0xfffff80412ee7d20 from zone 0xfffffe006bc0ba00 (malloc-32) slab 0xfffff80412ee7fc8(105) cpuid = 6 time = 1712999565 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe0202f859e0 vpanic() at vpanic+0x135/frame 0xfffffe0202f85b10 panic() at panic+0x43/frame 0xfffffe0202f85b70 uma_dbg_free() at uma_dbg_free+0x105/frame 0xfffffe0202f85b90 uma_zfree_arg() at uma_zfree_arg+0x95/frame 0xfffffe0202f85be0 free() at free+0xa1/frame 0xfffffe0202f85c20 hdacc_detach() at hdacc_detach+0x2f/frame 0xfffffe0202f85c40 device_detach() at device_detach+0x197/frame 0xfffffe0202f85c80 devclass_driver_deleted() at devclass_driver_deleted+0x66/frame 0xfffffe0202f85c devclass_delete_driver() at devclass_delete_driver+0x81/frame 0xfffffe0202f85d00 driver_module_handler() at driver_module_handler+0xff/frame 0xfffffe0202f85d50 module_unload() at module_unload+0x32/frame 0xfffffe0202f85d70 linker_file_unload() at linker_file_unload+0x1eb/frame 0xfffffe0202f85db0 kern_kldunload() at kern_kldunload+0x18e/frame 0xfffffe0202f85e00 amd64_syscall() at amd64_syscall+0x153/frame 0xfffffe0202f85f30 fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe0202f85f30 MFC after: 3 days Reviewed by: markj, christos Differential Revision: https://reviews.freebsd.org/D44778 Sponsored by: Postgres Professional --- sys/dev/sound/pci/hda/hdacc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index 123c64d9c487..009c9098ac3b 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -539,9 +539,10 @@ hdacc_detach(device_t dev) struct hdacc_softc *codec = device_get_softc(dev); int error; - error = device_delete_children(dev); + if ((error = device_delete_children(dev)) != 0) + return (error); free(codec->fgs, M_HDACC); - return (error); + return (0); } static int From nobody Mon Apr 15 12:21:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJ5s43DKSz5GDwY; Mon, 15 Apr 2024 12:22:16 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJ5s41DQrz4Gnq; Mon, 15 Apr 2024 12:22:16 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-518e5a74702so543823e87.1; Mon, 15 Apr 2024 05:22:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713183733; x=1713788533; 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=1+8hOKqyizpx42VDwEBRlK3dr3KFqkxARx+8CyJeBpw=; b=W5L21ak9eZ7YS83OhcSnMjxp4q+wJ8xs5HD1kTYcqa52cbqWQj1LCkv3/i1K2m27ut Cec+hV+p7b0DLtgSJb1BiLddRuM2JodUvwEPUwZcS0eoxhWOwH6T20StIce/i7xZM0J8 aFJ/MJwjyrM6FWTtp5/UyPc+ISubqrl1qbZH5cXJHq090fnpm6qoMitZEWumDtnieARN xPJ4FPw2A4C8CNdkrdpnNmUNemSDG+YMRlXDpr4kkRF90LSgcCc9c7VvYhikzdOjUbwy e2Z7O5YzFRcSAA2OEesMhD6iY8Z72nFHC/rS0GZ8aUhlj7LU02vtw5DQ8gkQUdLG/DyT zQBQ== X-Forwarded-Encrypted: i=1; AJvYcCXmdrY84xq/TD0F/cNIRHgP3zVnetK8N2Tom6KYYV3P7kW3nteVTFwRYaQgWU9jmfoT7WH43DOOYocAnuve/gDiDLIcQ9z3pbIk3jfvYCG+wlDMN9JlIgZrN2kIy+uh/1lkwFq5E6iwKIT5BRa7RvAY1g== X-Gm-Message-State: AOJu0Yzwt3W6jhe1zuZSEX4Y+5bRXeAcv+BQ2QiEncWE321ujkHAMv7z Te4P9EkFXDbJlBErBs0dmHV1phMAYtbFIixZ6m2vBzt7TRJPiwjxMi+7yRdL X-Google-Smtp-Source: AGHT+IHUqoNbB6LuhdJ1l0adwfh6tviIOEFzBlSEKBDe+STy2t5SW9MGEP4eay9npXgSwLNMODu+WQ== X-Received: by 2002:a05:6512:927:b0:516:d922:a06f with SMTP id f7-20020a056512092700b00516d922a06fmr2551884lft.23.1713183733100; Mon, 15 Apr 2024 05:22:13 -0700 (PDT) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com. [209.85.167.47]) by smtp.gmail.com with ESMTPSA id u24-20020ac25198000000b0051593cfb556sm1249952lfi.239.2024.04.15.05.22.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Apr 2024 05:22:12 -0700 (PDT) Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-516d68d7a8bso2628517e87.1; Mon, 15 Apr 2024 05:22:12 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUAsrFZltay0447wtoLjycFcW8IbSdSYFGJwX733S7et6Dp/Lm9Ihd4tCgdQzeiMjboSSvzUApHzWGuqgr1CF/Ea4tQgfiMMZz5VrIJb7fIFQ0cxfmGdIzm9eQ6+vxYPva3T3soQTV6E4mn+e/TLQ5m3A== X-Received: by 2002:a05:6512:1091:b0:518:c87b:6901 with SMTP id j17-20020a056512109100b00518c87b6901mr1220352lfg.34.1713183732093; Mon, 15 Apr 2024 05:22:12 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202404141746.43EHkobl002927@gitrepo.freebsd.org> <6114cce6-dd6e-478f-97af-1a2813f29332@FreeBSD.org> In-Reply-To: <6114cce6-dd6e-478f-97af-1a2813f29332@FreeBSD.org> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Mon, 15 Apr 2024 14:21:59 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: bc0c6c9cf3a9 - main - freebsd-update: Add check for kernel modules To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000c96a17061621aba3" 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)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VJ5s41DQrz4Gnq --000000000000c96a17061621aba3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Apr 15, 2024 at 5:44=E2=80=AFAM Kyle Evans wro= te: > On 4/14/24 12:46, Fernando Apestegu=C3=ADa wrote: > > The branch main has been updated by fernape: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dbc0c6c9cf3a9f9a54dbdd92dd8f1f65= ff8092d17 > > > > commit bc0c6c9cf3a9f9a54dbdd92dd8f1f65ff8092d17 > > Author: Fernando Apestegu=C3=ADa > > AuthorDate: 2023-04-19 16:08:47 +0000 > > Commit: Fernando Apestegu=C3=ADa > > CommitDate: 2024-04-14 17:46:23 +0000 > > > > freebsd-update: Add check for kernel modules > > > > People get confused when some software (VirtualBox, etc) does not > work as > > expected (or at all) after a major upgrade. > > > > We have a nice way to deal with this when using sources, namely > including > > PORTS_MODULES in /etc/make.conf, but we lack something similar for > binary > > updates. > > > > This patch retrieves a list of kernel modules installed from > packages and > > advises the user to recompile from ports to avoid problems. > > > > Approved by: zlei@ > > Differential Revision: https://reviews.freebsd.org/D39695 > > --- > > usr.sbin/freebsd-update/freebsd-update.sh | 58 > +++++++++++++++++++++++++++++++ > > 1 file changed, 58 insertions(+) > > > > diff --git a/usr.sbin/freebsd-update/freebsd-update.sh > b/usr.sbin/freebsd-update/freebsd-update.sh > > index 4a6a8d78330b..d1cd46963a6c 100644 > > --- a/usr.sbin/freebsd-update/freebsd-update.sh > > +++ b/usr.sbin/freebsd-update/freebsd-update.sh > > @@ -655,6 +655,63 @@ fetch_setup_verboselevel () { > > esac > > } > > > > +# Check if there are any kernel modules installed from ports. > > +# In that case warn the user that a rebuild from ports (i.e. not from > > +# packages) might need necessary for the modules to work in the new > release. > > +upgrade_check_kmod_ports() { > > + local mod_name > > + local modules > > + local pattern > > + local pkg_name > > + local port_name > > + local report > > + local w > > + > > + if ! command -v pkg >/dev/null; then > > + echo "Skipping kernel modules check. pkg(8) not present." > > + return > > + fi > > + > > + # Most modules are in /boot/modules but we should actually look > > + # in every path configured in module_path > > + search_files=3D"/boot/defaults/loader.conf /boot/loader.conf" > > Woof... this is inherently quite fragile, and it completely ignores how > loader.conf are actually processed. The final module_path will always > get passed to the kernel via kenv(1) and exposed as kern.module_path, > please strongly consider just grabbing it from one of them instea . > Thanks for the feedback. kern.module_path seems like the way to do this indeed. Here is a review: https://reviews.freebsd.org/D44797 Cheers. > > Thanks, > > Kyle Evans > --000000000000c96a17061621aba3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Apr 15, 2024 at 5:44=E2=80=AF= AM Kyle Evans <kevans@freebsd.org<= /a>> wrote:
O= n 4/14/24 12:46, Fernando Apestegu=C3=ADa wrote:
> The branch main has been updated by fernape:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Dbc0c6c9cf3a9f9a54dbdd92dd8f1f65ff8092d17<= /a>
>
> commit bc0c6c9cf3a9f9a54dbdd92dd8f1f65ff8092d17
> Author:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa <fernape@FreeBS= D.org>
> AuthorDate: 2023-04-19 16:08:47 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Fernando Apestegu=C3=ADa <fernape@FreeBS= D.org>
> CommitDate: 2024-04-14 17:46:23 +0000
>
>=C2=A0 =C2=A0 =C2=A0 freebsd-update: Add check for kernel modules
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 People get confused when some software (VirtualBox= , etc) does not work as
>=C2=A0 =C2=A0 =C2=A0 expected (or at all) after a major upgrade.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 We have a nice way to deal with this when using so= urces, namely including
>=C2=A0 =C2=A0 =C2=A0 PORTS_MODULES in /etc/make.conf, but we lack somet= hing similar for binary
>=C2=A0 =C2=A0 =C2=A0 updates.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 This patch retrieves a list of kernel modules inst= alled from packages and
>=C2=A0 =C2=A0 =C2=A0 advises the user to recompile from ports to avoid = problems.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Approved by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 zlei@
>=C2=A0 =C2=A0 =C2=A0 Differential Revision:=C2=A0 https://revi= ews.freebsd.org/D39695
> ---
>=C2=A0 =C2=A0usr.sbin/freebsd-update/freebsd-update.sh | 58 +++++++++++= ++++++++++++++++++++
>=C2=A0 =C2=A01 file changed, 58 insertions(+)
>
> diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/free= bsd-update/freebsd-update.sh
> index 4a6a8d78330b..d1cd46963a6c 100644
> --- a/usr.sbin/freebsd-update/freebsd-update.sh
> +++ b/usr.sbin/freebsd-update/freebsd-update.sh
> @@ -655,6 +655,63 @@ fetch_setup_verboselevel () {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0esac
>=C2=A0 =C2=A0}
>=C2=A0 =C2=A0
> +# Check if there are any kernel modules installed from ports.
> +# In that case warn the user that a rebuild from ports (i.e. not from=
> +# packages) might need necessary for the modules to work in the new r= elease.
> +upgrade_check_kmod_ports() {
> +=C2=A0 =C2=A0 =C2=A0local mod_name
> +=C2=A0 =C2=A0 =C2=A0local modules
> +=C2=A0 =C2=A0 =C2=A0local pattern
> +=C2=A0 =C2=A0 =C2=A0local pkg_name
> +=C2=A0 =C2=A0 =C2=A0local port_name
> +=C2=A0 =C2=A0 =C2=A0local report
> +=C2=A0 =C2=A0 =C2=A0local w
> +
> +=C2=A0 =C2=A0 =C2=A0if ! command -v pkg >/dev/null; then
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0echo "Skipping k= ernel modules check. pkg(8) not present."
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return
> +=C2=A0 =C2=A0 =C2=A0fi
> +
> +=C2=A0 =C2=A0 =C2=A0# Most modules are in /boot/modules but we should= actually look
> +=C2=A0 =C2=A0 =C2=A0# in every path configured in module_path
> +=C2=A0 =C2=A0 =C2=A0search_files=3D"/boot/defaults/loader.conf /= boot/loader.conf"

Woof... this is inherently quite fragile, and it completely ignores how loader.conf are actually processed.=C2=A0 The final module_path will always=
get passed to the kernel via kenv(1) and exposed as kern.module_path,
please strongly consider just grabbing it from one of them instea .

Thanks for the feedback. kern.module_path seem= s like the way to do this indeed.

Here is a re= view:
=C2=A0
Cheers.
=

Thanks,

Kyle Evans
--000000000000c96a17061621aba3-- From nobody Mon Apr 15 13:57:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJ7zc1wRPz5GdmW; Mon, 15 Apr 2024 13:58:04 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) (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 4VJ7zb0SLKz4Trb; Mon, 15 Apr 2024 13:58:03 +0000 (UTC) (envelope-from mavbsd@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=geDhtf8j; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of mavbsd@gmail.com designates 2607:f8b0:4864:20::22a as permitted sender) smtp.mailfrom=mavbsd@gmail.com Received: by mail-oi1-x22a.google.com with SMTP id 5614622812f47-3bbd6ea06f5so2227567b6e.1; Mon, 15 Apr 2024 06:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713189481; x=1713794281; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id:sender :from:to:cc:subject:date:message-id:reply-to; bh=dKIjeGj1vhEJG9JolaaiwcYU0+Yu+JuXoGDtJcPcPKY=; b=geDhtf8jlgrSbTZHUBI6mgAKIsPqHraE1TVScO/q72vROGxVqQbFvpa9I7Tu0r2wYj T/9VDVLyfZn6ti5i9Ahd1t6R6i+J9GbfbRUIJhlqEubXk+bwnySts4cw6Q4VIjvxwPIq rZleO3c62XCqZ8vDJM00hP5hffkWDKon+JjZym0MIB3N1XSqmYh649CIg4tC/qEcNBLU y+Uzs0deXvIaJ5wJVms4G8pt6DxvWIedF/jZWcXggVtNPxUDMjylCLfE/rn2LpUUwU/w 25LAO81WnmCS3eaTniGbZjChBvzmoW8ATU1dmnN1rsCunv3/UmZZjKATqvcZ88lNBYvN zrZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713189481; x=1713794281; h=content-transfer-encoding:in-reply-to:subject:from:references:cc:to :content-language:user-agent:mime-version:date:message-id:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dKIjeGj1vhEJG9JolaaiwcYU0+Yu+JuXoGDtJcPcPKY=; b=OqPwbg289eipH9G6lV+kSeW/3vleO2U0QhqpvETC9bihWb+v5jemwRUrf0NVGeHZ0F VcPqRJAUP8+YKUtTFfoWVPxl8k76ZXxUsl3qpVZNUyhGNtHbiZmaR4fhjiq6ciVu6nt8 T6oRtSmpgEVyC2ocb/ZyHFRW7nevek3fRfkXYBeR28EZdZkaxArURM43kQEhaA31caYB 4iz93nfOO33OZJNboyAsm5IVL+YKYa1tBWxP/lP1H04rfgyCtKCf9FebdfA8X1sP3t2M rNND/0LWNejdbjvBop9rsfRokyufPyqQW18jpj6jb7G9Bewr+Z4KI46QtuLX0A8a4kg0 1XAg== X-Forwarded-Encrypted: i=1; AJvYcCWtf+B8qsUSMZ0RY5d1OWfeCgalWhrHFU1scCumMPUboZCqtqTCZevjpSF/t0mt9jmY9Jezcpk17xbtJZHP4qhpg/j8JXURJtJJ7Wf8VWLf89KQbXIT1TrMOKkQD2UDCuF1el384kkVuyGtGyFfnHyYobN8Z34bgah+VAhP60Ylk7s= X-Gm-Message-State: AOJu0YyVNwf30joAAKY7ZP3fULMqtKpGQV1BtAZJ2N6i2Jw/inpXWn6T t+qWb1q/7p/wwyctNl3THMW9USWM6lXyv5/wY5MM42em6qGMaznvqLdkDw== X-Google-Smtp-Source: AGHT+IEKbi71Fsm2rUI0Ba2iZ69czaABJQP+XlOdgEOyurVDvBwJOH1iV+RB8d0/Wtdeoof3l+1rbg== X-Received: by 2002:a05:6808:2a71:b0:3c7:641:b360 with SMTP id fu17-20020a0568082a7100b003c70641b360mr1690055oib.25.1713189481530; Mon, 15 Apr 2024 06:58:01 -0700 (PDT) Received: from [10.230.45.5] ([38.32.73.2]) by smtp.gmail.com with ESMTPSA id q4-20020a056808200400b003c5fa27f498sm1613533oiw.12.2024.04.15.06.58.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Apr 2024 06:58:00 -0700 (PDT) Message-ID: <363f8b48-b0f3-b06d-a6d3-d19f14a3e420@FreeBSD.org> Date: Mon, 15 Apr 2024 09:57:15 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US To: "Bjoern A. Zeeb" , Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202403302256.42UMu3Vk098091@gitrepo.freebsd.org> From: Alexander Motin Subject: Re: git: 783d3ff6d7fa - main - zfs: merge openzfs/zfs@39be46f43 In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.98 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.88)[-0.884]; FORGED_SENDER(0.30)[mav@FreeBSD.org,mavbsd@gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[mav@FreeBSD.org,mavbsd@gmail.com]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::22a:from]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_TRACE(0.00)[gmail.com:+] X-Rspamd-Queue-Id: 4VJ7zb0SLKz4Trb On 12.04.2024 15:42, Bjoern A. Zeeb wrote: > On Sat, 30 Mar 2024, Martin Matuska wrote: >> The branch main has been updated by mm: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=783d3ff6d7fae619db8a7990b8a6387de0c677b5 >> >> commit 783d3ff6d7fae619db8a7990b8a6387de0c677b5 >> Merge: e0388a906ca7 39be46f43f96 >> Author:     Martin Matuska >> AuthorDate: 2024-03-30 21:14:52 +0000 >> Commit:     Martin Matuska >> CommitDate: 2024-03-30 22:54:24 +0000 >> >>    zfs: merge openzfs/zfs@39be46f43 >> >>    Notable upstream pull request merges: >>     #15509 b1e46f869 Add ashift validation when adding devices to a pool >>     #15927 45e23abed Update resume token at object receive >>     #15941 bf8f72359 BRT: Skip duplicate BRT prefetches >>     #15950 8cd8ccca5 BRT: Skip getting length in brt_entry_lookup() >>     #15951 80cc51629 ZAP: Massively switch to _by_dnode() interfaces >>     #15954 2c01cae8b BRT: Change brt_pending_tree sorting order >>     #15955 4616b96a6 BRT: Relax brt_pending_apply() locking >>     #15959 5c4a4f82c zio: update ZIO type x stage documentation >>     #15962 493fcce9b Provide macros for setting and getting blkptr >> birth times >>     #15963 90ff73235 freebsd: fix missing headers in distribution tarball >>     #15967 f68bde723 BRT: Make BRT block sizes configurable >>     #15976 c28f94f32 ZAP: Some cleanups/micro-optimizations >>     #15995 cfb96c772 vdev_disk: clean up spa/bdev mode conversion >>     #16006 c0aab8b8f zvols: prevent overflow of minor device numbers >>     #16007 a89d209bb BRT: Fix holes cloning >>     #16008 c9d8f6c59 Fix option string, adding -e and fixing order >> >>    Obtained from:  OpenZFS >>    OpenZFS commit: 39be46f43f96fb7420386d03751b01f5cb376d6b > > I see this during builds: > > /usr/src/src.git/sys/contrib/openzfs/module/zfs/arc.c:1362:1: warning: > function 'arc_buf_is_shared' is not needed and will not be emitted > [-Wunneeded-internal-declaration] It is used only for assertions in debug builds now. I've tried to wrap it with ifdef, but with that on non-debug builds compiler is not happy either. -- Alexander Motin From nobody Mon Apr 15 14:58:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJ9K14qL8z5GlYC; Mon, 15 Apr 2024 14:58: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 4VJ9K13k13z4lPL; Mon, 15 Apr 2024 14:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713193093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BUyN8f0u+NZHltr+g+lVwazzZvebEG4bHiUhi6Inv9I=; b=hpp1xWqoD/9zQHVxiQ0DS118o8fiQq7nhFVzPQWXTOuPBg6SsGK7JUC6dH+bpcVZA2r5G3 NtwP/FkNveKgzsag9GIvEyLElnJDi6iY+EXqCIZf3HUCXXufrOdiQmZqQTY10wWd6kF0BI nV8eOpVWSJ527nLJ3N1DMjds7xPddhZMqoyk/KDlPCo4Bxr+scXzKqFb5h5YpUXYbT2ddE KYqC/4IsSCZ7GBE1KgJeP58nUYCX1KQWYlJHtCklhROP5sjhR04I67g9/9Ff2iB+/sYCdN asMyYQz2UsqAk+Lvw3FdAgF2NU9RdIwvR93kt4HcrPerNy500IY1klFf7D9tUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713193093; a=rsa-sha256; cv=none; b=nckhfdQC7ZeRQsFL088/NerEXzv6gLL60dbnyyvkywCRs81fFl9n39joUiRrzrPGcg4LCD O30+74OSHIRWTTLHXfEHPO50RGepFQvVSfU4kvcRQW9Qs3W+hXQt/cTweFwwlHUwYfzUfA 3xrbJim1LUEGC2q1To6PSnUr9URCq4wRkaLYHx5gxikvJoxAt/qx3zVyDuOXjP6xOC70Zf Tc3rj88LStW8DfTMZjxu3d2Xsct5rckBGzbGmYpzsrcb5pB0+izgrObUv1ZfJPMxp8AXaw flz9R2qWdd7+TUuEQmkm+a3aJRA7FdAhjBfgSxbC1Puan1To/ru7Wsr+SEjulw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713193093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BUyN8f0u+NZHltr+g+lVwazzZvebEG4bHiUhi6Inv9I=; b=EUfGJUJ3o/AbpTh1R9mlEzNPvU8fOoyIwiSTZwCTwtfvYPHja5uKu8nU+W0UPJYq+/6eJf zuGYqxX74GMiEdpQqH2tWQmsspKHKHMmWP78kLdlkHq9fQjLLmZ3lhJ2cUo+KWsEQWFwp0 N/ZvPxmIanY3IKdVACWPhOb0REgogfYzhiJugyOMmguBtxCdQDNV1b1Pzvr24MHOKhoLPl rWV14+ngSRvwXsBwjMpiKbnncW949UWJrFOilfCmZ1JnteAALczslW32NRe/IKp7xuK+sH WcbUwYA4hi5Lp/xPa9lHrN9d7kW6wKJSMSMan3xUXydYaFEbiEZvXiWv6qrUXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJ9K13C9sz14Fc; Mon, 15 Apr 2024 14:58: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 43FEwDK8053724; Mon, 15 Apr 2024 14:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FEwDkQ053721; Mon, 15 Apr 2024 14:58:13 GMT (envelope-from git) Date: Mon, 15 Apr 2024 14:58:13 GMT Message-Id: <202404151458.43FEwDkQ053721@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: 303dea74c2cb - main - iflib: Fix compiler warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 303dea74c2cb3a41fba455fce8577993e637c3da Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=303dea74c2cb3a41fba455fce8577993e637c3da commit 303dea74c2cb3a41fba455fce8577993e637c3da Author: Stephen J. Kiernan AuthorDate: 2024-04-03 20:21:55 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-15 14:57:52 +0000 iflib: Fix compiler warnings Some of the QUAD sysctls are actually for unsigned quad values. Switch to using UQUAD instead, as that is meant for unsigned. Reviewed by: erj, jhb Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44620 --- sys/net/iflib.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 999a86fabc79..53f18fc90dfe 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -6850,32 +6850,32 @@ iflib_add_device_sysctl_post(if_ctx_t ctx) CTLFLAG_RD, &txq->ift_task.gt_cpu, 0, "cpu this queue is bound to"); #if MEMORY_LOGGING - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "txq_dequeued", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txq_dequeued", CTLFLAG_RD, &txq->ift_dequeued, "total mbufs freed"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "txq_enqueued", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txq_enqueued", CTLFLAG_RD, &txq->ift_enqueued, "total mbufs enqueued"); #endif - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "mbuf_defrag", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "mbuf_defrag", CTLFLAG_RD, &txq->ift_mbuf_defrag, "# of times m_defrag was called"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "m_pullups", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "m_pullups", CTLFLAG_RD, &txq->ift_pullups, "# of times m_pullup was called"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "mbuf_defrag_failed", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "mbuf_defrag_failed", CTLFLAG_RD, &txq->ift_mbuf_defrag_failed, "# of times m_defrag failed"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "no_desc_avail", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "no_desc_avail", CTLFLAG_RD, &txq->ift_no_desc_avail, "# of times no descriptors were available"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "tx_map_failed", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "tx_map_failed", CTLFLAG_RD, &txq->ift_map_failed, "# of times DMA map failed"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "txd_encap_efbig", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txd_encap_efbig", CTLFLAG_RD, &txq->ift_txd_encap_efbig, "# of times txd_encap returned EFBIG"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "no_tx_dma_setup", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "no_tx_dma_setup", CTLFLAG_RD, &txq->ift_no_tx_dma_setup, "# of times map failed for other than EFBIG"); SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, "txq_pidx", @@ -6890,10 +6890,10 @@ iflib_add_device_sysctl_post(if_ctx_t ctx) SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, "txq_in_use", CTLFLAG_RD, &txq->ift_in_use, 1, "descriptors in use"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "txq_processed", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txq_processed", CTLFLAG_RD, &txq->ift_processed, "descriptors procesed for clean"); - SYSCTL_ADD_QUAD(ctx_list, queue_list, OID_AUTO, "txq_cleaned", + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txq_cleaned", CTLFLAG_RD, &txq->ift_cleaned, "total cleaned"); SYSCTL_ADD_PROC(ctx_list, queue_list, OID_AUTO, "ring_state", @@ -6958,16 +6958,16 @@ iflib_add_device_sysctl_post(if_ctx_t ctx) CTLFLAG_RD, &fl->ifl_buf_size, 1, "buffer size"); #if MEMORY_LOGGING - SYSCTL_ADD_QUAD(ctx_list, fl_list, OID_AUTO, "fl_m_enqueued", + SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, "fl_m_enqueued", CTLFLAG_RD, &fl->ifl_m_enqueued, "mbufs allocated"); - SYSCTL_ADD_QUAD(ctx_list, fl_list, OID_AUTO, "fl_m_dequeued", + SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, "fl_m_dequeued", CTLFLAG_RD, &fl->ifl_m_dequeued, "mbufs freed"); - SYSCTL_ADD_QUAD(ctx_list, fl_list, OID_AUTO, "fl_cl_enqueued", + SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, "fl_cl_enqueued", CTLFLAG_RD, &fl->ifl_cl_enqueued, "clusters allocated"); - SYSCTL_ADD_QUAD(ctx_list, fl_list, OID_AUTO, "fl_cl_dequeued", + SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, "fl_cl_dequeued", CTLFLAG_RD, &fl->ifl_cl_dequeued, "clusters freed"); #endif From nobody Mon Apr 15 16:07:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJBrh38s1z5Gsby; Mon, 15 Apr 2024 16:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJBrh2HMmz4sVk; Mon, 15 Apr 2024 16:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713197236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A1uc+uUfV+nxvWesT+l52Ne2aPah5+EBFQ5BChhGIzw=; b=dlJrGX69YlMFtfDnHYt12wC7rR0to2VX0JyClnpg1SU8imqvy6VY2teXwP453gQHyaaSjZ AkHBua1Z9fq5FWx/jXJdpXiXuh7eFBLWqrw6erP5gxY8icvMjYxeD+TbsFr5fhuwayG0Ev t5CvkG7VmLsUbrAbbXMH8baMpWUr4T9Z+NTeuc2VLak94PTCPJSOaDGpOcsC4AWKJ+WArA B6bURmLVNWrkRbBabAxxPKNWDF40hXfM+SBvWxyNsscKlkKBegAjxzAaxY7RhYenJJHBbm 09nhL7KRTiccdSWi6SOxjij0XthVXYr5aEOiRQpE3aZcZfiiPt2tzoMHBf0r8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713197236; a=rsa-sha256; cv=none; b=oiapR7NXB+NnuY8MADWsGYOc8dQyMzjIA0ilBzco+VEdt/7BHTUnMmcUxcP+0Xx1dbtpQQ T6xbl6YjYz/5tz5BJcUOiRGn6rTu28BdX/FzoxdpAKDvq4N8vuA8wOC2Kk1v/AQBpY48Cq nrBzIu8Tdws5TshZ8JLQSt2KhKmSIvvLpzulHRgZkHL5FxUMi7qfXwz0LmCLeyk0lXsWoI Ci5lpUHeoEbBlLkd5GvmM1FrrtkVRWHke4MPHPNfwXCadCSknN3AXmEC032GaICuH+0ryP VbRauY5VSrRw3ANV6voduIENYBZ3+GKcvCi7MYkupDpUxoFCj6kiAKwCnZ94/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713197236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A1uc+uUfV+nxvWesT+l52Ne2aPah5+EBFQ5BChhGIzw=; b=gqCfHRVDc26MokSEZiOXa0/XmWAOK1LqUvUF/0HOTDo/GzoHvXuJTepoWu7VkZStVNdutu EQ58vnN6XdCn1/ElXcgpIMrBT9K9g0JmVmj2T2tKTycZyJIsteINUCWwp81YiGZVUX0GqU 2sXeA7NAJLa+O4+LV9rPNlC/b/xftZHWbESJ8GdXJ1rUo8DPYDv2KZpCSVcuGswZiBJAqQ ULO9M7Om/Vd16+YbPSHGYcBq3YE8/BACr2eXR2lXnI4sWzIeNUBVWFYzCxvereqijU4vsU bgmsM/h0ALyjdOB/mxMKYspKNaY/eiseWjsR4eDxQSGbqqE+dtwGrM7oYkyQZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJBrh1rRRz15Vb; Mon, 15 Apr 2024 16:07: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 43FG7GM9072463; Mon, 15 Apr 2024 16:07:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FG7Gbn072460; Mon, 15 Apr 2024 16:07:16 GMT (envelope-from git) Date: Mon, 15 Apr 2024 16:07:16 GMT Message-Id: <202404151607.43FG7Gbn072460@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: 3d3ec17825a1 - main - LinuxKPI: sk_buff: implement skb_queue_splice_tail_init() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 3d3ec17825a124f0119d76c4d2523d73012fa226 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3d3ec17825a124f0119d76c4d2523d73012fa226 commit 3d3ec17825a124f0119d76c4d2523d73012fa226 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:17:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 16:06:11 +0000 LinuxKPI: sk_buff: implement skb_queue_splice_tail_init() Implement skb_queue_splice_tail_init() and SKB_DATA_ALIGN() as needed by the mt76 wireless driver. Sponsord by: The FreeBD Foundation MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44590 --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 02190a29e241..ee3f427aa6e9 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -89,6 +89,7 @@ struct skb_shared_hwtstamps { }; #define NET_SKB_PAD max(CACHE_LINE_SIZE, 32) +#define SKB_DATA_ALIGN(_x) roundup2(_x, CACHE_LINE_SIZE) struct sk_buff_head { /* XXX TODO */ @@ -824,7 +825,7 @@ skb_mark_not_on_list(struct sk_buff *skb) } static inline void -___skb_queue_splice_init(const struct sk_buff_head *from, +___skb_queue_splice(const struct sk_buff_head *from, struct sk_buff *p, struct sk_buff *n) { struct sk_buff *b, *e; @@ -847,7 +848,21 @@ skb_queue_splice_init(struct sk_buff_head *from, struct sk_buff_head *to) if (skb_queue_empty(from)) return; - ___skb_queue_splice_init(from, (struct sk_buff *)to, to->next); + ___skb_queue_splice(from, (struct sk_buff *)to, to->next); + to->qlen += from->qlen; + __skb_queue_head_init(from); +} + +static inline void +skb_queue_splice_tail_init(struct sk_buff_head *from, struct sk_buff_head *to) +{ + + SKB_TRACE2(from, to); + + if (skb_queue_empty(from)) + return; + + ___skb_queue_splice(from, to->prev, (struct sk_buff *)to); to->qlen += from->qlen; __skb_queue_head_init(from); } From nobody Mon Apr 15 16:21:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJC8t28yGz5GtjT; Mon, 15 Apr 2024 16:21: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 4VJC8t1Zhfz4tvK; Mon, 15 Apr 2024 16:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713198078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpahFiS3b8BmoQ9auWdFctd6phpPjwqwEUVzJE3/lJc=; b=AIzKRTzs5flVJDdvP/NtXcTIggcEPe8jRXFC1l8y/cCrvbLFWOqo+WjoJljmNN/7kxuGvu olq0ZH6hzOb9uOgK/H2uaMuv/m9brtr5vKa/Xe+f2N4XF1EofF+Z6fSbHeR+9pQX2W9U54 hG9hO7aFZ901IL5zkSzX+7E2quScKhAzqAyePUvt1LUVwONHuI1QgSS7pvj9//TxxYHOW0 QkFSEE5hVSa1og0wUQyZKn4AGDgls8rLw2xeUoA3qIcvsw+NU7BIsDYEPkxu0MXndGOHke fQ83si+I1HPRUAHQQzx7SxeTyDsuGEjRq+mGfoki6ADquF85J7n9pyoIWU3moQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713198078; a=rsa-sha256; cv=none; b=nqI1Rh5yoSDVApqSjyjAMdLq3PaqCjPurHFhEpSs4TcpdmwIQ3QJ7v9LsTHWvuhH6Y6uxA vTuLcY8bNHRvtENWvjx3APuPMorLWkeRnIGNZfzJfJ1dyLS4FlfAosnpPcwYIJLHJEsEmz Kqrh+Tt3jFWQlJtaQVrrnwrGbYwYNgyR8Ic5qW6G3Q/fZKVy5zEkOJodV0zMlkp0+9Fq0w CBHmqjsZTcomSFXPh5M0RfumvnRzl54V2W2Q/BzN0oQrPXbCAB0tCYM7oIsI5Ha6nG2sfZ YL2bRhIwruxIlI4qQFQjVnzO14OaMs+/BqiDSiCXi+eMwISLtfiU468jjIXNDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713198078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kpahFiS3b8BmoQ9auWdFctd6phpPjwqwEUVzJE3/lJc=; b=QGOEIcBo2CRjr1sjR5x9cQv3sNrcPjmZtGn/m8O072WqRAC3mGmcWkLFErS1jYPzfN/Yr6 QYT2FdzlUaTG+ahpPZ+SsNkmi3OShYiBT/VOjIhOUsPgAoLgmCSsZm1NYBfZ62jnwz1SCi sr3ra9Rt2CqiJeYnM8FEByuGFtp9Ljf0MAT2VzNhhEIae60a+X57WuMZ4f5IHjQaGs/d8g aASv35vkZFycudcemgGWp2wkG5nnF6AwdAMjouhnBViTu/i4EpLcCljGo2R2gRJ7YxORFq cJWKnkulHBTNaK3GSjg025F5ulv3qip4hLTR0pD14AUGC2gOVQ4CLKKr6HyD3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJC8t1Bljz15Wj; Mon, 15 Apr 2024 16:21: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 43FGLIdl000934; Mon, 15 Apr 2024 16:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FGLIsU000932; Mon, 15 Apr 2024 16:21:18 GMT (envelope-from git) Date: Mon, 15 Apr 2024 16:21:18 GMT Message-Id: <202404151621.43FGLIsU000932@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: 21761f2ede4e - main - LinuxKPI: napi_schedule() requires return value, implement napi_is_scheduled() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 21761f2ede4ebad13e78112b9409c1f20f946781 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=21761f2ede4ebad13e78112b9409c1f20f946781 commit 21761f2ede4ebad13e78112b9409c1f20f946781 Author: Bjoern A. Zeeb AuthorDate: 2024-03-31 17:27:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 16:19:47 +0000 LinuxKPI: napi_schedule() requires return value, implement napi_is_scheduled() A newer version of iwlwifi requires a return value from napi_schedule(); unclear if the function always should have been bool. Add the bool to test based on the napi_schedule_prep() result. Also add napi_is_scheduled() for rtw89. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste (previous version) Differential Revision: https://reviews.freebsd.org/D44591 --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 9 ++++++++- sys/compat/linuxkpi/common/src/linux_netdev.c | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 95fbf2a0f48c..3d2b309909b4 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -230,7 +230,7 @@ void linuxkpi_netif_napi_add(struct net_device *, struct napi_struct *, void linuxkpi_netif_napi_del(struct napi_struct *); bool linuxkpi_napi_schedule_prep(struct napi_struct *); void linuxkpi___napi_schedule(struct napi_struct *); -void linuxkpi_napi_schedule(struct napi_struct *); +bool linuxkpi_napi_schedule(struct napi_struct *); void linuxkpi_napi_reschedule(struct napi_struct *); bool linuxkpi_napi_complete_done(struct napi_struct *, int); bool linuxkpi_napi_complete(struct napi_struct *); @@ -272,6 +272,13 @@ netif_napi_add_tx(struct net_device *dev, struct napi_struct *napi, netif_napi_add(dev, napi, napi_poll); } +static inline bool +napi_is_scheduled(struct napi_struct *napi) +{ + + return (test_bit(LKPI_NAPI_FLAG_IS_SCHEDULED, &napi->state)); +} + /* -------------------------------------------------------------------------- */ static inline void diff --git a/sys/compat/linuxkpi/common/src/linux_netdev.c b/sys/compat/linuxkpi/common/src/linux_netdev.c index 4d00dbf5c9ff..fe00e929c168 100644 --- a/sys/compat/linuxkpi/common/src/linux_netdev.c +++ b/sys/compat/linuxkpi/common/src/linux_netdev.c @@ -184,7 +184,7 @@ linuxkpi___napi_schedule(struct napi_struct *napi) } } -void +bool linuxkpi_napi_schedule(struct napi_struct *napi) { @@ -194,8 +194,12 @@ linuxkpi_napi_schedule(struct napi_struct *napi) * iwlwifi calls this sequence instead of napi_schedule() * to be able to test the prep result. */ - if (napi_schedule_prep(napi)) + if (napi_schedule_prep(napi)) { __napi_schedule(napi); + return (true); + } + + return (false); } void From nobody Mon Apr 15 16:30:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJCN05mZmz5GvSp; Mon, 15 Apr 2024 16:30: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 4VJCN04wyZz3x0h; Mon, 15 Apr 2024 16:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713198656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8XWtUGkcGd6UTmUnk96KPlXm8nMudZ5Gqu8GfromHbs=; b=AX2DzUz3MHcmCktSy3WFloK6DJJtS+7YKmcbOKXohXLozQOvUE2bNXkceStp7JBTbDdUSA iNdr+i6lbAYP7pK723W4TS4Fcq1j3RP9zKDz9ovqtKSMiJznRsSf54RR9OCJgCdVixrO3B vrOMf1g+qRqIASd2Q59KmWhjONTrTZqK/mp+BgrFbwEDpiOyKscftLeXEAF3n7Qfvi1U57 zU+Zy0FrkJ2YRWPNbANc0ZFETY5aao5FXabk7kbQB3e8AmQH2wdoWBE/cqf8dOxSz4X39L ClUePsGz3PezMrWetQsn1oqBx376bJPVUtRZCnLPvBy1LK7c0IlN5Wniel2rRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713198656; a=rsa-sha256; cv=none; b=WpG4Fy/6RywUUlU8BiYPZqi66lUy4W1SrB/0VvjkZM+nfaJRF0Bs5ZfJegglPUQJg6Uw5Q t6HtKhPG6+z4wCMv/FM0mF+4gPFqwMJ1hNNdUTHteHiI99WYqazkXneHOZ8ePxLvvf/NtI MrX3BfS3G1PVohZRnW6q1lwZVx9zgMgMoEHVazUFrNhhmBrNc8Cag3LKfEDooX7je6nlnn 0iJAkLYY67b8xkBDtuPnFFyTcUaOZJFqvaKq2i8fd7GAgeEVmrFPz2L+SRH5LdccZiyv7t 8KlAleM5a0O1Kl6N630tGP5DxmUeTv97OB5bv5pRDYOLOd+VbXTkxnOm3szt5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713198656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8XWtUGkcGd6UTmUnk96KPlXm8nMudZ5Gqu8GfromHbs=; b=oEmG1567OUc4rJO5D5sujCucGFtJn6BCfLRUPUb57sZOV28h/MAqkDxnk9QPQYNfWxp9QL EB+9A2ASQH0IWC/5P/f+pCu3lvdcyXqro4ACCVAULRRF+9POa9MGliwBgsSIGGGChx6cJE 5p0AJUwFAys1+4tLFT3oW5CxMqaTB2cGInn3Yp7lkEqRl29tmq1Jv2wXt6JCJuPqFmhVDn DItfdgNQX37izIPoki7Yv/o9D1xyubamEREyuNFGfJC30map5LF3vH2pYBaFi1v4MjjfhT 6clfAQ8w5ywJsX/BoTwZJKrSFSTwNKgQM5bFih+z5iFucW7J65iFoHKIDaUk+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJCN04XSyz16W3; Mon, 15 Apr 2024 16:30: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 43FGUuhY015032; Mon, 15 Apr 2024 16:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FGUumD015028; Mon, 15 Apr 2024 16:30:56 GMT (envelope-from git) Date: Mon, 15 Apr 2024 16:30:56 GMT Message-Id: <202404151630.43FGUumD015028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 514c98ba14a0 - main - Merge commit 37b7207651b4 from llvm-project (by zhongyunde@huawei.com): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 514c98ba14a0f590891844d1a6bec0ac4de54489 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=514c98ba14a0f590891844d1a6bec0ac4de54489 commit 514c98ba14a0f590891844d1a6bec0ac4de54489 Author: Dimitry Andric AuthorDate: 2024-04-15 16:24:39 +0000 Commit: Dimitry Andric CommitDate: 2024-04-15 16:30:29 +0000 Merge commit 37b7207651b4 from llvm-project (by zhongyunde@huawei.com): [SimplifyCFG] Fix crash when there is unreachable large index (#88616) The large case index out of scope is dead code, but it is still be created for TableContents in SwitchLookupTable::SwitchLookupTable, so make sure the table size after growing should not get smaller. Fix https://github.com/llvm/llvm-project/issues/88607 This should fix "Assertion failed: (idx < size()), function operator[]" when building the science/dynare port. PR: 276104, 278320 Reported by: yuri MFC after: 1 month --- contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 13eae549b2ce..f95dae1842fe 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -6710,9 +6710,11 @@ static bool SwitchToLookupTable(SwitchInst *SI, IRBuilder<> &Builder, return SwitchLookupTable::WouldFitInRegister( DL, UpperBound, KV.second /* ResultType */); })) { + // There may be some case index larger than the UpperBound (unreachable + // case), so make sure the table size does not get smaller. + TableSize = std::max(UpperBound, TableSize); // The default branch is unreachable after we enlarge the lookup table. // Adjust DefaultIsReachable to reuse code path. - TableSize = UpperBound; DefaultIsReachable = false; } } From nobody Mon Apr 15 16:56:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJCxX4jMDz5GxLh; Mon, 15 Apr 2024 16:56: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 4VJCxX48Ycz42dk; Mon, 15 Apr 2024 16:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713200192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gvNjeYYC/U5hIwua6PXLqITPWs+I5yiLnFZptnZCSEw=; b=xrlR6CmM93LuNUaE3ESeglWT5VjYkkHayjZHPbEjK+7ykJCshDugETyuUNuJVHROaMVn3u AzvIlAqBhygPOBFdHetaSaqLp8V6KSdGZMrfhehjCDZZgiF0dxT5UFF9cAVbocnOWdoMVt 3z7Vnl6kFGWIeyikFWC0mSBtIEuNThJRluy1NYgnYwFraQ1PdQC+yn27YHM+GWBRNx/uSb tL1jZLFZ6paR+pXlawPow8/1CV+MdREVCqnluYQYTsb1OqPxqOa+1fEVh0yyBkFfAxHlEm LF4m2keNMxWtgFcZXtsF5tcMt5kc5vggZLiTA62CdSv59A7tEpbZUYJ7H+V8GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713200192; a=rsa-sha256; cv=none; b=UWjhjA3D9UW92Qz8FK4Imx2FxsiCZIrvwjPLFsmkTZCn7lKObORB6a0o4FnjaPtxkP/07u gm8F2aEfW9rLcTOLDamDafmuxFEYF0WO36sjAsbiLbGrBn4U8/W2wf2Ett1DYrrycF2GH+ y59mm4y+aEcPdcYihQiWdadLw2MYv69RtLlqyk4diKHt5s4yprsR2FRXH09LOul1Eymdqu moJmnKrSCES3oM5V/o67lysywMhgJtEHrKCtBbkkZgDqY9F2I4yf0BrWQUstrZKriznN80 tnF8Kn9+WufKm8l6cuIDIx5JQ3Jr++cR4qAbgy/rl79y2+T4EuQNur+7PneSIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713200192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gvNjeYYC/U5hIwua6PXLqITPWs+I5yiLnFZptnZCSEw=; b=Alfl1PmBP1fJOU1AWYJtj3chYBK9xd8nCpIvcMqeLSShxaFmFmop/9dbDZbEqwa/3hT3CV Fnr1x4CDrxTz6MWkfxTk7Ddf4f7zotTqcEVwwR4EP+ByNUFFDSnG0OTG322G+cxS8JYmK7 rGRTEuhzqOjcG68jhFWucojZAnG/Ur6GTjI5heqLZQnn+qeqacBgkCOvH5S8GnOLvxaf00 214k40zjf+UvWJmN6whKMx55kGhCc035RPRFNzBHKC9qoTzBAzQVvpG06lihISDJfuhIto yjp3VxSI6dszYSJMDO0GVNHrFkX3C9A8304J1eArCqn/G3tFDla+ap4uvadh0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJCxX3gs7z17Bg; Mon, 15 Apr 2024 16:56: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 43FGuWs6056315; Mon, 15 Apr 2024 16:56:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FGuWaC056312; Mon, 15 Apr 2024 16:56:32 GMT (envelope-from git) Date: Mon, 15 Apr 2024 16:56:32 GMT Message-Id: <202404151656.43FGuWaC056312@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: 170c2e0e2bb1 - main - LinuxKPI: add devm_kfree() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 170c2e0e2bb1b2d9a7661ba729f8264381c9d9d7 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=170c2e0e2bb1b2d9a7661ba729f8264381c9d9d7 commit 170c2e0e2bb1b2d9a7661ba729f8264381c9d9d7 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:45:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 16:55:59 +0000 LinuxKPI: add devm_kfree() mt76 calls devm_kfree() directly, so alias it to our lkpi_devm_kmalloc_release() function. Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44589 --- sys/compat/linuxkpi/common/include/linux/device.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 77c7a253a2e8..668fe9cb8650 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -283,6 +283,7 @@ int lkpi_devres_destroy(struct device *, void(*release)(struct device *, void *) void lkpi_devres_release_free_list(struct device *); void lkpi_devres_unlink(struct device *, void *); void lkpi_devm_kmalloc_release(struct device *, void *); +#define devm_kfree(_d, _p) lkpi_devm_kmalloc_release(_d, _p) static inline const char * dev_driver_string(const struct device *dev) From nobody Mon Apr 15 17:31:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJDjJ2rnYz5H19J; Mon, 15 Apr 2024 17: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 4VJDjJ2L1Gz4D79; Mon, 15 Apr 2024 17: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=1713202260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tjdw7qGZxkpHfFpL0+OvHQt8EmeMym9hnmHUfGku+n4=; b=AHXwZxZ6Ngex2NJ5cmIwsffTZX9V30f+44CtSy0p5ajyqr9qa0kP4JVAm1869CeMJ45yPv hMa6KvxJ+7ZPuK6xHnCQdxWU+OY2ryunfrQ9Iihaf6HV94GOy/mZMHeVxBX97SV6alKcDS Tq6Ysaklsi+PrkG/j42zPvVcN0uuXRm8A6yQfDpj+LxAPLjBsH+2oMm1oK3BGJMMOprkKK V68aukmn1hmBgxwCs+VUhKq94NdfU/Uv8UvDQ/ngm16W1P0BFW5ZEGsNnvPhQfCHldG1TJ SD6G5LUtUM7R6hux/Xb4VsiZ8NN5EhThsOgtl8nojj6zLWiMbfyFqofEROb3tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713202260; a=rsa-sha256; cv=none; b=qtruXmVx0WLV4Uwt7JP0QwnoYTy0Jl6RHCurcKcVEE9edlq9sNct6IJdXqomOyFPVIzmhZ RMX9/ey6ipiIwmcwiyaU+sDVHAwlAzAuYQ03a3yqYj3aCeGPmgDuFArn0sm855dBMij2wE MSuiRL9hUUr4wticWit7HMVAm5wc6i0GGx5+qsgitHq96opXoapMgskLRQJQYy4On2OaxS A7KlgNG2Xjixw7Pcr5OsU0+W50Uo1gZZ8KxMQPbDJNAQOv+P4PHdDz+opt5r9UhECPXUge BSul3XtfMsAKkWT5nN3LopMIingA6AzHf3v2tMAVS+qKbeWoqBD75GPrlf2cww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713202260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tjdw7qGZxkpHfFpL0+OvHQt8EmeMym9hnmHUfGku+n4=; b=otHwq5WzatCQiKCPJRxPdU+JJEFB2WxRBdt0wy78r15Yo1HUqtcv+hAKX2XUWn9fGp76z/ etxHk+yE2zXFRHt+XuhMKCsPhiUTJ9UOStdA+uRY9gwNDoiJWSJzNIvptfDkWuX8bIqXgA hOFp9QDsvN/G+zEV0k6fBP1fHjXDz63Z0vAmWF20YSlmYJPPwltQF2SE8DyJQMxuRcaNyT QvnwXJdDgO7lBTrmhUWqoUzYiQlPX1Set+8aTQ2/cL8NiZ3dNAczNis7VlkJlQCyIJRZ8l ZXSFKSiakMaxz1jf985tfddi6XbJmUuU4XSRk9oc0gwajJ3wq5kxrcOv0xz6Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJDjJ1xH9z17v5; Mon, 15 Apr 2024 17: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 43FHV0td017480; Mon, 15 Apr 2024 17: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 43FHV0YV017477; Mon, 15 Apr 2024 17:31:00 GMT (envelope-from git) Date: Mon, 15 Apr 2024 17:31:00 GMT Message-Id: <202404151731.43FHV0YV017477@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: ac867c20e674 - main - LinuxKPI: 802.11: remove unneeded re-lookup in lkpi_80211_txq_tx_one() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ac867c20e67423e5019ab90148c387ea127eeffb Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ac867c20e67423e5019ab90148c387ea127eeffb commit ac867c20e67423e5019ab90148c387ea127eeffb Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 18:07:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 17:09:06 +0000 LinuxKPI: 802.11: remove unneeded re-lookup in lkpi_80211_txq_tx_one() Given we are passed the lsta in as a function argument there is no need to re-lookup the sta by ni and possibly not find it. We know the sta and ni from the lsta and whether it is uploaded to firmware or not we can check directly from the local lsta flag. MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43965 --- sys/compat/linuxkpi/common/src/linux_80211.c | 76 +++++++++++++--------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index df3b0bc467f2..03ad38e33333 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -141,8 +141,10 @@ const struct cfg80211_ops linuxkpi_mac80211cfgops = { */ }; +#if 0 static struct lkpi_sta *lkpi_find_lsta_by_ni(struct lkpi_vif *, struct ieee80211_node *); +#endif static void lkpi_80211_txq_task(void *, int); static void lkpi_80211_lhw_rxq_task(void *, int); static void lkpi_ieee80211_free_skb_mbuf(void *); @@ -3583,6 +3585,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) struct ieee80211_tx_info *info; struct ieee80211_sta *sta; struct ieee80211_hdr *hdr; + struct lkpi_txq *ltxq; void *buf; uint8_t ac, tid; @@ -3693,54 +3696,45 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) #endif #endif - lsta = lkpi_find_lsta_by_ni(lvif, ni); - if (lsta != NULL) { - sta = LSTA_TO_STA(lsta); + sta = LSTA_TO_STA(lsta); #ifdef LKPI_80211_HW_CRYPTO - info->control.hw_key = lsta->kc; + info->control.hw_key = lsta->kc; #endif - } else { - sta = NULL; - } IMPROVE(); - if (sta != NULL) { - struct lkpi_txq *ltxq; - - ltxq = NULL; - if (!ieee80211_is_data_present(hdr->frame_control)) { - if (vif->type == NL80211_IFTYPE_STATION && - lsta->added_to_drv && - sta->txq[IEEE80211_NUM_TIDS] != NULL) - ltxq = TXQ_TO_LTXQ(sta->txq[IEEE80211_NUM_TIDS]); - } else if (lsta->added_to_drv && - sta->txq[skb->priority] != NULL) { - ltxq = TXQ_TO_LTXQ(sta->txq[skb->priority]); - } - if (ltxq == NULL) - goto ops_tx; + ltxq = NULL; + if (!ieee80211_is_data_present(hdr->frame_control)) { + if (vif->type == NL80211_IFTYPE_STATION && + lsta->added_to_drv && + sta->txq[IEEE80211_NUM_TIDS] != NULL) + ltxq = TXQ_TO_LTXQ(sta->txq[IEEE80211_NUM_TIDS]); + } else if (lsta->added_to_drv && + sta->txq[skb->priority] != NULL) { + ltxq = TXQ_TO_LTXQ(sta->txq[skb->priority]); + } + if (ltxq == NULL) + goto ops_tx; - KASSERT(ltxq != NULL, ("%s: lsta %p sta %p m %p skb %p " - "ltxq %p != NULL\n", __func__, lsta, sta, m, skb, ltxq)); + KASSERT(ltxq != NULL, ("%s: lsta %p sta %p m %p skb %p " + "ltxq %p != NULL\n", __func__, lsta, sta, m, skb, ltxq)); - LKPI_80211_LTXQ_LOCK(ltxq); - skb_queue_tail(<xq->skbq, skb); + LKPI_80211_LTXQ_LOCK(ltxq); + skb_queue_tail(<xq->skbq, skb); #ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE_TX) - printf("%s:%d mo_wake_tx_queue :: %d %u lsta %p sta %p " - "ni %p %6D skb %p lxtq %p { qlen %u, ac %d tid %u } " - "WAKE_TX_Q ac %d prio %u qmap %u\n", - __func__, __LINE__, - curthread->td_tid, (unsigned int)ticks, - lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, - skb_queue_len(<xq->skbq), ltxq->txq.ac, - ltxq->txq.tid, ac, skb->priority, skb->qmap); + if (linuxkpi_debug_80211 & D80211_TRACE_TX) + printf("%s:%d mo_wake_tx_queue :: %d %u lsta %p sta %p " + "ni %p %6D skb %p lxtq %p { qlen %u, ac %d tid %u } " + "WAKE_TX_Q ac %d prio %u qmap %u\n", + __func__, __LINE__, + curthread->td_tid, (unsigned int)ticks, + lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq, + skb_queue_len(<xq->skbq), ltxq->txq.ac, + ltxq->txq.tid, ac, skb->priority, skb->qmap); #endif - LKPI_80211_LTXQ_UNLOCK(ltxq); - lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); - return; - } + LKPI_80211_LTXQ_UNLOCK(ltxq); + lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); + return; ops_tx: #ifdef LINUXKPI_DEBUG_80211 @@ -3752,9 +3746,7 @@ ops_tx: #endif memset(&control, 0, sizeof(control)); control.sta = sta; - lkpi_80211_mo_tx(hw, &control, skb); - return; } static void @@ -5224,6 +5216,7 @@ linuxkpi_ieee80211_frequency_to_channel(uint32_t freq, uint32_t flags __unused) return (ieee80211_mhz2ieee(freq, 0)); } +#if 0 static struct lkpi_sta * lkpi_find_lsta_by_ni(struct lkpi_vif *lvif, struct ieee80211_node *ni) { @@ -5240,6 +5233,7 @@ lkpi_find_lsta_by_ni(struct lkpi_vif *lvif, struct ieee80211_node *ni) return (NULL); } +#endif struct ieee80211_sta * linuxkpi_ieee80211_find_sta(struct ieee80211_vif *vif, const u8 *peer) From nobody Mon Apr 15 17:40:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJDwP0bMnz5H1j8; Mon, 15 Apr 2024 17:40: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 4VJDwP021qz4DSH; Mon, 15 Apr 2024 17:40:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713202837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EOrAsYPVeS8ZyZBY/7dIyWQ9XA34QPeSAZR4VlNqh4=; b=YKJ0EVpTgMvaHWMiGso2kzzLha3bz5CQnEyVPwGIubVbABbaW7lQI+9UmKXxFuriXML77Q wwjO4lXJiYpDOnwcHbuSjDPRu2n/GxItR+Lh5vygN3cpsZzLJcTHd+ElBt3AezN2ZMMHru nMGm011qkcE86XjSuiXkgBFPi3GnbvsdkKP5QhxIhyzFfS7RRz/jbfIYRNcrr4xFR13+Tv 6wINMarH2nLC1Uw4WhMvvvTEEeN4HcyILWHDEzYqfeEarZa6OA6WxA7qIH1h/TLx3CChLC dUXqKjU8DvMY44KD2dSXoNrvVm1KgjBDMQFF5+DqbPGhE0K98Kc4td/Gq7LQ7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713202837; a=rsa-sha256; cv=none; b=lBUdGYPmkqeP1Vn9/FHj4rD0Rpyu3nJMquqwo1wckf3ry96F+C71BAwSLeOn4mvKOSJksW MHEXvx/7JiWi6DA0mBB3NDr3GMDIGI/Ds9Ypp0xJlmYHiOat5mPL8cN6aMZ8qOruxj4XIy 3vFmppHRswPszjRzzUvSh6t2kZqeHIr9r0xs0FdxQMw7GqNAmfAoUsxRrqd1DpaXEgm4NG 7UgQnJOM4lc9EftikynZPqHjEMyOD4CnXV4DEHNn7F0sKf9sSNrx6NUGKV9XHJUOGuV1Bl W04eQnjRJ+dwqSoxTTGgdwUjWRHxKydo+Xn6U2FPpJWyqKysWw/acSp4UOpyfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713202837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6EOrAsYPVeS8ZyZBY/7dIyWQ9XA34QPeSAZR4VlNqh4=; b=L+dUVIkC8fEbA4UJ5aIVdf05+felqRtl/aVx7OGJHmT6laMt/TKkD0VLhi92Ot6q4RzjGA RjcgAGC48XtdMPQLQ2DhGQKUYMJjq5dR9kvy9JdNc1PQR68yi0QvLzd2SKh9rIXtaVYLyJ ZDdSmJ4OYNRHNhNevrSM/oMy3KgdzpKKPrsNrQU2yqAcVDewe5rq1Xix6PeRdB0DKvvOrr HSUNvDQqqHsTq3uOzdG7n+v8Enw4iWlRObFgaNeDDMjj3bPJkyH5gTdPbVk2Gw5iYwEgaA b1YUL+VeN6Yt87Zu4kXhMvStyJUxRFD+zXIOZHH9cEYtruM18dIKTaDPEF9XsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJDwN6l6Fz17y9; Mon, 15 Apr 2024 17:40: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 43FHea8i034572; Mon, 15 Apr 2024 17:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FHea8K034569; Mon, 15 Apr 2024 17:40:36 GMT (envelope-from git) Date: Mon, 15 Apr 2024 17:40:36 GMT Message-Id: <202404151740.43FHea8K034569@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: cd9fee3d2c37 - main - net80211: amrr_init: change order of commands List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: cd9fee3d2c370e81109505c2abfd381af952e9b3 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cd9fee3d2c370e81109505c2abfd381af952e9b3 commit cd9fee3d2c370e81109505c2abfd381af952e9b3 Author: Bjoern A. Zeeb AuthorDate: 2024-02-05 14:48:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 17:32:28 +0000 net80211: amrr_init: change order of commands First run the KASSERT before trying to do the free operation. Better for reporting and debugging. Add a guard setting the value to NULL afterwards. NULL pointers are a lot easier to test for. MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43751 --- sys/net80211/ieee80211_amrr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_amrr.c b/sys/net80211/ieee80211_amrr.c index 7248af0edccf..461554d75ea1 100644 --- a/sys/net80211/ieee80211_amrr.c +++ b/sys/net80211/ieee80211_amrr.c @@ -132,8 +132,9 @@ amrr_init(struct ieee80211vap *vap) static void amrr_deinit(struct ieee80211vap *vap) { - IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL); KASSERT(nrefs > 0, ("imbalanced attach/detach")); + IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL); + vap->iv_rs = NULL; /* guard */ nrefs--; /* XXX locking */ } From nobody Mon Apr 15 17:52:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJF9r6Vqtz5H2vF; Mon, 15 Apr 2024 17:52: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 4VJF9r644Gz4G5p; Mon, 15 Apr 2024 17:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713203536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/92oHLRVxTd081b43tz8HszMkRwrAO3tP179GuLoH8k=; b=FrD6u34STggzJVF291e74rBFN5oMWU+XBBIyuCsInj77XRMyKHF2pjzpIWB3nhZCHEwsYk P2u/MDi4Zu8IcxrrOIwCmdnUkwMz81Z/rQF9lc+IHHaI+Q5zoLJ1IGS4wsGXejDN9Gv6No 3+DZymLJAYwZgZ9mq6VfdXP8sinF3p5Wd2wEZTkJtMvs/vfdOvW0HQlDM30pjvZ4ANwIIx 4CoeLPlhXS4xiW3J6LKzGRMwIPMlINSppKfUFBZgAkkE7JCk6fYOTz2qLh/EQN6eIfP7nZ 1COlIZjQLzyrjDhdU5wjzNY6KteKnYIj3JkU4RMYfHM46UCC75AcCqqglOHFtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713203536; a=rsa-sha256; cv=none; b=BPfL/+sGS9/ouB/hc5KDDhw5R2MNMf4exDcR524CPLonZKwfv1YREmDSQqO8pxQkcQEygV 9hhB88dRvoJqZODZp1+LabSGoY095gK+5KyvKyQK2ejnc/5K64rZGULOe7y9TH83FU6+1i TTblZDoDG6UV11CQOFgU7KcaZ6Bc+t6fudEBBObTTUH6YtJhxQ/zO41M0VDU0LL1/SiJp7 2nOfz9JEvewgBBa0KHFu1XXOSDsl5hidEv5RC5sGIyH907jOtp0Zbzv8tP5XD26xHkhXWt QXh80NZtgj8Yr7UHbkeCWWSfdAE/cA3CYpMEo/RpvBJWAnvPamLtBdz/rdrUmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713203536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/92oHLRVxTd081b43tz8HszMkRwrAO3tP179GuLoH8k=; b=s6i2dPdJMCy72mOCxW6uKCPND2lkYLJrB8XTqEgGfrM17Y/ZezePop6zwgc9B0n8SdM0nR D+42lgIzOm0BGGcjN2nis1SCN2jey6r+HTAQUq7wp9jVfzmmNRv4I77+Tq+VL74SQinWEi 1Znh183za/bJ1S2uGQSaMn8qSAgGI/LXV0xbW53u0K45v22LUloAm/LsYzpOO1VDKGIia5 TgmVqkIjHMQGOG0SlDMNsbDIAje66KcFYK3W1S3xzWiH4Aa94n/QHmEkwQMr0pvF72cV70 Ab2fCYaXfpi7IBpey29U7JRDRa4kjhYSBtIm6cNyltJVktUKRRpjaDT04DkxXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJF9r5f1hz18mj; Mon, 15 Apr 2024 17:52: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 43FHqG44056570; Mon, 15 Apr 2024 17:52:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FHqGkv056567; Mon, 15 Apr 2024 17:52:16 GMT (envelope-from git) Date: Mon, 15 Apr 2024 17:52:16 GMT Message-Id: <202404151752.43FHqGkv056567@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: 1665ef979d3a - main - LinuxKPI: 802.11: disable early queue wakeup workaround; better classify List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1665ef979d3adab05d178480077674ab5978e4f0 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1665ef979d3adab05d178480077674ab5978e4f0 commit 1665ef979d3adab05d178480077674ab5978e4f0 Author: Bjoern A. Zeeb AuthorDate: 2024-02-16 21:14:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 17:44:00 +0000 LinuxKPI: 802.11: disable early queue wakeup workaround; better classify We used to call lkpi_wake_tx_queues() for all queues early on in order to make sure they are ready. Turns out whatever logic in iwlwifi startup is working correctly these days under LinuxKPI so this is no longer needed. As the comment indicated the "workaround" did not always work. Disable it for now. The second part of the improvement is to properly classify Non-QOS non-data frames (mgmt and ctl frames for now, unless we have to be even more careful in the future about certain sub-types) as TID 7/VO. Contrary to net80211 we must not promote PAE frames. PR: 274382 MFC after: 3 day Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43944 --- sys/compat/linuxkpi/common/src/linux_80211.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 03ad38e33333..d598e9af0050 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1311,6 +1311,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); +#if 0 /* * Wakeup all queues now that sta is there so we have as much time to * possibly prepare the queue in the driver to be ready for the 1st @@ -1320,6 +1321,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int * for all queues. */ lkpi_wake_tx_queues(hw, LSTA_TO_STA(lsta), false, false); +#endif /* Start mgd_prepare_tx. */ memset(&prep_tx_info, 0, sizeof(prep_tx_info)); @@ -3669,8 +3671,16 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) hdr = (void *)skb->data; tid = linuxkpi_ieee80211_get_tid(hdr, true); if (tid == IEEE80211_NONQOS_TID) { /* == IEEE80211_NUM_TIDS */ - skb->priority = 0; - ac = IEEE80211_AC_BE; + if (!ieee80211_is_data(hdr->frame_control)) { + /* MGMT and CTRL frames go on TID 7/VO. */ + skb->priority = 7; + ac = IEEE80211_AC_VO; + } else { + /* Other non-QOS traffic goes to BE. */ + /* Contrary to net80211 we MUST NOT promote M_EAPOL. */ + skb->priority = 0; + ac = IEEE80211_AC_BE; + } } else { skb->priority = tid & IEEE80211_QOS_CTL_TID_MASK; ac = ieee80211e_up_to_ac[tid & 7]; From nobody Mon Apr 15 17:55:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJFFW1W3Tz5H3G4; Mon, 15 Apr 2024 17:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJFFW10f9z4GYr; Mon, 15 Apr 2024 17:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713203727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d6/O8oZJnEgCijNSAAldTiL9ysC+cFV9zx4ayLP8A3Q=; b=dHGYgiPdob08HkRJS6FBBu0mSu3LL9DIWi9Q3PoF5aW5m8SUEv/rjKf3Y29LU+jps5mR0Q tJ4ycpyZdbXZ+jYGAausuOd57OiOFEdby0kZKTokiQpTjY6eEBcwO95WgqrvcyG1GLDvAb 5o/IYU4VsCip3yBMy3SdUrMJg0wItEXYPQRnGSpFazNGOzVDM0gRTGqTnHbjE93G4c/Xtl X6g5Nyasqczov66Hz2+O9lNPKSWZT8cuipwNl3UzivuSou3Q419gnbcVA98lkWQQNPFQz7 vpD2kF7YZLw2Jz39eqDIsFtkrJtcHt8yrXIq5RpznEQEDP7hLF5AhcmJcUEV2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713203727; a=rsa-sha256; cv=none; b=DVf5BcOXvQ7QS7bBIOwqpBcRSPnq8UftSxrLtnL1Z1dCgzvcuH6xzjHkgcVCeEoFIfNiSi mfbq46O1Ig+kNNtee4NYCA1tRlcBIw06+C62d2uy+xdoxmg6fBblzM9p6x6vp5I2R5DfvS aKwO21VDjDJ+Y4wKKroJAzzph3HoDT2JsGk7WqFlv7kifaJqjrTEhGo8cgTd6kPa3+//ul VU9mmZNYg0hBMzAB0p3vudwxlfNqNwMchw4w8W53cpWiXjlWSoMDO9VRv+WtMy6hSFDyrU QftVUadOy9AjbwYu5bppMGtXiNr2yubD0M4hz2u+kbC8h4saqne5oX6Wn4FK3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713203727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d6/O8oZJnEgCijNSAAldTiL9ysC+cFV9zx4ayLP8A3Q=; b=wJs8kHPjeGsnrbfteguoGli4c1d/tZmdGG4R/C7lNcchhSS1RjZrdXYd9yypsq6l5LGVjm vNoNmtHcMtDicqOf5VAzIHbS0s1O9LNS8XMHldWikmDYFBS0xU3YiiODz5jo/DaczpcNsS 4872TtVBsppghWPn8EyYFruZ3Hr7lmt+kLwXxKgM3BZnXlZRiNBVjVX9Nncxsqzn0RnI3m u0qE+YD/YXNJAuoEYE1bM3DP0l7wRjZ39QdLCRDwL9e29NgovLvWw66bL4aHR/7U4uIN/W ECvrayOrxnNoeF9t0PC333F8y+hlIdE0f19KkT1WtlRK0WeMWZvNyBTkBRHLRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJFFW0L61z18mq; Mon, 15 Apr 2024 17:55: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 43FHtQld058295; Mon, 15 Apr 2024 17:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FHtQtV058292; Mon, 15 Apr 2024 17:55:26 GMT (envelope-from git) Date: Mon, 15 Apr 2024 17:55:26 GMT Message-Id: <202404151755.43FHtQtV058292@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: 3f115b864b1f - main - git/mfc-candidates.sh: allow comments in exclude file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 3f115b864b1fba951ce60970b5febb4e593b1f77 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f115b864b1fba951ce60970b5febb4e593b1f77 commit 3f115b864b1fba951ce60970b5febb4e593b1f77 Author: Bjoern A. Zeeb AuthorDate: 2023-11-28 19:09:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 17:54:42 +0000 git/mfc-candidates.sh: allow comments in exclude file As branches ages, the list of unmerged or unmergable changes may grow longer. In some cases it is helpful to group and or annotate them in an exclude file. Filtering out lines starting with "#" allows adding comment lines to aid tracking. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42790 --- tools/tools/git/mfc-candidates.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index 76ff9b4d53c6..d7fd4b5ded13 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -141,6 +141,9 @@ commits_to() canonicalize_hashes() { while read hash rest; do + case "${hash}" in + "#"*) continue ;; + esac if ! git show --pretty=%H --no-patch $hash; then echo "error parsing hash list" >&2 exit 1 From nobody Mon Apr 15 19:32:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJHPY39Dxz5HBXf; Mon, 15 Apr 2024 19:32: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 4VJHPY2cSQz4PjQ; Mon, 15 Apr 2024 19:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713209553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ghONVKf/GE6U5Yao4ayI50aZcMvQnhZEYgQQhQHog6w=; b=j/89B+FpFhjOUCKQio/2wIGrFKAqjUWvRnAk63RIW7rK2PsyV1RbuJEZZPbl/t1ISnCu7K enVZ5XF/CGmMtEl9MOaUBu7ziFzNwwRFAwY7Fa418ftQBiMam5S2hQccLa2k1au85Kl37s h5ffTSvL5yif+QmPlDrchPHWEE1SgBl+Ta27pnVWT8FqHQBQowRuOmpy8J33+/f8ZzCjD2 gw6PPGgN+wZgjNtpRaSi7TDt3PfnbTTWrAkR7xfdELky2RH4gcipCE075KINTS7azN7aQt oX/dkuTl+EkDQr9HHG4014/DrLWzHqEnG1aH82KeHxYZMw3faGIjHK+0vtw2qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713209553; a=rsa-sha256; cv=none; b=FRFXnS1mN5tFvThKWkdHVuN0foHhyIoYL84xd9BIIeV/CQGswsSEbUOwqlPfcRZZfuhO7G 4t4lGEaSY70I7bc/mzA4DN2fuQkuJCTIx/mRTkZrjE0toYjE/Qlld+5JTf8nEeHXWtqYrW JEWgTLX8R/C7rD9OkpQXvFDtxbWenMiZwEuxT6U0033HLkL1YBf0biZPDR3f2el058utYN CJwy3vuuvMOou9FBn7ia78fOoQE2F3y2JEcr5vQfLoRVzFepS9wrsQe75nlLg6pixN53J5 FKDx0YIGv4NVcpUrFKKAKsM9wAAXqrHwONr/VuzLKtDaHbxhTUBOWBZRwrklRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713209553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ghONVKf/GE6U5Yao4ayI50aZcMvQnhZEYgQQhQHog6w=; b=O5ex0DqDUTRYrqwuV2bqmpMtU1LOMHzq3HV/KidMbqDYDhtJO/nQs5V+QVjypR34Src2hG jqgWIhxdQzkfriiQCf80U4niz8AnaGc4oJ0LyK5eycoKA86PX1Jl9764q/ltT03TwO4StB gsg9Cb7Wil9AplHifoVXgw+lO/EQXT/Bb28h6nztX66JuuNLclrMR9JQjjNGhn1VEaBEcM GHn4HFdk3/HF/F0ep0PauRHIeY5eXo00UGbjlVh4TL37Q2c3ZMhYM5t4OZr312aL104Cc7 5dm7q0GwwNw86aFvvlYWbrpZ/uNZ0hw6GGB79a64lN6VvmvzoJQTXHZHoNJ+CQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJHPY2Ckkz1B5s; Mon, 15 Apr 2024 19:32: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 43FJWXbo027311; Mon, 15 Apr 2024 19:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FJWXsd027308; Mon, 15 Apr 2024 19:32:33 GMT (envelope-from git) Date: Mon, 15 Apr 2024 19:32:33 GMT Message-Id: <202404151932.43FJWXsd027308@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: 2a8c50592f7f - main - LinuxKPI: add __counted_by() and __nonstring List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 2a8c50592f7fce8bceedf004f674a5a9eae0fd46 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2a8c50592f7fce8bceedf004f674a5a9eae0fd46 commit 2a8c50592f7fce8bceedf004f674a5a9eae0fd46 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:41:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 19:31:49 +0000 LinuxKPI: add __counted_by() and __nonstring Add checks for __counted_by(_x) and __nonstring as and depending on compiler support enable the attribute/feature. This is needed to make mtk76 and ath1xk drivers compile. Sposnored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste, dim Differential Revision: https://reviews.freebsd.org/D44587 --- sys/compat/linuxkpi/common/include/linux/compiler.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index 1ae41d9ba641..d59e6faed12d 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -67,6 +67,17 @@ #define ____cacheline_aligned_in_smp __aligned(CACHE_LINE_SIZE) #define fallthrough /* FALLTHROUGH */ do { } while(0) +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif +#if __has_attribute(__counted_by__) +#define __counted_by(_x) __attribute__((__counted_by__(_x))) +#else +#define __counted_by(_x) +#endif + #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) #define typeof(x) __typeof(x) From nobody Mon Apr 15 20:41:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJJxb5LcWz5H3WZ; Mon, 15 Apr 2024 20:41: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 4VJJxb4hrwz4YX6; Mon, 15 Apr 2024 20:41:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlM2Mn4rDbcZeDx7E+w8RH/2CF3m+Shi1y68NyrbdMw=; b=C8ZOmX2zir9oeoLARCv4xhn3uDvHIVHPlysisDxU5HJwcr+QI4AlAGXPPaKvFt/8WyVkF6 It/MgfHOEwHKJtjcNCS7pdqsAcj6M/GxEg2RA9Ft40eVxojIlEno7sWLL4A+KQ84IuskJe ZAi1sVkXDogTKr7sD3YS2rI5miX3ZNe9FbD0jDvXXB02HVbyZSWL0BMCidx3l2LnnusLCw iS4xzM0XdmvpE/j8eCw9ojibjkj44wSIYLZSCudzuGSEa/WLZk2r1NEigOhOnaS+EW8mHA rpBrMZ7YG/Kdlmu1mFQx8myO4e3pIGvRwZJVJZOgLVVctMi0ge1U6+beePyoKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713213715; a=rsa-sha256; cv=none; b=pODTQbAOQuUrUxI5ZuNQ0Lnvgu/BKFhDWSjwKCW/vfID2zvQBLSo5jC7hHmT/51e7CAB2d XJzDFXyEnT2+dxUiatiNqiUDT5R1Ylsoxq/ULHbChH6jN11W2knTJ7OdAW8C1CVtc3cB4k bp/Ml+DfeiySfp7smKT7Ny0rzB0TLu/hULc7IjWNfCRVEyxCSVnAuBPjpiydOZ5iPlt14B 9SbsEfczrdcbz4ZHlHzHyx9gfhK8+cs2dGO3UtiVO/JBSKDxy1SS3yhW9ZbQ4R3UXKL4Z4 dOy5Vg1BEiBiAbETbw0DhmDiuv5TUXBkJcPTpiQ4XRTQiPCnFsxQFSNGggZOVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlM2Mn4rDbcZeDx7E+w8RH/2CF3m+Shi1y68NyrbdMw=; b=L1X99RtwcHmCkEZHdZiDAWJa5C+T47SxdgYr4Sqih94k6/X0Sk6GoxvbNWFF7KlXn41tQO ja4onyccZgsw4XAdxqH8aBe0DYtlYG8BksiibHmdA3qthmRflcMfILPvdgAvIQugvsna5/ mdm95DWAe2lELe971DCykpRmw5bVUd9IMf1tDFUWK0NsSuH+m4DtLihNVK8MNA33kwLs97 2hRS/8cfLM3Xh+gerGfW/Fw5Y4i3Z3PGlnLg5tFzt3+f/JNZpouY64G+HuxF+/+0hM9VHw FA7qF3wJntzn/pDoOlvR9ctvcMJWlsBM0QS8MpAXHHvTj/fu5lO66WhD0rGyrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJJxb4JR0zFHL; Mon, 15 Apr 2024 20:41: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 43FKftsU043558; Mon, 15 Apr 2024 20:41:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FKftie043555; Mon, 15 Apr 2024 20:41:55 GMT (envelope-from git) Date: Mon, 15 Apr 2024 20:41:55 GMT Message-Id: <202404152041.43FKftie043555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 101c80fe46b5 - main - sys/malloc.h: move sys/proc.h MALLOC_DECLAREs here List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 101c80fe46b5c1a0f957e21ea56bf868451226aa Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=101c80fe46b5c1a0f957e21ea56bf868451226aa commit 101c80fe46b5c1a0f957e21ea56bf868451226aa Author: Brooks Davis AuthorDate: 2024-04-15 16:52:40 +0000 Commit: Brooks Davis CommitDate: 2024-04-15 20:35:40 +0000 sys/malloc.h: move sys/proc.h MALLOC_DECLAREs here This avoids the need to explicitly include sys/malloc.h before sys/proc.h. Suggested by: kib Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44766 --- sys/sys/malloc.h | 3 +++ sys/sys/proc.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index ac1f86397951..f16231d61daf 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -157,6 +157,9 @@ struct malloc_type_header { MALLOC_DECLARE(M_CACHE); MALLOC_DECLARE(M_DEVBUF); +MALLOC_DECLARE(M_PARGS); +MALLOC_DECLARE(M_SESSION); +MALLOC_DECLARE(M_SUBPROC); MALLOC_DECLARE(M_TEMP); /* diff --git a/sys/sys/proc.h b/sys/sys/proc.h index fa4c7d2768f0..33b836f4150e 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -938,12 +938,6 @@ struct proc { #define SINGLE_BOUNDARY 2 #define SINGLE_ALLPROC 3 -#ifdef MALLOC_DECLARE -MALLOC_DECLARE(M_PARGS); -MALLOC_DECLARE(M_SESSION); -MALLOC_DECLARE(M_SUBPROC); -#endif - #define FOREACH_PROC_IN_SYSTEM(p) \ LIST_FOREACH((p), &allproc, p_list) #define FOREACH_THREAD_IN_PROC(p, td) \ From nobody Mon Apr 15 20:41:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJJxd1WDCz5H3M4; Mon, 15 Apr 2024 20:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJJxc65xyz4Ybq; Mon, 15 Apr 2024 20:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vj7H+L0B1Iaulgj1eLCuIS32A8ad44OJ4eZFvntHCMw=; b=apm+jBhqBONOzmOAtBhYyLKjE789o/UgfxbE88GfjKrXxEQ6jdC+UB8LnD9FE2KqPSGFXI 94CzA8VqxCM99ReVzAg41rRYIvpaNwBrHHFdK6S1enanye5p0juZ7WVMBJMSjyZUR+IAz7 7R2e6XCg2+fJwMKmdsqF9doxwZIYFBdAKMO0VidnHtbOYBU5sF/AVAVbNXuz/7eiVaLnAy 4PgscDb8sGJOv5PwfvsCWe3Ox7buR74EiC3XAQhEF6nSHoUM6Xf0HQesq75GrXEVgghSEJ nWvBKB9p2ROhKrnryc2Ee8tw3EdsWCfPb4SX3xrzupGZHI1FN754sNBfiDmF9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713213716; a=rsa-sha256; cv=none; b=p3QpAVm7RclkUNyQ6d1hFVLVmENJLyXnbKz2JRXiETF2gngn/ffGpIDDBLfY0Q/ZWfLQ+W LdE701EAZESbXJfDLwOccgTNSZQb/hyaExRGKLH0VNnRQFT0r72MzyvvLHyWtVOt7n0J34 jhDvS9eUZTjfuu7VBF24+f9KgzjkiYegX5C6SsMEq8+HlTB0uFpTuByhwkhcPvEwtvU0D8 wyqbIGyK7/EWijtIDN4aA+0BvYtfro1cywiQ+ahcQ3VkwRDf5P9WiQvYyJvuUY02sRCXxd g7XzwiOOWgJG3l9T+pECy7Izdv0yKEiGcj513VugE9lt1MYJOMiZnB4mx9ACBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vj7H+L0B1Iaulgj1eLCuIS32A8ad44OJ4eZFvntHCMw=; b=YOEpCnm+AwtIR8+39sbgP8T86Kc/P+LWGQBw/ifTBgFrncNIVYINzIjsOCFbJje1H0480f DxoUd5w9fVHT7PsWdDtTmBd3VwSaFgJ9gaJHB0vlybNBFjm3pGQhTmPYUL5nEAxMVyc6pw HnuLUpD/97NzaHzfhbcPjJ0/5bxJBjwzmwjEQhN7rvjPBYVimd52Sb7/z27eetAfSLkV1Z ceuliy8z1DfH84Op89EKXez6xc+kj4lh/c6jTvb+jauJXWGNGeaLvcVHuc12hzSJkyX2dd ATPlrK6cyYQiuDFMruq+8tyqjyfNruQm2AlPESjjyT1QUppBeTSer9dI9fEKwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJJxc5RDvzDll; Mon, 15 Apr 2024 20:41: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 43FKfuNN043600; Mon, 15 Apr 2024 20:41:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FKfuX6043597; Mon, 15 Apr 2024 20:41:56 GMT (envelope-from git) Date: Mon, 15 Apr 2024 20:41:56 GMT Message-Id: <202404152041.43FKfuX6043597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 6bb132ba1e4e - main - Reduce reliance on sys/sysproto.h pollution List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bb132ba1e4e28cf1e713c8dcd77f2e8af7bde88 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6bb132ba1e4e28cf1e713c8dcd77f2e8af7bde88 commit 6bb132ba1e4e28cf1e713c8dcd77f2e8af7bde88 Author: Brooks Davis AuthorDate: 2024-04-15 16:53:05 +0000 Commit: Brooks Davis CommitDate: 2024-04-15 20:35:40 +0000 Reduce reliance on sys/sysproto.h pollution Add sys/errno.h, sys/malloc.h, sys/queue.h, and vm/uma.h as needed. sys/sysproto.h currently includes sys/acl.h which currently includes sys/param.h, sys/queue.h, and vm/uma.h which in turn bring in sys/errno.h sys/malloc.h. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44465 --- sbin/restore/tape.c | 1 + sys/amd64/sgx/sgx_linux.c | 1 + sys/compat/linux/linux_mmap.c | 1 + sys/compat/linux/linux_util.h | 1 + sys/dev/nvme/nvme_test.c | 1 + sys/fs/autofs/autofs.h | 2 ++ sys/fs/tmpfs/tmpfs_subr.c | 1 + sys/kern/kern_environment.c | 2 ++ sys/kern/kern_membarrier.c | 1 + sys/kern/kern_procctl.c | 1 + sys/kern/kern_prot.c | 2 ++ sys/kern/kern_rctl.c | 2 ++ sys/kern/kern_time.c | 1 + sys/kern/kern_umtx.c | 1 + sys/kern/kern_uuid.c | 1 + sys/sys/namei.h | 2 ++ 16 files changed, 21 insertions(+) diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index 4c5d828027a5..5b7cde10c670 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/amd64/sgx/sgx_linux.c b/sys/amd64/sgx/sgx_linux.c index 55c5f7386d0c..6ecef9207a38 100644 --- a/sys/amd64/sgx/sgx_linux.c +++ b/sys/amd64/sgx/sgx_linux.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index 223ff1733acb..a8e790a29da4 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index e651eb391452..58f7c533d647 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -35,6 +35,7 @@ #ifndef _LINUX_UTIL_H_ #define _LINUX_UTIL_H_ +#include #include extern int linux_debug; diff --git a/sys/dev/nvme/nvme_test.c b/sys/dev/nvme/nvme_test.c index 188ad4f86f85..d19376d9ef78 100644 --- a/sys/dev/nvme/nvme_test.c +++ b/sys/dev/nvme/nvme_test.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/fs/autofs/autofs.h b/sys/fs/autofs/autofs.h index 470aeb86de8b..704da7350541 100644 --- a/sys/fs/autofs/autofs.h +++ b/sys/fs/autofs/autofs.h @@ -31,6 +31,8 @@ #ifndef AUTOFS_H #define AUTOFS_H +#include + #define VFSTOAUTOFS(mp) ((struct autofs_mount *)((mp)->mnt_data)) MALLOC_DECLARE(M_AUTOFS); diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index c8961a819e7b..9bdcc4575511 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -64,6 +64,7 @@ #include #include #include +#include #include #include diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c index c07157db9c8d..0cb0f566a839 100644 --- a/sys/kern/kern_environment.c +++ b/sys/kern/kern_environment.c @@ -54,6 +54,8 @@ #include +#include + static char *_getenv_dynamic_locked(const char *name, int *idx); static char *_getenv_dynamic(const char *name, int *idx); diff --git a/sys/kern/kern_membarrier.c b/sys/kern/kern_membarrier.c index 9d101b955804..f0660bd7360e 100644 --- a/sys/kern/kern_membarrier.c +++ b/sys/kern/kern_membarrier.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 150a8612c2f8..2c8c638a2956 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index be8e0b14add2..40cfa236a07d 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -72,6 +72,8 @@ #include #include +#include + #ifdef REGRESSION FEATURE(regression, "Kernel support for interfaces necessary for regression testing (SECURITY RISK!)"); diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c index 2e5051de05bc..4232c71f86fb 100644 --- a/sys/kern/kern_rctl.c +++ b/sys/kern/kern_rctl.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -2205,6 +2206,7 @@ rctl_init(void) #else /* !RCTL */ #include +#include #include int diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 885804bacf71..c94ae49b6923 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -58,6 +58,7 @@ #include #include +#include #define MAX_CLOCKS (CLOCK_MONOTONIC+1) #define CPUCLOCK_BIT 0x80000000 diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 092fcade9d19..e6d5e2de5e88 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c index 0e7e894664fe..fb27f7bbf736 100644 --- a/sys/kern/kern_uuid.c +++ b/sys/kern/kern_uuid.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/sys/namei.h b/sys/sys/namei.h index cb69fc96b112..08395c6d699f 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -38,6 +38,8 @@ #include #include +#include + enum nameiop { LOOKUP, CREATE, DELETE, RENAME }; struct componentname { From nobody Mon Apr 15 20:41:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJJxf2qpnz5H3M8; Mon, 15 Apr 2024 20:41: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 4VJJxd6sQ2z4YTg; Mon, 15 Apr 2024 20:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wls8P370n2knKRPNxzAcDENpYDEC3mBL+DZyVlHZU7k=; b=wlfOx119yHOH4QDigetI929OIIolgQbalibxr1Mv90HHiUcOD6voCzrF9md4m/BGa1GQsQ +Zd5RrTyhvqOn9fdsNA6pZwj7JvDsMdGq/50I4Wz2uCmB752Hcjnzy0278Ry8mjME6NRQ4 /nzufVbVLYSnCNKCrQgaEpueEQHHYIturemRcJ1zWI0P9+MeR5ZfvYdKbh9jeqFCq8mcam atCFSD1oNkOHpFbX7xOpjr6196ra6HqdVfeeEyqnGDa9Vi+llVrx1Z+9AxP3KJxN908dAC BuAz8WfwbcaN6IgvjjVdkH0iAoqO8a+djr4SLx74Fb4AwjKwl7dkMalGeCnZMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713213718; a=rsa-sha256; cv=none; b=Lp06uLBV/qxa+akYkEAN+9pcET7lMpuCkbdk6IGbunQ3Q01zcKuGS/QLFxA5GfmcO+ChVO Zpu7hDTkT55+AiLx380LuFtcs4xgLQYWCTLWJWy5S09nxxlrwbr0tJUhSQvw4M00YVzzpo /8QNg5YeE0vewKklWa4p9xxQVnh5eOXnZgU09bM6YJQL4yYa0l+8a7onfioNxYumTeg5wx YDK08TVKr48FgJ9gnojNGWzLmhNXbmwDSTaCgO6cKcJRM9lILKTZ7CvoEK9qMGYg3BDX6D BsqmwMARezVRyxDgefebwmX+LlxliFwEFcj9x/mQYfnpKpXfUbPdC3q3rwAF3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wls8P370n2knKRPNxzAcDENpYDEC3mBL+DZyVlHZU7k=; b=ZQI8irVrf22sYTmsrrz9IfZ2/Om7DXs6KucUQg8R/qRP/T346Xaql+iRxis/tsaYsPylnp Tr0j8B82DTQXDdCNKS/zdRqnBKSRbSG863CEEO3KNio63U+gm4VuKwX+rV3/UPXHrKmvac pjEJ9n3GKgg0Z8xBLHI3E1LaJiE7GvEnW1merX00TokEmUrTck5jYvEcQ4pZ7gReAeAfqf 0o75oAnTDuxlhbuAdxhM2pePm0XIXW6Tgi+gmaXQ0gze38VoiN/6+VB9dQOpLntBxBeXaA D4+yAgCuToaiIVh9SjkpS+fd/g0GUyND6hF35Biy1a3AuHbxAusFa1e0YU7Nuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJJxd6RdtzF1n; Mon, 15 Apr 2024 20:41: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 43FKfvse043642; Mon, 15 Apr 2024 20:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FKfvVe043638; Mon, 15 Apr 2024 20:41:57 GMT (envelope-from git) Date: Mon, 15 Apr 2024 20:41:57 GMT Message-Id: <202404152041.43FKfvVe043638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b83d3eb5b798 - main - sys/_{cpu,domain}set.h: don't require sys/param.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b83d3eb5b79860c20829d599630e7eae03d7fd53 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b83d3eb5b79860c20829d599630e7eae03d7fd53 commit b83d3eb5b79860c20829d599630e7eae03d7fd53 Author: Brooks Davis AuthorDate: 2024-04-15 16:53:39 +0000 Commit: Brooks Davis CommitDate: 2024-04-15 20:35:40 +0000 sys/_{cpu,domain}set.h: don't require sys/param.h Add machine/param.h for MAXCPU and MAXMEMDOM in the _KERNEL case of sys/_cpuset.h and sys/_domainset.h, making them more self contained. This eliminates the need to include sys/param.h before sys/cpuset.h and sys/domainset.h. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44466 --- sys/sys/_cpuset.h | 2 ++ sys/sys/_domainset.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h index 8b77721f4b3c..b87cfb5d3f80 100644 --- a/sys/sys/_cpuset.h +++ b/sys/sys/_cpuset.h @@ -35,6 +35,8 @@ #include #ifdef _KERNEL +#include + #define CPU_SETSIZE MAXCPU #endif diff --git a/sys/sys/_domainset.h b/sys/sys/_domainset.h index 11ddef0e1909..857aaba67990 100644 --- a/sys/sys/_domainset.h +++ b/sys/sys/_domainset.h @@ -32,6 +32,8 @@ #include #ifdef _KERNEL +#include + #define DOMAINSET_SETSIZE MAXMEMDOM #endif From nobody Mon Apr 15 20:41:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJJxg22LRz5H3C7; Mon, 15 Apr 2024 20:41: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 4VJJxg0zmbz4YjK; Mon, 15 Apr 2024 20:41:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/sGiCBteJJs5mj2Fj/qlJY2lnXjxWEFPbUf3xTpqH0=; b=KW9mW1Qwla4yGLQSntpTCATDwviDeMFE3Bbg5fP3iRpIWdEw+sJqRTl5yXqG8oChCrmNbE OeWIxGbd7o2jPfV3W9pko9nDV3fmRHpBUDOFEsDSg7IEwYWERArLPnegPUYvB5gVsy/Ex1 7c++wVI6NLCNHDXj3ck9M6X6u6g9adbfFMq9r3fU4BI9pOSSz5Q88ZIUOdqT4OmPI/DCWC PHLafOTU+s1XTHM/+V2jFSGMKyyyI8SdxVWmOwcU/i5Xj0gbijU9hFkatLsO/rCcapDTqj hGHNCIizYwYuwtTydG0CEMG8Ysy+OVQ1uGngr/RSHKWYXK6azPAB2sFz6/Zdfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713213719; a=rsa-sha256; cv=none; b=egJYOhsiNhrUu8VyssWhLn+yx2/xCweVYrkmqSdFFIYdp5Z/RYIbdlI5JqsC96IIX3ez1x 6IYgPw91jpnHuRGw2itgSQ2b+rtrZCgery9MLGYeSKOGcPdS7QroOwnbJLxTQXzN+YqKR4 kzWP0SFeDnkVu5gQkKOyokBJMtSzD5G8pwzEKweyMrHmeF/BePkC+tKgcP9TGp71zurgW+ Yh1hd8wZ9A0Jrk76kjhdjh8+Sb4yww+Lj6ncs/EuIcEpTQZRUrmuR19JBsxSZ47brpeeSE ydmBjRZlelLt5lT4H0bAosOrWXTbMBbWu7DNsZK9HdMioeL/dvBOfGkZ+7+5uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O/sGiCBteJJs5mj2Fj/qlJY2lnXjxWEFPbUf3xTpqH0=; b=b+OKsmVVl4jX0TTUdSEV0VlvB26YOWOzn/1aIQ7fAK5c0grN+tDwcqZeNMaMC3OZ5q6XI0 ei99nhwzGx2yk7DD2XqCk1jB+SGE40YwAmsNOznnKMDXSb2+iCCnNxvFjo2Z1HVTB+W6B8 CPSRjWFhx/8jTH6+eVbO0QwTP9R2Z69fM+p9aynWw8JP4YZuM6HHNpH6eFbD9mK/pYLJkA b+6pSJxaxuddIaxvgy3ovPiNNjVSYXnUhckAMuOSU1JMMlJzy8NwsfXhuEukHleYrF5ZdK vEX/jdwIF/O3rgXInZ60MC670v41ZM2z8RuCV+yoaCciIfZsLBQKcIaARPuKrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJJxg0PbvzFFH; Mon, 15 Apr 2024 20:41: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 43FKfwPN043688; Mon, 15 Apr 2024 20:41:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FKfw1P043685; Mon, 15 Apr 2024 20:41:58 GMT (envelope-from git) Date: Mon, 15 Apr 2024 20:41:58 GMT Message-Id: <202404152041.43FKfw1P043685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 5d88a2aacf1f - main - sysproto.h: sys/acl.h -> sys/types.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d88a2aacf1fa7eb7a2bb522a9dbd78686471a6b Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=5d88a2aacf1fa7eb7a2bb522a9dbd78686471a6b commit 5d88a2aacf1fa7eb7a2bb522a9dbd78686471a6b Author: Brooks Davis AuthorDate: 2024-04-15 16:54:28 +0000 Commit: Brooks Davis CommitDate: 2024-04-15 20:35:41 +0000 sysproto.h: sys/acl.h -> sys/types.h In sysproto.h, stop including sys/acl.h as syscall defintions now use __acl* types from sys/_types.h. Add sys/types.h to provide types previously provided by sys/param.h (via sys/acl.h). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44467 --- sys/amd64/linux/linux_proto.h | 2 +- sys/amd64/linux32/linux32_proto.h | 2 +- sys/arm64/linux/linux_proto.h | 2 +- sys/compat/freebsd32/freebsd32_proto.h | 2 +- sys/i386/linux/linux_proto.h | 2 +- sys/sys/sysproto.h | 2 +- sys/tools/makesyscalls.lua | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index e02e1e9e64eb..065c82d7db50 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -7,8 +7,8 @@ #ifndef _LINUX_SYSPROTO_H_ #define _LINUX_SYSPROTO_H_ +#include #include -#include #include #include #include diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 8da298847a43..59bb85e742db 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -7,8 +7,8 @@ #ifndef _LINUX32_SYSPROTO_H_ #define _LINUX32_SYSPROTO_H_ +#include #include -#include #include #include #include diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index c42de57d77c5..1a5335af05b1 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -7,8 +7,8 @@ #ifndef _LINUX_SYSPROTO_H_ #define _LINUX_SYSPROTO_H_ +#include #include -#include #include #include #include diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index c56a5b55f06c..cbb95f2b835b 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -7,8 +7,8 @@ #ifndef _FREEBSD32_SYSPROTO_H_ #define _FREEBSD32_SYSPROTO_H_ +#include #include -#include #include #include #include diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 8109afec72e9..f894310b01c5 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -7,8 +7,8 @@ #ifndef _LINUX_SYSPROTO_H_ #define _LINUX_SYSPROTO_H_ +#include #include -#include #include #include #include diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 3d4c30a89a82..c86c5d1eb212 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -7,8 +7,8 @@ #ifndef _SYS_SYSPROTO_H_ #define _SYS_SYSPROTO_H_ +#include #include -#include #include #include #include diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 6f21079d0ebc..624b84a32eb1 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -1431,8 +1431,8 @@ write_line("sysarg", string.format([[/* #ifndef %s #define %s +#include #include -#include #include #include #include From nobody Mon Apr 15 20:42:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJJxh4CRsz5H3F6; Mon, 15 Apr 2024 20:42: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 4VJJxh1fCvz4YsJ; Mon, 15 Apr 2024 20:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ZDzjy8qSqayBWQDUGlv/tcdNQ8psJffXtgVI0V5VC4=; b=vXy9SyX3A64b+0tFvKGLAOtwDLiWxp3zGRqnvZa1RcHoYYLlNVxblNrxqKbwFe8/qN2CpV Y4tPZiLKq0lDuTNFGQOApzDCr04DN3Pb6FrDiQ+hWfO02P+us61ByhYyPiV4/CLAjdmgB1 1wpCSA+uH9d2hlyMxkMCKOTryyq6no9waqGoEbCLHrV1VHmV8UgZ2X62KaTZJWSc1I5evj copUai8JDw2/wdDzcsOYdF5UT9OQkra5TOLUZBRRi3ahJizrBRIkauSlpukjBdWRZi7fKC MxnTZpCkBq2RxB3oTcvHaAM2bcA4GLfAFFti3NkZwHZr45cdKyVE9A/RS2A2sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713213720; a=rsa-sha256; cv=none; b=mtZJvQVpJSIaoLXcylTtaCS9QxJJi4U7Y1jy4JYR5DuGwJdIwEKw5mbt4R0Hcqjb48IXTC J920RzDvGdVwpAFY4d2vJb/YCKqUhWl15Q4sNo4ViMit5jsGY/JzMO9T13Sqm13xK4D8y/ 9zKDYnyQCANVvIQixLR28BZTKNpOftSiuzFpwqlqEwJgcSOH4BGyhBgk7ALb63c8K0RSL7 BhdV7eDIpsmS0tiiBPYuK1xHMH2eM2vbq1cVu1prhXN4Lu2b974l4O+X6Zl94JnXMtoRLW XXTKdSnnjaR5DHwJW0cs6yvkhgNeqFHWHp1UkRd09ROWOMGykHWC/mwRltXfWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ZDzjy8qSqayBWQDUGlv/tcdNQ8psJffXtgVI0V5VC4=; b=BIYj6kZav6ZZpFtKn3sL1QEtr3oBGVCIYHxIIHcaYueIQSpy/4XY1+Juc9guEF6x/oRvXp xbz7juv+rq8AmGT4IlddBYPWRxw9gsTwSgiu8BZoEvTps0aY7FiWUu2CL8zUJMGeKjT37N bTHITMiJaYH4Ql68xcKy90ZNfvP60AQECkUD8/i4EIqJ18E5uNsVOF4ljsGEwi03cg9gdk ug277ONGKp2BedoG1whohQRuv9sZLZHoVL2agC8J1cz595Gn5mjz9s9XGVCU/VRseRr8j2 OYkPFEd9FT9M3BTpZkB2f+E180qL4XleqdNsKiXS/czW9OBY/1E3A0peFxnFmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJJxh1GdxzF36; Mon, 15 Apr 2024 20:42: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 43FKg0RR043738; Mon, 15 Apr 2024 20:42:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FKg0Iw043735; Mon, 15 Apr 2024 20:42:00 GMT (envelope-from git) Date: Mon, 15 Apr 2024 20:42:00 GMT Message-Id: <202404152042.43FKg0Iw043735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 418b4c2a80a2 - main - acl_to_text: include sys/param.h for MAXLOGNAME List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 418b4c2a80a20ec41a1cdd227c321990a6a9711f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=418b4c2a80a20ec41a1cdd227c321990a6a9711f commit 418b4c2a80a20ec41a1cdd227c321990a6a9711f Author: Brooks Davis AuthorDate: 2024-04-15 16:54:53 +0000 Commit: Brooks Davis CommitDate: 2024-04-15 20:35:41 +0000 acl_to_text: include sys/param.h for MAXLOGNAME Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44474 --- lib/libc/posix1e/acl_to_text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c index f03ddeb79c09..c17253e2cec2 100644 --- a/lib/libc/posix1e/acl_to_text.c +++ b/lib/libc/posix1e/acl_to_text.c @@ -30,8 +30,8 @@ * in it. */ -#include #include "namespace.h" +#include #include #include "un-namespace.h" #include From nobody Mon Apr 15 20:42:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJJxj3dBtz5H3Gl; Mon, 15 Apr 2024 20:42: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 4VJJxj2dFxz4Z0W; Mon, 15 Apr 2024 20:42:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdScJaltJiYnT84/jmEmGpOSuRwkRSHW0y8xRVBqMVA=; b=KZdvn1lbwOTIchlCslhks0xbabp0/ScD5FDwuSDL337Q4TCAfeVx89/O+oD0hPDqqkwSfL XuINrBCfSFmreyxEVvE+wthldpOG4gu/V61V5knyaurrFOfXp+ykNe25a782EvG1UzLLXi MIiSDc09sOx9So0EraFYvV+tSRLn2MnXQz1nnf03xBOmFgHFRSbJDpUON/R7zWOva79Bk/ eXGeZePEa8GdKAxiQmTbBPKn1W3gIkJHfQ48tuYcN3FdMx8S4uau/MRS5WKh+ko06XZ0V2 atK1O1DwIlvE2qoOFEqOLOlEN8cMz7pfqSitlHYfrGgAV4YRSpTjbrCP+mkeqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713213721; a=rsa-sha256; cv=none; b=xM1U9jox2CXWQp1xp4ct72k4aBhO+MbHBQXpaWEwvYWips8QPnJAIpSflPaoc5Wwz+pq6g 5PnliyhpEdvoKT12Nj+EHIYDZW2RjjkngIcsXkUCL1WZGqhOSWO9CleLSeDPQ4WINvikcf J5P1Ub876fnJ38KZwVE+WtgN//wb7blvaBL88HPqM2VKvVZGee94XjjG9qSiy73jZVN0r7 jZVvt/pi9snDbg1VL1cpIEqMED+OfYPaw9t7MIIsOsxBcS4kZ6AXDARAf6SgYAZRoxefKR 16cU3AKSBz03TTGe3x2xGhDIzw4u/SzFx41faAAI/dRnqXbIvq/D7EPipUXC5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713213721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdScJaltJiYnT84/jmEmGpOSuRwkRSHW0y8xRVBqMVA=; b=fMPKFDmVfMJ4m1Q8526SXwDmXfWa25PGPxcjmQmCa6svvL5x8LtHwWRayanE1bVyobFLWK 4yscPO2Olig+zW958KIGpdWnTAZxv5THC+ksL4lJkSyarOGXGmxU6dx9If8KPX2vSk9FGP EVFwqgr+W5m4v6JILXnlMBYLvmXybDnoYSH2pL+konDIbxjDwiDlB6AhwK9lC8lI6b6G5+ tNWTw1o02yYBRl2sf6SW4tKKqmGhS6j/5bBjGpLJHgajsrFOL3waCFkKS/LF56zI72qdiK FKM9Q+fRp1OODr/wlOtYKI8QSVUkZdaSuvYAKMcQlmbFrGcDLY0UecFEMvdEhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJJxj2FwtzF37; Mon, 15 Apr 2024 20:42: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 43FKg1V2043777; Mon, 15 Apr 2024 20:42:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FKg1Lm043774; Mon, 15 Apr 2024 20:42:01 GMT (envelope-from git) Date: Mon, 15 Apr 2024 20:42:01 GMT Message-Id: <202404152042.43FKg1Lm043774@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: dcda49233de3 - main - sys/acl.h: reduce header pollution List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcda49233de3efb9ed361692e118ecdf2f692339 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=dcda49233de3efb9ed361692e118ecdf2f692339 commit dcda49233de3efb9ed361692e118ecdf2f692339 Author: Brooks Davis AuthorDate: 2024-04-15 16:55:07 +0000 Commit: Brooks Davis CommitDate: 2024-04-15 20:35:41 +0000 sys/acl.h: reduce header pollution In commit d1dfd921774f0 the acl allocator was switched from malloc(9) to uma(9) and done in a way required vm/uma.h and prerequisites. This added considerable header pollution to sys/sysproto.h. The uma details were hidden in commit b998d381f2868, but the header pollution remained. Add less broad includes as required to keep the header self contained. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44468 --- sys/sys/acl.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/sys/acl.h b/sys/sys/acl.h index 66517cff543e..c119cfabef32 100644 --- a/sys/sys/acl.h +++ b/sys/sys/acl.h @@ -36,9 +36,11 @@ #ifndef _SYS_ACL_H_ #define _SYS_ACL_H_ -#include -#include -#include +#include +#include +#ifdef _KERNEL +#include +#endif /* * POSIX.1e and NFSv4 ACL types and related constants. From nobody Mon Apr 15 21:28:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJKz24mQSz5H76c; Mon, 15 Apr 2024 21:28: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 4VJKz243cjz4j85; Mon, 15 Apr 2024 21:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713216494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUrH7bLWWqGr72KrKQqYj6zucf4fLk2i7oePUCix3mY=; b=XnZbGQl0Vg64rXCDi/OW/x0CknWKGgWO1IRxt5AzVTFUu+qVyFWOlygirkEj0glOpm4pF3 Egr10fyc9N2VGDE/tEA5zMG27U/rDjfE1QIg+o2C1xjKk6tqTYcNx8y9DVAh/sYW6Db6/b fyGRUpIenRpkpbBQvYknMbca/BjZCUO5m9Xazgi1DpY8bvYgLC7/Ol28LVnBdV1+wgvGAZ Sjdm8meCnxCf06rA0uLJ+qPJZ6AJXsME4di5/IjSQHh4JUiQPo/TSeZHs0X42fKLprlRZD eyGASh8ozdobcKi/A06OeiVPeHy9eDqfPey+VAoP0Odt/SAqxZb+4UUXHZCdvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713216494; a=rsa-sha256; cv=none; b=hPt2DW6Wm6uOCTi/FkuALoOCUhg3tuThxFAeKlEcWv9j5J+iQOzcf6dODY+D61Nvl45+GT esztSve3OXrFAkmJy4x8sa5ae8eb5fmQjUmmO8rvQLuFBQqiD+TNvOMhzSGTicEK4+n94j sny2uesIBG1dkW/6p1lpCEjzRd8pDLqzeIXGk6N1odx6gpEf9m/PGbOJ25U+mot8i2mIAP G6wit25KLDkAOzaet0K3TkN98KZcqRixyclx95opIMpClnWIPb7ZcwmbroqQxDPTUeTgtA r9OghbqEvSB+u4qf+EhgZiEg0aaakWrISh7Hx2ZNv6DiESg9W7gILkqIF0Eimg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713216494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mUrH7bLWWqGr72KrKQqYj6zucf4fLk2i7oePUCix3mY=; b=dCpR3hSaYtJV+rJbE4tximlQnJRbZWIbsXgct3AWLcTWFoE38nd9EOCmseUrTserqEu9WV QLQtJFkTqlGnZx51mla6eHZcmf6DvVlXNAourrI7+Gm0Y/Cqy7h2XE0w/infc/QtDVdNjb v/WLYM7QuWQywGhEuzVzGgAsDZ8HRkW29nX/zK4eJg+R6sicXQTUqu+J02mXSTvB05uj1b Syh7hzcdLd10oEcHLtqANDGkNHqYkqRmFULbYI2csb4ULDBvIke4j76l6x9bPuOwgPnFDm 7catpPbh8PN8CoUqL/BmHyvhPLJZcnk+38uAxj2cRq0nxyHoPTK1LzRzQWaBwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJKz23fn8zGK4; Mon, 15 Apr 2024 21:28: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 43FLSEwm014156; Mon, 15 Apr 2024 21:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FLSEjm014153; Mon, 15 Apr 2024 21:28:14 GMT (envelope-from git) Date: Mon, 15 Apr 2024 21:28:14 GMT Message-Id: <202404152128.43FLSEjm014153@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: 3075939da41a - main - src.libnames.mk: fix LIBPFCTL definition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 3075939da41a22fc6a4ec592d78f582a711b5e79 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3075939da41a22fc6a4ec592d78f582a711b5e79 commit 3075939da41a22fc6a4ec592d78f582a711b5e79 Author: Lexi Winter AuthorDate: 2024-04-14 10:37:46 +0000 Commit: Kristof Provost CommitDate: 2024-04-15 21:27:05 +0000 src.libnames.mk: fix LIBPFCTL definition Following the convention used in the rest of this file, ${LIBPFCTLDIR} should refer to the directory, and ${LIBPFCTL} to the library itself. Instead, both values were assigned to ${LIBPFCTL}, and ${LIBPFCTLDIR} was not set at all. This appears to be a simple typo and not a deliberate choice, so fix it by assigning the directory name to ${LIBPFCTLDIR} instead. --- share/mk/src.libnames.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index a12c3755ea72..ebe788a346aa 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -617,7 +617,7 @@ LIBOPTS?= ${LIBOPTSDIR}/libopts${PIE_SUFFIX}.a LIBPARSEDIR= ${_LIB_OBJTOP}/usr.sbin/ntp/libparse LIBPARSE?= ${LIBPARSEDIR}/libparse${PIE_SUFFIX}.a -LIBPFCTL= ${_LIB_OBJTOP}/lib/libpfctl +LIBPFCTLDIR= ${_LIB_OBJTOP}/lib/libpfctl LIBPFCTL?= ${LIBPFCTLDIR}/libpfctl${PIE_SUFFIX}.a LIBLPRDIR= ${_LIB_OBJTOP}/usr.sbin/lpr/common_source From nobody Mon Apr 15 21:54:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJLYJ3gTYz5H9nH; Mon, 15 Apr 2024 21:54: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 4VJLYJ38kxz4l80; Mon, 15 Apr 2024 21:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713218068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O4NdQXoRfDK+txTQyw/3/01lUcnW9U+P/46i311+WCI=; b=H4OH6H1mYvn20qh+CcsTtQjD2d/v5hMidnAiEQsgtLc8L88MUOpthjQEQW1RGFEA7vU1Nd qAgygaOYfWC/lgBjLJB7hymJ6gdRoijOB1VxDDKsYD2oqsHyMVHEaDVwkqqEaofjNDHmln gIRq2TMhwH5DeJMnDCrT9CHpo0K43BX95S5AARJPdQefhCP/tl4ccgJMg+fVYCsvuhHZjx aiBUK90Nv6sGr1b7JsXhbIQj+bPPecLur8AUcUUE2q0R6qcE98n+8IWKw9RA17XcnC9+vi 4J4jGeenPCZlGWJaVzm/09efmAqny6jKtskKsFGksYN8hNyVMEhNW5+OhGG9eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713218068; a=rsa-sha256; cv=none; b=AaXvDx/YQ8qbz9ohgRHlRBUt6yo/hoNY+DYg5wmEUamQYZbS17oF5F30CUMqemL0up4DvB x+UkZCQaP4CT/06AmswW8y6VXTLm62xuWoSAbEyAY49+vHWD2tmwpSOmwNCe3Tl7qA+v4s hEoOvTDOJxQJzQ6Q9oIWjgQfTgzla7VfcDqWTPfZ+2g6vsKT37SkHOejihfqweLxX2tWxf IpjmxnHk2XQtpBOveJ4TKIcfk1BThZ8II1Enfw8LLsNtggkz1u/ABQsEAByIhRYgjFytIE KB2GoLfTNADxi/CC4zECTyObSj7/nBG8iac+x6AchsrT+wjBr2EI7QptyMbHdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713218068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O4NdQXoRfDK+txTQyw/3/01lUcnW9U+P/46i311+WCI=; b=XB21wgbP63qOIZYE2zUnSt6dIzwBT2Y6KHa8M7wDo3ySQ6Q4iLYNAU/N2j3EcCFr4qyBsv NBO4o17p435UKhG9Zms47ayN9kainYsRyYgZO6M03USzsIhuEOZGuiuuxroSErsrUCPGs3 am0+mw9IO7LJg7mOkNviIso80AcJaNYJxWa13suWbmRJFwqnPwhzhBg/pOP+5C2mYUh3SI wi+iae93DCDckAQdm5klaBFAv3st12/Z3AngqQRGiB1xoxfaAcp82UcCHF83yCdPPB6Mej PB+JTuy8UYXT5EamYoYmBeYHbx4aGXLzzpPjFtLrWBM9LyImdgteWPfbAitZNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJLYJ2jKgzGpb; Mon, 15 Apr 2024 21:54: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 43FLsSwg064295; Mon, 15 Apr 2024 21:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FLsS5J064292; Mon, 15 Apr 2024 21:54:28 GMT (envelope-from git) Date: Mon, 15 Apr 2024 21:54:28 GMT Message-Id: <202404152154.43FLsS5J064292@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: 605a00660ead - main - tcp bbr: improve code consistency List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 605a00660eadb210ed76d49df551f3f33bbb4da7 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=605a00660eadb210ed76d49df551f3f33bbb4da7 commit 605a00660eadb210ed76d49df551f3f33bbb4da7 Author: Michael Tuexen AuthorDate: 2024-04-15 21:52:08 +0000 Commit: Michael Tuexen CommitDate: 2024-04-15 21:52:08 +0000 tcp bbr: improve code consistency Improve code consistency with the RACK stack. Reviewed by: gallatin, rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44800 --- sys/netinet/tcp_stacks/bbr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 4be12e824926..06e80db4a0eb 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -11807,7 +11807,7 @@ bbr_output_wtime(struct tcpcb *tp, const struct timeval *tv) uint32_t recwin, sendwin; int32_t sb_offset; int32_t flags, abandon, error = 0; - struct tcp_log_buffer *lgb = NULL; + struct tcp_log_buffer *lgb; struct mbuf *m; struct mbuf *mb; uint32_t if_hw_tsomaxsegcount = 0; @@ -13590,12 +13590,12 @@ send: mtu = inp->inp_route.ro_nh->nh_mtu; } #endif /* INET */ -out: - if (lgb) { lgb->tlb_errno = error; lgb = NULL; } + +out: /* * In transmit state, time the transmission and arrange for the * retransmit. In persist state, just set snd_max. From nobody Tue Apr 16 07:07:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJZqY2krwz5G0pT; Tue, 16 Apr 2024 07: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 4VJZqY2GDCz4mg3; Tue, 16 Apr 2024 07: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=1713251257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWDNMpGfZGzdca4TbYY9BJsuM7xtxMjI7LBRCk0TU28=; b=w+H8KSnvUlhLYgs13gscg4kxHpYtpyiihYxjEgwLRPZOqKuc6Jj++l30gUpUdRF9YGV5/s sbmeBn2WTSiW7DBUE2dq6N7XZ19LqCt87UNymUsUIVZga1NaIvTRaUfLJzAtR3KecHgAS2 Fy+FKDAXOzv0xHJcvmQVQpnBzLx+KkiE6YsK0PPYZgIIw1G49FZvJv1X+9s5z5jAAJhoTP i08LLndXPm1wOT1yGo4EGVzjT7VObsbKBxlRAtNgDXMMoidbPWpkghwspd701A8CC1wfyu hbbUHcVtX4gRTx6u+lCxdcHPV8NCtEZuEIASJDsfe/GKOcIBLnb7aP9rV2kEkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713251257; a=rsa-sha256; cv=none; b=sNkni7aEdMRAnvc/OajfKkZkB8eGLsxkMR7uDfpQSceaZCXCtaWMvb0SwDbJhFdMbSbV5u NMAzKsNxOUGzAQxP2SX43EYe9GIGz3bW2spdBrPJz9fvlLVf/RhYkLQVkcMKaiVhn/2lzI 2I2H9D+LaxPc8vRfk2/d6NKjD4n38a/2GqTS3zE+z61ESJZXWH1Feyg1i9ReZ3e4SAViXg Bnjmfn1QRqTfiM7tcCjiZVWP/Otd6z9Q37xop/er8eU+H1p6ROT+9VWPsg+1AFFjDCqwQr N6oLDyv+i+/5EY320VuS75eoYAmgLunXUcpk4NQLj6jwzRWVPt6PT1+9PO+cxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713251257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWDNMpGfZGzdca4TbYY9BJsuM7xtxMjI7LBRCk0TU28=; b=f4vZ45adOfqYLx1ORXPL2wlpoyAY4AuPM2Z14VOTq4OCCv04eKHVhqY/YljxCSc7vhMWx+ VAt2CbrCQDGE8h52JRnP8ga2XtwJaJ+4yshKgAWgPisDAqbBJUzi6ZHRuqWnijQfQlqqux 5BpMv4AN3RnBSgRRHTaF9Dx+RZ2IpJ3LkMWvI/uzXdJUzu6QyvBZGlB7n5f+Hr6eHJpN6b Rm5k8NchkzCWcSxbXAJ58B/yezO+QHkE9ePOXehZquKAalTfhVNE5OBfT2fUmGsz5vMRCr P4RdCBX5Rd/3HMrgy5L7cSweIJ7LMo7CNWudYIjw8QlcelMUJMwxkbMmYNHVbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJZqY1sPzzYgw; Tue, 16 Apr 2024 07: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 43G77bP3097173; Tue, 16 Apr 2024 07: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 43G77b5U097170; Tue, 16 Apr 2024 07:07:37 GMT (envelope-from git) Date: Tue, 16 Apr 2024 07:07:37 GMT Message-Id: <202404160707.43G77b5U097170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: f750dce972ef - main - x86/xen: fix accounted interrupt time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f750dce972efaea614aa6d03ecdb24aa962a38a4 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=f750dce972efaea614aa6d03ecdb24aa962a38a4 commit f750dce972efaea614aa6d03ecdb24aa962a38a4 Author: Roger Pau Monné AuthorDate: 2024-03-05 13:15:03 +0000 Commit: Roger Pau Monné CommitDate: 2024-04-16 07:06:33 +0000 x86/xen: fix accounted interrupt time The current addition to the interrupt nesting level in xen_arch_intr_handle_upcall() needs to be compensated in xen_intr_handle_upcall(), otherwise interrupts dispatched by the upcall handler end up seeing a td_intr_nesting_level of 2 or more, which makes them assume there's been an interrupt nesting. Such extra interrupt nesting count lead to statclock() reporting idle time as interrupt, as the call from interrupt context will always be seen as a nested one (td->td_intr_nesting_level >= 2) due to the nesting count increase done by both xen_arch_intr_handle_upcall() and intr_execute_handlers(). Fix this by adjusting the nested interrupt count before dispatching interrupts from xen_intr_handle_upcall(). PR: 277231 Reported by: Matthew Grooms Fixes: af610cabf1f4 ('xen/intr: adjust xen_intr_handle_upcall() to match driver filter') Sponsored by: Cloud Software Group Reviewed by: Elliott Mitchell --- sys/dev/xen/bus/xen_intr.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c index 609f31b5418a..bfe080b16f03 100644 --- a/sys/dev/xen/bus/xen_intr.c +++ b/sys/dev/xen/bus/xen_intr.c @@ -341,7 +341,7 @@ xen_intr_active_ports(const struct xen_intr_pcpu_data *const pcpu, /** * Interrupt handler for processing all Xen event channel events. * - * \param trap_frame The trap frame context for the current interrupt. + * \param unused */ int xen_intr_handle_upcall(void *unused __unused) @@ -354,6 +354,15 @@ xen_intr_handle_upcall(void *unused __unused) struct xen_intr_pcpu_data *pc; u_long l1, l2; + /* + * The upcall handler is an interrupt handler itself (that calls other + * interrupt handlers), hence the caller has the responsibility to + * increase td_intr_nesting_level ahead of dispatching the upcall + * handler. + */ + KASSERT(curthread->td_intr_nesting_level > 0, + ("Unexpected thread context")); + /* We must remain on the same vCPU during this function */ CRITICAL_ASSERT(curthread); @@ -417,7 +426,17 @@ xen_intr_handle_upcall(void *unused __unused) ("Received unexpected event on vCPU#%u, event bound to vCPU#%u", PCPU_GET(cpuid), isrc->xi_cpu)); + /* + * Reduce interrupt nesting level ahead of calling the + * per-arch interrupt dispatch helper. This is + * required because the per-arch dispatcher will also + * increase td_intr_nesting_level, and then handlers + * would wrongly see td_intr_nesting_level = 2 when + * there's no nesting at all. + */ + curthread->td_intr_nesting_level--; xen_arch_intr_execute_handlers(isrc, trap_frame); + curthread->td_intr_nesting_level++; /* * If this is the final port processed, From nobody Tue Apr 16 08:22:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJcTy2b3Pz5G6tN; Tue, 16 Apr 2024 08:22: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 4VJcTy222Tz4tt0; Tue, 16 Apr 2024 08:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713255750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2WrBY3x+WL6IOyRKs2dAf8XzwLM1vW65ySHoOX1blG4=; b=IygyuFWZhrQR13zcN4gqMDSfbdLtZbXsfdK+n6rlC6FYCQx9N1sNVXp0dt/ggkiGd4vHRh 8pjyvk29WDhFz3pfL8xa8YgiQunflfPtsTXKDuQejgdp8B0AvU9MLtExB6dIo1XbFJAzLF R2lsVb2qnSIBuzfGKYkPjKJJVOwtwrdxJ9795ODyz/l61Us6TOG534OIKyC3yi7cprLcLm C8z3c+AAEe7bsNYTjPYNQRT9GpjilG1vvT6kN7mYccrt9HXcyXDv/fXAGn0Rv1YUr/rVd9 5fravJlp5vwEzmhCLmqZ/KFj78xCYQYkly0bkJrWzzh63M6xgHf9SsRdjIVVEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713255750; a=rsa-sha256; cv=none; b=ntw4GAORkUp/RqqQJnAzo/TpYNvYEiXvDVV9uSt7OSV5wfPbR7llxULQ+6MCG5ad7sZAWr yqZCWK3QZ/D5PQ9q7W9Q6C0uWmUXTo5nmcahcc8jSvdf7HsJiMh/gFka/oUOq/CWJW+aE+ x7lC3RHL/2X/41YusNDhT0wDyLZnbUyUmYQ4CfkMPM9X3CAQ/RNbXlLNwNOu3Rwdgcc+Ll +aqWC7aJi7DGC/FO0+aIo5xxntD6Lmgari7wxGdnnCGejHcncN02tbQNJq3pRIIlKAmVwj VixdHsM6qgwAeeBZuvUypEKAt39IrmUhfI02MiWM0sRXRlnBlsafeu7gdRj0XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713255750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2WrBY3x+WL6IOyRKs2dAf8XzwLM1vW65ySHoOX1blG4=; b=nyDs5l2IrtzuueXMhrtiajAhEo4u1yrCaypki0f/5DNQpV0JvjWIEgMK+MUkIGjlxk+Sya hB5Fss4/Q+kWn0+kW+Ew7GQZhIShwVJlTpKUVfgNr4vO94uDPTpKbZ8a1O3t9StT0B0uSs tE+5eiLHT1MIYpQK4Xk+VTHO8c2QDpk4Hf5CFgHDLt/4VOTKPvMbQY7MKYLvJZ5+x7O6VO rNi/I1KPnP6dp4Mb7r7bwUspR4P7IQM+3M0GRdWIrXBEnjfsEewPZm5hB5zBBGk0h/YQnn S1YCDlgr/ZHUpivre8HJxsCPae8OMPtxQfsnaVsaCpViYLvi4l6TsMqPYH6YNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJcTy1f9pzbVC; Tue, 16 Apr 2024 08:22: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 43G8MUKs032047; Tue, 16 Apr 2024 08:22:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43G8MUA3032044; Tue, 16 Apr 2024 08:22:30 GMT (envelope-from git) Date: Tue, 16 Apr 2024 08:22:30 GMT Message-Id: <202404160822.43G8MUA3032044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 02a2005a5a2d - main - stress2: Add new unionfs test scenarios List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02a2005a5a2d0a2a6e0920ee13f6d63dca55e8e0 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=02a2005a5a2d0a2a6e0920ee13f6d63dca55e8e0 commit 02a2005a5a2d0a2a6e0920ee13f6d63dca55e8e0 Author: Peter Holm AuthorDate: 2024-04-16 08:21:14 +0000 Commit: Peter Holm CommitDate: 2024-04-16 08:21:14 +0000 stress2: Add new unionfs test scenarios --- tools/test/stress2/misc/unionfs15.sh | 86 ++++++++++++++++++++++++++++++++++++ tools/test/stress2/misc/unionfs16.sh | 65 +++++++++++++++++++++++++++ tools/test/stress2/misc/unionfs17.sh | 73 ++++++++++++++++++++++++++++++ tools/test/stress2/misc/unionfs18.sh | 73 ++++++++++++++++++++++++++++++ 4 files changed, 297 insertions(+) diff --git a/tools/test/stress2/misc/unionfs15.sh b/tools/test/stress2/misc/unionfs15.sh new file mode 100755 index 000000000000..87cea7c0b15d --- /dev/null +++ b/tools/test/stress2/misc/unionfs15.sh @@ -0,0 +1,86 @@ +#!/bin/sh + +# +# Copyright (c) 2024 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# O_PATH test scenario. Variation of nullfs29.sh + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg + +md1=$mdstart +md2=$((md1 + 1)) +mp1=/mnt$md1 +mp2=/mnt$md2 +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done +for i in $md1 $md2; do + mdconfig -l | grep -q md$i && mdconfig -d -u $i +done + +mdconfig -a -t swap -s 2g -u $md1 +mdconfig -a -t swap -s 2g -u $md2 +newfs $newfs_flags -n md$md1 > /dev/null +newfs $newfs_flags -n md$md2 > /dev/null +mount /dev/md$md1 $mp1 +mount /dev/md$md2 $mp2 +mount -t unionfs -o noatime $mp1 $mp2 +set +e + +cat > /tmp/unionfs15.c < +#include +#include +#include +#include +#include +#include + +int +main(void) { + int new_dir, new_file, ret; + struct stat sb; + char *dir = "test2"; + char *path= "test2/what2"; + + if (mkdir(dir, 0755) == -1) + err(1, "mkdir(test2)"); + new_dir = openat(AT_FDCWD, dir, O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_PATH, 0700); + if (new_dir == -1) + err(1, "openat(%s)", dir); + + ret = fstatat(new_dir, "what2", &sb, AT_SYMLINK_NOFOLLOW); + if (ret == 0) + errx(1, "Expected fstatat() to fail"); + if (ret == -1 && errno != ENOENT) + err(1, "fstatat(%s)", dir); + + close(new_dir); + new_file = openat(AT_FDCWD, path, O_WRONLY|O_CREAT|O_EXCL|O_CLOEXEC, 0644); + if (new_file== -1) + err(1, "openat(%s)", path); +} + +EOF +mycc -o /tmp/unionfs15 -Wall -Wextra -O2 /tmp/unionfs15.c || exit 1 +cd $mp2 +/tmp/unionfs15; s=$? +cd $here +umount $mp2 + +while mount | grep -Eq "on $mp2 .*unionfs"; do + umount $mp2 && break + sleep 5 +done +umount $mp2 +umount $mp1 +mdconfig -d -u $md2 +mdconfig -d -u $md1 +rm -f /tmp/unionfs15.c /tmp/unionfs15 +exit $s diff --git a/tools/test/stress2/misc/unionfs16.sh b/tools/test/stress2/misc/unionfs16.sh new file mode 100755 index 000000000000..c1c65f7d8313 --- /dev/null +++ b/tools/test/stress2/misc/unionfs16.sh @@ -0,0 +1,65 @@ +#!/bin/sh + +# +# Copyright (c) 2024 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# No problems seen with this test scenario + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg + +[ -d /usr/src/tools/test/stress2 ] || exit 0 +prog=$(basename "$0" .sh) +log=/tmp/$prog.log +md1=$mdstart +md2=$((md1 + 1)) +mp1=/mnt$md1 +mp2=/mnt$md2 +s=0 + +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done +for i in $md1 $md2; do + mdconfig -l | grep -q md$i && mdconfig -d -u $i +done + +mdconfig -a -t swap -s 3g -u $md1 +mdconfig -a -t swap -s 3g -u $md2 +newfs $newfs_flags -n md$md1 > /dev/null +newfs $newfs_flags -n md$md2 > /dev/null +mount /dev/md$md1 $mp1 +mount /dev/md$md2 $mp2 +(cd $mp1; cp -a /usr/src/tools/test/stress2 .) +(cd $mp2; cp -a /usr/src/tools/test/stress2 .) +rm $mp1/stress2/testcases/run/run +rm $mp2/stress2/testcases/swap/swap +mount -u -o ro $mp1 +mount -t unionfs -o below $mp1 $mp2 +rm $mp2/stress2/testcases/mkdir/mkdir +chmod 777 $mp2 +set +e + +(cd $mp2/stress2; make > /dev/null 2>&1) +export RUNDIR=$mp2/stressX +export runRUNTIME=1m +su $testuser -c "cd $mp2/stress2; ./run.sh vfs.cfg" > /dev/null 2>&1 +umount $mp2 + +while mount | grep -Eq "unionfs.* on $mp2 "; do + umount $mp2 && break + sleep 5 +done +fsck_ffs -fy /dev/md$md2 > $log 2>&1 +grep -Eq "WAS MODIFIED" $log && { cat $log; s=1; } +umount $mp2 +umount $mp1 +mdconfig -d -u $md1 +mdconfig -d -u $md2 +rm -f $log +exit $s diff --git a/tools/test/stress2/misc/unionfs17.sh b/tools/test/stress2/misc/unionfs17.sh new file mode 100755 index 000000000000..bcb6d242187b --- /dev/null +++ b/tools/test/stress2/misc/unionfs17.sh @@ -0,0 +1,73 @@ +#!/bin/sh + +# +# Copyright (c) 2024 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# unionfs(8) test +# Variation of unionfs7.sh, but with tmpfs + +# "mkdir: rmdir(d17) Directory not empty" seen. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg + +mp1=/mnt$mdstart +mp2=/mnt$((mdstart + 1)) +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done + +mount -o size=4g -t tmpfs dummy $mp1 +mount -o size=4g -t tmpfs dummy $mp2 + +mount -t unionfs -o noatime $mp1 $mp2 +set +e +export 'INODES=100000' + +export CTRLDIR=$mp2/stressX.control +export INCARNATIONS=10 +export LOAD=80 +export RUNDIR=$mp2/stressX +export runRUNTIME=5m +export rwLOAD=80 +export symlinkLOAD=80 + +export TESTPROGS=" +testcases/lockf2/lockf2 +testcases/symlink/symlink +testcases/openat/openat +testcases/rw/rw +testcases/fts/fts +testcases/link/link +testcases/lockf/lockf +testcases/creat/creat +testcases/mkdir/mkdir +testcases/rename/rename +testcases/mkfifo/mkfifo +testcases/dirnprename/dirnprename +testcases/dirrename/dirrename +testcases/swap/swap +" + +cp -r ../../stress2 $mp2 +export TESTPROGS=`echo $TESTPROGS | sed 's/\n/ /g'` + +set +e +chmod 777 $mp2 +su $testuser -c \ + "(cd $mp2/stress2; ./testcases/run/run $TESTPROGS)" + +while mount | grep -Eq "on $mp2 .*unionfs"; do + umount $mp2 && break + sleep 5 +done +umount $mp2 +n=`find $mp1/stressX | wc -l` +[ $n -eq 1 ] && s=0 || { find $mp1/stressX -ls | head -12; s=1; } +umount $mp1 +exit $s diff --git a/tools/test/stress2/misc/unionfs18.sh b/tools/test/stress2/misc/unionfs18.sh new file mode 100755 index 000000000000..e772a67a07fb --- /dev/null +++ b/tools/test/stress2/misc/unionfs18.sh @@ -0,0 +1,73 @@ +#!/bin/sh + +# +# Copyright (c) 2024 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Simple unionfs(8) + tmpfs test + +# "rmdir: d2: Directory not empty" seen. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg + +mp1=/mnt$mdstart +mp2=/mnt$((mdstart + 1)) +mkdir -p $mp1 $mp2 +set -e +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done + +md1=$mdstart +md2=$((md1 + 1)) +mp1=/mnt$md1 +mp2=/mnt$md2 +mkdir -p $mp1 $mp2 +for i in $mp1 $mp2; do + mount | grep -q "on $i " && umount -f $i +done + +if [ $# -eq 0 ]; then + echo "tmpfs version" + mount -o size=4g -t tmpfs dummy $mp1 + mount -o size=4g -t tmpfs dummy $mp2 +else + echo "UFS version" + for i in $md1 $md2; do + mdconfig -l | grep -q md$i && mdconfig -d -u $i + done + mdconfig -a -t swap -s 4g -u $md1 + mdconfig -a -t swap -s 4g -u $md2 + newfs $newfs_flags -n md$md1 > /dev/null + newfs $newfs_flags -n md$md2 > /dev/null + mount /dev/md$md1 $mp1 + mount /dev/md$md2 $mp2 +fi + +mount -t unionfs -o noatime $mp1 $mp2 +set +e + +N=3 # Tree depth +here=`pwd` +cd $mp2 +mkdir dir; cd dir +for j in `seq 1 $N`; do + mkdir d$j && cd d$j +done +for j in `seq $N 1`; do + cd .. && rmdir d$j +done +cd .. +rmdir dir || { s=1; find dir -ls; } +cd $here + +while mount | grep -Eq "on $mp2 .*unionfs"; do + umount $mp2 && break + sleep 5 +done +umount $mp2 +umount $mp1 +exit $s From nobody Tue Apr 16 08:22:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJcTz4YFtz5G721; Tue, 16 Apr 2024 08:22: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 4VJcTz2s6Qz4v3x; Tue, 16 Apr 2024 08:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713255751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=roEtQkFAC9GatESJSnFG1mFk09e1YlVF3wnbHUoKBgc=; b=Ieu5jWOyDOPS99wAQHXY1ImSXZCEkoLHgvV8mvXaWqTgtEuDXsVRQCwggX7aO4j5iDYIgK oUn4qPlQWMNFInes1j9t3L0rJw878BGUDfadSUZchyKR764/XG1rTe+5aF4r/IuIIU1Gg2 y5QG4GTdae0bi2xA8rSLEoZgdDFylN8ZGlDBnnmLJAjmCVp7z1qyrHODsNhNfuHHCUwiKm 0RyCKmZQRLpuP2G6+9cb1tl4nf2fmyxmloFdCtsXy3bLfQzHUg38qkLAM5C4GZQ9OmLRQC pCWoad9S7rE//CXkAC0PW4gdUZNGW+Zs0Bu89Mx3xjLBP0q0U86fugo5ED/eCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713255751; a=rsa-sha256; cv=none; b=UQr0uztispM+Ipw5vMISgTwyXF86gsqONKaeZ+vRzssS0srLh6vMHTORO/UN3eYUEMDzgV GX/ykQdv+BEFjWx5cVCeg+3LuFxLRnX1JCJ3s0cQCcf8rFODrwUI/CMyGUNv1mXepOVWnQ 4CK2HWbKCs8tu841I6pyPplOIWws3iMJS/BJfLjrJryBpYV/cJmAK2B2IeLroDzixOZVff 3xt7pF/kKrhc6eeDUvILT5X8fHsfTaWf2igoiKEj/RadCcK9QGu798aRiU/1jqVuaQtMHl wsYO0OOWDbZGJrdI+1MX6lu4Qf5B0HhiiuEB35/kcL/57LqioOT8N4wdjQizug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713255751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=roEtQkFAC9GatESJSnFG1mFk09e1YlVF3wnbHUoKBgc=; b=xOyr14Ql0CETt6DdaU8RG3cJdqYXB/AoRooCiHBpTHIGJKY+EeC435ObIzIlqytHtoZ/3y SkKerPKu89V/eQ/HvYIsbqCu9lcRom5v0RGTxnjQ4DaoebMyvdacp2e3vjqFqg1ZKZCeyr 0RmVb3gGABihGJYSEPqRWLsZ+c+7C6AvjJVgE7KeW5SmUtNdqkXKy1MQ2TdO8iCSnUuISD k45G2SwD6N3xDSe9tLfXPB22otimDchHiezhO8p51mGxdnwAwJjxgOfbFCpYsHTZ+PaoKr tiyaOl0hHaivBGzUUZ9p93A4qSkd8Jkw6pfcyJQZnJQFUhr68sm49UWJNT8VRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJcTz2S0HzbwS; Tue, 16 Apr 2024 08:22: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 43G8MVSp032101; Tue, 16 Apr 2024 08:22:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43G8MVK8032098; Tue, 16 Apr 2024 08:22:31 GMT (envelope-from git) Date: Tue, 16 Apr 2024 08:22:31 GMT Message-Id: <202404160822.43G8MVK8032098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 219d8fb0361f - main - stress2: Add an option to exit on error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 219d8fb0361f459ab458f17fe58da32ea00c0104 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=219d8fb0361f459ab458f17fe58da32ea00c0104 commit 219d8fb0361f459ab458f17fe58da32ea00c0104 Author: Peter Holm AuthorDate: 2024-04-16 08:22:03 +0000 Commit: Peter Holm CommitDate: 2024-04-16 08:22:03 +0000 stress2: Add an option to exit on error --- tools/test/stress2/misc/all.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/all.sh b/tools/test/stress2/misc/all.sh index 605c9958b552..86d986099dbb 100755 --- a/tools/test/stress2/misc/all.sh +++ b/tools/test/stress2/misc/all.sh @@ -42,14 +42,15 @@ alloutput=$sdir/output # Output from current test allexcess=$sdir/excessive # Tests with excessive runtime allelapsed=$sdir/elapsed # Test runtime alllocal=$sdir/all.exclude # Local exclude list +exitonerror=0 # -e option loops=0 # Times to run the tests # Get kernel config + revision rev=`uname -a | awk '{print $7}' | sed 's/://'` rev="`uname -a | sed 's#.*/compile/##; s/ .*//'` $rev" -args=`getopt acl:m:no "$@"` +args=`getopt acel:m:no "$@"` [ $? -ne 0 ] && - echo "Usage $0 [-a] [-c] [-l ] [-m ] [-n] [-o] []" && + echo "Usage $0 [-a] [-c] [-e] [-l ] [-m ] [-n] [-o] []" && exit 1 set -- $args for i; do @@ -62,6 +63,9 @@ for i; do rm -f $alllist shift ;; + -e) exitonerror=1 + shift + ;; -l) loops=$2 # Number of time to run shift; shift ;; @@ -160,6 +164,7 @@ trap intr INT [ -f all.debug.inc ] && . all.debug.inc s1=`date +%s` +touch $sdir/starttime while true; do exclude=`cat all.exclude $alllocal 2>/dev/null | sed '/^#/d' | grep "^[a-zA-Z].*\.sh" | awk '{print $1}'` @@ -226,6 +231,7 @@ while true; do [ $e -ne 0 ] && echo "FAIL $i exit code $e" ) 2>&1 | tee $alloutput + grep -qw FAIL $alloutput && e=1 || e=0 ts=`date '+%Y%m%d %T'` grep -qw FAIL $alloutput && echo "$ts $rev $i" >> $allfaillog && @@ -247,6 +253,7 @@ while true; do [ $all_debug ] && post_debug [ $minutes ] && [ $((`date +%s` - s1)) -ge $minutes ] && break 2 + [ $exitonerror -eq 1 -a $e -ne 0 ] && break 2 done [ $((loops -= 1)) -eq 0 ] && break done From nobody Tue Apr 16 13:20:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJl655RpYz5GrYp; Tue, 16 Apr 2024 13:20: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 4VJl653clWz44LJ; Tue, 16 Apr 2024 13:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713273645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gs4WMy+/kyzXmd4i40mcKo/UNiMnvpmWqe0Pn9kKUd8=; b=D+R1dd3o0BwBb0jrrnx2wKdesqQ6Ib5SEcnKCmbQhHNIIuFhEAZwpE59wTETd0514FLR5l +qXmP9eatYJNi40SoTLXn3R8d68fSdmlSt6LkQyFLx2rt3s2Kddlkg9Lhqign1ktqVlVtE dhKSKlL/Ia0Z4w0bacM6MuHFL2S0HBJFCyCz4fp8WJM83jqMlo7jjkXzjyrrCWWkW8uXcw 7/uS9RNoDojfskh+s+t1he19mp5hseigSWdfpoWtPUrSpW6wgk4cjnScbJAxWukYq0sH8N 13R4xZMITYWP451afnXGX1EReVQY7+zQseFDp+gtLMJCqzcYAeDkA7dBs9ZGQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713273645; a=rsa-sha256; cv=none; b=VBF4BpO/DRzBnPc3aDBLxkTZV081VVAxxt6d0bi07dtPACenhXdcz1mAyPtegjTnDx63S6 Q/3M4W+eifroEFVJVEOVQt20fiPwqrDZuzmYE/fsiNEVuJoogZuUiUiCuirFHoy8CKgQs3 gayboM24m3EVIk5zEKga9c9euXRiJkFBMAczggVWP0eauo9CQeTZdBQC5w733m79QMAJdw LtX5u/cJwvSzGQPwEmRLg3o7HffthYnyY5qwreDNVoWHubfsZim/2u4SloNktgEare9+5l ukOomraZByScZL3SySaj6wihXxT+2lQmGF8VO7gKkbCML5SWWhPc7BgsC+Dkyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713273645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gs4WMy+/kyzXmd4i40mcKo/UNiMnvpmWqe0Pn9kKUd8=; b=sjn4IkXyc7MSk5sn1Mqw470inquS+724rOm+3K+iEEHjmBhX2Dj3wPS7rU1qxy316FQQSg XAwLM/ov9hTPPTBI5ZaHX0brCnfyh+Syw00gnVFUtik2bxXdPSSsyzDH9zR1LnfQ4Hy9io EFcjeYeE5ksvWdfpznmKNhKTJyKbQfMIPWHbYxfrW/BMkY5ivqM+wnGtmIrKIWW9z532KD I75GlvRqrTSxsvG/Eo7tqokB2YSN3vFBXtdEHmv4Hdmy0vnYUzb/XYnqgUhVLAV/KlIeQi R6ENkjrZtLUhsw42/AiLR2m7B8vPVyNKhotxjweyQ4TLClQFg9APer1b2HbXIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJl653B9fzl1C; Tue, 16 Apr 2024 13:20: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 43GDKjpl035585; Tue, 16 Apr 2024 13:20:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GDKjeY035582; Tue, 16 Apr 2024 13:20:45 GMT (envelope-from git) Date: Tue, 16 Apr 2024 13:20:45 GMT Message-Id: <202404161320.43GDKjeY035582@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: 428f86fd2ff1 - main - mv: Set file flags after setting file times List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 428f86fd2ff1fd2b073d556fac273c8c7f457376 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=428f86fd2ff1fd2b073d556fac273c8c7f457376 commit 428f86fd2ff1fd2b073d556fac273c8c7f457376 Author: Ricardo Branco AuthorDate: 2024-03-16 17:13:10 +0000 Commit: Mark Johnston CommitDate: 2024-04-16 13:18:15 +0000 mv: Set file flags after setting file times Some file flags prevent modification of file times, so they should be set later. This matches NetBSD's behaviour. Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1138 --- bin/mv/mv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 7a1ecba7e076..8aea4bbf567c 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -319,6 +319,12 @@ err: if (unlink(to)) */ preserve_fd_acls(from_fd, to_fd, from, to); (void)close(from_fd); + + ts[0] = sbp->st_atim; + ts[1] = sbp->st_mtim; + if (futimens(to_fd, ts)) + warn("%s: set times", to); + /* * XXX * NFS doesn't support chflags; ignore errors unless there's reason @@ -339,11 +345,6 @@ err: if (unlink(to)) } else warn("%s: cannot stat", to); - ts[0] = sbp->st_atim; - ts[1] = sbp->st_mtim; - if (futimens(to_fd, ts)) - warn("%s: set times", to); - if (close(to_fd)) { warn("%s", to); return (1); From nobody Tue Apr 16 13:56:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJlvC1LLRz5GvYp; Tue, 16 Apr 2024 13:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJlvC0jMQz49RR; Tue, 16 Apr 2024 13:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713275783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SbqqD0/XBDl7HrKcZi7BZx4+BQSjzBzT+TQAsdJiynA=; b=uc4XeIMMNNyeQw+t2TCJKmucFm75v6V5qkcDjG95mw1qnjeSzQF3CTIdqEEZKbPJAurrQ4 vG8cJOGUkk3XtbRJxo2u/ivy4Ddqt2JEqbDF/kk3HQKSq4yH0PzLzeftACNHh7ghYeeRL/ jLDSAuplX6EQHocxJCZCr0ppnp4UR8/MOcETc++CNAVPGfD0uZ/5WtTfZMREZQOZFGMqAx +XjGJ8lV7hk2y465ZEf7cdufUosFIHM9CAIGS33Q0sTbDoALW3G2p5BLy20K+JjAPydn86 FsbiDpdC91GwJIaa92viV7nAY1Vfdu0E6wGUlX2zon/5hUxiAyW63hX3CYzziQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713275783; a=rsa-sha256; cv=none; b=v7cpvak3bBY2ye1h/tuK23fM1StVDLDGHFOEqPSiujMgjlcm4fQtVUUxLuD+f1Y+OXcHKN +4nYZAajf4fAfZ4d6awc16eQiJCBiDBXj1nBLXr5lGvBrpTO0YK+gs4EWyQw5o3WFWh1kY Qp8NmdwiVHf8em5k7vdf2kRAPGq4oPI6CceWmVA2Wd9oyTEy7ftIeLvylKJGtlOm5b5a6f 5tqQURa2aRiOCYvb04GFZ2/REhmlVyX1DB2ymnuUaG+rtTkMlj8xn9XqJWUi7GqNZLt5rf MlqqZWnFI9AQkmR8QuWaAyu8LkrsYZZeAmRk+OUxJ8rclhoJIghGVyLlrqjNfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713275783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SbqqD0/XBDl7HrKcZi7BZx4+BQSjzBzT+TQAsdJiynA=; b=kkVLNQ4g7UyFC2Lal7AP8SQyOFzAcO0qrCorr2zB8vJt1QCSLhWfEXnhqk1iSPo/GdTIbF vZ3hDsyVDRMJ5Kmrg86fqv97QOyYIuKOrS+uFExJB95+2kQ9007FcBTLiZmiB465O5eNoU aXMhOiPTw8Wnf4Gb5Rm23YpCt2xoBhZSwmoRd7nOQ0+Hvq/z2MZ4791z+tGs+0i5RqxV4m LpDAmYuqpzJtt6TqUHcfpDC+hrMpLkoZ9ic5+L2ZHWXCN8IHI4Gis8YPjVw+FkZEUQqEUY qfCIRjSeOV/lGDGHoLNajwM7uMZtq7cmmN0MyiI1Fpqe6ZzODE5pRICoDp4XVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJlvC0JjDzm1Q; Tue, 16 Apr 2024 13:56: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 43GDuMCu090299; Tue, 16 Apr 2024 13:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GDuMFV090296; Tue, 16 Apr 2024 13:56:22 GMT (envelope-from git) Date: Tue, 16 Apr 2024 13:56:22 GMT Message-Id: <202404161356.43GDuMFV090296@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: 40b57cb616ca - main - tzsetup: be explicit about *timezone* abbreviation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 40b57cb616ca19aee3de104acd058da289c936bb Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=40b57cb616ca19aee3de104acd058da289c936bb commit 40b57cb616ca19aee3de104acd058da289c936bb Author: Ed Maste AuthorDate: 2024-03-25 20:25:23 +0000 Commit: Ed Maste CommitDate: 2024-04-16 13:55:46 +0000 tzsetup: be explicit about *timezone* abbreviation During the install process tzsetup asks a question like Does the abbreviation `EDT' look reasonable? The installer asks lots of questions, some that relate to the previous screen or topic and some that do not. A new user installed FreeBSD for the first time and was confused by this question, not realizing that it was asking whether the abbreviation is correct for the selected timezone. Reviewed by: bapt, brooks, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44500 --- usr.sbin/tzsetup/tzsetup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 9610023ec3ea..fee5762b6fa6 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -709,7 +709,7 @@ confirm_zone(const char *filename) tm = localtime(&t); snprintf(prompt, sizeof(prompt), - "Does the abbreviation `%s' look reasonable?", tm->tm_zone); + "Does the timezone abbreviation `%s' look reasonable?", tm->tm_zone); conf.title = "Confirmation"; rv = (bsddialog_yesno(&conf, prompt, 5, 72) == BSDDIALOG_YES); return (rv); From nobody Tue Apr 16 14:21:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJmRf4jWLz5GxJq; Tue, 16 Apr 2024 14:21: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 4VJmRf26rLz4FSr; Tue, 16 Apr 2024 14:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713277262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lmvPoG/lzxjfTbBeOVvVcpy25bXzQaru+ZepC2DT+Ow=; b=qM3jZyUVnA0KZgfNI+D9h8qmCj3KRjtjsYCU2S6NCWOeB0EVVSkU71i5gBXzJEfbXImUfb wac39x6NgC8RafzNkMdtfzfePQ/29qBYA9leh8f/kBB+TeefN814RiE197kVD3XcE6cbik UXo8LlSpVqYJOpR8lseUoEGusnhgjoNFQicCGTSWeaLHiNtK0lhyAf+93O+1mv3JmUFY5/ cE2+XA4DKodLe582XEQFspb6m71DkmY7A95QhLSaVwQoAw0Fvc+3J+jcW6nvGvKJolaond mjVkUeDSVDBEVtQK+ejRz6a0pRtJbQFFlnQcZz1uOKQgChmy9ryJiKYII6uEwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713277262; a=rsa-sha256; cv=none; b=xjlO37ca1n/hCi/2j4VJuTfULAgPqmspzJ7u0kUajcZZ2Q6tVbdQoDdWuD2HR/PsAL5Mni H522po/iVWgrpw6ZZtd0RMj96jgQa+FJwW0SeACC1WQ0trL2UJCiOL1xmQOowCZNNju4ev tYmG0RZIWhygbQz4CGeXdcdpremKQw8PgOfcu1gtr6ohOCKgqC4ZBS34krEDJ1hzFU0j8c tbSy+sSXoSO7RLfDqHogrr6R4AOdGZpCTF7AJeEnDU3KlevnuQEisYjaLFsE5endtxb6Cl OLro97kaeSf8V6UabhdMbcH8MYEjYo3KXiJM7WBJizhPsrbJhFJVWE1D4bRStw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713277262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lmvPoG/lzxjfTbBeOVvVcpy25bXzQaru+ZepC2DT+Ow=; b=X7P1FDMtVKd8gvy2za2wcjY9D7vqt9DLCIwhUHh+WnjnFiHa1D23G5iytfwObPmsKeLuH5 +Hm2Mh4ZpX5Cs68hTtmrHVQ7OTichCX9MGnKohZKodqo15X//rXCX4Hvae7gbwSsEnqOHv qCxFv2YZKQJ+bI1OBsx0napwphpaQ8coyIEKFNCU+3UgJaTi0iIGotyVy4hnQAxJAlgh10 VuXQsBjg2wtzgZqwzU7G/g1l0BFDTpdeg5n3Bx+AaK09El329yKs3SpD90bQ+UZqIJ9c1n LwUVmEKrdX7KuFYLBxk296UKVUYUVCu/hAQrMp2CxyC2JugqHzIh+/jVn7BeQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJmRf1jm5zmgk; Tue, 16 Apr 2024 14:21: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 43GEL2xZ034059; Tue, 16 Apr 2024 14:21:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GEL2Wd034056; Tue, 16 Apr 2024 14:21:02 GMT (envelope-from git) Date: Tue, 16 Apr 2024 14:21:02 GMT Message-Id: <202404161421.43GEL2Wd034056@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: 73cce7d8886b - main - mergemaster: postpone removal to FreeBSD 15 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 73cce7d8886bc59284c757decb49deba046e73fc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=73cce7d8886bc59284c757decb49deba046e73fc commit 73cce7d8886bc59284c757decb49deba046e73fc Author: Ed Maste AuthorDate: 2024-04-16 14:19:14 +0000 Commit: Ed Maste CommitDate: 2024-04-16 14:19:14 +0000 mergemaster: postpone removal to FreeBSD 15 Mergemaster has been deprecated for quite some time, but was not removed prior to FreeBSD 14.0. Update the deprecation notice in the man page to reflect this. PR: 274967 Reported by: naddy Sponsored by: The FreeBSD Foundation --- usr.sbin/mergemaster/mergemaster.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 695f1bba3474..20d746de347c 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 2, 2023 +.Dd April 16, 2024 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -45,7 +45,7 @@ The .Nm utility is deprecated and may not be available in -.Fx 14.0 +.Fx 15.0 or later. Users are advised to use .Xr etcupdate 8 From nobody Tue Apr 16 16:48:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJqjg09JSz5H9Vd; Tue, 16 Apr 2024 16:48: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 4VJqjf5bVTz4Xjf; Tue, 16 Apr 2024 16:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Lh8FLNyp9Sw6+geUeT/HTDzTDbSUV7I33woEKcshwU=; b=m/2vrngvP9w/zIWZ2Ow9m8GBJ4CNTKbrhYanRgtOtAoR3CodksA25mAWig15V85JxfiRb0 vwa6klYcEcHUR+fnQyst5KABmzd33DeZwkr5rO1/T70G6AyWYRBc9lhcDXGlmfu+8OyEd5 mWr+uRoPQANFFXRCih1njGg/ZvjzGQJ0Sgsb1+Jfihks5nqYiUvkEVB9r8CWYrDlsIeaCP OXorKPkhoEi7sny19iVFl2zesBmF9Oy++96qC6y4098nPsrrPn5dRPBs1+L6bDq942HOOO PT310AJAhljQHoZ3GxQ/dwEDwPk+/OOQOcxO7sLpkEBZ3K2A9R5cXDnmM4LQmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713286102; a=rsa-sha256; cv=none; b=ZMmyIvcPrSKHhuZdvnmRVFH2HTWU+XmBMoW7UBdcnwKJ9NrOIXv1MrSB+TsmFN9s/q6Jce Bp0x0E6HXF+pL62QHihz+HW7mQ0IqjSKrj54LkVLFsElUmhQzYD6j1bBhe6lg3fBUunHOd C7AHbvpqtlFxp5cTC6aLJ/pbP2wMTBsbS/at337rCLjc2GWx18I7qg9X5Pg4mkLi9pc+BH s4POwNIf13sNvLute0qVtoUv0JnskXF8FigOKwKdQACFC2QzvhPbvWQ3uHK8s0aVXENs2y xLhJPccRlL6SFgpS/BUzRdRtFP3pIeTrwuFqOTzqdNeagV6eMrwBhQylEn2Mcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Lh8FLNyp9Sw6+geUeT/HTDzTDbSUV7I33woEKcshwU=; b=PBwTcagFgHAs6VEzctiIP+1x7MwuqgjITTPsJevCqOpPFdcu6ysYZEzoVVvoIOmDY9o4m2 uah/kr91oToyNL4KOZtB8SUEwhguQGJhGDgIbMkWvDB5GbqRFR9hl5hKCAYm/IsIi6m6Q9 p8rCC2gNSYFiAw2mlQSntV9gL6khPRe3O3Zb172EuMcwOEC9DuBaLu9FaA6YGxf3TFeUZD s7++AlGin7qChXSgMGXQJTtAH2A1ZDVMymQi+2EeM26vw5MfXFOWffcGdeIGnM2WQIXNZY 5pjz3xJol+umMC78upQXmqXGe2cUMr6bULsToIKZPW2fnYv2rr1Wq61SMFGJRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJqjf5CQXzqjx; Tue, 16 Apr 2024 16:48: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 43GGmMgF080021; Tue, 16 Apr 2024 16:48:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GGmMAt080018; Tue, 16 Apr 2024 16:48:22 GMT (envelope-from git) Date: Tue, 16 Apr 2024 16:48:22 GMT Message-Id: <202404161648.43GGmMAt080018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 792081a7300e - main - lib{c,rt}: use libsys.h for __sys_* declerations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 792081a7300ecf368a1cf6a2f8ddb198d86abe55 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=792081a7300ecf368a1cf6a2f8ddb198d86abe55 commit 792081a7300ecf368a1cf6a2f8ddb198d86abe55 Author: Brooks Davis AuthorDate: 2024-04-16 16:48:07 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 16:48:07 +0000 lib{c,rt}: use libsys.h for __sys_* declerations Use the genreated source of truth for system call declerations. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44388 --- lib/libc/include/libc_private.h | 79 ++--------------------------------------- lib/librt/mq.c | 12 ------- 2 files changed, 2 insertions(+), 89 deletions(-) diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index 629889a6ff17..b38603b59a88 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -37,6 +37,8 @@ #include #include +#include + extern char **environ; /* @@ -334,79 +336,6 @@ struct __siginfo; struct __ucontext; struct __wrusage; enum idtype; -int __sys_aio_suspend(const struct aiocb * const[], int, - const struct timespec *); -int __sys_accept(int, struct sockaddr *, __socklen_t *); -int __sys_accept4(int, struct sockaddr *, __socklen_t *, int); -int __sys_clock_gettime(__clockid_t, struct timespec *ts); -int __sys_clock_nanosleep(__clockid_t, int, - const struct timespec *, struct timespec *); -int __sys_close(int); -int __sys_close_range(unsigned, unsigned, int); -int __sys_connect(int, const struct sockaddr *, __socklen_t); -int __sys_fcntl(int, int, __intptr_t); -int __sys_fdatasync(int); -int __sys_fstat(int fd, struct stat *); -int __sys_fstatfs(int fd, struct statfs *); -int __sys_fstatat(int, const char *, struct stat *, int); -int __sys_fsync(int); -__pid_t __sys_fork(void); -int __sys_ftruncate(int, __off_t); -__ssize_t __sys_getdirentries(int, char *, __size_t, __off_t *); -int __sys_getfsstat(struct statfs *, long, int); -int __sys_gettimeofday(struct timeval *, struct timezone *); -int __sys_kevent(int, const struct kevent *, int, struct kevent *, - int, const struct timespec *); -__off_t __sys_lseek(int, __off_t, int); -void *__sys_mmap(void *, __size_t, int, int, int, __off_t); -int __sys_msync(void *, __size_t, int); -int __sys_nanosleep(const struct timespec *, struct timespec *); -int __sys_open(const char *, int, ...); -int __sys_openat(int, const char *, int, ...); -int __sys_pdfork(int *, int); -int __sys_pselect(int, struct fd_set *, struct fd_set *, - struct fd_set *, const struct timespec *, - const __sigset_t *); -int __sys_ptrace(int, __pid_t, char *, int); -int __sys_poll(struct pollfd *, unsigned, int); -int __sys_ppoll(struct pollfd *, unsigned, const struct timespec *, - const __sigset_t *); -__ssize_t __sys_pread(int, void *, __size_t, __off_t); -__ssize_t __sys_pwrite(int, const void *, __size_t, __off_t); -__ssize_t __sys_read(int, void *, __size_t); -__ssize_t __sys_readv(int, const struct iovec *, int); -__ssize_t __sys_recv(int, void *, __size_t, int); -__ssize_t __sys_recvfrom(int, void *, __size_t, int, struct sockaddr *, - __socklen_t *); -__ssize_t __sys_recvmsg(int, struct msghdr *, int); -int __sys_sched_getcpu(void); -int __sys_select(int, struct fd_set *, struct fd_set *, - struct fd_set *, struct timeval *); -__ssize_t __sys_sendmsg(int, const struct msghdr *, int); -__ssize_t __sys_sendto(int, const void *, __size_t, int, - const struct sockaddr *, __socklen_t); -int __sys_setcontext(const struct __ucontext *); -int __sys_sigaction(int, const struct sigaction *, - struct sigaction *); -int __sys_sigprocmask(int, const __sigset_t *, __sigset_t *); -int __sys_sigsuspend(const __sigset_t *); -int __sys_sigtimedwait(const __sigset_t *, struct __siginfo *, - const struct timespec *); -int __sys_sigwait(const __sigset_t *, int *); -int __sys_sigwaitinfo(const __sigset_t *, struct __siginfo *); -int __sys___specialfd(int, const void *, __size_t); -int __sys_statfs(const char *, struct statfs *); -int __sys_swapcontext(struct __ucontext *, - const struct __ucontext *); -int __sys_thr_kill(long, int); -int __sys_thr_self(long *); -int __sys_truncate(const char *, __off_t); -__pid_t __sys_wait4(__pid_t, int *, int, struct rusage *); -__pid_t __sys_wait6(enum idtype, __id_t, int *, int, - struct __wrusage *, struct __siginfo *); -__ssize_t __sys_write(int, const void *, __size_t); -__ssize_t __sys_writev(int, const struct iovec *, int); -int __sys_shm_open2(const char *, int, __mode_t, int, const char *); int __libc_sigaction(int, const struct sigaction *, struct sigaction *) __hidden; @@ -417,10 +346,6 @@ int __libsys_sigwait(const __sigset_t *, int *) __hidden; int __libc_system(const char *); int __libc_tcdrain(int); -int __sys_futimens(int fd, const struct timespec *times) __hidden; -int __sys_utimensat(int fd, const char *path, - const struct timespec *times, int flag) __hidden; - int _elf_aux_info(int aux, void *buf, int buflen); struct dl_phdr_info; int __elf_phdr_match_addr(struct dl_phdr_info *, void *); diff --git a/lib/librt/mq.c b/lib/librt/mq.c index 89387b136792..eba52f76c928 100644 --- a/lib/librt/mq.c +++ b/lib/librt/mq.c @@ -40,18 +40,6 @@ #include "un-namespace.h" #include "libc_private.h" -extern int __sys_kmq_notify(int, const struct sigevent *); -extern int __sys_kmq_open(const char *, int, mode_t, - const struct mq_attr *); -extern int __sys_kmq_setattr(int, const struct mq_attr *__restrict, - struct mq_attr *__restrict); -extern ssize_t __sys_kmq_timedreceive(int, char *__restrict, size_t, - unsigned *__restrict, const struct timespec *__restrict); -extern int __sys_kmq_timedsend(int, const char *, size_t, unsigned, - const struct timespec *); -extern int __sys_kmq_unlink(const char *); -extern int __sys_close(int fd); - struct __mq { int oshandle; struct sigev_node *node; From nobody Tue Apr 16 16:48:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJqjd6ctmz5H9Mj; Tue, 16 Apr 2024 16:48: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 4VJqjd4yYZz4Xrw; Tue, 16 Apr 2024 16:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aakg1C4v69BOMcQtfVe9F05gmemAJ2ZrZ5rNARJP0gU=; b=rAQBLKUqiFQC+1HIFwhzFmrUDnov14V1zZpbVONkfYfdHq4muiwGXSglAc+LSjUgGyYzDV VD8DNXDjf/k0wOtKYDryvHKLKgYtIZQrfN77nvWb3l6vEL0/O/rokWtIL2TO32dFoNo4LW b3Ex8V78f5H3KNW59nN7q9QQDcqZAFBM8wH+cYV5MNKvPIkRiVAGWEglcIYX/8P3lzzxMV W748vHDP3hLtKzC9xYlB7LEifkZSJHxuTvvgLbz+goKfiPY0YOyEm46MjfwfK9iYCrIcyP 1YMlr3sDP2hOz+5Qi/yNHh6DAdBkfvv+QjObAwz7ysCYFfuTYdKeDbEOb2bqLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713286101; a=rsa-sha256; cv=none; b=qp9cV9YClyIT4ZJTA3yxmXP4kHcCehr+d/4LD+GhvcCNKhDteZDj0FRT9wTzrNunORBe5t h3WPYyoE0b6Rjppm7GkXnMfhcDYxKYi0uaD4N6acGo0SG7O/Wu4xgSi+FBKfbHxREzCF9b SafJ5stT0UOIDTquXAYg0ZSGD0g3QxGNKnD46u8YWYrq8v94R5amdaUKY2df/A4zFpu8vp M8K5gl/6/VMOVnxS9pR/ZEh/2KUYToS51qJnKfaipEyqjG8QPvAkBuCK9oh25sQZ9x94Ql ZMMBhGj6Psq2zz6yJf1O64TcaAIYfvtNRO80cKE1HYqHZdTXXK7sJFfvQomzZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aakg1C4v69BOMcQtfVe9F05gmemAJ2ZrZ5rNARJP0gU=; b=Jq6JJT9ykj+GQ+UMZ5hxUq7mm/3+xJxfq95tJNqenuu2W6EozAEAyPbLDEl9O6U1Jey/KC Xs5Q2ipS6HTo0svCQbgc0sxI1E4kPh6VBJo48zreOdrKpkitbHRGyBmBBSH5nkB4eb5tYP 9/bLPyJmqFx4lsfyz8sBgLSAqwMEq6V9NPt7uRlVdeCpiSJW1yYPW9yJzHhTyfiBgKV4XM H8JcnbAtF05e1eOZT2W4lsTFGnEPOuWFYaf2NSftRAnuiYgm4nx1ozDv32i4a/OGq/EQsd tBdtrLwV2MLT/cGEeBH+qM+siqznKOYbBNZA5Twbdw/Qt5+W56f0YO/0AaeVsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJqjd4Ylbzr0X; Tue, 16 Apr 2024 16:48: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 43GGmLk5079974; Tue, 16 Apr 2024 16:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GGmLAN079971; Tue, 16 Apr 2024 16:48:21 GMT (envelope-from git) Date: Tue, 16 Apr 2024 16:48:21 GMT Message-Id: <202404161648.43GGmLAN079971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 1fd880742ace - main - libsys: add a libsys.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fd880742ace94e11fa60ee0b074f0b18e54c54f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=1fd880742ace94e11fa60ee0b074f0b18e54c54f commit 1fd880742ace94e11fa60ee0b074f0b18e54c54f Author: Brooks Davis AuthorDate: 2024-04-16 16:48:07 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 16:48:07 +0000 libsys: add a libsys.h This declares an API for libsys which currently consists of __sys_() declarations for system call stubs and function pointer typedefs of the form __sys__t. The vast majority of the implementation resides in a generated _libsys.h which ensures that all system call stub declarations match syscalls.master. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44387 --- lib/libsys/Makefile | 2 + lib/libsys/_libsys.h | 865 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/libsys/libsys.h | 25 ++ sys/kern/syscalls.conf | 1 + 4 files changed, 893 insertions(+) diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile index a1c6a64194d0..93b880cd67fe 100644 --- a/lib/libsys/Makefile +++ b/lib/libsys/Makefile @@ -23,6 +23,8 @@ SHLIB_MAJOR= 7 WARNS?= 2 MK_SSP= no +INCS= libsys.h _libsys.h + CFLAGS+=-I${LIBSYS_SRCTOP}/include -I${LIBC_SRCTOP}/include CFLAGS+=-I${LIBSYS_SRCTOP}/${LIBC_ARCH} CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH} diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h new file mode 100644 index 000000000000..d0dd144bc8f1 --- /dev/null +++ b/lib/libsys/_libsys.h @@ -0,0 +1,865 @@ +/* + * Public system call stubs provided by libsys. + * + * Do not use directly, include instead. + * + * DO NOT EDIT-- this file is automatically @generated. + */ +#ifndef __LIBSYS_H_ +#define __LIBSYS_H_ + +#include +#include +#include +#include +#include +#include /* for mcontext_t */ +#include +#include + +struct __siginfo; +struct __ucontext; +struct __wrusage; +struct acl; +struct aiocb; +struct auditinfo; +struct auditinfo_addr; +struct ffclock_estimate; +struct fhandle; +struct iovec; +struct itimerspec; +struct itimerval; +struct jail; +struct kevent; +struct kld_file_stat; +struct mac; +struct module_stat; +struct mq_attr; +struct msghdr; +struct msqid_ds; +struct ntptimeval; +struct pollfd; +struct rlimit; +struct rtprio; +struct rusage; +struct sched_param; +struct sctp_sndrcvinfo; +struct sembuf; +struct sf_hdtr; +struct shmid_ds; +struct sigaction; +struct sigaltstack; +struct sigevent; +struct sockaddr; +struct spacectl_range; +struct stat; +struct statfs; +struct thr_param; +struct timespec; +struct timeval; +struct timex; +struct timezone; +struct uuid; +union semun; + +__BEGIN_DECLS +typedef void (__sys_exit_t)(int); +typedef int (__sys_fork_t)(void); +typedef ssize_t (__sys_read_t)(int, void *, size_t); +typedef ssize_t (__sys_write_t)(int, const void *, size_t); +typedef int (__sys_open_t)(const char *, int, mode_t); +typedef int (__sys_close_t)(int); +typedef int (__sys_wait4_t)(int, int *, int, struct rusage *); +typedef int (__sys_link_t)(const char *, const char *); +typedef int (__sys_unlink_t)(const char *); +typedef int (__sys_chdir_t)(const char *); +typedef int (__sys_fchdir_t)(int); +typedef int (__sys_chmod_t)(const char *, mode_t); +typedef int (__sys_chown_t)(const char *, int, int); +typedef void * (__sys_break_t)(char *); +typedef pid_t (__sys_getpid_t)(void); +typedef int (__sys_mount_t)(const char *, const char *, int, void *); +typedef int (__sys_unmount_t)(const char *, int); +typedef int (__sys_setuid_t)(uid_t); +typedef uid_t (__sys_getuid_t)(void); +typedef uid_t (__sys_geteuid_t)(void); +typedef int (__sys_ptrace_t)(int, pid_t, caddr_t, int); +typedef ssize_t (__sys_recvmsg_t)(int, struct msghdr *, int); +typedef ssize_t (__sys_sendmsg_t)(int, const struct msghdr *, int); +typedef ssize_t (__sys_recvfrom_t)(int, void *, size_t, int, struct sockaddr *, __socklen_t *); +typedef int (__sys_accept_t)(int, struct sockaddr *, __socklen_t *); +typedef int (__sys_getpeername_t)(int, struct sockaddr *, __socklen_t *); +typedef int (__sys_getsockname_t)(int, struct sockaddr *, __socklen_t *); +typedef int (__sys_access_t)(const char *, int); +typedef int (__sys_chflags_t)(const char *, u_long); +typedef int (__sys_fchflags_t)(int, u_long); +typedef int (__sys_sync_t)(void); +typedef int (__sys_kill_t)(int, int); +typedef pid_t (__sys_getppid_t)(void); +typedef int (__sys_dup_t)(u_int); +typedef gid_t (__sys_getegid_t)(void); +typedef int (__sys_profil_t)(char *, size_t, size_t, u_int); +typedef int (__sys_ktrace_t)(const char *, int, int, int); +typedef gid_t (__sys_getgid_t)(void); +typedef int (__sys_getlogin_t)(char *, u_int); +typedef int (__sys_setlogin_t)(const char *); +typedef int (__sys_acct_t)(const char *); +typedef int (__sys_sigaltstack_t)(const struct sigaltstack *, struct sigaltstack *); +typedef int (__sys_ioctl_t)(int, u_long, char *); +typedef int (__sys_reboot_t)(int); +typedef int (__sys_revoke_t)(const char *); +typedef int (__sys_symlink_t)(const char *, const char *); +typedef ssize_t (__sys_readlink_t)(const char *, char *, size_t); +typedef int (__sys_execve_t)(const char *, char **, char **); +typedef mode_t (__sys_umask_t)(mode_t); +typedef int (__sys_chroot_t)(const char *); +typedef int (__sys_msync_t)(void *, size_t, int); +typedef int (__sys_vfork_t)(void); +typedef int (__sys_munmap_t)(void *, size_t); +typedef int (__sys_mprotect_t)(void *, size_t, int); +typedef int (__sys_madvise_t)(void *, size_t, int); +typedef int (__sys_mincore_t)(const void *, size_t, char *); +typedef int (__sys_getgroups_t)(int, gid_t *); +typedef int (__sys_setgroups_t)(int, const gid_t *); +typedef int (__sys_getpgrp_t)(void); +typedef int (__sys_setpgid_t)(int, int); +typedef int (__sys_setitimer_t)(int, const struct itimerval *, struct itimerval *); +typedef int (__sys_swapon_t)(const char *); +typedef int (__sys_getitimer_t)(int, struct itimerval *); +typedef int (__sys_getdtablesize_t)(void); +typedef int (__sys_dup2_t)(u_int, u_int); +typedef int (__sys_fcntl_t)(int, int, intptr_t); +typedef int (__sys_select_t)(int, fd_set *, fd_set *, fd_set *, struct timeval *); +typedef int (__sys_fsync_t)(int); +typedef int (__sys_setpriority_t)(int, int, int); +typedef int (__sys_socket_t)(int, int, int); +typedef int (__sys_connect_t)(int, const struct sockaddr *, __socklen_t); +typedef int (__sys_getpriority_t)(int, int); +typedef int (__sys_bind_t)(int, const struct sockaddr *, __socklen_t); +typedef int (__sys_setsockopt_t)(int, int, int, const void *, __socklen_t); +typedef int (__sys_listen_t)(int, int); +typedef int (__sys_gettimeofday_t)(struct timeval *, struct timezone *); +typedef int (__sys_getrusage_t)(int, struct rusage *); +typedef int (__sys_getsockopt_t)(int, int, int, void *, __socklen_t *); +typedef int (__sys_readv_t)(int, const struct iovec *, u_int); +typedef int (__sys_writev_t)(int, const struct iovec *, u_int); +typedef int (__sys_settimeofday_t)(const struct timeval *, const struct timezone *); +typedef int (__sys_fchown_t)(int, int, int); +typedef int (__sys_fchmod_t)(int, mode_t); +typedef int (__sys_setreuid_t)(int, int); +typedef int (__sys_setregid_t)(int, int); +typedef int (__sys_rename_t)(const char *, const char *); +typedef int (__sys_flock_t)(int, int); +typedef int (__sys_mkfifo_t)(const char *, mode_t); +typedef ssize_t (__sys_sendto_t)(int, const void *, size_t, int, const struct sockaddr *, __socklen_t); +typedef int (__sys_shutdown_t)(int, int); +typedef int (__sys_socketpair_t)(int, int, int, int *); +typedef int (__sys_mkdir_t)(const char *, mode_t); +typedef int (__sys_rmdir_t)(const char *); +typedef int (__sys_utimes_t)(const char *, const struct timeval *); +typedef int (__sys_adjtime_t)(const struct timeval *, struct timeval *); +typedef int (__sys_setsid_t)(void); +typedef int (__sys_quotactl_t)(const char *, int, int, void *); +typedef int (__sys_nlm_syscall_t)(int, int, int, char **); +typedef int (__sys_nfssvc_t)(int, void *); +typedef int (__sys_lgetfh_t)(const char *, struct fhandle *); +typedef int (__sys_getfh_t)(const char *, struct fhandle *); +typedef int (__sys_sysarch_t)(int, char *); +typedef int (__sys_rtprio_t)(int, pid_t, struct rtprio *); +typedef int (__sys_semsys_t)(int, int, int, int, int); +typedef int (__sys_msgsys_t)(int, int, int, int, int, int); +typedef int (__sys_shmsys_t)(int, int, int, int); +typedef int (__sys_setfib_t)(int); +typedef int (__sys_ntp_adjtime_t)(struct timex *); +typedef int (__sys_setgid_t)(gid_t); +typedef int (__sys_setegid_t)(gid_t); +typedef int (__sys_seteuid_t)(uid_t); +typedef int (__sys_pathconf_t)(const char *, int); +typedef int (__sys_fpathconf_t)(int, int); +typedef int (__sys_getrlimit_t)(u_int, struct rlimit *); +typedef int (__sys_setrlimit_t)(u_int, struct rlimit *); +typedef int (__sys___sysctl_t)(int *, u_int, void *, size_t *, const void *, size_t); +typedef int (__sys_mlock_t)(const void *, size_t); +typedef int (__sys_munlock_t)(const void *, size_t); +typedef int (__sys_undelete_t)(const char *); +typedef int (__sys_futimes_t)(int, const struct timeval *); +typedef int (__sys_getpgid_t)(pid_t); +typedef int (__sys_poll_t)(struct pollfd *, u_int, int); +typedef int (__sys_semget_t)(key_t, int, int); +typedef int (__sys_semop_t)(int, struct sembuf *, size_t); +typedef int (__sys_msgget_t)(key_t, int); +typedef int (__sys_msgsnd_t)(int, const void *, size_t, int); +typedef ssize_t (__sys_msgrcv_t)(int, void *, size_t, long, int); +typedef void * (__sys_shmat_t)(int, const void *, int); +typedef int (__sys_shmdt_t)(const void *); +typedef int (__sys_shmget_t)(key_t, size_t, int); +typedef int (__sys_clock_gettime_t)(clockid_t, struct timespec *); +typedef int (__sys_clock_settime_t)(clockid_t, const struct timespec *); +typedef int (__sys_clock_getres_t)(clockid_t, struct timespec *); +typedef int (__sys_ktimer_create_t)(clockid_t, struct sigevent *, int *); +typedef int (__sys_ktimer_delete_t)(int); +typedef int (__sys_ktimer_settime_t)(int, int, const struct itimerspec *, struct itimerspec *); +typedef int (__sys_ktimer_gettime_t)(int, struct itimerspec *); +typedef int (__sys_ktimer_getoverrun_t)(int); +typedef int (__sys_nanosleep_t)(const struct timespec *, struct timespec *); +typedef int (__sys_ffclock_getcounter_t)(ffcounter *); +typedef int (__sys_ffclock_setestimate_t)(struct ffclock_estimate *); +typedef int (__sys_ffclock_getestimate_t)(struct ffclock_estimate *); +typedef int (__sys_clock_nanosleep_t)(clockid_t, int, const struct timespec *, struct timespec *); +typedef int (__sys_clock_getcpuclockid2_t)(id_t, int, clockid_t *); +typedef int (__sys_ntp_gettime_t)(struct ntptimeval *); +typedef int (__sys_minherit_t)(void *, size_t, int); +typedef int (__sys_rfork_t)(int); +typedef int (__sys_issetugid_t)(void); +typedef int (__sys_lchown_t)(const char *, int, int); +typedef int (__sys_aio_read_t)(struct aiocb *); +typedef int (__sys_aio_write_t)(struct aiocb *); +typedef int (__sys_lio_listio_t)(int, struct aiocb * const *, int, struct sigevent *); +typedef int (__sys_lchmod_t)(const char *, mode_t); +typedef int (__sys_lutimes_t)(const char *, const struct timeval *); +typedef ssize_t (__sys_preadv_t)(int, struct iovec *, u_int, off_t); +typedef ssize_t (__sys_pwritev_t)(int, struct iovec *, u_int, off_t); +typedef int (__sys_fhopen_t)(const struct fhandle *, int); +typedef int (__sys_modnext_t)(int); +typedef int (__sys_modstat_t)(int, struct module_stat *); +typedef int (__sys_modfnext_t)(int); +typedef int (__sys_modfind_t)(const char *); +typedef int (__sys_kldload_t)(const char *); +typedef int (__sys_kldunload_t)(int); +typedef int (__sys_kldfind_t)(const char *); +typedef int (__sys_kldnext_t)(int); +typedef int (__sys_kldstat_t)(int, struct kld_file_stat *); +typedef int (__sys_kldfirstmod_t)(int); +typedef int (__sys_getsid_t)(pid_t); +typedef int (__sys_setresuid_t)(uid_t, uid_t, uid_t); +typedef int (__sys_setresgid_t)(gid_t, gid_t, gid_t); +typedef ssize_t (__sys_aio_return_t)(struct aiocb *); +typedef int (__sys_aio_suspend_t)(const struct aiocb * const *, int, const struct timespec *); +typedef int (__sys_aio_cancel_t)(int, struct aiocb *); +typedef int (__sys_aio_error_t)(struct aiocb *); +typedef int (__sys_mlockall_t)(int); +typedef int (__sys_munlockall_t)(void); +typedef int (__sys___getcwd_t)(char *, size_t); +typedef int (__sys_sched_setparam_t)(pid_t, const struct sched_param *); +typedef int (__sys_sched_getparam_t)(pid_t, struct sched_param *); +typedef int (__sys_sched_setscheduler_t)(pid_t, int, const struct sched_param *); +typedef int (__sys_sched_getscheduler_t)(pid_t); +typedef int (__sys_sched_yield_t)(void); +typedef int (__sys_sched_get_priority_max_t)(int); +typedef int (__sys_sched_get_priority_min_t)(int); +typedef int (__sys_sched_rr_get_interval_t)(pid_t, struct timespec *); +typedef int (__sys_utrace_t)(const void *, size_t); +typedef int (__sys_kldsym_t)(int, int, void *); +typedef int (__sys_jail_t)(struct jail *); +typedef int (__sys_nnpfs_syscall_t)(int, char *, int, void *, int); +typedef int (__sys_sigprocmask_t)(int, const sigset_t *, sigset_t *); +typedef int (__sys_sigsuspend_t)(const sigset_t *); +typedef int (__sys_sigpending_t)(sigset_t *); +typedef int (__sys_sigtimedwait_t)(const sigset_t *, struct __siginfo *, const struct timespec *); +typedef int (__sys_sigwaitinfo_t)(const sigset_t *, struct __siginfo *); +typedef int (__sys___acl_get_file_t)(const char *, __acl_type_t, struct acl *); +typedef int (__sys___acl_set_file_t)(const char *, __acl_type_t, struct acl *); +typedef int (__sys___acl_get_fd_t)(int, __acl_type_t, struct acl *); +typedef int (__sys___acl_set_fd_t)(int, __acl_type_t, struct acl *); +typedef int (__sys___acl_delete_file_t)(const char *, __acl_type_t); +typedef int (__sys___acl_delete_fd_t)(int, __acl_type_t); +typedef int (__sys___acl_aclcheck_file_t)(const char *, __acl_type_t, struct acl *); +typedef int (__sys___acl_aclcheck_fd_t)(int, __acl_type_t, struct acl *); +typedef int (__sys_extattrctl_t)(const char *, int, const char *, int, const char *); +typedef ssize_t (__sys_extattr_set_file_t)(const char *, int, const char *, void *, size_t); +typedef ssize_t (__sys_extattr_get_file_t)(const char *, int, const char *, void *, size_t); +typedef int (__sys_extattr_delete_file_t)(const char *, int, const char *); +typedef ssize_t (__sys_aio_waitcomplete_t)(struct aiocb **, struct timespec *); +typedef int (__sys_getresuid_t)(uid_t *, uid_t *, uid_t *); +typedef int (__sys_getresgid_t)(gid_t *, gid_t *, gid_t *); +typedef int (__sys_kqueue_t)(void); +typedef ssize_t (__sys_extattr_set_fd_t)(int, int, const char *, void *, size_t); +typedef ssize_t (__sys_extattr_get_fd_t)(int, int, const char *, void *, size_t); +typedef int (__sys_extattr_delete_fd_t)(int, int, const char *); +typedef int (__sys___setugid_t)(int); +typedef int (__sys_eaccess_t)(const char *, int); +typedef int (__sys_afs3_syscall_t)(long, long, long, long, long, long, long); +typedef int (__sys_nmount_t)(struct iovec *, unsigned int, int); +typedef int (__sys___mac_get_proc_t)(struct mac *); +typedef int (__sys___mac_set_proc_t)(struct mac *); +typedef int (__sys___mac_get_fd_t)(int, struct mac *); +typedef int (__sys___mac_get_file_t)(const char *, struct mac *); +typedef int (__sys___mac_set_fd_t)(int, struct mac *); +typedef int (__sys___mac_set_file_t)(const char *, struct mac *); +typedef int (__sys_kenv_t)(int, const char *, char *, int); +typedef int (__sys_lchflags_t)(const char *, u_long); +typedef int (__sys_uuidgen_t)(struct uuid *, int); +typedef int (__sys_sendfile_t)(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int); +typedef int (__sys_mac_syscall_t)(const char *, int, void *); +typedef int (__sys_ksem_close_t)(semid_t); +typedef int (__sys_ksem_post_t)(semid_t); +typedef int (__sys_ksem_wait_t)(semid_t); +typedef int (__sys_ksem_trywait_t)(semid_t); +typedef int (__sys_ksem_init_t)(semid_t *, unsigned int); +typedef int (__sys_ksem_open_t)(semid_t *, const char *, int, mode_t, unsigned int); +typedef int (__sys_ksem_unlink_t)(const char *); +typedef int (__sys_ksem_getvalue_t)(semid_t, int *); +typedef int (__sys_ksem_destroy_t)(semid_t); +typedef int (__sys___mac_get_pid_t)(pid_t, struct mac *); +typedef int (__sys___mac_get_link_t)(const char *, struct mac *); +typedef int (__sys___mac_set_link_t)(const char *, struct mac *); +typedef ssize_t (__sys_extattr_set_link_t)(const char *, int, const char *, void *, size_t); +typedef ssize_t (__sys_extattr_get_link_t)(const char *, int, const char *, void *, size_t); +typedef int (__sys_extattr_delete_link_t)(const char *, int, const char *); +typedef int (__sys___mac_execve_t)(const char *, char **, char **, struct mac *); +typedef int (__sys_sigaction_t)(int, const struct sigaction *, struct sigaction *); +typedef int (__sys_sigreturn_t)(const struct __ucontext *); +typedef int (__sys_getcontext_t)(struct __ucontext *); +typedef int (__sys_setcontext_t)(const struct __ucontext *); +typedef int (__sys_swapcontext_t)(struct __ucontext *, const struct __ucontext *); +typedef int (__sys___acl_get_link_t)(const char *, __acl_type_t, struct acl *); +typedef int (__sys___acl_set_link_t)(const char *, __acl_type_t, struct acl *); +typedef int (__sys___acl_delete_link_t)(const char *, __acl_type_t); +typedef int (__sys___acl_aclcheck_link_t)(const char *, __acl_type_t, struct acl *); +typedef int (__sys_sigwait_t)(const sigset_t *, int *); +typedef int (__sys_thr_create_t)(ucontext_t *, long *, int); +typedef void (__sys_thr_exit_t)(long *); +typedef int (__sys_thr_self_t)(long *); +typedef int (__sys_thr_kill_t)(long, int); +typedef int (__sys_jail_attach_t)(int); +typedef ssize_t (__sys_extattr_list_fd_t)(int, int, void *, size_t); +typedef ssize_t (__sys_extattr_list_file_t)(const char *, int, void *, size_t); +typedef ssize_t (__sys_extattr_list_link_t)(const char *, int, void *, size_t); +typedef int (__sys_ksem_timedwait_t)(semid_t, const struct timespec *); +typedef int (__sys_thr_suspend_t)(const struct timespec *); +typedef int (__sys_thr_wake_t)(long); +typedef int (__sys_kldunloadf_t)(int, int); +typedef int (__sys_audit_t)(const void *, u_int); +typedef int (__sys_auditon_t)(int, void *, u_int); +typedef int (__sys_getauid_t)(uid_t *); +typedef int (__sys_setauid_t)(uid_t *); +typedef int (__sys_getaudit_t)(struct auditinfo *); +typedef int (__sys_setaudit_t)(struct auditinfo *); +typedef int (__sys_getaudit_addr_t)(struct auditinfo_addr *, u_int); +typedef int (__sys_setaudit_addr_t)(struct auditinfo_addr *, u_int); +typedef int (__sys_auditctl_t)(const char *); +typedef int (__sys__umtx_op_t)(void *, int, u_long, void *, void *); +typedef int (__sys_thr_new_t)(struct thr_param *, int); +typedef int (__sys_sigqueue_t)(pid_t, int, void *); +typedef int (__sys_kmq_open_t)(const char *, int, mode_t, const struct mq_attr *); +typedef int (__sys_kmq_setattr_t)(int, const struct mq_attr *, struct mq_attr *); +typedef int (__sys_kmq_timedreceive_t)(int, char *, size_t, unsigned *, const struct timespec *); +typedef int (__sys_kmq_timedsend_t)(int, const char *, size_t, unsigned, const struct timespec *); +typedef int (__sys_kmq_notify_t)(int, const struct sigevent *); +typedef int (__sys_kmq_unlink_t)(const char *); +typedef void (__sys_abort2_t)(const char *, int, void **); +typedef int (__sys_thr_set_name_t)(long, const char *); +typedef int (__sys_aio_fsync_t)(int, struct aiocb *); +typedef int (__sys_rtprio_thread_t)(int, lwpid_t, struct rtprio *); +typedef int (__sys_sctp_peeloff_t)(int, uint32_t); +typedef int (__sys_sctp_generic_sendmsg_t)(int, void *, int, const struct sockaddr *, __socklen_t, struct sctp_sndrcvinfo *, int); +typedef int (__sys_sctp_generic_sendmsg_iov_t)(int, struct iovec *, int, const struct sockaddr *, __socklen_t, struct sctp_sndrcvinfo *, int); +typedef int (__sys_sctp_generic_recvmsg_t)(int, struct iovec *, int, struct sockaddr *, __socklen_t *, struct sctp_sndrcvinfo *, int *); +typedef ssize_t (__sys_pread_t)(int, void *, size_t, off_t); +typedef ssize_t (__sys_pwrite_t)(int, const void *, size_t, off_t); +typedef void * (__sys_mmap_t)(void *, size_t, int, int, int, off_t); +typedef off_t (__sys_lseek_t)(int, off_t, int); +typedef int (__sys_truncate_t)(const char *, off_t); +typedef int (__sys_ftruncate_t)(int, off_t); +typedef int (__sys_thr_kill2_t)(pid_t, long, int); +typedef int (__sys_shm_unlink_t)(const char *); +typedef int (__sys_cpuset_t)(cpusetid_t *); +typedef int (__sys_cpuset_setid_t)(cpuwhich_t, id_t, cpusetid_t); +typedef int (__sys_cpuset_getid_t)(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); +typedef int (__sys_cpuset_getaffinity_t)(cpulevel_t, cpuwhich_t, id_t, size_t, cpuset_t *); +typedef int (__sys_cpuset_setaffinity_t)(cpulevel_t, cpuwhich_t, id_t, size_t, const cpuset_t *); +typedef int (__sys_faccessat_t)(int, const char *, int, int); +typedef int (__sys_fchmodat_t)(int, const char *, mode_t, int); +typedef int (__sys_fchownat_t)(int, const char *, uid_t, gid_t, int); +typedef int (__sys_fexecve_t)(int, char **, char **); +typedef int (__sys_futimesat_t)(int, const char *, const struct timeval *); +typedef int (__sys_linkat_t)(int, const char *, int, const char *, int); +typedef int (__sys_mkdirat_t)(int, const char *, mode_t); +typedef int (__sys_mkfifoat_t)(int, const char *, mode_t); +typedef int (__sys_openat_t)(int, const char *, int, mode_t); +typedef ssize_t (__sys_readlinkat_t)(int, const char *, char *, size_t); +typedef int (__sys_renameat_t)(int, const char *, int, const char *); +typedef int (__sys_symlinkat_t)(const char *, int, const char *); +typedef int (__sys_unlinkat_t)(int, const char *, int); +typedef int (__sys_posix_openpt_t)(int); +typedef int (__sys_gssd_syscall_t)(const char *); +typedef int (__sys_jail_get_t)(struct iovec *, unsigned int, int); +typedef int (__sys_jail_set_t)(struct iovec *, unsigned int, int); +typedef int (__sys_jail_remove_t)(int); +typedef int (__sys___semctl_t)(int, int, int, union semun *); +typedef int (__sys_msgctl_t)(int, int, struct msqid_ds *); +typedef int (__sys_shmctl_t)(int, int, struct shmid_ds *); +typedef int (__sys_lpathconf_t)(const char *, int); +typedef int (__sys___cap_rights_get_t)(int, int, cap_rights_t *); +typedef int (__sys_cap_enter_t)(void); +typedef int (__sys_cap_getmode_t)(u_int *); +typedef int (__sys_pdfork_t)(int *, int); +typedef int (__sys_pdkill_t)(int, int); +typedef int (__sys_pdgetpid_t)(int, pid_t *); +typedef int (__sys_pselect_t)(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *); +typedef int (__sys_getloginclass_t)(char *, size_t); +typedef int (__sys_setloginclass_t)(const char *); +typedef int (__sys_rctl_get_racct_t)(const void *, size_t, void *, size_t); +typedef int (__sys_rctl_get_rules_t)(const void *, size_t, void *, size_t); +typedef int (__sys_rctl_get_limits_t)(const void *, size_t, void *, size_t); +typedef int (__sys_rctl_add_rule_t)(const void *, size_t, void *, size_t); +typedef int (__sys_rctl_remove_rule_t)(const void *, size_t, void *, size_t); +typedef int (__sys_posix_fallocate_t)(int, off_t, off_t); +typedef int (__sys_posix_fadvise_t)(int, off_t, off_t, int); +typedef int (__sys_wait6_t)(idtype_t, id_t, int *, int, struct __wrusage *, struct __siginfo *); +typedef int (__sys_cap_rights_limit_t)(int, cap_rights_t *); +typedef int (__sys_cap_ioctls_limit_t)(int, const u_long *, size_t); +typedef ssize_t (__sys_cap_ioctls_get_t)(int, u_long *, size_t); +typedef int (__sys_cap_fcntls_limit_t)(int, uint32_t); +typedef int (__sys_cap_fcntls_get_t)(int, uint32_t *); +typedef int (__sys_bindat_t)(int, int, const struct sockaddr *, __socklen_t); +typedef int (__sys_connectat_t)(int, int, const struct sockaddr *, __socklen_t); +typedef int (__sys_chflagsat_t)(int, const char *, u_long, int); +typedef int (__sys_accept4_t)(int, struct sockaddr *, __socklen_t *, int); +typedef int (__sys_pipe2_t)(int *, int); +typedef int (__sys_aio_mlock_t)(struct aiocb *); +typedef int (__sys_procctl_t)(idtype_t, id_t, int, void *); +typedef int (__sys_ppoll_t)(struct pollfd *, u_int, const struct timespec *, const sigset_t *); +typedef int (__sys_futimens_t)(int, const struct timespec *); +typedef int (__sys_utimensat_t)(int, const char *, const struct timespec *, int); +typedef int (__sys_fdatasync_t)(int); +typedef int (__sys_fstat_t)(int, struct stat *); +typedef int (__sys_fstatat_t)(int, const char *, struct stat *, int); +typedef int (__sys_fhstat_t)(const struct fhandle *, struct stat *); +typedef ssize_t (__sys_getdirentries_t)(int, char *, size_t, off_t *); +typedef int (__sys_statfs_t)(const char *, struct statfs *); +typedef int (__sys_fstatfs_t)(int, struct statfs *); +typedef int (__sys_getfsstat_t)(struct statfs *, long, int); +typedef int (__sys_fhstatfs_t)(const struct fhandle *, struct statfs *); +typedef int (__sys_mknodat_t)(int, const char *, mode_t, dev_t); +typedef int (__sys_kevent_t)(int, const struct kevent *, int, struct kevent *, int, const struct timespec *); +typedef int (__sys_cpuset_getdomain_t)(cpulevel_t, cpuwhich_t, id_t, size_t, domainset_t *, int *); +typedef int (__sys_cpuset_setdomain_t)(cpulevel_t, cpuwhich_t, id_t, size_t, domainset_t *, int); +typedef int (__sys_getrandom_t)(void *, size_t, unsigned int); +typedef int (__sys_getfhat_t)(int, char *, struct fhandle *, int); +typedef int (__sys_fhlink_t)(struct fhandle *, const char *); +typedef int (__sys_fhlinkat_t)(struct fhandle *, int, const char *); +typedef int (__sys_fhreadlink_t)(struct fhandle *, char *, size_t); +typedef int (__sys_funlinkat_t)(int, const char *, int, int); +typedef ssize_t (__sys_copy_file_range_t)(int, off_t *, int, off_t *, size_t, unsigned int); +typedef int (__sys___sysctlbyname_t)(const char *, size_t, void *, size_t *, void *, size_t); +typedef int (__sys_shm_open2_t)(const char *, int, mode_t, int, const char *); +typedef int (__sys_shm_rename_t)(const char *, const char *, int); +typedef int (__sys_sigfastblock_t)(int, void *); +typedef int (__sys___realpathat_t)(int, const char *, char *, size_t, int); +typedef int (__sys_close_range_t)(u_int, u_int, int); +typedef int (__sys_rpctls_syscall_t)(int, const char *); +typedef int (__sys___specialfd_t)(int, const void *, size_t); +typedef int (__sys_aio_writev_t)(struct aiocb *); +typedef int (__sys_aio_readv_t)(struct aiocb *); +typedef int (__sys_fspacectl_t)(int, int, const struct spacectl_range *, int, struct spacectl_range *); +typedef int (__sys_sched_getcpu_t)(void); +typedef int (__sys_swapoff_t)(const char *, u_int); +typedef int (__sys_kqueuex_t)(u_int); +typedef int (__sys_membarrier_t)(int, unsigned, int); +typedef int (__sys_timerfd_create_t)(int, int); +typedef int (__sys_timerfd_gettime_t)(int, struct itimerspec *); +typedef int (__sys_timerfd_settime_t)(int, int, const struct itimerspec *, struct itimerspec *); +typedef int (__sys_kcmp_t)(pid_t, pid_t, int, uintptr_t, uintptr_t); + +void __sys_exit(int rval); +int __sys_fork(void); +ssize_t __sys_read(int fd, void * buf, size_t nbyte); +ssize_t __sys_write(int fd, const void * buf, size_t nbyte); +int __sys_open(const char * path, int flags, mode_t mode); +int __sys_close(int fd); +int __sys_wait4(int pid, int * status, int options, struct rusage * rusage); +int __sys_link(const char * path, const char * link); +int __sys_unlink(const char * path); +int __sys_chdir(const char * path); +int __sys_fchdir(int fd); +int __sys_chmod(const char * path, mode_t mode); +int __sys_chown(const char * path, int uid, int gid); +void * __sys_break(char * nsize); +pid_t __sys_getpid(void); +int __sys_mount(const char * type, const char * path, int flags, void * data); +int __sys_unmount(const char * path, int flags); +int __sys_setuid(uid_t uid); +uid_t __sys_getuid(void); +uid_t __sys_geteuid(void); +int __sys_ptrace(int req, pid_t pid, caddr_t addr, int data); +ssize_t __sys_recvmsg(int s, struct msghdr * msg, int flags); +ssize_t __sys_sendmsg(int s, const struct msghdr * msg, int flags); +ssize_t __sys_recvfrom(int s, void * buf, size_t len, int flags, struct sockaddr * from, __socklen_t * fromlenaddr); +int __sys_accept(int s, struct sockaddr * name, __socklen_t * anamelen); +int __sys_getpeername(int fdes, struct sockaddr * asa, __socklen_t * alen); +int __sys_getsockname(int fdes, struct sockaddr * asa, __socklen_t * alen); +int __sys_access(const char * path, int amode); +int __sys_chflags(const char * path, u_long flags); +int __sys_fchflags(int fd, u_long flags); +int __sys_sync(void); +int __sys_kill(int pid, int signum); +pid_t __sys_getppid(void); +int __sys_dup(u_int fd); +gid_t __sys_getegid(void); +int __sys_profil(char * samples, size_t size, size_t offset, u_int scale); +int __sys_ktrace(const char * fname, int ops, int facs, int pid); +gid_t __sys_getgid(void); +int __sys_getlogin(char * namebuf, u_int namelen); +int __sys_setlogin(const char * namebuf); +int __sys_acct(const char * path); +int __sys_sigaltstack(const struct sigaltstack * ss, struct sigaltstack * oss); +int __sys_ioctl(int fd, u_long com, char * data); +int __sys_reboot(int opt); +int __sys_revoke(const char * path); +int __sys_symlink(const char * path, const char * link); +ssize_t __sys_readlink(const char * path, char * buf, size_t count); +int __sys_execve(const char * fname, char ** argv, char ** envv); +mode_t __sys_umask(mode_t newmask); +int __sys_chroot(const char * path); +int __sys_msync(void * addr, size_t len, int flags); +int __sys_vfork(void); +int __sys_munmap(void * addr, size_t len); +int __sys_mprotect(void * addr, size_t len, int prot); +int __sys_madvise(void * addr, size_t len, int behav); +int __sys_mincore(const void * addr, size_t len, char * vec); +int __sys_getgroups(int gidsetsize, gid_t * gidset); +int __sys_setgroups(int gidsetsize, const gid_t * gidset); +int __sys_getpgrp(void); +int __sys_setpgid(int pid, int pgid); +int __sys_setitimer(int which, const struct itimerval * itv, struct itimerval * oitv); +int __sys_swapon(const char * name); +int __sys_getitimer(int which, struct itimerval * itv); +int __sys_getdtablesize(void); +int __sys_dup2(u_int from, u_int to); +int __sys_fcntl(int fd, int cmd, intptr_t arg); +int __sys_select(int nd, fd_set * in, fd_set * ou, fd_set * ex, struct timeval * tv); +int __sys_fsync(int fd); +int __sys_setpriority(int which, int who, int prio); +int __sys_socket(int domain, int type, int protocol); +int __sys_connect(int s, const struct sockaddr * name, __socklen_t namelen); +int __sys_getpriority(int which, int who); +int __sys_bind(int s, const struct sockaddr * name, __socklen_t namelen); +int __sys_setsockopt(int s, int level, int name, const void * val, __socklen_t valsize); +int __sys_listen(int s, int backlog); +int __sys_gettimeofday(struct timeval * tp, struct timezone * tzp); +int __sys_getrusage(int who, struct rusage * rusage); +int __sys_getsockopt(int s, int level, int name, void * val, __socklen_t * avalsize); +int __sys_readv(int fd, const struct iovec * iovp, u_int iovcnt); +int __sys_writev(int fd, const struct iovec * iovp, u_int iovcnt); +int __sys_settimeofday(const struct timeval * tv, const struct timezone * tzp); +int __sys_fchown(int fd, int uid, int gid); +int __sys_fchmod(int fd, mode_t mode); +int __sys_setreuid(int ruid, int euid); +int __sys_setregid(int rgid, int egid); +int __sys_rename(const char * from, const char * to); +int __sys_flock(int fd, int how); +int __sys_mkfifo(const char * path, mode_t mode); +ssize_t __sys_sendto(int s, const void * buf, size_t len, int flags, const struct sockaddr * to, __socklen_t tolen); +int __sys_shutdown(int s, int how); +int __sys_socketpair(int domain, int type, int protocol, int * rsv); +int __sys_mkdir(const char * path, mode_t mode); +int __sys_rmdir(const char * path); +int __sys_utimes(const char * path, const struct timeval * tptr); +int __sys_adjtime(const struct timeval * delta, struct timeval * olddelta); +int __sys_setsid(void); +int __sys_quotactl(const char * path, int cmd, int uid, void * arg); +int __sys_nlm_syscall(int debug_level, int grace_period, int addr_count, char ** addrs); +int __sys_nfssvc(int flag, void * argp); +int __sys_lgetfh(const char * fname, struct fhandle * fhp); +int __sys_getfh(const char * fname, struct fhandle * fhp); +int __sys_sysarch(int op, char * parms); +int __sys_rtprio(int function, pid_t pid, struct rtprio * rtp); +int __sys_semsys(int which, int a2, int a3, int a4, int a5); +int __sys_msgsys(int which, int a2, int a3, int a4, int a5, int a6); +int __sys_shmsys(int which, int a2, int a3, int a4); +int __sys_setfib(int fibnum); +int __sys_ntp_adjtime(struct timex * tp); +int __sys_setgid(gid_t gid); +int __sys_setegid(gid_t egid); +int __sys_seteuid(uid_t euid); +int __sys_pathconf(const char * path, int name); +int __sys_fpathconf(int fd, int name); +int __sys_getrlimit(u_int which, struct rlimit * rlp); +int __sys_setrlimit(u_int which, struct rlimit * rlp); +int __sys___sysctl(int * name, u_int namelen, void * old, size_t * oldlenp, const void * new, size_t newlen); +int __sys_mlock(const void * addr, size_t len); +int __sys_munlock(const void * addr, size_t len); +int __sys_undelete(const char * path); +int __sys_futimes(int fd, const struct timeval * tptr); +int __sys_getpgid(pid_t pid); +int __sys_poll(struct pollfd * fds, u_int nfds, int timeout); +int __sys_semget(key_t key, int nsems, int semflg); +int __sys_semop(int semid, struct sembuf * sops, size_t nsops); +int __sys_msgget(key_t key, int msgflg); +int __sys_msgsnd(int msqid, const void * msgp, size_t msgsz, int msgflg); +ssize_t __sys_msgrcv(int msqid, void * msgp, size_t msgsz, long msgtyp, int msgflg); +void * __sys_shmat(int shmid, const void * shmaddr, int shmflg); +int __sys_shmdt(const void * shmaddr); +int __sys_shmget(key_t key, size_t size, int shmflg); +int __sys_clock_gettime(clockid_t clock_id, struct timespec * tp); +int __sys_clock_settime(clockid_t clock_id, const struct timespec * tp); +int __sys_clock_getres(clockid_t clock_id, struct timespec * tp); +int __sys_ktimer_create(clockid_t clock_id, struct sigevent * evp, int * timerid); +int __sys_ktimer_delete(int timerid); +int __sys_ktimer_settime(int timerid, int flags, const struct itimerspec * value, struct itimerspec * ovalue); +int __sys_ktimer_gettime(int timerid, struct itimerspec * value); +int __sys_ktimer_getoverrun(int timerid); +int __sys_nanosleep(const struct timespec * rqtp, struct timespec * rmtp); +int __sys_ffclock_getcounter(ffcounter * ffcount); +int __sys_ffclock_setestimate(struct ffclock_estimate * cest); +int __sys_ffclock_getestimate(struct ffclock_estimate * cest); +int __sys_clock_nanosleep(clockid_t clock_id, int flags, const struct timespec * rqtp, struct timespec * rmtp); +int __sys_clock_getcpuclockid2(id_t id, int which, clockid_t * clock_id); +int __sys_ntp_gettime(struct ntptimeval * ntvp); +int __sys_minherit(void * addr, size_t len, int inherit); +int __sys_rfork(int flags); +int __sys_issetugid(void); +int __sys_lchown(const char * path, int uid, int gid); +int __sys_aio_read(struct aiocb * aiocbp); +int __sys_aio_write(struct aiocb * aiocbp); +int __sys_lio_listio(int mode, struct aiocb * const * acb_list, int nent, struct sigevent * sig); +int __sys_lchmod(const char * path, mode_t mode); +int __sys_lutimes(const char * path, const struct timeval * tptr); +ssize_t __sys_preadv(int fd, struct iovec * iovp, u_int iovcnt, off_t offset); +ssize_t __sys_pwritev(int fd, struct iovec * iovp, u_int iovcnt, off_t offset); +int __sys_fhopen(const struct fhandle * u_fhp, int flags); +int __sys_modnext(int modid); +int __sys_modstat(int modid, struct module_stat * stat); +int __sys_modfnext(int modid); +int __sys_modfind(const char * name); +int __sys_kldload(const char * file); +int __sys_kldunload(int fileid); +int __sys_kldfind(const char * file); +int __sys_kldnext(int fileid); +int __sys_kldstat(int fileid, struct kld_file_stat * stat); +int __sys_kldfirstmod(int fileid); +int __sys_getsid(pid_t pid); +int __sys_setresuid(uid_t ruid, uid_t euid, uid_t suid); +int __sys_setresgid(gid_t rgid, gid_t egid, gid_t sgid); +ssize_t __sys_aio_return(struct aiocb * aiocbp); +int __sys_aio_suspend(const struct aiocb * const * aiocbp, int nent, const struct timespec * timeout); +int __sys_aio_cancel(int fd, struct aiocb * aiocbp); +int __sys_aio_error(struct aiocb * aiocbp); +int __sys_mlockall(int how); +int __sys_munlockall(void); +int __sys___getcwd(char * buf, size_t buflen); +int __sys_sched_setparam(pid_t pid, const struct sched_param * param); +int __sys_sched_getparam(pid_t pid, struct sched_param * param); +int __sys_sched_setscheduler(pid_t pid, int policy, const struct sched_param * param); +int __sys_sched_getscheduler(pid_t pid); +int __sys_sched_yield(void); +int __sys_sched_get_priority_max(int policy); +int __sys_sched_get_priority_min(int policy); +int __sys_sched_rr_get_interval(pid_t pid, struct timespec * interval); +int __sys_utrace(const void * addr, size_t len); +int __sys_kldsym(int fileid, int cmd, void * data); +int __sys_jail(struct jail * jail); +int __sys_nnpfs_syscall(int operation, char * a_pathP, int a_opcode, void * a_paramsP, int a_followSymlinks); +int __sys_sigprocmask(int how, const sigset_t * set, sigset_t * oset); +int __sys_sigsuspend(const sigset_t * sigmask); +int __sys_sigpending(sigset_t * set); +int __sys_sigtimedwait(const sigset_t * set, struct __siginfo * info, const struct timespec * timeout); +int __sys_sigwaitinfo(const sigset_t * set, struct __siginfo * info); +int __sys___acl_get_file(const char * path, __acl_type_t type, struct acl * aclp); +int __sys___acl_set_file(const char * path, __acl_type_t type, struct acl * aclp); +int __sys___acl_get_fd(int filedes, __acl_type_t type, struct acl * aclp); +int __sys___acl_set_fd(int filedes, __acl_type_t type, struct acl * aclp); +int __sys___acl_delete_file(const char * path, __acl_type_t type); +int __sys___acl_delete_fd(int filedes, __acl_type_t type); +int __sys___acl_aclcheck_file(const char * path, __acl_type_t type, struct acl * aclp); +int __sys___acl_aclcheck_fd(int filedes, __acl_type_t type, struct acl * aclp); +int __sys_extattrctl(const char * path, int cmd, const char * filename, int attrnamespace, const char * attrname); +ssize_t __sys_extattr_set_file(const char * path, int attrnamespace, const char * attrname, void * data, size_t nbytes); +ssize_t __sys_extattr_get_file(const char * path, int attrnamespace, const char * attrname, void * data, size_t nbytes); +int __sys_extattr_delete_file(const char * path, int attrnamespace, const char * attrname); +ssize_t __sys_aio_waitcomplete(struct aiocb ** aiocbp, struct timespec * timeout); +int __sys_getresuid(uid_t * ruid, uid_t * euid, uid_t * suid); +int __sys_getresgid(gid_t * rgid, gid_t * egid, gid_t * sgid); +int __sys_kqueue(void); +ssize_t __sys_extattr_set_fd(int fd, int attrnamespace, const char * attrname, void * data, size_t nbytes); +ssize_t __sys_extattr_get_fd(int fd, int attrnamespace, const char * attrname, void * data, size_t nbytes); +int __sys_extattr_delete_fd(int fd, int attrnamespace, const char * attrname); +int __sys___setugid(int flag); +int __sys_eaccess(const char * path, int amode); +int __sys_afs3_syscall(long syscall, long parm1, long parm2, long parm3, long parm4, long parm5, long parm6); +int __sys_nmount(struct iovec * iovp, unsigned int iovcnt, int flags); +int __sys___mac_get_proc(struct mac * mac_p); +int __sys___mac_set_proc(struct mac * mac_p); +int __sys___mac_get_fd(int fd, struct mac * mac_p); +int __sys___mac_get_file(const char * path_p, struct mac * mac_p); +int __sys___mac_set_fd(int fd, struct mac * mac_p); +int __sys___mac_set_file(const char * path_p, struct mac * mac_p); +int __sys_kenv(int what, const char * name, char * value, int len); +int __sys_lchflags(const char * path, u_long flags); +int __sys_uuidgen(struct uuid * store, int count); +int __sys_sendfile(int fd, int s, off_t offset, size_t nbytes, struct sf_hdtr * hdtr, off_t * sbytes, int flags); +int __sys_mac_syscall(const char * policy, int call, void * arg); +int __sys_ksem_close(semid_t id); +int __sys_ksem_post(semid_t id); +int __sys_ksem_wait(semid_t id); +int __sys_ksem_trywait(semid_t id); +int __sys_ksem_init(semid_t * idp, unsigned int value); +int __sys_ksem_open(semid_t * idp, const char * name, int oflag, mode_t mode, unsigned int value); +int __sys_ksem_unlink(const char * name); +int __sys_ksem_getvalue(semid_t id, int * val); +int __sys_ksem_destroy(semid_t id); +int __sys___mac_get_pid(pid_t pid, struct mac * mac_p); +int __sys___mac_get_link(const char * path_p, struct mac * mac_p); +int __sys___mac_set_link(const char * path_p, struct mac * mac_p); +ssize_t __sys_extattr_set_link(const char * path, int attrnamespace, const char * attrname, void * data, size_t nbytes); +ssize_t __sys_extattr_get_link(const char * path, int attrnamespace, const char * attrname, void * data, size_t nbytes); +int __sys_extattr_delete_link(const char * path, int attrnamespace, const char * attrname); +int __sys___mac_execve(const char * fname, char ** argv, char ** envv, struct mac * mac_p); +int __sys_sigaction(int sig, const struct sigaction * act, struct sigaction * oact); +int __sys_sigreturn(const struct __ucontext * sigcntxp); +int __sys_getcontext(struct __ucontext * ucp); +int __sys_setcontext(const struct __ucontext * ucp); +int __sys_swapcontext(struct __ucontext * oucp, const struct __ucontext * ucp); +int __sys___acl_get_link(const char * path, __acl_type_t type, struct acl * aclp); +int __sys___acl_set_link(const char * path, __acl_type_t type, struct acl * aclp); +int __sys___acl_delete_link(const char * path, __acl_type_t type); +int __sys___acl_aclcheck_link(const char * path, __acl_type_t type, struct acl * aclp); +int __sys_sigwait(const sigset_t * set, int * sig); +int __sys_thr_create(ucontext_t * ctx, long * id, int flags); +void __sys_thr_exit(long * state); +int __sys_thr_self(long * id); +int __sys_thr_kill(long id, int sig); +int __sys_jail_attach(int jid); +ssize_t __sys_extattr_list_fd(int fd, int attrnamespace, void * data, size_t nbytes); +ssize_t __sys_extattr_list_file(const char * path, int attrnamespace, void * data, size_t nbytes); +ssize_t __sys_extattr_list_link(const char * path, int attrnamespace, void * data, size_t nbytes); +int __sys_ksem_timedwait(semid_t id, const struct timespec * abstime); +int __sys_thr_suspend(const struct timespec * timeout); +int __sys_thr_wake(long id); +int __sys_kldunloadf(int fileid, int flags); +int __sys_audit(const void * record, u_int length); +int __sys_auditon(int cmd, void * data, u_int length); +int __sys_getauid(uid_t * auid); +int __sys_setauid(uid_t * auid); +int __sys_getaudit(struct auditinfo * auditinfo); +int __sys_setaudit(struct auditinfo * auditinfo); +int __sys_getaudit_addr(struct auditinfo_addr * auditinfo_addr, u_int length); +int __sys_setaudit_addr(struct auditinfo_addr * auditinfo_addr, u_int length); +int __sys_auditctl(const char * path); +int __sys__umtx_op(void * obj, int op, u_long val, void * uaddr1, void * uaddr2); +int __sys_thr_new(struct thr_param * param, int param_size); +int __sys_sigqueue(pid_t pid, int signum, void * value); +int __sys_kmq_open(const char * path, int flags, mode_t mode, const struct mq_attr * attr); +int __sys_kmq_setattr(int mqd, const struct mq_attr * attr, struct mq_attr * oattr); +int __sys_kmq_timedreceive(int mqd, char * msg_ptr, size_t msg_len, unsigned * msg_prio, const struct timespec * abs_timeout); +int __sys_kmq_timedsend(int mqd, const char * msg_ptr, size_t msg_len, unsigned msg_prio, const struct timespec * abs_timeout); +int __sys_kmq_notify(int mqd, const struct sigevent * sigev); +int __sys_kmq_unlink(const char * path); +void __sys_abort2(const char * why, int nargs, void ** args); +int __sys_thr_set_name(long id, const char * name); +int __sys_aio_fsync(int op, struct aiocb * aiocbp); +int __sys_rtprio_thread(int function, lwpid_t lwpid, struct rtprio * rtp); +int __sys_sctp_peeloff(int sd, uint32_t name); +int __sys_sctp_generic_sendmsg(int sd, void * msg, int mlen, const struct sockaddr * to, __socklen_t tolen, struct sctp_sndrcvinfo * sinfo, int flags); +int __sys_sctp_generic_sendmsg_iov(int sd, struct iovec * iov, int iovlen, const struct sockaddr * to, __socklen_t tolen, struct sctp_sndrcvinfo * sinfo, int flags); +int __sys_sctp_generic_recvmsg(int sd, struct iovec * iov, int iovlen, struct sockaddr * from, __socklen_t * fromlenaddr, struct sctp_sndrcvinfo * sinfo, int * msg_flags); +ssize_t __sys_pread(int fd, void * buf, size_t nbyte, off_t offset); +ssize_t __sys_pwrite(int fd, const void * buf, size_t nbyte, off_t offset); +void * __sys_mmap(void * addr, size_t len, int prot, int flags, int fd, off_t pos); +off_t __sys_lseek(int fd, off_t offset, int whence); +int __sys_truncate(const char * path, off_t length); +int __sys_ftruncate(int fd, off_t length); +int __sys_thr_kill2(pid_t pid, long id, int sig); +int __sys_shm_unlink(const char * path); +int __sys_cpuset(cpusetid_t * setid); +int __sys_cpuset_setid(cpuwhich_t which, id_t id, cpusetid_t setid); +int __sys_cpuset_getid(cpulevel_t level, cpuwhich_t which, id_t id, cpusetid_t * setid); +int __sys_cpuset_getaffinity(cpulevel_t level, cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t * mask); +int __sys_cpuset_setaffinity(cpulevel_t level, cpuwhich_t which, id_t id, size_t cpusetsize, const cpuset_t * mask); +int __sys_faccessat(int fd, const char * path, int amode, int flag); +int __sys_fchmodat(int fd, const char * path, mode_t mode, int flag); +int __sys_fchownat(int fd, const char * path, uid_t uid, gid_t gid, int flag); +int __sys_fexecve(int fd, char ** argv, char ** envv); +int __sys_futimesat(int fd, const char * path, const struct timeval * times); +int __sys_linkat(int fd1, const char * path1, int fd2, const char * path2, int flag); +int __sys_mkdirat(int fd, const char * path, mode_t mode); +int __sys_mkfifoat(int fd, const char * path, mode_t mode); +int __sys_openat(int fd, const char * path, int flag, mode_t mode); +ssize_t __sys_readlinkat(int fd, const char * path, char * buf, size_t bufsize); +int __sys_renameat(int oldfd, const char * old, int newfd, const char * new); +int __sys_symlinkat(const char * path1, int fd, const char * path2); +int __sys_unlinkat(int fd, const char * path, int flag); +int __sys_posix_openpt(int flags); +int __sys_gssd_syscall(const char * path); +int __sys_jail_get(struct iovec * iovp, unsigned int iovcnt, int flags); +int __sys_jail_set(struct iovec * iovp, unsigned int iovcnt, int flags); +int __sys_jail_remove(int jid); +int __sys___semctl(int semid, int semnum, int cmd, union semun * arg); +int __sys_msgctl(int msqid, int cmd, struct msqid_ds * buf); +int __sys_shmctl(int shmid, int cmd, struct shmid_ds * buf); +int __sys_lpathconf(const char * path, int name); +int __sys___cap_rights_get(int version, int fd, cap_rights_t * rightsp); +int __sys_cap_enter(void); +int __sys_cap_getmode(u_int * modep); +int __sys_pdfork(int * fdp, int flags); +int __sys_pdkill(int fd, int signum); +int __sys_pdgetpid(int fd, pid_t * pidp); +int __sys_pselect(int nd, fd_set * in, fd_set * ou, fd_set * ex, const struct timespec * ts, const sigset_t * sm); +int __sys_getloginclass(char * namebuf, size_t namelen); +int __sys_setloginclass(const char * namebuf); +int __sys_rctl_get_racct(const void * inbufp, size_t inbuflen, void * outbufp, size_t outbuflen); +int __sys_rctl_get_rules(const void * inbufp, size_t inbuflen, void * outbufp, size_t outbuflen); +int __sys_rctl_get_limits(const void * inbufp, size_t inbuflen, void * outbufp, size_t outbuflen); +int __sys_rctl_add_rule(const void * inbufp, size_t inbuflen, void * outbufp, size_t outbuflen); +int __sys_rctl_remove_rule(const void * inbufp, size_t inbuflen, void * outbufp, size_t outbuflen); +int __sys_posix_fallocate(int fd, off_t offset, off_t len); +int __sys_posix_fadvise(int fd, off_t offset, off_t len, int advice); +int __sys_wait6(idtype_t idtype, id_t id, int * status, int options, struct __wrusage * wrusage, struct __siginfo * info); +int __sys_cap_rights_limit(int fd, cap_rights_t * rightsp); +int __sys_cap_ioctls_limit(int fd, const u_long * cmds, size_t ncmds); +ssize_t __sys_cap_ioctls_get(int fd, u_long * cmds, size_t maxcmds); +int __sys_cap_fcntls_limit(int fd, uint32_t fcntlrights); +int __sys_cap_fcntls_get(int fd, uint32_t * fcntlrightsp); +int __sys_bindat(int fd, int s, const struct sockaddr * name, __socklen_t namelen); +int __sys_connectat(int fd, int s, const struct sockaddr * name, __socklen_t namelen); +int __sys_chflagsat(int fd, const char * path, u_long flags, int atflag); +int __sys_accept4(int s, struct sockaddr * name, __socklen_t * anamelen, int flags); +int __sys_pipe2(int * fildes, int flags); +int __sys_aio_mlock(struct aiocb * aiocbp); +int __sys_procctl(idtype_t idtype, id_t id, int com, void * data); +int __sys_ppoll(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * set); +int __sys_futimens(int fd, const struct timespec * times); +int __sys_utimensat(int fd, const char * path, const struct timespec * times, int flag); +int __sys_fdatasync(int fd); +int __sys_fstat(int fd, struct stat * sb); +int __sys_fstatat(int fd, const char * path, struct stat * buf, int flag); +int __sys_fhstat(const struct fhandle * u_fhp, struct stat * sb); +ssize_t __sys_getdirentries(int fd, char * buf, size_t count, off_t * basep); +int __sys_statfs(const char * path, struct statfs * buf); +int __sys_fstatfs(int fd, struct statfs * buf); +int __sys_getfsstat(struct statfs * buf, long bufsize, int mode); +int __sys_fhstatfs(const struct fhandle * u_fhp, struct statfs * buf); +int __sys_mknodat(int fd, const char * path, mode_t mode, dev_t dev); +int __sys_kevent(int fd, const struct kevent * changelist, int nchanges, struct kevent * eventlist, int nevents, const struct timespec * timeout); +int __sys_cpuset_getdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t * mask, int * policy); +int __sys_cpuset_setdomain(cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t * mask, int policy); +int __sys_getrandom(void * buf, size_t buflen, unsigned int flags); +int __sys_getfhat(int fd, char * path, struct fhandle * fhp, int flags); +int __sys_fhlink(struct fhandle * fhp, const char * to); +int __sys_fhlinkat(struct fhandle * fhp, int tofd, const char * to); +int __sys_fhreadlink(struct fhandle * fhp, char * buf, size_t bufsize); +int __sys_funlinkat(int dfd, const char * path, int fd, int flag); +ssize_t __sys_copy_file_range(int infd, off_t * inoffp, int outfd, off_t * outoffp, size_t len, unsigned int flags); +int __sys___sysctlbyname(const char * name, size_t namelen, void * old, size_t * oldlenp, void * new, size_t newlen); +int __sys_shm_open2(const char * path, int flags, mode_t mode, int shmflags, const char * name); +int __sys_shm_rename(const char * path_from, const char * path_to, int flags); +int __sys_sigfastblock(int cmd, void * ptr); +int __sys___realpathat(int fd, const char * path, char * buf, size_t size, int flags); +int __sys_close_range(u_int lowfd, u_int highfd, int flags); +int __sys_rpctls_syscall(int op, const char * path); +int __sys___specialfd(int type, const void * req, size_t len); +int __sys_aio_writev(struct aiocb * aiocbp); +int __sys_aio_readv(struct aiocb * aiocbp); +int __sys_fspacectl(int fd, int cmd, const struct spacectl_range * rqsr, int flags, struct spacectl_range * rmsr); +int __sys_sched_getcpu(void); +int __sys_swapoff(const char * name, u_int flags); +int __sys_kqueuex(u_int flags); +int __sys_membarrier(int cmd, unsigned flags, int cpu_id); +int __sys_timerfd_create(int clockid, int flags); +int __sys_timerfd_gettime(int fd, struct itimerspec * curr_value); +int __sys_timerfd_settime(int fd, int flags, const struct itimerspec * new_value, struct itimerspec * old_value); +int __sys_kcmp(pid_t pid1, pid_t pid2, int type, uintptr_t idx1, uintptr_t idx2); +__END_DECLS + +#endif /* __LIBSYS_H_ */ diff --git a/lib/libsys/libsys.h b/lib/libsys/libsys.h new file mode 100644 index 000000000000..4ac7cfc14256 --- /dev/null +++ b/lib/libsys/libsys.h @@ -0,0 +1,25 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 SRI International + * + * This software was developed by SRI International, the University of + * Cambridge Computer Laboratory (Department of Computer Science and + * Technology), and Capabilities Limited under Defense Advanced Research + * Projects Agency (DARPA) Contract No. FA8750-24-C-B047 ("DEC"). + */ + +#ifndef _LIBSYS_H_ +#define _LIBSYS_H_ + +#include + +#include <_libsys.h> + +typedef int (__sys_syscall_t)(int number, ...); +typedef int (__sys___syscall_t)(int64_t number, ...); + +int __sys_syscall(int number, ...); +off_t __sys___syscall(int64_t number, ...); + +#endif /* _LIBSYS_H_ */ diff --git a/sys/kern/syscalls.conf b/sys/kern/syscalls.conf index 384e011d3e8d..a98d52659832 100644 --- a/sys/kern/syscalls.conf +++ b/sys/kern/syscalls.conf @@ -1,2 +1,3 @@ libsysmap="../../lib/libsys/syscalls.map" +libsys_h="../../lib/libsys/_libsys.h" sysmk="../sys/syscall.mk" From nobody Tue Apr 16 16:48:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJqjc6y91z5H9Q4; Tue, 16 Apr 2024 16:48: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 4VJqjc4Jzjz4Xv0; Tue, 16 Apr 2024 16:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXrlHiBlX1zIbWFjTSJoS/Zxwg9N414saDmBgzI7Fq8=; b=D9m9BvWOzmMvxWB0a4q8GPOaSQ1J6pTDcQezAxcHshiOrt+Xqy01FBt+c+4vJIx2yJmiRz DhzImh89AT49fuDAFFzU5Yyg+/LA7vConSK9tXdQaSewIFtykR7OHDEIqTmQ/kqy4fU7Aa 0wOjDExTaRKxc8tB4hsXNXwgm1mP0KZ6R3peL0Z235M4ED4AwmrF41kphDXEH6zoDC7cDV TesLyC92HEz2/d7TD19opzIPriduCGImh0zQBCOFtq8hTFlGbaPUqugJHLP7o9V1oArke7 Xb+adEOH5fuApWOx0lysd09c90A/ZI7dIx0mruTdeAoc32mT410wO162JFKjcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713286100; a=rsa-sha256; cv=none; b=HpfVeymHQFmqjbttZUarHgnyLVVtvdhyJALLtaVoD8OEnm9UPxQo91jBLnZPurSoppnftx z05xnNqOZPmp8H9lWuUrGwmF4lReyZY4P30gBFH4xIHGkrZPrstaMoP5T0QeYEsS6Mct2s VcwczzR3XgOQ3nb/xhgmSeMjIb5AEQJH3slHJxHxjuoGOjsHtdSvBlhdVB3pBECpQJ7m2K CXdJPC62U/+iRqgwB0jX4FOUNf+CLZ0JYpvB6MBAG09yA310VP3ArwhIzo3vF5qzkk/MVH 8QnOi54oqLoawceIooao+fqS0pi7AM41ESr7D4gjYyetNcbAWPE5B8uTIyAr7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXrlHiBlX1zIbWFjTSJoS/Zxwg9N414saDmBgzI7Fq8=; b=ZsZUwAtFPmGqKHCR2H27AWssYF21PTNoA7+MkCzjRoKCiM0Lx57fA5HysYC8gjcJVBusiS yDiXqfswZLOi852bW7BvHnQpQMoD84/VpNbPlkZzYG0qel/hTcwrn5rW9EBp1K1W7xDpNQ Q/Plyu67i16I22ZMD24biRxmib15yTXn0w9w7VZ9dzN5X1m61dJeG9k+agQuFi4DgXHbMo ybHefF9UiByHereq7DEZCsnsrazcqN5imwRshA1whi2lIukaYSpu6Jgr6F/12/p0SHUEk7 YjeIEBqJyjqEE9ZiQ5nO64PDHhD94Dz9rmR3xpqHa6JCMmcSykoR+/cPZ+FDuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJqjc3wXkzqL4; Tue, 16 Apr 2024 16:48: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 43GGmKnU079935; Tue, 16 Apr 2024 16:48:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GGmKYG079932; Tue, 16 Apr 2024 16:48:20 GMT (envelope-from git) Date: Tue, 16 Apr 2024 16:48:20 GMT Message-Id: <202404161648.43GGmKYG079932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 79b758e32775 - main - makesyscalls: generate core libsys header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79b758e327757dc015fb26a122fdc9608c405e9e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=79b758e327757dc015fb26a122fdc9608c405e9e commit 79b758e327757dc015fb26a122fdc9608c405e9e Author: Brooks Davis AuthorDate: 2024-04-16 16:48:07 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 16:48:07 +0000 makesyscalls: generate core libsys header Create a header covering most of the "stable" libsys interfaces. Specifically __sys_ syscall stubs and __sys__t typedefs for those interfaces. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44386 --- sys/tools/makesyscalls.lua | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 624b84a32eb1..a87c8c421313 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -35,6 +35,7 @@ local unistd = require("posix.unistd") local savesyscall = -1 local maxsyscall = -1 +local structs = {} local generated_tag = "@" .. "generated" -- Default configuration; any of these may get replaced by a configuration file @@ -43,6 +44,7 @@ local config = { os_id_keyword = "FreeBSD", -- obsolete, ignored on input, not generated abi_func_prefix = "", libsysmap = "/dev/null", + libsys_h = "/dev/null", sysnames = "syscalls.c", sysproto = "../sys/sysproto.h", sysproto_h = "_SYS_SYSPROTO_H_", @@ -87,6 +89,7 @@ local output_files = { "syshdr", "sysmk", "libsysmap", + "libsys_h", "syssw", "systrace", "sysproto", @@ -94,6 +97,8 @@ local output_files = { -- These ones we'll create temporary files for; generation purposes. local temp_files = { + "libsys_h_type", + "libsys_h_func", "sysaue", "sysdcl", "syscompat", @@ -934,6 +939,47 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, end write_line("libsysmap", string.format("\t__sys_%s;\n", funcalias)) + + if flags & known_flags.SYSMUX == 0 then + local argstr_type = "" + local argstr_var = "" + local comma = "" + if #funcargs == 0 then + argstr_type = "void" + argstr_var = "void" + end + for _, v in ipairs(funcargs) do + local argname, argtype = v.name, v.type + argstr_type = argstr_type .. comma .. argtype + argstr_var = argstr_var .. comma .. argtype .. " " .. argname + comma = ", " + + -- Accumulate a list of struct types for + -- forward decls. We can't do this in + -- process_args because we don't want compat + -- types in userspace even as no-op. + if isptrtype(argtype) then + local is_struct = false + for word in argtype:gmatch("[^ *]+") do + if is_struct then + structs[word] = word + break + end + if word == "struct" then + is_struct = true + -- next word is the name + end + end + end + end + write_line("libsys_h_type", + string.format("typedef %s (__sys_%s_t)(%s);\n", + syscallret, funcalias, argstr_type)) + write_line("libsys_h_func", + string.format("%s __sys_%s(%s);\n", + syscallret, funcalias, argstr_var)) + + end end end @@ -1330,6 +1376,20 @@ process_syscall_def = function(line) end end +local function pairsByKeys (t, f) + local a = {} + for n in pairs(t) do table.insert(a, n) end + table.sort(a, f) + local i = 0 -- iterator variable + local iter = function () -- iterator function + i = i + 1 + if a[i] == nil then return nil + else return a[i], t[a[i]] + end + end + return iter +end + -- Entry point if #arg < 1 or #arg > 2 then @@ -1504,6 +1564,27 @@ write_line("libsysmap", string.format([[/* FBSDprivate_1.0 { ]], generated_tag)) +write_line("libsys_h", string.format([[/* + * Public system call stubs provided by libsys. + * + * Do not use directly, include instead. + * + * DO NOT EDIT-- this file is automatically %s. + */ +#ifndef __LIBSYS_H_ +#define __LIBSYS_H_ + +#include +#include +#include +#include +#include +#include /* for mcontext_t */ +#include +#include + +]], generated_tag)) + write_line("systrace", string.format([[/* * System call argument to DTrace register array converstion. * @@ -1600,6 +1681,16 @@ write_line("systraceret", [[ ]]) -- Finish up; output +table.sort(structs) +for name,_ in pairsByKeys(structs) do + write_line("libsys_h", string.format("struct %s;\n", name)) +end +write_line("libsys_h", "union semun;\n\n__BEGIN_DECLS\n") +write_line("libsys_h", read_file("libsys_h_type")) +write_line("libsys_h", "\n") +write_line("libsys_h", read_file("libsys_h_func")) +write_line("libsys_h", "__END_DECLS\n\n#endif /* __LIBSYS_H_ */\n") + write_line("syssw", read_file("sysinc")) write_line("syssw", read_file("sysent")) From nobody Tue Apr 16 16:48:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJqjh0vtdz5H9QD; Tue, 16 Apr 2024 16:48: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 4VJqjg63JCz4Xgm; Tue, 16 Apr 2024 16:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eXO1p90g5a08HMW5HNUX1FNOSdp/YzRlA8XzgHvI3Zc=; b=XqUtA/9m4T2vMayGHSGRocuxkQpdAmhWTnGUzwLW3J/Flk1wPFFu+AMQD5R3l0jx039n7y dKXwKAoylT2+KxW5C2AEK/6im+BbPGRYj74fTVpv1hN71jD+EVeGe1x1nHz0QR3VvkHo3I lR0jrR+6ZvCv1fu5Dv3Q4Gxef19WAFpG/U+eKzqpLXzRDVsn7RbXjkWaZYx585bnY+1FYI Pjaffblz2dkvRo1Jy7cCAYtjT+ErNsLGqZBmlnXz7L7SI9tFY1ONZfcTShfgzDbpuWaY0z iqIAYCRT4+qgUq7XBk3SJxxDiNO458HFQ8s2Oran785n9E3sTWxgfX4oNfnd5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713286103; a=rsa-sha256; cv=none; b=ojwyNIdhzwOuPtHIaybLxGNzl/NtxHTX0kF33KmUp9hx0Ck/49vfStOlPZzqL5i4yd71JC 1YuvWIRKQdQ3IyVuSuxuhLrOLmLNZPK6k1eOMZu7wOnoYHIenJu5iQLY1BKX39OaVlvHqJ hC84P75jEWPhVgDI1VnzYu0QRZvriTOCTnaNXZjYUxxjTRkX1AQbdHOPbaKzotdRqeQnmt yP4WEcOosM2Dpsvfr7i/D4s3eaEcd8J81XcJGL2hsT95c2KnEhfMiqlkFifREe1VUX3ZVl 9TrFVrkLEnJ3APiinUdXZfpmStPZxJyyl+78U+RajVY6JClLRJSHGpUflY/6gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713286103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eXO1p90g5a08HMW5HNUX1FNOSdp/YzRlA8XzgHvI3Zc=; b=wzB8OytC8GXSbtyMp1Pi9jSVzEcfG+J6Tgxl2ivF0bCZ2qRNGTD5uwB72XlDZjv3Bd3cti cKpV95iGEHXmSiqtkjg9kRgohNxXiiNEUDNkmXgpDECpDt6hQVdrNtAs56xywc63/rX2hY GAmFnMatnblMK+OlAA87G8ibVKTF7qalV3oJUp9y2eFEFRzOss+a9B0jehnfRzhh5QhS25 X/xxU1u7o1puO0ZOrp2rfvuBjY32nrNb97+uJaw5dxLvv3fftFYinBSCB/pcoOfA9iF1C8 vNof2m08hoZGjrScrwJlf2jRskcILvDfUHERq4DeB4eKk0A1LRaBgm4ZDCrH0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJqjg5cq2zrDc; Tue, 16 Apr 2024 16:48: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 43GGmNDB080068; Tue, 16 Apr 2024 16:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GGmNxQ080065; Tue, 16 Apr 2024 16:48:23 GMT (envelope-from git) Date: Tue, 16 Apr 2024 16:48:23 GMT Message-Id: <202404161648.43GGmNxQ080065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7dd9070e4425 - main - libc: INTERPOS_SYS macro for interposed syscalls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dd9070e4425a1c2e2418694fd632425a283d558 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7dd9070e4425a1c2e2418694fd632425a283d558 commit 7dd9070e4425a1c2e2418694fd632425a283d558 Author: Brooks Davis AuthorDate: 2024-04-16 16:48:08 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 16:48:08 +0000 libc: INTERPOS_SYS macro for interposed syscalls This macro makes uses the __sys__t typedefs from libsys.h to greatly simplify calling functions in the interposing table. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44389 --- lib/libc/gen/sleep.c | 4 +--- lib/libc/gen/usleep.c | 4 +--- lib/libc/include/libc_private.h | 6 ++++++ lib/libc/sys/accept.c | 3 +-- lib/libc/sys/accept4.c | 4 +--- lib/libc/sys/aio_suspend.c | 5 +---- lib/libc/sys/clock_nanosleep.c | 5 +---- lib/libc/sys/close.c | 2 +- lib/libc/sys/connect.c | 3 +-- lib/libc/sys/creat.c | 5 ++--- lib/libc/sys/fcntl.c | 3 +-- lib/libc/sys/fdatasync.c | 3 +-- lib/libc/sys/fork.c | 2 +- lib/libc/sys/fsync.c | 2 +- lib/libc/sys/kevent.c | 6 ++---- lib/libc/sys/lockf.c | 3 +-- lib/libc/sys/msync.c | 3 +-- lib/libc/sys/nanosleep.c | 3 +-- lib/libc/sys/open.c | 4 +--- lib/libc/sys/openat.c | 4 +--- lib/libc/sys/pdfork.c | 4 +--- lib/libc/sys/poll.c | 3 +-- lib/libc/sys/ppoll.c | 4 +--- lib/libc/sys/pselect.c | 4 +--- lib/libc/sys/read.c | 3 +-- lib/libc/sys/readv.c | 3 +-- lib/libc/sys/recv.c | 5 +---- lib/libc/sys/recvfrom.c | 5 +---- lib/libc/sys/recvmsg.c | 3 +-- lib/libc/sys/select.c | 3 +-- lib/libc/sys/send.c | 5 +---- lib/libc/sys/sendmsg.c | 3 +-- lib/libc/sys/sendto.c | 5 +---- lib/libc/sys/setcontext.c | 3 +-- lib/libc/sys/sigaction.c | 3 +-- lib/libc/sys/sigprocmask.c | 3 +-- lib/libc/sys/sigsuspend.c | 3 +-- lib/libc/sys/sigtimedwait.c | 4 +--- lib/libc/sys/sigwait.c | 3 +-- lib/libc/sys/sigwaitinfo.c | 3 +-- lib/libc/sys/swapcontext.c | 3 +-- lib/libc/sys/wait.c | 4 +--- lib/libc/sys/wait3.c | 4 +--- lib/libc/sys/wait4.c | 4 +--- lib/libc/sys/wait6.c | 4 +--- lib/libc/sys/waitid.c | 4 +--- lib/libc/sys/waitpid.c | 4 +--- lib/libc/sys/write.c | 3 +-- lib/libc/sys/writev.c | 3 +-- 49 files changed, 56 insertions(+), 123 deletions(-) diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c index 7b6e80353c6e..e32d434d4d33 100644 --- a/lib/libc/gen/sleep.c +++ b/lib/libc/gen/sleep.c @@ -55,9 +55,7 @@ __sleep(unsigned int seconds) time_to_sleep.tv_sec = seconds; time_to_sleep.tv_nsec = 0; - if (((int (*)(const struct timespec *, struct timespec *)) - (*__libc_interposing_slot(INTERPOS_nanosleep)))( - &time_to_sleep, &time_remaining) != -1) + if (INTERPOS_SYS(nanosleep, &time_to_sleep, &time_remaining) != -1) return (0); if (errno != EINTR) return (seconds); /* best guess */ diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c index f58d81d978e3..31d5567d562d 100644 --- a/lib/libc/gen/usleep.c +++ b/lib/libc/gen/usleep.c @@ -45,9 +45,7 @@ __usleep(useconds_t useconds) time_to_sleep.tv_nsec = (useconds % 1000000) * 1000; time_to_sleep.tv_sec = useconds / 1000000; - return (((int (*)(const struct timespec *, struct timespec *)) - (*__libc_interposing_slot(INTERPOS_nanosleep)))(&time_to_sleep, - NULL)); + return (INTERPOS_SYS(nanosleep, &time_to_sleep, NULL)); } __weak_reference(__usleep, usleep); diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index b38603b59a88..73b22beffe88 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -252,6 +252,12 @@ enum { INTERPOS_MAX }; +#define _INTERPOS_SYS(type, idx, ...) \ + ((type *)*(__libc_interposing_slot(idx)))(__VA_ARGS__) +#define INTERPOS_SYS(syscall, ...) \ + _INTERPOS_SYS(__sys_## syscall ##_t, INTERPOS_## syscall \ + __VA_OPT__(,) __VA_ARGS__) + /* * yplib internal interfaces */ diff --git a/lib/libc/sys/accept.c b/lib/libc/sys/accept.c index 609cb31b140e..95c8b4a58c74 100644 --- a/lib/libc/sys/accept.c +++ b/lib/libc/sys/accept.c @@ -40,6 +40,5 @@ __weak_reference(__sys_accept, __accept); int accept(int s, struct sockaddr *addr, socklen_t *addrlen) { - return (((int (*)(int, struct sockaddr *, socklen_t *)) - *(__libc_interposing_slot(INTERPOS_accept)))(s, addr, addrlen)); + return (INTERPOS_SYS(accept, s, addr, addrlen)); } diff --git a/lib/libc/sys/accept4.c b/lib/libc/sys/accept4.c index c789d0a63250..1a1f75c9f528 100644 --- a/lib/libc/sys/accept4.c +++ b/lib/libc/sys/accept4.c @@ -40,7 +40,5 @@ __weak_reference(__sys_accept4, __accept4); int accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags) { - return (((int (*)(int, struct sockaddr *, socklen_t *, int)) - *(__libc_interposing_slot(INTERPOS_accept4))) - (s, addr, addrlen, flags)); + return (INTERPOS_SYS(accept4, s, addr, addrlen, flags)); } diff --git a/lib/libc/sys/aio_suspend.c b/lib/libc/sys/aio_suspend.c index 499d2a349c3c..592cb5b0e1d7 100644 --- a/lib/libc/sys/aio_suspend.c +++ b/lib/libc/sys/aio_suspend.c @@ -40,8 +40,5 @@ int aio_suspend(const struct aiocb * const iocbs[], int niocb, const struct timespec *timeout) { - return (((int (*)(const struct aiocb * const[], int, - const struct timespec *)) - *(__libc_interposing_slot(INTERPOS_aio_suspend))) - (iocbs, niocb, timeout)); + return (INTERPOS_SYS(aio_suspend, iocbs, niocb, timeout)); } diff --git a/lib/libc/sys/clock_nanosleep.c b/lib/libc/sys/clock_nanosleep.c index ad996220d19f..a50af30e1fb3 100644 --- a/lib/libc/sys/clock_nanosleep.c +++ b/lib/libc/sys/clock_nanosleep.c @@ -41,8 +41,5 @@ int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, struct timespec *rmtp) { - return (((int (*)(clockid_t, int, const struct timespec *, - struct timespec *)) - *(__libc_interposing_slot(INTERPOS_clock_nanosleep))) - (clock_id, flags, rqtp, rmtp)); + return (INTERPOS_SYS(clock_nanosleep, clock_id, flags, rqtp, rmtp)); } diff --git a/lib/libc/sys/close.c b/lib/libc/sys/close.c index 5017f6e3d745..08a5419361a9 100644 --- a/lib/libc/sys/close.c +++ b/lib/libc/sys/close.c @@ -40,5 +40,5 @@ __weak_reference(__sys_close, __close); int close(int fd) { - return (((int (*)(int))*(__libc_interposing_slot(INTERPOS_close)))(fd)); + return (INTERPOS_SYS(close, fd)); } diff --git a/lib/libc/sys/connect.c b/lib/libc/sys/connect.c index 70fc4682b06d..e64451683abc 100644 --- a/lib/libc/sys/connect.c +++ b/lib/libc/sys/connect.c @@ -40,6 +40,5 @@ __weak_reference(__sys_connect, __connect); int connect(int s, const struct sockaddr *addr, socklen_t addrlen) { - return (((int (*)(int, const struct sockaddr *, socklen_t)) - *(__libc_interposing_slot(INTERPOS_connect)))(s, addr, addrlen)); + return (INTERPOS_SYS(connect, s, addr, addrlen)); } diff --git a/lib/libc/sys/creat.c b/lib/libc/sys/creat.c index bcb750e93d38..afd626e928bb 100644 --- a/lib/libc/sys/creat.c +++ b/lib/libc/sys/creat.c @@ -43,8 +43,7 @@ int __creat(const char *path, mode_t mode); int __creat(const char *path, mode_t mode) { - return (((int (*)(int, const char *, int, ...)) - *(__libc_interposing_slot(INTERPOS_openat))) - (AT_FDCWD, path, O_WRONLY | O_CREAT | O_TRUNC, mode)); + return (INTERPOS_SYS(openat, AT_FDCWD, path, + O_WRONLY | O_CREAT | O_TRUNC, mode)); } diff --git a/lib/libc/sys/fcntl.c b/lib/libc/sys/fcntl.c index 308d144a4426..fc225fdeb379 100644 --- a/lib/libc/sys/fcntl.c +++ b/lib/libc/sys/fcntl.c @@ -49,6 +49,5 @@ fcntl(int fd, int cmd, ...) arg = va_arg(args, long); va_end(args); - return (((int (*)(int, int, ...)) - *(__libc_interposing_slot(INTERPOS_fcntl)))(fd, cmd, arg)); + return (INTERPOS_SYS(fcntl, fd, cmd, arg)); } diff --git a/lib/libc/sys/fdatasync.c b/lib/libc/sys/fdatasync.c index 2dd81ec1a215..15cef821dc1e 100644 --- a/lib/libc/sys/fdatasync.c +++ b/lib/libc/sys/fdatasync.c @@ -37,6 +37,5 @@ int fdatasync(int fd) { - return (((int (*)(int))*(__libc_interposing_slot(INTERPOS_fdatasync))) - (fd)); + return (INTERPOS_SYS(fdatasync, fd)); } diff --git a/lib/libc/sys/fork.c b/lib/libc/sys/fork.c index 1c70c2587c32..e907c51b5cee 100644 --- a/lib/libc/sys/fork.c +++ b/lib/libc/sys/fork.c @@ -39,5 +39,5 @@ __weak_reference(__sys_fork, __fork); pid_t fork(void) { - return (((pid_t (*)(void))*(__libc_interposing_slot(INTERPOS_fork)))()); + return (INTERPOS_SYS(fork)); } diff --git a/lib/libc/sys/fsync.c b/lib/libc/sys/fsync.c index aa33bbdf69e7..e542c8cdea48 100644 --- a/lib/libc/sys/fsync.c +++ b/lib/libc/sys/fsync.c @@ -39,5 +39,5 @@ __weak_reference(__sys_fsync, __fsync); int fsync(int fd) { - return (((int (*)(int))*(__libc_interposing_slot(INTERPOS_fsync)))(fd)); + return (INTERPOS_SYS(fsync, fd)); } diff --git a/lib/libc/sys/kevent.c b/lib/libc/sys/kevent.c index e81bcabc568a..f16ac89a36c6 100644 --- a/lib/libc/sys/kevent.c +++ b/lib/libc/sys/kevent.c @@ -41,8 +41,6 @@ int kevent(int kq, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout) { - return (((int (*)(int, const struct kevent *, int, - struct kevent *, int, const struct timespec *)) - *(__libc_interposing_slot(INTERPOS_kevent))) - (kq, changelist, nchanges, eventlist, nevents, timeout)); + return (INTERPOS_SYS(kevent, kq, changelist, nchanges, eventlist, + nevents, timeout)); } diff --git a/lib/libc/sys/lockf.c b/lib/libc/sys/lockf.c index 3701cebbc190..6211275e5f16 100644 --- a/lib/libc/sys/lockf.c +++ b/lib/libc/sys/lockf.c @@ -78,6 +78,5 @@ lockf(int filedes, int function, off_t size) /* NOTREACHED */ } - return (((int (*)(int, int, ...)) - *(__libc_interposing_slot(INTERPOS_fcntl)))(filedes, cmd, &fl)); + return (INTERPOS_SYS(fcntl, filedes, cmd, (intptr_t)&fl)); } diff --git a/lib/libc/sys/msync.c b/lib/libc/sys/msync.c index bda60db5c333..f825db97b947 100644 --- a/lib/libc/sys/msync.c +++ b/lib/libc/sys/msync.c @@ -40,6 +40,5 @@ __weak_reference(__sys_msync, __msync); int msync(void *addr, size_t len, int flags) { - return (((int (*)(void *, size_t, int)) - *(__libc_interposing_slot(INTERPOS_msync)))(addr, len, flags)); + return (INTERPOS_SYS(msync, addr, len, flags)); } diff --git a/lib/libc/sys/nanosleep.c b/lib/libc/sys/nanosleep.c index daa4784363db..bd0794c3af8e 100644 --- a/lib/libc/sys/nanosleep.c +++ b/lib/libc/sys/nanosleep.c @@ -39,6 +39,5 @@ __weak_reference(__sys_nanosleep, __nanosleep); int nanosleep(const struct timespec *rqtp, struct timespec *rmtp) { - return (((int (*)(const struct timespec *, struct timespec *)) - *(__libc_interposing_slot(INTERPOS_nanosleep)))(rqtp, rmtp)); + return (INTERPOS_SYS(nanosleep, rqtp, rmtp)); } diff --git a/lib/libc/sys/open.c b/lib/libc/sys/open.c index 6ea18727c876..57c07637d2aa 100644 --- a/lib/libc/sys/open.c +++ b/lib/libc/sys/open.c @@ -50,7 +50,5 @@ open(const char *path, int flags, ...) } else { mode = 0; } - return (((int (*)(int, const char *, int, ...)) - *(__libc_interposing_slot(INTERPOS_openat))) - (AT_FDCWD, path, flags, mode)); + return (INTERPOS_SYS(openat, AT_FDCWD, path, flags, mode)); } diff --git a/lib/libc/sys/openat.c b/lib/libc/sys/openat.c index d49aafe35e62..1cd8e7d90745 100644 --- a/lib/libc/sys/openat.c +++ b/lib/libc/sys/openat.c @@ -53,7 +53,5 @@ openat(int fd, const char *path, int flags, ...) } else { mode = 0; } - return (((int (*)(int, const char *, int, ...)) - *(__libc_interposing_slot(INTERPOS_openat))) - (fd, path, flags, mode)); + return (INTERPOS_SYS(openat, fd, path, flags, mode)); } diff --git a/lib/libc/sys/pdfork.c b/lib/libc/sys/pdfork.c index 6830d878b414..f25f081ec174 100644 --- a/lib/libc/sys/pdfork.c +++ b/lib/libc/sys/pdfork.c @@ -37,7 +37,5 @@ pid_t pdfork(int *fdp, int flags) { - return (((pid_t (*)(int *, int)) - *(__libc_interposing_slot(INTERPOS_pdfork))) - (fdp, flags)); + return (INTERPOS_SYS(pdfork, fdp, flags)); } diff --git a/lib/libc/sys/poll.c b/lib/libc/sys/poll.c index 93b0e1b3c8ed..6528603e7603 100644 --- a/lib/libc/sys/poll.c +++ b/lib/libc/sys/poll.c @@ -39,6 +39,5 @@ __weak_reference(__sys_poll, __poll); int poll(struct pollfd pfd[], nfds_t nfds, int timeout) { - return (((int (*)(struct pollfd *, nfds_t, int)) - *(__libc_interposing_slot(INTERPOS_poll)))(pfd, nfds, timeout)); + return (INTERPOS_SYS(poll, pfd, nfds, timeout)); } diff --git a/lib/libc/sys/ppoll.c b/lib/libc/sys/ppoll.c index 50e83975da2a..52c4c177cf0a 100644 --- a/lib/libc/sys/ppoll.c +++ b/lib/libc/sys/ppoll.c @@ -40,7 +40,5 @@ int ppoll(struct pollfd pfd[], nfds_t nfds, const struct timespec *__restrict timeout, const sigset_t *__restrict newsigmask) { - return (((int (*)(struct pollfd *, nfds_t, const struct timespec *, - const sigset_t *))*(__libc_interposing_slot(INTERPOS_ppoll))) - (pfd, nfds, timeout, newsigmask)); + return (INTERPOS_SYS(ppoll, pfd, nfds, timeout, newsigmask)); } diff --git a/lib/libc/sys/pselect.c b/lib/libc/sys/pselect.c index a7776049013f..38477e39af44 100644 --- a/lib/libc/sys/pselect.c +++ b/lib/libc/sys/pselect.c @@ -40,7 +40,5 @@ int pselect(int n, fd_set *rs, fd_set *ws, fd_set *es, const struct timespec *t, const sigset_t *s) { - return (((int (*)(int, fd_set *, fd_set *, fd_set *, - const struct timespec *, const sigset_t *)) - *(__libc_interposing_slot(INTERPOS_pselect)))(n, rs, ws, es, t, s)); + return (INTERPOS_SYS(pselect, n, rs, ws, es, t, s)); } diff --git a/lib/libc/sys/read.c b/lib/libc/sys/read.c index 2b8185975a6a..b4610e0c38c3 100644 --- a/lib/libc/sys/read.c +++ b/lib/libc/sys/read.c @@ -40,6 +40,5 @@ __weak_reference(__sys_read, __read); ssize_t read(int fd, void *buf, size_t nbytes) { - return (((ssize_t (*)(int, void *, size_t)) - *(__libc_interposing_slot(INTERPOS_read)))(fd, buf, nbytes)); + return (INTERPOS_SYS(read, fd, buf, nbytes)); } diff --git a/lib/libc/sys/readv.c b/lib/libc/sys/readv.c index 62a8fa976e2b..78a529254fa0 100644 --- a/lib/libc/sys/readv.c +++ b/lib/libc/sys/readv.c @@ -41,6 +41,5 @@ __weak_reference(__sys_readv, __readv); ssize_t readv(int fd, const struct iovec *iov, int iovcnt) { - return (((ssize_t (*)(int, const struct iovec *, int)) - *(__libc_interposing_slot(INTERPOS_readv)))(fd, iov, iovcnt)); + return (INTERPOS_SYS(readv, fd, iov, iovcnt)); } diff --git a/lib/libc/sys/recv.c b/lib/libc/sys/recv.c index 21caf2f841f6..9afb1dee0654 100644 --- a/lib/libc/sys/recv.c +++ b/lib/libc/sys/recv.c @@ -42,8 +42,5 @@ recv(int s, void *buf, size_t len, int flags) * POSIX says recv() shall be a cancellation point, so call the * cancellation-enabled recvfrom() and not _recvfrom(). */ - return (((ssize_t (*)(int, void *, size_t, int, - struct sockaddr *, socklen_t *)) - *(__libc_interposing_slot(INTERPOS_recvfrom))) - (s, buf, len, flags, NULL, NULL)); + return (INTERPOS_SYS(recvfrom, s, buf, len, flags, NULL, NULL)); } diff --git a/lib/libc/sys/recvfrom.c b/lib/libc/sys/recvfrom.c index 0bb3c4c3b719..04738d06a71c 100644 --- a/lib/libc/sys/recvfrom.c +++ b/lib/libc/sys/recvfrom.c @@ -41,8 +41,5 @@ ssize_t recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr * __restrict from, socklen_t * __restrict fromlen) { - return (((ssize_t (*)(int, void *, size_t, int, - struct sockaddr *, socklen_t *)) - *(__libc_interposing_slot(INTERPOS_recvfrom))) - (s, buf, len, flags, from, fromlen)); + return (INTERPOS_SYS(recvfrom, s, buf, len, flags, from, fromlen)); } diff --git a/lib/libc/sys/recvmsg.c b/lib/libc/sys/recvmsg.c index c8d631ebe56e..c7e34b9beeb4 100644 --- a/lib/libc/sys/recvmsg.c +++ b/lib/libc/sys/recvmsg.c @@ -40,6 +40,5 @@ __weak_reference(__sys_recvmsg, __recvmsg); ssize_t recvmsg(int s, struct msghdr *msg, int flags) { - return (((int (*)(int, struct msghdr *, int)) - *(__libc_interposing_slot(INTERPOS_recvmsg)))(s, msg, flags)); + return (INTERPOS_SYS(recvmsg, s, msg, flags)); } diff --git a/lib/libc/sys/select.c b/lib/libc/sys/select.c index 27f4ff10a1bb..bbbcfc8bf1e0 100644 --- a/lib/libc/sys/select.c +++ b/lib/libc/sys/select.c @@ -39,6 +39,5 @@ __weak_reference(__sys_select, __select); int select(int n, fd_set *rs, fd_set *ws, fd_set *es, struct timeval *t) { - return (((int (*)(int, fd_set *, fd_set *, fd_set *, struct timeval *)) - *(__libc_interposing_slot(INTERPOS_select)))(n, rs, ws, es, t)); + return (INTERPOS_SYS(select, n, rs, ws, es, t)); } diff --git a/lib/libc/sys/send.c b/lib/libc/sys/send.c index 4e945f969a65..82715c1b880b 100644 --- a/lib/libc/sys/send.c +++ b/lib/libc/sys/send.c @@ -42,8 +42,5 @@ send(int s, const void *msg, size_t len, int flags) * POSIX says send() shall be a cancellation point, so call the * cancellation-enabled sendto() and not _sendto(). */ - return (((ssize_t (*)(int, const void *, size_t, int, - const struct sockaddr *, socklen_t)) - *__libc_interposing_slot(INTERPOS_sendto))(s, msg, len, flags, - NULL, 0)); + return (INTERPOS_SYS(sendto, s, msg, len, flags, NULL, 0)); } diff --git a/lib/libc/sys/sendmsg.c b/lib/libc/sys/sendmsg.c index 488e0c736801..fd4e41837c48 100644 --- a/lib/libc/sys/sendmsg.c +++ b/lib/libc/sys/sendmsg.c @@ -40,6 +40,5 @@ __weak_reference(__sys_sendmsg, __sendmsg); ssize_t sendmsg(int s, const struct msghdr *msg, int flags) { - return (((int (*)(int, const struct msghdr *, int)) - *(__libc_interposing_slot(INTERPOS_sendmsg)))(s, msg, flags)); + return (INTERPOS_SYS(sendmsg, s, msg, flags)); } diff --git a/lib/libc/sys/sendto.c b/lib/libc/sys/sendto.c index 93d336cfca11..708fc6ec9368 100644 --- a/lib/libc/sys/sendto.c +++ b/lib/libc/sys/sendto.c @@ -41,8 +41,5 @@ ssize_t sendto(int s, const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen) { - return (((ssize_t (*)(int, const void *, size_t, int, - const struct sockaddr *, socklen_t)) - *(__libc_interposing_slot(INTERPOS_sendto))) - (s, msg, len, flags, to, tolen)); + return (INTERPOS_SYS(sendto, s, msg, len, flags, to, tolen)); } diff --git a/lib/libc/sys/setcontext.c b/lib/libc/sys/setcontext.c index e54d4ba82395..96b5dc115067 100644 --- a/lib/libc/sys/setcontext.c +++ b/lib/libc/sys/setcontext.c @@ -42,6 +42,5 @@ __sym_default(setcontext, setcontext, FBSD_1.2); int setcontext(const ucontext_t *uc) { - return (((int (*)(const ucontext_t *)) - *(__libc_interposing_slot(INTERPOS_setcontext)))(uc)); + return (INTERPOS_SYS(setcontext, uc)); } diff --git a/lib/libc/sys/sigaction.c b/lib/libc/sys/sigaction.c index 07593a4e540d..809881ca4d3f 100644 --- a/lib/libc/sys/sigaction.c +++ b/lib/libc/sys/sigaction.c @@ -40,6 +40,5 @@ __weak_reference(sigaction, __libc_sigaction); int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { - return (((int (*)(int, const struct sigaction *, struct sigaction *)) - *(__libc_interposing_slot(INTERPOS_sigaction)))(sig, act, oact)); + return (INTERPOS_SYS(sigaction, sig, act, oact)); } diff --git a/lib/libc/sys/sigprocmask.c b/lib/libc/sys/sigprocmask.c index 6b20065ff6d1..96cb9586509b 100644 --- a/lib/libc/sys/sigprocmask.c +++ b/lib/libc/sys/sigprocmask.c @@ -40,6 +40,5 @@ __weak_reference(sigprocmask, __libc_sigprocmask); int sigprocmask(int how, const sigset_t *set, sigset_t *oset) { - return (((int (*)(int, const sigset_t *, sigset_t *)) - *(__libc_interposing_slot(INTERPOS_sigprocmask)))(how, set, oset)); + return (INTERPOS_SYS(sigprocmask, how, set, oset)); } diff --git a/lib/libc/sys/sigsuspend.c b/lib/libc/sys/sigsuspend.c index 32125eb846be..e5a9495f9f39 100644 --- a/lib/libc/sys/sigsuspend.c +++ b/lib/libc/sys/sigsuspend.c @@ -40,6 +40,5 @@ __weak_reference(sigsuspend, __libc_sigsuspend); int sigsuspend(const sigset_t *set) { - return (((int (*)(const sigset_t *)) - *(__libc_interposing_slot(INTERPOS_sigsuspend)))(set)); + return (INTERPOS_SYS(sigsuspend, set)); } diff --git a/lib/libc/sys/sigtimedwait.c b/lib/libc/sys/sigtimedwait.c index 4b449407e754..839e5fe4d992 100644 --- a/lib/libc/sys/sigtimedwait.c +++ b/lib/libc/sys/sigtimedwait.c @@ -40,7 +40,5 @@ int sigtimedwait(const sigset_t * __restrict set, siginfo_t * __restrict info, const struct timespec * __restrict t) { - return (((int (*)(const sigset_t *, siginfo_t *, - const struct timespec *)) - *(__libc_interposing_slot(INTERPOS_sigtimedwait)))(set, info, t)); + return (INTERPOS_SYS(sigtimedwait, set, info, t)); } diff --git a/lib/libc/sys/sigwait.c b/lib/libc/sys/sigwait.c index 23c341461639..5a7d71bf3ed9 100644 --- a/lib/libc/sys/sigwait.c +++ b/lib/libc/sys/sigwait.c @@ -32,6 +32,5 @@ int sigwait(const sigset_t *set, int *sig) { - return (((int (*)(const sigset_t *, int *)) - *(__libc_interposing_slot(INTERPOS_sigwait)))(set, sig)); + return (INTERPOS_SYS(sigwait, set, sig)); } diff --git a/lib/libc/sys/sigwaitinfo.c b/lib/libc/sys/sigwaitinfo.c index d8a0780441d1..611d09c3c221 100644 --- a/lib/libc/sys/sigwaitinfo.c +++ b/lib/libc/sys/sigwaitinfo.c @@ -39,6 +39,5 @@ __weak_reference(__sys_sigwaitinfo, __sigwaitinfo); int sigwaitinfo(const sigset_t * __restrict set, siginfo_t * __restrict info) { - return (((int (*)(const sigset_t *, siginfo_t *)) - *(__libc_interposing_slot(INTERPOS_sigwaitinfo)))(set, info)); + return (INTERPOS_SYS(sigwaitinfo, set, info)); } diff --git a/lib/libc/sys/swapcontext.c b/lib/libc/sys/swapcontext.c index 0793dd838526..b69a5b19e698 100644 --- a/lib/libc/sys/swapcontext.c +++ b/lib/libc/sys/swapcontext.c @@ -44,6 +44,5 @@ __sym_default(swapcontext, swapcontext, FBSD_1.2); int swapcontext(ucontext_t *oucp, const ucontext_t *ucp) { - return (((int (*)(ucontext_t *, const ucontext_t *)) - *(__libc_interposing_slot(INTERPOS_swapcontext)))(oucp, ucp)); + return (INTERPOS_SYS(swapcontext, oucp, ucp)); } diff --git a/lib/libc/sys/wait.c b/lib/libc/sys/wait.c index 7c847a616003..6678ecc522ba 100644 --- a/lib/libc/sys/wait.c +++ b/lib/libc/sys/wait.c @@ -43,9 +43,7 @@ pid_t __wait(int *); pid_t __wait(int *istat) { - return (((pid_t (*)(pid_t, int *, int, struct rusage *)) - *(__libc_interposing_slot(INTERPOS_wait4))) - (WAIT_ANY, istat, 0, NULL)); + return (INTERPOS_SYS(wait4, WAIT_ANY, istat, 0, NULL)); } __weak_reference(__wait, wait); diff --git a/lib/libc/sys/wait3.c b/lib/libc/sys/wait3.c index 5d7d7bc22a67..4e98ccff5227 100644 --- a/lib/libc/sys/wait3.c +++ b/lib/libc/sys/wait3.c @@ -43,9 +43,7 @@ pid_t __wait3(int *, int, struct rusage *); pid_t __wait3(int *istat, int options, struct rusage *rup) { - return (((pid_t (*)(pid_t, int *, int, struct rusage *)) - *(__libc_interposing_slot(INTERPOS_wait4))) - (WAIT_ANY, istat, options, rup)); + return (INTERPOS_SYS(wait4, WAIT_ANY, istat, options, rup)); } __weak_reference(__wait3, wait3); diff --git a/lib/libc/sys/wait4.c b/lib/libc/sys/wait4.c index eab2e9b6e2c0..57b0071ef87f 100644 --- a/lib/libc/sys/wait4.c +++ b/lib/libc/sys/wait4.c @@ -39,7 +39,5 @@ __weak_reference(__sys_wait4, __wait4); pid_t wait4(pid_t pid, int *status, int options, struct rusage *ru) { - return (((pid_t (*)(pid_t, int *, int, struct rusage *)) - *(__libc_interposing_slot(INTERPOS_wait4))) - (pid, status, options, ru)); + return (INTERPOS_SYS(wait4, pid, status, options, ru)); } diff --git a/lib/libc/sys/wait6.c b/lib/libc/sys/wait6.c index eff40eae3b76..118a7ef6b99e 100644 --- a/lib/libc/sys/wait6.c +++ b/lib/libc/sys/wait6.c @@ -41,7 +41,5 @@ pid_t wait6(idtype_t idtype, id_t id, int *status, int options, struct __wrusage *ru, siginfo_t *infop) { - return (((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *, - siginfo_t *))*(__libc_interposing_slot(INTERPOS_wait6))) - (idtype, id, status, options, ru, infop)); + return (INTERPOS_SYS(wait6, idtype, id, status, options, ru, infop)); } diff --git a/lib/libc/sys/waitid.c b/lib/libc/sys/waitid.c index f885e8f55912..334f25e99bb6 100644 --- a/lib/libc/sys/waitid.c +++ b/lib/libc/sys/waitid.c @@ -46,9 +46,7 @@ __waitid(idtype_t idtype, id_t id, siginfo_t *info, int flags) int status; pid_t ret; - ret = ((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *, - siginfo_t *))*(__libc_interposing_slot(INTERPOS_wait6))) - (idtype, id, &status, flags, NULL, info); + ret = INTERPOS_SYS(wait6, idtype, id, &status, flags, NULL, info); /* * According to SUSv4, waitid() shall not return a PID when a diff --git a/lib/libc/sys/waitpid.c b/lib/libc/sys/waitpid.c index 971c598d6a93..d8fdcec23a1c 100644 --- a/lib/libc/sys/waitpid.c +++ b/lib/libc/sys/waitpid.c @@ -43,9 +43,7 @@ pid_t __waitpid(pid_t, int *, int); pid_t __waitpid(pid_t pid, int *istat, int options) { - return (((pid_t (*)(pid_t, int *, int, struct rusage *)) - *(__libc_interposing_slot(INTERPOS_wait4))) - (pid, istat, options, NULL)); + return (INTERPOS_SYS(wait4, pid, istat, options, NULL)); } __weak_reference(__waitpid, waitpid); diff --git a/lib/libc/sys/write.c b/lib/libc/sys/write.c index c2050374431b..5880856b8af8 100644 --- a/lib/libc/sys/write.c +++ b/lib/libc/sys/write.c @@ -40,6 +40,5 @@ __weak_reference(__sys_write, __write); ssize_t write(int fd, const void *buf, size_t nbytes) { - return (((ssize_t (*)(int, const void *, size_t)) - *(__libc_interposing_slot(INTERPOS_write)))(fd, buf, nbytes)); + return (INTERPOS_SYS(write, fd, buf, nbytes)); } diff --git a/lib/libc/sys/writev.c b/lib/libc/sys/writev.c index 40f6f2f211ae..9a32cb603ab8 100644 --- a/lib/libc/sys/writev.c +++ b/lib/libc/sys/writev.c @@ -41,6 +41,5 @@ __weak_reference(__sys_writev, __writev); ssize_t writev(int fd, const struct iovec *iov, int iovcnt) { - return (((ssize_t (*)(int, const struct iovec *, int)) - *(__libc_interposing_slot(INTERPOS_writev)))(fd, iov, iovcnt)); + return (INTERPOS_SYS(writev, fd, iov, iovcnt)); } From nobody Tue Apr 16 18:24:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJsrV4khtz5HJGQ; Tue, 16 Apr 2024 18:24: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 4VJsrV49bBz4jVJ; Tue, 16 Apr 2024 18:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713291866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KbmW96CS0ne+ulqCcNbf3qLUTM9zUlgof9Epwbbm5S4=; b=pWgLySHO7N4sI2GfdeN7osN3JSBqsgNaCQFe9HweJlEUPgVbJYgMXM3H+e11/WFSlwvwwz IKG3IkYMfjE4hnlGijwvIZ+L1+7AfF9sqWbcctkjO8bU3So5MUgUe4mDnssZ9rRBe4yKPU Tgv9n9+HK0CY/npxEot8OuVBrbmc/C3YD+xt/IsRn9914KLvTfH2s1avZTjEjkNXw6sAs2 4Pup7kApXxswNy3RgJu/eAvfVDSChMmqPQ1B8bC2zJJf/7xBd5OhZ20F5O/GKD9bBUoqL1 8F1wd7A/0N8r0DJpUUpVxPq8EQOfdSN+JZF59yWYmauiBJDe+Sn8xxbKkD7BKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713291866; a=rsa-sha256; cv=none; b=JAZNt/PvAA+42RrqMpgu8CHEohQ6knWSGSqUpjdLSiHpa22g5Ub9+8NegAgFzJQtyU8xAT 0lsReQrO1FE5k7jORo9/WssTA636ucoCi9yId6gdKUo7JQ/ACL3RK/vyt37BMB7Q8WPKMx up2YUSy9oHJNk4dg0t1OUaMScX2KZonOCvm32514E1J0dxxAOqcvzeHJsHVTpWXIJv411+ y2E0yKw2Wwdn2hvkRw/c5pYDjumkbdvsz3ezp4uxn9KiqPsb7byuf3HuwW5NLm18y08jtn Pm/RyiJQGEiWv3KVIklt0G19qyHEURAVOvTOG5avHcR8Y5zOzXTtb2pQeJAsHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713291866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KbmW96CS0ne+ulqCcNbf3qLUTM9zUlgof9Epwbbm5S4=; b=BiGQOzTeJvuy0VgXkJECe8NBPg12+6sRSqeESyy9BPs0bCFKK04Mlk4XlmOHoaex2+qsoO olyuVMRWfYyItwUKZ6rSY+fE2KyD/zgmF2gYOEhaP1sTdKz7jDIYIWJUWzoCJjQv/5Z2ua QSj+FAwLdu9M6lyI5ne0jLX0h4qrezPmuiVwaqLKankNihWgv9YPO83lwNiP9bBVVINUDk AWETJ80pD9xAMaWbkgfq1lGqKhpB7SAWFRWKCB94XeXXfKPNVxIS9tuAI6Onib4r7G5BHA houUhB9SIWaCLhaybCzoXI8B/aQaBUreEfEFdOmYr5R9Is58QZEsKyI1GdVEDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJsrV3mfcztsk; Tue, 16 Apr 2024 18:24: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 43GIOQqj049750; Tue, 16 Apr 2024 18:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GIOQkr049747; Tue, 16 Apr 2024 18:24:26 GMT (envelope-from git) Date: Tue, 16 Apr 2024 18:24:26 GMT Message-Id: <202404161824.43GIOQkr049747@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: d51c59002367 - main - mfc-candidates: fix output order with incorrect commit dates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d51c590023675ca20a7da74d75a3b5a5dcfdfddc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d51c590023675ca20a7da74d75a3b5a5dcfdfddc commit d51c590023675ca20a7da74d75a3b5a5dcfdfddc Author: Ed Maste AuthorDate: 2024-04-16 15:41:05 +0000 Commit: Ed Maste CommitDate: 2024-04-16 18:20:40 +0000 mfc-candidates: fix output order with incorrect commit dates Previously we obtained the list of MFC candidate hashes (i.e., those commits only in the mfc-from branch), removed the already-merged commits based on "cherry picked from" commit message entries, and then printed the list sorted by commit time. This is usually the correct order, but it is not when commits have non-monotonically-increasing commit times. This is unfortunately the case for a number of commits in our tree. This made it difficult to merge some groups of dependent commits in the correct order. Instead, leave the from-list in git rev-parse order, and move the matching logic to a new lua script. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44808 --- tools/tools/git/candidatematch.lua | 66 ++++++++++++++++++++++++++++++++++++++ tools/tools/git/mfc-candidates.sh | 19 ++++------- 2 files changed, 72 insertions(+), 13 deletions(-) diff --git a/tools/tools/git/candidatematch.lua b/tools/tools/git/candidatematch.lua new file mode 100755 index 000000000000..98c247fca339 --- /dev/null +++ b/tools/tools/git/candidatematch.lua @@ -0,0 +1,66 @@ +#!/usr/libexec/flua + +-- MFC candidate script utility - $0 from-file to-file +-- +-- from-file specifies hashes that exist only in the "MFC from" branch and +-- to-file specifies the original hashes of commits already merged to the +-- "MFC to" branch. + +-- SPDX-License-Identifier: BSD-2-Clause +-- Copyright 2024 The FreeBSD Foundation + +-- Read a file and return its content as a table +local function read_file(filename) + local file = assert(io.open(filename, "r")) + local content = {} + for line in file:lines() do + table.insert(content, line) + end + file:close() + return content +end + +-- Remove hashes from 'set1' list that are present in 'set2' list +local function set_difference(set1, set2) + local set2_values = {} + for _, value in ipairs(set2) do + set2_values[value] = true + end + + local result = {} + for _, value in ipairs(set1) do + if not set2_values[value] then + table.insert(result, value) + end + end + return result +end + +-- Main function +local function main() + local from_file = arg[1] + local to_file = arg[2] + local exclude_file = arg[3] + + if not from_file or not to_file then + print("Usage: flua $0 from-file to-file") + return + end + + local from_hashes = read_file(from_file) + local to_hashes = read_file(to_file) + + local result_hashes = set_difference(from_hashes, to_hashes) + + if exclude_file then + exclude_hashes = read_file(exclude_file) + result_hashes = set_difference(result_hashes, exclude_hashes) + end + + -- Print the result + for _, hash in ipairs(result_hashes) do + print(hash) + end +end + +main() diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index d7fd4b5ded13..0787e1278991 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -124,16 +124,14 @@ fi # Commits in from_branch after branch point commits_from() { - git rev-list --first-parent $authorarg $to_branch..$from_branch "$@" |\ - sort + git rev-list --first-parent --reverse $authorarg $to_branch..$from_branch "$@" } # "cherry picked from" hashes from commits in to_branch after branch point commits_to() { git log $from_branch..$to_branch --grep 'cherry picked from' "$@" |\ - sed -E -n 's/^[[:space:]]*\(cherry picked from commit ([0-9a-f]+)\)[[:space:]]*$/\1/p' |\ - sort + sed -E -n 's/^[[:space:]]*\(cherry picked from commit ([0-9a-f]+)\)[[:space:]]*$/\1/p' } # Turn a list of short hashes (and optional descriptions) into a list of full @@ -164,16 +162,11 @@ fi commits_from "$@" > $from_list commits_to "$@" > $to_list -comm -23 $from_list $to_list > $candidate_list +/usr/libexec/flua $(dirname $0)/candidatematch.lua \ + $from_list $to_list $exclude_list > $candidate_list -if [ -n "$exclude_file" ]; then - mv $candidate_list $candidate_list.bak - comm -23 $candidate_list.bak $exclude_list > $candidate_list -fi - -# Sort by (but do not print) commit time while read hash; do - git show --pretty='%ct %h %s' --no-patch $hash -done < $candidate_list | sort -n | cut -d ' ' -f 2- + git show --pretty='%h %s' --no-patch $hash +done < $candidate_list rm -rf "$workdir" From nobody Tue Apr 16 20:37:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJwp43dDRz5H2ny; Tue, 16 Apr 2024 20:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJwp41jL9z4MGF; Tue, 16 Apr 2024 20:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713299852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWM9AfC1x/LNBM5mW/IOl+/4YSiQyrHiLq4EJnEG7Qc=; b=ofYBMjLFQrC7ugr2jiBaJouOh9YDFAWY0+mcEg9J3OPbmID48AHni4czjeZeTk5+2Pmx3M n2lVnWFprtMdrh/kRYPQroBZX1IpE+2bU5pjJlo2EmMfgY0Z2rx9w6DaXBRBmN6b0TsMdn m5IjSX8ufBb+JV++kPOWoJIDqosSVl4l5njXQA865W5ndmTKJ+NMmxclE34ocxAPAPfgzB H6/QaSgINrBmXX4I2Rkj2EZ9beyXUToJ8o50Q0nzFZpNfi9jYQceaoKhYbkWgkTNe5SNxj 1+y32VKC3Ip6XhC0e/XlNmjr40OV2mHN1aq76lToiJ6V0pgTqZmhLsK0E28vNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713299852; a=rsa-sha256; cv=none; b=xbR31MqVY+fT49H/lE5epAaGw5t5EQwKRxkiFbLofU+b24/wTWBvgRl3kouHoMj0L0Cbek 5lTYxkhktfgUvyLPh5rKCPI9lipLu+OZsjRffGCWLrmzPoRw/61o44gfWdJ2USsdmKK04D /jAFqjXL48JOfFMgegFbVgEyxZHVqd1CZ9azYXf8KpGqROY2SN0b0aFiYqeTkYsss2eZwm eRt4r9WypJHv0oydX9seW+C6sICIypX9TUWf5OhOlCqWNmU7JQoEXf9hxnG5UzRsfh5AbH 4t50UeT+Wf+EeQXtbPKe0JlnWNWcqUgCU0bNxkE88eFJ3/svuOjPuk90ri8M9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713299852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zWM9AfC1x/LNBM5mW/IOl+/4YSiQyrHiLq4EJnEG7Qc=; b=uNUAGFUyqFXOZDdNdznVr+cjjGmH8OnA1sFjp0ioVCYN0pPnwebmg7UfkG8lM8CIFwv1g0 HCqKUyhHPZWDjKsbWoGY5ZsBJpn69WwunFmuFrFq71sOKcwUNjU/aWXHAW0v6Fad+xZtki z2mEHFU3wgqA9wWxdhXIGxsOP585kD9olvuj++IRCFUnMGWBmoqDbodlQ6VOxiTB5BjQC9 RfZ7d2sMEFjPZHdT053QEda+oe5lOBylGaGllEU0oaf7viGm83aAAnKKYVLERKgM0d14dB ubu99sMO2cl/YQEKXe8pJoW7g0ljN6N6UR750ti+9KWCT9G9pFT4FgNhLBOoVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJwp41K5Szy37; Tue, 16 Apr 2024 20:37: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 43GKbW1w075989; Tue, 16 Apr 2024 20:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKbWNp075986; Tue, 16 Apr 2024 20:37:32 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:37:32 GMT Message-Id: <202404162037.43GKbWNp075986@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: e4a0c92e7aea - main - iflib: Correct indentation according to style(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e4a0c92e7aea50654290e3082668932cea16b64f Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=e4a0c92e7aea50654290e3082668932cea16b64f commit e4a0c92e7aea50654290e3082668932cea16b64f Author: Stephen J. Kiernan AuthorDate: 2024-04-16 18:35:57 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-16 20:36:25 +0000 iflib: Correct indentation according to style(9) The indentation style for the SYSCTL_* macros used was not matching KNF. Reported by: jhb Differential Revision: https://reviews.freebsd.org/D44811 --- sys/net/iflib.c | 277 +++++++++++++++++++++++++++----------------------------- 1 file changed, 135 insertions(+), 142 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 53f18fc90dfe..5e1f71f6f9c2 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -575,13 +575,15 @@ static SYSCTL_NODE(_net, OID_AUTO, iflib, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, */ static int iflib_min_tx_latency = 0; SYSCTL_INT(_net_iflib, OID_AUTO, min_tx_latency, CTLFLAG_RW, - &iflib_min_tx_latency, 0, "minimize transmit latency at the possible expense of throughput"); + &iflib_min_tx_latency, 0, + "minimize transmit latency at the possible expense of throughput"); static int iflib_no_tx_batch = 0; SYSCTL_INT(_net_iflib, OID_AUTO, no_tx_batch, CTLFLAG_RW, - &iflib_no_tx_batch, 0, "minimize transmit latency at the possible expense of throughput"); + &iflib_no_tx_batch, 0, + "minimize transmit latency at the possible expense of throughput"); static int iflib_timer_default = 1000; SYSCTL_INT(_net_iflib, OID_AUTO, timer_default, CTLFLAG_RW, - &iflib_timer_default, 0, "number of ticks between iflib_timer calls"); + &iflib_timer_default, 0, "number of ticks between iflib_timer calls"); #if IFLIB_DEBUG_COUNTERS @@ -594,31 +596,31 @@ static int iflib_fl_refills; static int iflib_fl_refills_large; static int iflib_tx_frees; -SYSCTL_INT(_net_iflib, OID_AUTO, tx_seen, CTLFLAG_RD, - &iflib_tx_seen, 0, "# TX mbufs seen"); -SYSCTL_INT(_net_iflib, OID_AUTO, tx_sent, CTLFLAG_RD, - &iflib_tx_sent, 0, "# TX mbufs sent"); -SYSCTL_INT(_net_iflib, OID_AUTO, tx_encap, CTLFLAG_RD, - &iflib_tx_encap, 0, "# TX mbufs encapped"); -SYSCTL_INT(_net_iflib, OID_AUTO, tx_frees, CTLFLAG_RD, - &iflib_tx_frees, 0, "# TX frees"); -SYSCTL_INT(_net_iflib, OID_AUTO, rx_allocs, CTLFLAG_RD, - &iflib_rx_allocs, 0, "# RX allocations"); -SYSCTL_INT(_net_iflib, OID_AUTO, fl_refills, CTLFLAG_RD, - &iflib_fl_refills, 0, "# refills"); +SYSCTL_INT(_net_iflib, OID_AUTO, tx_seen, CTLFLAG_RD, &iflib_tx_seen, 0, + "# TX mbufs seen"); +SYSCTL_INT(_net_iflib, OID_AUTO, tx_sent, CTLFLAG_RD, &iflib_tx_sent, 0, + "# TX mbufs sent"); +SYSCTL_INT(_net_iflib, OID_AUTO, tx_encap, CTLFLAG_RD, &iflib_tx_encap, 0, + "# TX mbufs encapped"); +SYSCTL_INT(_net_iflib, OID_AUTO, tx_frees, CTLFLAG_RD, &iflib_tx_frees, 0, + "# TX frees"); +SYSCTL_INT(_net_iflib, OID_AUTO, rx_allocs, CTLFLAG_RD, &iflib_rx_allocs, 0, + "# RX allocations"); +SYSCTL_INT(_net_iflib, OID_AUTO, fl_refills, CTLFLAG_RD, &iflib_fl_refills, 0, + "# refills"); SYSCTL_INT(_net_iflib, OID_AUTO, fl_refills_large, CTLFLAG_RD, - &iflib_fl_refills_large, 0, "# large refills"); + &iflib_fl_refills_large, 0, "# large refills"); static int iflib_txq_drain_flushing; static int iflib_txq_drain_oactive; static int iflib_txq_drain_notready; SYSCTL_INT(_net_iflib, OID_AUTO, txq_drain_flushing, CTLFLAG_RD, - &iflib_txq_drain_flushing, 0, "# drain flushes"); + &iflib_txq_drain_flushing, 0, "# drain flushes"); SYSCTL_INT(_net_iflib, OID_AUTO, txq_drain_oactive, CTLFLAG_RD, - &iflib_txq_drain_oactive, 0, "# drain oactives"); + &iflib_txq_drain_oactive, 0, "# drain oactives"); SYSCTL_INT(_net_iflib, OID_AUTO, txq_drain_notready, CTLFLAG_RD, - &iflib_txq_drain_notready, 0, "# drain notready"); + &iflib_txq_drain_notready, 0, "# drain notready"); static int iflib_encap_load_mbuf_fail; static int iflib_encap_pad_mbuf_fail; @@ -626,13 +628,13 @@ static int iflib_encap_txq_avail_fail; static int iflib_encap_txd_encap_fail; SYSCTL_INT(_net_iflib, OID_AUTO, encap_load_mbuf_fail, CTLFLAG_RD, - &iflib_encap_load_mbuf_fail, 0, "# busdma load failures"); + &iflib_encap_load_mbuf_fail, 0, "# busdma load failures"); SYSCTL_INT(_net_iflib, OID_AUTO, encap_pad_mbuf_fail, CTLFLAG_RD, - &iflib_encap_pad_mbuf_fail, 0, "# runt frame pad failures"); + &iflib_encap_pad_mbuf_fail, 0, "# runt frame pad failures"); SYSCTL_INT(_net_iflib, OID_AUTO, encap_txq_avail_fail, CTLFLAG_RD, - &iflib_encap_txq_avail_fail, 0, "# txq avail failures"); + &iflib_encap_txq_avail_fail, 0, "# txq avail failures"); SYSCTL_INT(_net_iflib, OID_AUTO, encap_txd_encap_fail, CTLFLAG_RD, - &iflib_encap_txd_encap_fail, 0, "# driver encap failures"); + &iflib_encap_txd_encap_fail, 0, "# driver encap failures"); static int iflib_task_fn_rxs; static int iflib_rx_intr_enables; @@ -644,22 +646,22 @@ static int iflib_rxd_flush; static int iflib_verbose_debug; -SYSCTL_INT(_net_iflib, OID_AUTO, task_fn_rx, CTLFLAG_RD, - &iflib_task_fn_rxs, 0, "# task_fn_rx calls"); +SYSCTL_INT(_net_iflib, OID_AUTO, task_fn_rx, CTLFLAG_RD, &iflib_task_fn_rxs, 0, + "# task_fn_rx calls"); SYSCTL_INT(_net_iflib, OID_AUTO, rx_intr_enables, CTLFLAG_RD, - &iflib_rx_intr_enables, 0, "# RX intr enables"); -SYSCTL_INT(_net_iflib, OID_AUTO, fast_intrs, CTLFLAG_RD, - &iflib_fast_intrs, 0, "# fast_intr calls"); -SYSCTL_INT(_net_iflib, OID_AUTO, rx_unavail, CTLFLAG_RD, - &iflib_rx_unavail, 0, "# times rxeof called with no available data"); + &iflib_rx_intr_enables, 0, "# RX intr enables"); +SYSCTL_INT(_net_iflib, OID_AUTO, fast_intrs, CTLFLAG_RD, &iflib_fast_intrs, 0, + "# fast_intr calls"); +SYSCTL_INT(_net_iflib, OID_AUTO, rx_unavail, CTLFLAG_RD, &iflib_rx_unavail, 0, + "# times rxeof called with no available data"); SYSCTL_INT(_net_iflib, OID_AUTO, rx_ctx_inactive, CTLFLAG_RD, - &iflib_rx_ctx_inactive, 0, "# times rxeof called with inactive context"); -SYSCTL_INT(_net_iflib, OID_AUTO, rx_if_input, CTLFLAG_RD, - &iflib_rx_if_input, 0, "# times rxeof called if_input"); -SYSCTL_INT(_net_iflib, OID_AUTO, rxd_flush, CTLFLAG_RD, - &iflib_rxd_flush, 0, "# times rxd_flush called"); + &iflib_rx_ctx_inactive, 0, "# times rxeof called with inactive context"); +SYSCTL_INT(_net_iflib, OID_AUTO, rx_if_input, CTLFLAG_RD, &iflib_rx_if_input, + 0, "# times rxeof called if_input"); +SYSCTL_INT(_net_iflib, OID_AUTO, rxd_flush, CTLFLAG_RD, &iflib_rxd_flush, 0, + "# times rxd_flush called"); SYSCTL_INT(_net_iflib, OID_AUTO, verbose_debug, CTLFLAG_RW, - &iflib_verbose_debug, 0, "enable verbose debugging"); + &iflib_verbose_debug, 0, "enable verbose debugging"); #define DBG_COUNTER_INC(name) atomic_add_int(&(iflib_ ## name), 1) static void @@ -6766,42 +6768,41 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) ctx_list = device_get_sysctl_ctx(dev); child = SYSCTL_CHILDREN(device_get_sysctl_tree(dev)); - ctx->ifc_sysctl_node = node = SYSCTL_ADD_NODE(ctx_list, child, OID_AUTO, "iflib", - CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "IFLIB fields"); + ctx->ifc_sysctl_node = node = SYSCTL_ADD_NODE(ctx_list, child, + OID_AUTO, "iflib", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, + "IFLIB fields"); oid_list = SYSCTL_CHILDREN(node); SYSCTL_ADD_CONST_STRING(ctx_list, oid_list, OID_AUTO, "driver_version", - CTLFLAG_RD, ctx->ifc_sctx->isc_driver_version, - "driver version"); + CTLFLAG_RD, ctx->ifc_sctx->isc_driver_version, "driver version"); 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 #"); + CTLFLAG_RWTUN, &ctx->ifc_sysctl_ntxqs, 0, + "# 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 #"); + CTLFLAG_RWTUN, &ctx->ifc_sysctl_nrxqs, 0, + "# 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"); + 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"); + CTLFLAG_RWTUN, &ctx->ifc_sysctl_rx_budget, 0, "set the RX budget"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "tx_abdicate", - CTLFLAG_RWTUN, &ctx->ifc_sysctl_tx_abdicate, 0, - "cause TX to abdicate instead of running to completion"); + CTLFLAG_RWTUN, &ctx->ifc_sysctl_tx_abdicate, 0, + "cause TX to abdicate instead of running to completion"); ctx->ifc_sysctl_core_offset = CORE_OFFSET_UNSPECIFIED; SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "core_offset", - CTLFLAG_RDTUN, &ctx->ifc_sysctl_core_offset, 0, - "offset to start using cores at"); + 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"); + CTLFLAG_RDTUN, &ctx->ifc_sysctl_use_logical_cores, 0, + "try to make use of logical cores for TX and RX"); /* XXX change for per-queue sizes */ SYSCTL_ADD_PROC(ctx_list, oid_list, OID_AUTO, "override_ntxds", @@ -6847,77 +6848,71 @@ iflib_add_device_sysctl_post(if_ctx_t ctx) CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Queue Name"); queue_list = SYSCTL_CHILDREN(queue_node); SYSCTL_ADD_INT(ctx_list, queue_list, OID_AUTO, "cpu", - CTLFLAG_RD, - &txq->ift_task.gt_cpu, 0, "cpu this queue is bound to"); + CTLFLAG_RD, &txq->ift_task.gt_cpu, 0, + "cpu this queue is bound to"); #if MEMORY_LOGGING SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txq_dequeued", - CTLFLAG_RD, - &txq->ift_dequeued, "total mbufs freed"); + CTLFLAG_RD, &txq->ift_dequeued, "total mbufs freed"); SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txq_enqueued", - CTLFLAG_RD, - &txq->ift_enqueued, "total mbufs enqueued"); + CTLFLAG_RD, &txq->ift_enqueued, "total mbufs enqueued"); #endif SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "mbuf_defrag", - CTLFLAG_RD, - &txq->ift_mbuf_defrag, "# of times m_defrag was called"); + CTLFLAG_RD, &txq->ift_mbuf_defrag, + "# of times m_defrag was called"); SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "m_pullups", - CTLFLAG_RD, - &txq->ift_pullups, "# of times m_pullup was called"); - SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "mbuf_defrag_failed", - CTLFLAG_RD, - &txq->ift_mbuf_defrag_failed, "# of times m_defrag failed"); - SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "no_desc_avail", - CTLFLAG_RD, - &txq->ift_no_desc_avail, "# of times no descriptors were available"); - SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "tx_map_failed", - CTLFLAG_RD, - &txq->ift_map_failed, "# of times DMA map failed"); - SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txd_encap_efbig", - CTLFLAG_RD, - &txq->ift_txd_encap_efbig, "# of times txd_encap returned EFBIG"); - SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "no_tx_dma_setup", - CTLFLAG_RD, - &txq->ift_no_tx_dma_setup, "# of times map failed for other than EFBIG"); + CTLFLAG_RD, &txq->ift_pullups, + "# of times m_pullup was called"); + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, + "mbuf_defrag_failed", CTLFLAG_RD, + &txq->ift_mbuf_defrag_failed, "# of times m_defrag failed"); + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, + "no_desc_avail", CTLFLAG_RD, &txq->ift_no_desc_avail, + "# of times no descriptors were available"); + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, + "tx_map_failed", CTLFLAG_RD, &txq->ift_map_failed, + "# of times DMA map failed"); + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, + "txd_encap_efbig", CTLFLAG_RD, &txq->ift_txd_encap_efbig, + "# of times txd_encap returned EFBIG"); + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, + "no_tx_dma_setup", CTLFLAG_RD, &txq->ift_no_tx_dma_setup, + "# of times map failed for other than EFBIG"); SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, "txq_pidx", - CTLFLAG_RD, - &txq->ift_pidx, 1, "Producer Index"); + CTLFLAG_RD, &txq->ift_pidx, 1, "Producer Index"); SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, "txq_cidx", - CTLFLAG_RD, - &txq->ift_cidx, 1, "Consumer Index"); - SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, "txq_cidx_processed", - CTLFLAG_RD, - &txq->ift_cidx_processed, 1, "Consumer Index seen by credit update"); + CTLFLAG_RD, &txq->ift_cidx, 1, "Consumer Index"); + SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, + "txq_cidx_processed", CTLFLAG_RD, &txq->ift_cidx_processed, + 1, "Consumer Index seen by credit update"); SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, "txq_in_use", - CTLFLAG_RD, - &txq->ift_in_use, 1, "descriptors in use"); - SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txq_processed", - CTLFLAG_RD, - &txq->ift_processed, "descriptors procesed for clean"); + CTLFLAG_RD, &txq->ift_in_use, 1, "descriptors in use"); + SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, + "txq_processed", CTLFLAG_RD, &txq->ift_processed, + "descriptors procesed for clean"); SYSCTL_ADD_UQUAD(ctx_list, queue_list, OID_AUTO, "txq_cleaned", - CTLFLAG_RD, - &txq->ift_cleaned, "total cleaned"); + CTLFLAG_RD, &txq->ift_cleaned, "total cleaned"); SYSCTL_ADD_PROC(ctx_list, queue_list, OID_AUTO, "ring_state", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, __DEVOLATILE(uint64_t *, &txq->ift_br->state), 0, mp_ring_state_handler, "A", "soft ring state"); - SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, "r_enqueues", - CTLFLAG_RD, &txq->ift_br->enqueues, - "# of enqueues to the mp_ring for this queue"); - SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, "r_drops", - CTLFLAG_RD, &txq->ift_br->drops, - "# of drops in the mp_ring for this queue"); - SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, "r_starts", - CTLFLAG_RD, &txq->ift_br->starts, - "# of normal consumer starts in the mp_ring for this queue"); - SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, "r_stalls", - CTLFLAG_RD, &txq->ift_br->stalls, - "# of consumer stalls in the mp_ring for this queue"); - SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, "r_restarts", - CTLFLAG_RD, &txq->ift_br->restarts, - "# of consumer restarts in the mp_ring for this queue"); - SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, "r_abdications", - CTLFLAG_RD, &txq->ift_br->abdications, - "# of consumer abdications in the mp_ring for this queue"); + SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, + "r_enqueues", CTLFLAG_RD, &txq->ift_br->enqueues, + "# of enqueues to the mp_ring for this queue"); + SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, + "r_drops", CTLFLAG_RD, &txq->ift_br->drops, + "# of drops in the mp_ring for this queue"); + SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, + "r_starts", CTLFLAG_RD, &txq->ift_br->starts, + "# of normal consumer starts in mp_ring for this queue"); + SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, + "r_stalls", CTLFLAG_RD, &txq->ift_br->stalls, + "# of consumer stalls in the mp_ring for this queue"); + SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, + "r_restarts", CTLFLAG_RD, &txq->ift_br->restarts, + "# of consumer restarts in the mp_ring for this queue"); + SYSCTL_ADD_COUNTER_U64(ctx_list, queue_list, OID_AUTO, + "r_abdications", CTLFLAG_RD, &txq->ift_br->abdications, + "# of consumer abdications in the mp_ring for this queue"); } if (scctx->isc_nrxqsets > 100) @@ -6932,44 +6927,42 @@ iflib_add_device_sysctl_post(if_ctx_t ctx) CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Queue Name"); queue_list = SYSCTL_CHILDREN(queue_node); SYSCTL_ADD_INT(ctx_list, queue_list, OID_AUTO, "cpu", - CTLFLAG_RD, - &rxq->ifr_task.gt_cpu, 0, "cpu this queue is bound to"); + CTLFLAG_RD, &rxq->ifr_task.gt_cpu, 0, + "cpu this queue is bound to"); if (sctx->isc_flags & IFLIB_HAS_RXCQ) { - SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, "rxq_cq_cidx", - CTLFLAG_RD, - &rxq->ifr_cq_cidx, 1, "Consumer Index"); + SYSCTL_ADD_U16(ctx_list, queue_list, OID_AUTO, + "rxq_cq_cidx", CTLFLAG_RD, &rxq->ifr_cq_cidx, 1, + "Consumer Index"); } for (j = 0, fl = rxq->ifr_fl; j < rxq->ifr_nfl; j++, fl++) { snprintf(namebuf, NAME_BUFLEN, "rxq_fl%d", j); - fl_node = SYSCTL_ADD_NODE(ctx_list, queue_list, OID_AUTO, namebuf, - CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "freelist Name"); + fl_node = SYSCTL_ADD_NODE(ctx_list, queue_list, + OID_AUTO, namebuf, CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, "freelist Name"); fl_list = SYSCTL_CHILDREN(fl_node); SYSCTL_ADD_U16(ctx_list, fl_list, OID_AUTO, "pidx", - CTLFLAG_RD, - &fl->ifl_pidx, 1, "Producer Index"); + CTLFLAG_RD, &fl->ifl_pidx, 1, "Producer Index"); SYSCTL_ADD_U16(ctx_list, fl_list, OID_AUTO, "cidx", - CTLFLAG_RD, - &fl->ifl_cidx, 1, "Consumer Index"); + CTLFLAG_RD, &fl->ifl_cidx, 1, "Consumer Index"); SYSCTL_ADD_U16(ctx_list, fl_list, OID_AUTO, "credits", - CTLFLAG_RD, - &fl->ifl_credits, 1, "credits available"); + CTLFLAG_RD, &fl->ifl_credits, 1, + "credits available"); SYSCTL_ADD_U16(ctx_list, fl_list, OID_AUTO, "buf_size", - CTLFLAG_RD, - &fl->ifl_buf_size, 1, "buffer size"); + CTLFLAG_RD, &fl->ifl_buf_size, 1, "buffer size"); #if MEMORY_LOGGING - SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, "fl_m_enqueued", - CTLFLAG_RD, - &fl->ifl_m_enqueued, "mbufs allocated"); - SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, "fl_m_dequeued", - CTLFLAG_RD, - &fl->ifl_m_dequeued, "mbufs freed"); - SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, "fl_cl_enqueued", - CTLFLAG_RD, - &fl->ifl_cl_enqueued, "clusters allocated"); - SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, "fl_cl_dequeued", - CTLFLAG_RD, - &fl->ifl_cl_dequeued, "clusters freed"); + SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, + "fl_m_enqueued", CTLFLAG_RD, &fl->ifl_m_enqueued, + "mbufs allocated"); + SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, + "fl_m_dequeued", CTLFLAG_RD, &fl->ifl_m_dequeued, + "mbufs freed"); + SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, + "fl_cl_enqueued", CTLFLAG_RD, &fl->ifl_cl_enqueued, + "clusters allocated"); + SYSCTL_ADD_UQUAD(ctx_list, fl_list, OID_AUTO, + "fl_cl_dequeued", CTLFLAG_RD, &fl->ifl_cl_dequeued, + "clusters freed"); #endif } } From nobody Tue Apr 16 20:54:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxB93ZDlz5H3mH; Tue, 16 Apr 2024 20:54: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 4VJxB93Lq2z4NS9; Tue, 16 Apr 2024 20:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713300897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p6FBYe/bCHU6iWkf4Cd4ZNw1Il/uDOgWyF3W5ZB8LMM=; b=II3QG7iX6+hgP0ctO7R+y9EYrVB+Hb4zD9ZxDJHAGO+BGyqPMjKBLAuf7wS+4M24+6tgLX cuNaiZAt211U49o8qZ0wrBLy7wkIbv6i3sGSmp9CUl0bHJDPGnEUJ5PxN82ctOx1m4Xmuy ubgEJwgsYlbGpOzG7jNaRhj1s9b5C/HdatYVC1DHxojGsDr3MKY9SAZUcCex8IwQu5rd9B Rsy2O2tiPOhhd7ckBQ7PM0KOhBDisnN3RjG/w6wb7rEMnrp0UgtV/y6FFwiKbJ3DaUOsKx ltmF1X7aV4cw6U346WDBmZJKb/J4hw0wTng6kmn3m63iaUz9+XFKsir0xlT6sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713300897; a=rsa-sha256; cv=none; b=NbILxMrbfD9s21St+Kv1LrwBPbw7wX17BG7v5d61yrveN9OdZXxKbNXKfm9T4c7NVqCS+7 dmX3JY/YUhAhHmu1ou2B36tvl1kn6KGVbJMLivTkGRNDUzI4Z9jtLJuRdlh/xUKJS56Uwa plWbSbZUy/56NMPxxL5mSonh74VZYx8kK5CpkY4AvnvGLGSEa11DnKkDP0RZKr0kzQiupH WW5Q+3YwKr+4oNjmB32+acLeZXtstw+QNjQ2w3VwXInT3BBUZZoW0ODPtNAIRM4w2D/NEs V4J2fiZf6w1P7sj5kvAisa5BciCDovAL1BLib+ocRHTzMY4dQSUJcVpXVk2kTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713300897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p6FBYe/bCHU6iWkf4Cd4ZNw1Il/uDOgWyF3W5ZB8LMM=; b=EHip44pYRxxVpr6blyPntX4Yg3/PLMMEYVkK97CXVjCyhLU7jjP4nki2NGkoMX+ZfHSF7V a62UN6s2nQhi7J3KP2mt4yF0E2Ozjr7RRxkpfQzxEG/vP9eqdzXiq7fm5lGlwxAQ7plnaG N5REfDEP5JD4tEzW4GO4+sYDpeW/inKhqXP/4n7hQyzQegGW9R8Bcpyx2JhZtwHoSg4zQL Z+LPHKpHKadWrRahS8aImtt6n6h/+PqGnnNGIqqvq31HhsTumsAeH8/inR0TGRH5nKd2So d/ednzdmmTC47ssOYe2amiRGkTzCAVeSQ1dgpMrG5UfS4W9BH7ydCaZq6yCYHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxB92xbGzy4M; Tue, 16 Apr 2024 20:54: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 43GKsvu7009358; Tue, 16 Apr 2024 20:54:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKssXB009354; Tue, 16 Apr 2024 20:54:54 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:54:54 GMT Message-Id: <202404162054.43GKssXB009354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 1719886f6d08 - main - zfs: merge openzfs/zfs@90ba19eb7 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1719886f6d08408b834d270c59ffcfd821c8f63a Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=1719886f6d08408b834d270c59ffcfd821c8f63a commit 1719886f6d08408b834d270c59ffcfd821c8f63a Merge: e4a0c92e7aea 90ba19eb7b81 Author: Martin Matuska AuthorDate: 2024-04-16 20:52:34 +0000 Commit: Martin Matuska CommitDate: 2024-04-16 20:54:07 +0000 zfs: merge openzfs/zfs@90ba19eb7 Notable upstream pull request merges: #15784 90ba19eb7b Do no use .cfi_negate_ra_state within the assembly on Arm64 #15942 b6bbaa8372 Give a better message from 'zpool get' with invalid pool name #15943 ca678bc0bc Makefile.bsd: sort and cleanup source file list #15953 fa480fe5ba zinject: show more device fault fields #15983 30c4eba4ea Fix panics when truncating/deleting files #15992 99741bde59 zvol: use multiple taskq #16015 a100a195fa Add support for zfs mount -R #16022 5e5fd0a178 Speculative prefetch for reordered requests #16040 997f85b4d3 L2ARC: Relax locking during write #16042 b12738182c Improve dbuf_read() error reporting #16051 a9a4290173 xdr: header cleanup #16052 eeca9a91d6 Fix read errors race after block cloning #16057 aa5445c28b Remove db_state DB_NOFILL checks from syncing context #16061 76d1dde94c zinject: inject device errors into ioctls #16072 9e63631dea Small fix to prefetch ranges aggregation #16077 44f337be30 Illumos#16463 zfs_ioc_recv leaks nvlist #16085 4725e543be zinject: "no-op" error injection #16086 c6da985e28 Add the BTI elf note to the AArch64 SHA2 assembly Obtained from: OpenZFS OpenZFS commit: 90ba19eb7b81f0225e63bedfb902000d23383921 cddl/lib/libnvpair/Makefile | 2 - sys/contrib/openzfs/.mailmap | 18 + sys/contrib/openzfs/AUTHORS | 35 ++ sys/contrib/openzfs/cmd/arc_summary | 11 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 75 +++- sys/contrib/openzfs/cmd/zinject/zinject.c | 84 +++-- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 17 +- sys/contrib/openzfs/config/Substfiles.am | 3 +- sys/contrib/openzfs/config/kernel-blk-queue.m4 | 15 + sys/contrib/openzfs/config/kernel-blkdev.m4 | 159 ++++++-- .../openzfs/config/kernel-make-request-fn.m4 | 33 ++ sys/contrib/openzfs/config/zfs-build.m4 | 8 +- sys/contrib/openzfs/etc/init.d/README.md | 6 +- sys/contrib/openzfs/etc/init.d/zfs-import.in | 2 +- sys/contrib/openzfs/etc/init.d/zfs-load-key.in | 2 +- sys/contrib/openzfs/etc/init.d/zfs-mount.in | 2 +- sys/contrib/openzfs/etc/init.d/zfs-share.in | 3 +- sys/contrib/openzfs/etc/init.d/zfs-zed.in | 3 +- sys/contrib/openzfs/include/os/freebsd/Makefile.am | 3 - .../openzfs/include/os/freebsd/spl/rpc/xdr.h | 71 ---- .../openzfs/include/os/freebsd/spl/sys/debug.h | 149 +++++++- .../openzfs/include/os/freebsd/spl/sys/dkio.h | 34 -- sys/contrib/openzfs/include/os/linux/Makefile.am | 2 +- .../include/os/linux/kernel/linux/blkdev_compat.h | 6 +- .../os/linux/spl/{sys/dkio.h => rpc/types.h} | 25 +- sys/contrib/openzfs/include/os/linux/spl/rpc/xdr.h | 2 - .../openzfs/include/os/linux/spl/sys/debug.h | 152 +++++++- .../include/os/linux/zfs/sys/trace_common.h | 6 +- sys/contrib/openzfs/include/sys/dmu_zfetch.h | 16 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 8 +- sys/contrib/openzfs/include/sys/multilist.h | 5 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 3 +- sys/contrib/openzfs/include/sys/zap_leaf.h | 2 +- sys/contrib/openzfs/include/sys/zio.h | 6 +- sys/contrib/openzfs/include/sys/zio_impl.h | 21 +- sys/contrib/openzfs/lib/libspl/include/assert.h | 97 +++++ sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 6 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 1 + sys/contrib/openzfs/man/Makefile.am | 4 +- sys/contrib/openzfs/man/man4/zfs.4 | 18 + sys/contrib/openzfs/man/man7/vdevprops.7 | 8 +- sys/contrib/openzfs/man/man8/zfs-mount.8 | 6 +- sys/contrib/openzfs/man/man8/zinject.8 | 10 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 12 +- sys/contrib/openzfs/module/Makefile.bsd | 85 +++-- .../icp/asm-aarch64/blake3/b3_aarch64_sse2.S | 14 +- .../icp/asm-aarch64/blake3/b3_aarch64_sse41.S | 12 +- .../module/icp/asm-aarch64/sha2/sha256-armv8.S | 10 + .../module/icp/asm-aarch64/sha2/sha512-armv8.S | 10 + sys/contrib/openzfs/module/nvpair/nvpair.c | 1 + .../openzfs/module/os/freebsd/zfs/vdev_file.c | 11 +- .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 49 +-- sys/contrib/openzfs/module/os/linux/spl/spl-xdr.c | 1 + .../openzfs/module/os/linux/zfs/vdev_disk.c | 215 +++++++---- .../openzfs/module/os/linux/zfs/vdev_file.c | 46 +-- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 131 ++++++- sys/contrib/openzfs/module/zfs/arc.c | 184 ++++----- sys/contrib/openzfs/module/zfs/dbuf.c | 143 ++++--- sys/contrib/openzfs/module/zfs/dmu.c | 8 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 10 +- sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 289 +++++++++++--- sys/contrib/openzfs/module/zfs/metaslab.c | 8 +- sys/contrib/openzfs/module/zfs/multilist.c | 26 +- sys/contrib/openzfs/module/zfs/spa.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 12 +- sys/contrib/openzfs/module/zfs/vdev_draid.c | 24 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 5 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 30 +- sys/contrib/openzfs/module/zfs/zil.c | 93 +++-- sys/contrib/openzfs/module/zfs/zio.c | 51 ++- sys/contrib/openzfs/module/zfs/zio_inject.c | 6 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 15 +- sys/contrib/openzfs/tests/runfiles/common.run | 14 +- sys/contrib/openzfs/tests/runfiles/sanity.run | 9 +- sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 3 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + .../functional/cli_root/zfs_mount/zfs_mount.cfg | 1 + .../cli_root/zfs_mount/zfs_mount_recursive.ksh | 146 ++++++++ .../functional/cli_root/zinject/zinject_args.ksh | 62 ++++ .../tests/functional/vdev_disk/.gitignore | 1 + .../tests/functional/vdev_disk/page_alignment.c | 413 +++++++++++++++++++++ sys/modules/zfs/zfs_config.h | 44 ++- sys/modules/zfs/zfs_gitrev.h | 2 +- 83 files changed, 2475 insertions(+), 864 deletions(-) diff --cc cddl/lib/libnvpair/Makefile index fb80d7c22ea5,000000000000..a93ffcbd00de mode 100644,000000..100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@@ -1,32 -1,0 +1,30 @@@ + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair +.PATH: ${SRCTOP}/sys/contrib/openzfs/include + +LIB= nvpair +LIBADD= spl + +PACKAGE= zfs +# user +INCS= libnvpair.h +SRCS= libnvpair.c \ + libnvpair_json.c \ + nvpair_alloc_system.c +# kernel +SRCS+= nvpair_alloc_fixed.c \ + nvpair.c \ + fnvpair.c + +WARNS?= 2 +CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID -DHAVE_CONFIG_H -DHAVE_XDR_BYTESREC + - - CFLAGS.nvpair.c+= -UHAVE_RPC_TYPES +.include diff --cc sys/contrib/openzfs/.mailmap index 46ef016b93f8,000000000000..32bdb5209613 mode 100644,000000..100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@@ -1,189 -1,0 +1,207 @@@ +# This file maps the name+email seen in a commit back to a canonical +# name+email. Git will replace the commit name/email with the canonical version +# wherever it sees it. +# +# If there is a commit in the history with a "wrong" name or email, list it +# here. If you regularly commit with an alternate name or email address and +# would like to ensure that you are always listed consistently in the repo, add +# mapping here. +# +# On the other hand, if you use multiple names or email addresses legitimately +# (eg you use a company email address for your paid OpenZFS work, and a +# personal address for your evening side projects), then don't map one to the +# other here. +# +# The most common formats are: +# +# Canonical Name +# Canonical Name +# Canonical Name Commit Name +# +# See https://git-scm.com/docs/gitmailmap for more info. + +# These maps are making names consistent where they have varied but the email +# address has never changed. In most cases, the full name is in the +# Signed-off-by of a commit with a matching author. +Ahelenia Ziemiańska +Ahelenia Ziemiańska +Alex John +Andreas Dilger +Andrew Walker +Benedikt Neuffer +Chengfei Zhu ++ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee +Colm Buckley +Crag Wang +Damian Szuberski +Daniel Kolesa +Debabrata Banerjee +Finix Yan +Gaurav Kumar +Gionatan Danti +Glenn Washburn +Gordan Bobic +Gregory Bartholomew +hedong zhang ++Ilkka Sovanto +InsanePrawn +Jason Cohen +Jason Harmening +Jeremy Faulkner +Jinshan Xiong +John Poduska +Justin Scholz +Ka Ho Ng +Kash Pande +Kay Pedersen +KernelOfTruth +Liu Hua +Liu Qing +loli10K ++Mart Frauenlob +Matthias Blankertz +Michael Gmelin +Olivier Mazouffre +Piotr Kubaj +Quentin Zdanis +Roberto Ricci +Rob Norris +Rob Norris +Sam Lunt +Sanjeev Bagewadi +Stoiko Ivanov +Tamas TEVESZ +WHR +Yanping Gao +Youzhong Yang + ++# Signed-off-by: overriding Author: ++Yuxin Wang ++ +# Commits from strange places, long ago +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Herb Wartens +Ned Bass +Tulsi Jain + +# Mappings from Github no-reply addresses +ajs124 +Alek Pinchuk +Alexander Lobakin +Alexey Smirnoff +Allen Holl <65494904+allen-4@users.noreply.github.com> +Ameer Hamza <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <48421688+ahesford@users.noreply.github.com>> +Andrew Sun +Aron Xu +Arun KV <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer +bernie1995 <42413912+bernie1995@users.noreply.github.com> +Boris Protopopov +Brad Forschinger +Brandon Thetford +buzzingwires <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh ++Chris Peredun <126915832+chrisperedun@users.noreply.github.com> +Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <32984777+heeplr@users.noreply.github.com> +Daniel Kobras +Daniel Reichelt +David Quigley ++Dennis R. Friedrichsen <31087738+dennisfriedrichsen@users.noreply.github.com> ++Dex Wood +DHE +Dmitri John Ledkov <19779+xnox@users.noreply.github.com> +Dries Michiels <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre +Felix Neumärker <34678034+xdch47@users.noreply.github.com> +Finix Yan +Gaurav Kumar +George Gaydarov +Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> +Gerardwx +Gian-Carlo DeFazio +Giuseppe Di Natale +Hajo Möller +Harry Mallon <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê +Jake Howard +James Cowgill ++Jaron Kent-Dobias +Jason King +Jeff Dike <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís +John Eismeier <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney +John Ramsden +Jonathon Fernyhough <559369+jonathonf@users.noreply.github.com> ++Jose Luis Duran +Justin Hibbits ++Kevin Greene <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming +Krzysztof Piecuch <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans +Laurențiu Nicola +loli10K +Lorenz Hüdepohl +Luís Henriques <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek +Matt Fiddaman <81489167+matt-fidd@users.noreply.github.com> ++Maxim Filimonov +Max Zettlmeißl <6818198+maxz@users.noreply.github.com> +Michael Niewöhner +Michael Zhivich <33133421+mzhivich@users.noreply.github.com> ++MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <5723047+cdluminate@users.noreply.github.com> +Nick Mattis +omni <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford +Peter Dave Hello +Peter Wirdemo <4224155+pewo@users.noreply.github.com> +Petros Koutoupis +Ping Huang <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak +Richard Allen <33836503+belperite@users.noreply.github.com> +Rich Ercolani <214141+rincebrain@users.noreply.github.com> ++Rick Macklem <64620010+rmacklem@users.noreply.github.com> +Rob Wing <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin +Ryan Hirasaki <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <50765275+npc203@users.noreply.github.com> +Savyasachee Jha +Scott Colby +Sean Eric Fagan +Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <75025422+nssrikanth@users.noreply.github.com> ++Stefan Lendl <1321542+stfl@users.noreply.github.com> ++Thomas Bertschinger <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert +Tim Crawford +Tom Matthews +Tony Perkins <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein +Tulsi Jain +Václav Skála <33496485+vaclavskala@users.noreply.github.com> ++Vaibhav Bhanawat <88050553+vaibhav-delphix@users.noreply.github.com> +Violet Purcell <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller +xtouqh <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <82001006+yuripv@users.noreply.github.com> diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_recursive.ksh index 000000000000,0e5cc5d6955e..0e5cc5d6955e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_recursive.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_recursive.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_args.ksh index 000000000000,dd9ef9ddd229..dd9ef9ddd229 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_args.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_args.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/vdev_disk/.gitignore index 000000000000,27653e5924fc..27653e5924fc mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/vdev_disk/.gitignore +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/vdev_disk/.gitignore diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c index 000000000000,5c6d28eb2c44..5c6d28eb2c44 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c diff --cc sys/modules/zfs/zfs_config.h index 267fe048749c,000000000000..0e18c6092b9c mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1200 -1,0 +1,1218 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + ++/* bdev_file_open_by_path() exists */ ++/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ ++ +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + - /* blkdev_issue_discard() is available */ - /* #undef HAVE_BLKDEV_ISSUE_DISCARD */ ++/* __blkdev_issue_discard(flags) is available */ ++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ - /* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC */ ++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ ++ ++/* blkdev_issue_discard(flags) is available */ ++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ ++ ++/* blkdev_issue_discard() is available */ ++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + ++/* blkdev_put() exists */ ++/* #undef HAVE_BLKDEV_PUT */ ++ +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + ++/* blk_alloc_disk() exists and takes 2 args */ ++/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ ++ +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + ++/* block multiqueue hardware context is cached in struct request */ ++/* #undef HAVE_BLK_MQ_RQ_HCTX */ ++ +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + - /* Define to 1 if you have the `execvpe' function. */ - /* #undef HAVE_EXECVPE */ ++/* Define to 1 if you have the 'execvpe' function. */ ++#define HAVE_EXECVPE 1 + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + - /* Define to 1 if you have the `issetugid' function. */ ++/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ *** 652 LINES SKIPPED *** From nobody Tue Apr 16 21:14:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxcw0dSPz5H5pM; Tue, 16 Apr 2024 21:14: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 4VJxcw04P7z4Qlw; Tue, 16 Apr 2024 21:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQRHi1xV44h6mclEjOBTtS9h+hnTO0pxbH3ZCKdCzwo=; b=OTyQ9+ppVG+kNDYg7t1PSHW4ZLkD8cfw6LR4Tpnt34lwyS249zaUuDhjV6UkTjiS5V7nCj xCqMhSl+HCNGNfPPV9ZMPk0Uyv5BKzoyoYEDdusZ+ryxxZmDcb8JaD3FdLkgtylbZexxVU wCwhEa0K98otC11dcExDB/DDJucsUYPzcseS8XC5cY0dy78ghpcQNOB15PpGJRl2Z9eETi IBI/kC8rTqFKk/RfBxumBq3475siwnZHULmhAgm8f+BK7VcJfgKGFdwzDIHj5nTa3vGR9s uRO71bPHHRqSw1vvsunw/Cfyzlx/G3qJjIvhW0iAI+TwvB7i89Iy9O4tABwUIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302080; a=rsa-sha256; cv=none; b=XlAqMrk+vM1VZCrTPPQTaqvv0T2R5BhORspE506fMrB+9cNePlyK1hQ8l2drg/4ZE4iRB4 U5QM/w1tozfrqErksxF36uk5gOQkMmXRlxwkXuKhWUY0m4waMJwEo5QP93njmqEzAzJIBA 6lVsZ+3kboX4XC7/nDyW7UTKiOXFmqyxQlsN/qEExZs4ZE3CnNJUMEImADxcR4rRfkiV1E lnNdTd5kV3CucfQjvfDMkdyRHkDvdFcNzJk9JREdpLThbr+GDdjQxHtDlUlwjqQI1NepXp nSVJt1zkyJOyAE8sFFxC2uo/1Yt5s9RB3IdEANnaO+bDIjLAmVNbR32Prr4IRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQRHi1xV44h6mclEjOBTtS9h+hnTO0pxbH3ZCKdCzwo=; b=lINW9rfiNZimS55E+vpy+lY8CJ6LmYrxkL5id3MfbJ2GNZnzvUhsdiMSIitEzlM9H9PiVe FaWUYfdi3gX/eUoI8COrafCdyoRAmpTpHJjEdTpuPfigE+y9YYobD6CT5oqwJ+yCb4zJaS tutdqMoWw/kr7dXL6LW06XrqWSkF9NU4AXVD+49RqXbEGumMoiuIiM/zzZJNOpF6BpiXti TNCjKcC6LOm10k0+rRNKIDkuAbZkRR0BQtv7T6YjCW/A0MUvdNr3UOpJ0tBlYexKwF2UQp KgNfKAnmZd4fOHDjFsER3rxZzNJ6AeSnw18vXzgBglp3fgt6Jo/4hyp7mCKa6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxcv6hWTz1077; Tue, 16 Apr 2024 21:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GLEd6O043579; Tue, 16 Apr 2024 21:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEdd5043576; Tue, 16 Apr 2024 21:14:39 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:39 GMT Message-Id: <202404162114.43GLEdd5043576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0dd2f4a0cca9 - main - libc: only export hesiod symbols when enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dd2f4a0cca9332784d6a233dee8d211517fe7ba Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0dd2f4a0cca9332784d6a233dee8d211517fe7ba commit 0dd2f4a0cca9332784d6a233dee8d211517fe7ba Author: Brooks Davis AuthorDate: 2024-04-16 17:00:54 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:20 +0000 libc: only export hesiod symbols when enabled Create a seperate symbol file for hesiod and conditionally include it. This allows linkage with --no-undefined-version. Differential Revision: https://reviews.freebsd.org/D44184 --- lib/libc/net/Makefile.inc | 1 + lib/libc/net/Symbol.hesiod.map | 12 ++++++++++++ lib/libc/net/Symbol.map | 10 ---------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index 1305500176a3..cd4ccaefac92 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -168,6 +168,7 @@ MLINKS+=sourcefilter.3 setipv4sourcefilter.3 \ .if ${MK_HESIOD} != "no" SRCS+= hesiod.c +SYM_MAPS+=${LIBC_SRCTOP}/net/Symbol.hesiod.map MAN+= hesiod.3 MLINKS+=hesiod.3 hesiod_init.3 \ hesiod.3 hesiod_resolve.3 \ diff --git a/lib/libc/net/Symbol.hesiod.map b/lib/libc/net/Symbol.hesiod.map new file mode 100644 index 000000000000..bb020c969ee9 --- /dev/null +++ b/lib/libc/net/Symbol.hesiod.map @@ -0,0 +1,12 @@ +FBSD_1.0 { + hesiod_init; + hesiod_end; + hesiod_to_bind; + hesiod_resolve; + hesiod_free_list; + hes_init; + hes_to_bind; + hes_resolve; + hes_error; + hes_free; +}; diff --git a/lib/libc/net/Symbol.map b/lib/libc/net/Symbol.map index 4831868c0e55..454ce8486986 100644 --- a/lib/libc/net/Symbol.map +++ b/lib/libc/net/Symbol.map @@ -54,16 +54,6 @@ FBSD_1.0 { endservent; getservent; getservent_r; - hesiod_init; - hesiod_end; - hesiod_to_bind; - hesiod_resolve; - hesiod_free_list; - hes_init; - hes_to_bind; - hes_resolve; - hes_error; - hes_free; htonl; htons; ntohl; From nobody Tue Apr 16 21:14:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxcx1tqbz5H5V4; Tue, 16 Apr 2024 21:14: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 4VJxcx0W3Tz4QVS; Tue, 16 Apr 2024 21:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lS9+OcuxMZ7QNTW+y8GKBtGbSs5VujsoC1bW8fmTFAw=; b=B+jFRBgTS0syEyOiHahsZc/1A4g265WJQrt1N/EaRdQO5dV6M8JwJocz956ZssKsvR/tWP BJYgOSqBVSV7xxIFb/Ssdla3AajzoIDdIuzn39zH3sQK0Rp2J9OnrXpd4JMTOc1u8frV2T 07DPOFnF4ZHc3EzK8MdcwQFwORz9ki21gawmjvifrQFL4/8EA8VsR2ehYaN3arG+gNa8c2 RQbprRfnFiB5F4QrsfBR/kHg+R2tsxPxXyZ3bhYQMfMHdNStZRH6oxjOTkB8Ko5o97jK3/ KCBMlXNSe3AD5DxbyA/LLRXI0A4yWw2GKwvAgYgAEuAUKZoAMO0njF/xL+/Ljg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302081; a=rsa-sha256; cv=none; b=JyACVDdcBZl/09RaOaPB+op408sha6+dnjX8NnsmMWoFYoNtXuDtdH6efv9nl/5tGu6qeQ 7h9vfUXbHc78nUlq8+vMfR2WWs4bFbAENCGruVMskW4f66htm8rkGQ9hcGskkUhThvEYPi tN5QQ/7AZLrORlzlHjM1X/CEQWtyTg/SY7BpCz0yMMnZf7UJ2h8tyDG1PuWjnluqA+SEVl 1ipmDZ8k+mxjsvsoQG9zmtq3Ox4+LtWPcqCLCXqKObbZJWzNvVca4+MoJhFXyT6lHBE1qt o18gZrYl0k7ArkQXWIKxFpwajATYBTE66IU/D/ex4o9u9NMurC8QXcJer26lag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lS9+OcuxMZ7QNTW+y8GKBtGbSs5VujsoC1bW8fmTFAw=; b=sWE+om6M08IwJYoHXB8uoyVHHX9ud1AptRaDB+2rvLv8K86KegrthimwJjauEnaHOpliCy urDLP+lILvxpWSU9b+J6QzGzlD9QQ1sC4jvgcNqbgOIOZ4B0sZMBuis7GK52rmyOZbkpMP Rd1ozVpHlceNOJHfD69/qEuyfvzJ4323Qsv4Zy4WlWX6w4l4CvDwqnblK7rvxnqqlsQ0VY eIdtDdux/52r/DaILeYBgvTlN9NAscP4v1ZQ9iWNLJbGxjPa9NtftT2JxeP2HEm174J+Wf C6byyNS5auopRSpc/0SwKZYZez8yQNGw/L2SAEGtoEQ1RZCnUELdNAiKsfWvAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxcx06dLz1078; Tue, 16 Apr 2024 21:14: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 43GLEeNH043633; Tue, 16 Apr 2024 21:14:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEeDD043630; Tue, 16 Apr 2024 21:14:40 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:40 GMT Message-Id: <202404162114.43GLEeDD043630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 1b10a30539c5 - main - libc: don't try to export mpool_stat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b10a30539c5b3e1a73352e661e7abfd2f53fead Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=1b10a30539c5b3e1a73352e661e7abfd2f53fead commit 1b10a30539c5b3e1a73352e661e7abfd2f53fead Author: Brooks Davis AuthorDate: 2024-04-16 17:01:25 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:20 +0000 libc: don't try to export mpool_stat This requires that mpool.c be compiled with -DSTATISTICS and we provide no mechanism to do this. Differential Revision: https://reviews.freebsd.org/D44185 --- lib/libc/db/Symbol.map | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/db/Symbol.map b/lib/libc/db/Symbol.map index 2cca589af9f0..b46fb17e499d 100644 --- a/lib/libc/db/Symbol.map +++ b/lib/libc/db/Symbol.map @@ -16,7 +16,6 @@ FBSD_1.0 { mpool_put; mpool_close; mpool_sync; - mpool_stat; }; FBSD_1.1 { From nobody Tue Apr 16 21:14:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxcz5PY1z5H5Rb; Tue, 16 Apr 2024 21:14: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 4VJxcz2X20z4Qh6; Tue, 16 Apr 2024 21:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rSWDImnv4oiVaKr7m+x1fyzr5qWkT8171C5M6zGn6FM=; b=wA4CyAQC5OgA/ZwcTn+6Paa0oNXlPvswmG1X5wED5Qaiyl+PTCM93NYvIAcHsoFpuVT4rF DGgiHUTeM4+HqDt523rKqy0QKiCulSIZ2VUtKFDOEQf02yCaasw3qxmIXP5SwcBJtnCxDp ayCuhoHlXXXKl3gLPan4E+1g6o8qUDLA/IXSzEJUgoALJ18UyVfTGTplHgHDn9uY35eU62 Z+eK2AOEt4Rp3QzFIslQV7u4B+bI+TfIh/gxiU2U+pB7jQ4D/4ECyJtllm3Cek+MjAH8e6 xeheWdrP+jS9sL1fDIT39PKwttmtxaIV1C/7nK/7SmLUUKXG9H5Eaujpkmqk4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302083; a=rsa-sha256; cv=none; b=NSY5ipyqcXKFKkRjdOm6vrQb9tNXAJPBCT+sadDtTnLUnGDL6kzxqo0/JGNHEJAabKO4eC TzLrOIC4T5HY38wmogrUhVeSEeeBDKNfVJ43VUefNjWz8kpDw2FzFLyxNW3wtDJHlAR26y rr9VwrfMvpkMIvKBcPsy/1/W3iQC7fXmhEOz5SWdpcKyot9bCvxVSeV5oHs7v6izuGH0H1 ETwC5i69g9XQ4orJU59PZXC+eM7eoCGR6syUp/X2omaVY+OdCOUUvCdwpikE4z6pY7NDUI 8kfD9Yievi55bSQnzk121qcuTCDRv75xxmb1Lqzb0HBHaBSw9HCNxrrxBDupcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rSWDImnv4oiVaKr7m+x1fyzr5qWkT8171C5M6zGn6FM=; b=Oz1gBbqqL+Z0OWUtITfqDfyFvGfQPJSBeSpcLaNudhsDdwAkek3rf57xtfMoT2To5jSu5V y+wMNlP9Bopz8ouVP5qxJoGRxhsyq8msrAkGV+wHRz6AOAf9HDDZWqrOZ9/DK0OKjl+TpI sfJStrNCVowkuzh/M5eNeT6dIOl/+IbWlX8/q9mgT+hrravF5CayJL36Mf4ikr6Wt6Gcib JDofOC77n3ceR35/xvXDz2rT6EwnM4wADONQRMmapFTNnTr802fF3WyUn8dvCfcxinHW9y dSA9CtuaIt3hFuy9op/258s7/SUQbQKdLkBTe59Ps8bMKPBuK+UhfgKYVzXmiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxcz28BMz1016; Tue, 16 Apr 2024 21:14: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 43GLEhxR043735; Tue, 16 Apr 2024 21:14:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEhgw043732; Tue, 16 Apr 2024 21:14:43 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:43 GMT Message-Id: <202404162114.43GLEhgw043732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 88fcb6179985 - main - libc: don't try to export _nsdbtdump List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88fcb6179985613500e5b5a4183f575ced06e414 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=88fcb6179985613500e5b5a4183f575ced06e414 commit 88fcb6179985613500e5b5a4183f575ced06e414 Author: Brooks Davis AuthorDate: 2024-04-16 17:01:45 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:20 +0000 libc: don't try to export _nsdbtdump It is only present when compiling nsdispatch.c with -D_NSS_DEBUG and we provide no mechanism to do so. Differential Revision: https://reviews.freebsd.org/D44187 --- lib/libc/net/Symbol.map | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/net/Symbol.map b/lib/libc/net/Symbol.map index 454ce8486986..ebc3a56b549f 100644 --- a/lib/libc/net/Symbol.map +++ b/lib/libc/net/Symbol.map @@ -82,7 +82,6 @@ FBSD_1.0 { freehostent; __nsdefaultsrc; _nsdbtaddsrc; - _nsdbtdump; _nsdbtput; nsdispatch; rcmd; From nobody Tue Apr 16 21:14:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxcy5Q88z5H5P6; Tue, 16 Apr 2024 21:14: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 4VJxcy1WsHz4QxR; Tue, 16 Apr 2024 21:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbeNGpTvOFfLRcCpAD47/zwti+t0BFW7FcXGeR/zPqY=; b=OU0H50q6gAXwlxV13VP7AZyhGKTId5YDBqBmM8aw1bjUyMZvUE8Odi8mPlGP8iWmonpRzu P24TEjPnYBI0iwjPBbpV2LaVb4RFt7t4oGtB8B44o9nOJQFdG3tzZYrdOdHFpni8QiOGML PdkWqZM1WjJ66qtbTP+SEB1xsnDDnYb3XApxjS+FfjArlTxNQiA4TyPal4el9ZimYfx31j FDtm3jITAY4kROPit278wPKVmfWbgjK+Tj+PkEOeQ7ODoNojxKPlgnarF1rBKJb0d2fkKy frqT1Y0xbyHdJ9XBm7ouOC8kwsTPujuwJ2rlVtJtgFztZ1ePwkAUWeQjnLWz+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302082; a=rsa-sha256; cv=none; b=rycaKN2V71uZbPa7AJeLpT3iVThltkwJp7FECBPCq/wLPIb+RWKif6AzimfKAgVGwjrdei qrzl+pkC6o1g7FiUF6YCxeyRSeyVj7EZU+xCfOXYejPEl+65PaL9WWPUbbsCTq7zVX/0wh uII4EC9r5jac3lUviPhmF/ggkuZYtRkkEwPtVLgQ0Oodhi3WX+RmRRndwE5xj5xK3d4TtD aan6+/cXlNxWIbCsbUdGbN397VMxVo9GcT3xVxjYUIjJ6d9/iwrtPqbZHLi5WZhEXRcUCX K44zOWeVOIwfW9Fcvzv8pNF+rXAVg/GCmEP7EwL1OVMdmmWWurqRr1ZagVQHHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbeNGpTvOFfLRcCpAD47/zwti+t0BFW7FcXGeR/zPqY=; b=JwCXKU6b3EEPK1PSY0IYWr2s8MMghF5AofJBX2dDsbgLGP0otdQFPLb+PbtqO2pkCqUuHr 0pSGUdbKjSp/GAeZiGUtw4/US9/acR4nzM2qpO5gedCeUjyYwmGZUFIwHttQR70QMq3+93 /4WuVngeJx9a1kqf2+FVjLAD2SEBOzmtm4DXDhOClLuUDDVrRG2RfdtsTucVMgUJKy7HDl w5bW+LWznOd0YFd7qqxWK/cKKnnYtbVfsJAnn2INWI5oBqMMzjkaqQohsB0Co7ZdzX/JQ4 7Lm6VAEjZMLuaueXewuMiQXUkttC44XTptg7RxdLipy3RGGPNBmictmCWewOlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxcy15zlzyw7; Tue, 16 Apr 2024 21:14: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 43GLEgXp043688; Tue, 16 Apr 2024 21:14:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEgoe043683; Tue, 16 Apr 2024 21:14:42 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:42 GMT Message-Id: <202404162114.43GLEgoe043683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 4d6722ec693e - main - libc: don't try to export mexitcount List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d6722ec693e5561f2cb3bd84f082b23efc2c15e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4d6722ec693e5561f2cb3bd84f082b23efc2c15e commit 4d6722ec693e5561f2cb3bd84f082b23efc2c15e Author: Brooks Davis AuthorDate: 2024-04-16 17:01:35 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:20 +0000 libc: don't try to export mexitcount This requires that mcount.c be compiled with -DGUPROF and we provide no mechanism to do so. Differential Revision: https://reviews.freebsd.org/D44186 --- lib/libc/gmon/Symbol.map | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/gmon/Symbol.map b/lib/libc/gmon/Symbol.map index 7fd880a1b898..573c20020237 100644 --- a/lib/libc/gmon/Symbol.map +++ b/lib/libc/gmon/Symbol.map @@ -2,7 +2,6 @@ FBSD_1.0 { _mcleanup; monstartup; moncontrol; - mexitcount; }; FBSDprivate_1.0 { From nobody Tue Apr 16 21:14:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxd055Q8z5H5pV; Tue, 16 Apr 2024 21:14: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 4VJxd03Fxqz4Qdc; Tue, 16 Apr 2024 21:14:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tt9XLLyFdAcAkysVO+/hDyaXV8r4jMcsL6c2TCHiQoY=; b=Vtknr9fJwU2HBy92u7QXO9lCwUWWX+ggzvv/5EFRRcqOhzqicvHyzsMAsv4LcfjdprKPi4 3hvZu45FCAsCIf3CXtF8uQf2xYxRNtqZqw7QX4vUA7GDBStXxG72vGNdSgwtTCucFjF/hd T2YcrAaEKi2z6livxox3Gv/d7TK4g9azK91HVt63SknVQmajhAMWjbq9XsSlI/Kqz81CjB RKd7EPwAT0yWaCcyWFYSGAqGK35ySWNtuxTKxiwZzM3gzN48A4+8vVwY1RaBlv8eVw9z6G LE5/sZf3lE4QF+n0qFUkJNJoux+iNpqpHBiVvO5VAhpXMKMMAVT9dZQ4Nsiyug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302084; a=rsa-sha256; cv=none; b=G3kOoO0s1npb9pgb36jej5tVU/ZqqcD3S7Ws2gUylywttj8a2FLP6fvFdbyL9dh6QE7bpM jK6G0GxnisOrlSwsGEEjRcb96p0g7ttliGc8EeNIDwDfA3qEkudRG9ozh/SW/+wZ1/4hph 1QgEjMW1puF/VMU0CQyL8zOkhtwmG362CG2oaFm+qspRtWah4GHFYcchvq8wV7TTlon5qa zUUk3fVroyewEoZnCKqcv1jpWycsR9x5hqiQqA7iTYg06vTMbYclOLSHimbXb0u0BlThmc SvLzK2qsahMD+M7gYws0tWxnVAzej0Rs79O7qX2seTf/Kx5C6gFqHkqnXqkq0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tt9XLLyFdAcAkysVO+/hDyaXV8r4jMcsL6c2TCHiQoY=; b=fmkQedNCwaX/EHK/ECyEuc1vb/LzqtpyVBcbX/aBVbct4wx7vE6+y12zIZfrUCACdxgGrN EbF+qmLF+h4CKKcFwjYyRaY/J66KilWQAmWdk1SIARtU7Z6On3u0REWChoFk2EJIcymmrl agTHnf3+mOfjLaKEwnK98Lv7qA9JK1Rszvy1Zzc+x5xeTkhBN5WuoxtYF7OzyX7ryYRw0S kGzTyPYhcVQ0GOizVB2TsNie0FkAQdyluxmwAXw+Td0A0a9OquQNZ0jLCKG9+Ben2DDt/d +QY6WSbxgXaVf/7Wm5cnTANiZGuw21ScZnTE5mjCJ7Lb6CjlFc9cl5I7mBbXsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxd02rZKzyw8; Tue, 16 Apr 2024 21:14: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 43GLEiua043781; Tue, 16 Apr 2024 21:14:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEiVH043778; Tue, 16 Apr 2024 21:14:44 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:44 GMT Message-Id: <202404162114.43GLEiVH043778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 63b179b68d21 - main - libc: don't try to export __sF List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63b179b68d21d551a296d48a51ba24c80d2f1b0b Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=63b179b68d21d551a296d48a51ba24c80d2f1b0b commit 63b179b68d21d551a296d48a51ba24c80d2f1b0b Author: Brooks Davis AuthorDate: 2024-04-16 17:01:54 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:20 +0000 libc: don't try to export __sF This symbol has been static since 2008 (commit 1e98f88776fc). Differential Revision: https://reviews.freebsd.org/D44188 --- lib/libc/stdio/Symbol.map | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/stdio/Symbol.map b/lib/libc/stdio/Symbol.map index f5e74eeddfd4..d491b83c11fb 100644 --- a/lib/libc/stdio/Symbol.map +++ b/lib/libc/stdio/Symbol.map @@ -18,7 +18,6 @@ FBSD_1.0 { fgetwln; fgetws; fileno; - __sF; __stdinp; __stdoutp; __stderrp; From nobody Tue Apr 16 21:14:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxd20sPYz5H5md; Tue, 16 Apr 2024 21:14: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 4VJxd14W7bz4QwH; Tue, 16 Apr 2024 21:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7AGc62CtMWxNslcXaHFuvo6NTTDCddyGYfFClGg17qM=; b=BO6KLBE9t2tNFax5GG4VKcFcmO2v3pz6eeghpC+UqE3GyabpQd16Gx5uUKgQkCmaqr28m6 VXAAObuMIlQDzNY6Sx5OLlKUTDUvq1SdFAff8Psf2XWObxF0dr2nwCdMZ0UcQiW9xs74Tf 076Vtr+EeFiD+Wu6sjmHr0knmNuodmk3IsNqvgHSmbMe8KcmwD28CozzpX3tjSxHQhQ16P HMhbCDu2/M+QzvCwRWFQCc3/36/RMmpCc2FxoNgzxV8LTfrusnXi6BKjYASdkU3KOE9HPV LMUaLuahQKZwJDqxsqEFhzG7xL7J1Xwg9lXsOtH8Snj4ZyWtRKJFKCzJEm0QpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302085; a=rsa-sha256; cv=none; b=KK2/HVf6Pu/lnpBrI4dDbrQu/tgsfqLQaM9lKpaUozVoWKp9KGKpcok/sal8UPD6F0VIF7 f+10oCrWR7BeCT/hJlunnbpVWiT/30ONpi9/EHPex6lSxkVzywaaIiF5bqgpybfDUSK1Nd n/pE1TmbWr54/9GmhUhyeqyCvEbnggTaR6HqWoeCZWxMH+oiz2gUpHFBzFP/qKkgiW4Szf jEwGzmGG04OLCo4otJHeFR2IGwVv6Xj90C1bMjaJWiwxaYBlRUKn91HH4Yoqi9jOW6UJMz XGW5W0W+8bT1Hd94WFcB+emIqs5pTTRAtDSQbZOS7Bjxjnb1YRNStgQb9RS76A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7AGc62CtMWxNslcXaHFuvo6NTTDCddyGYfFClGg17qM=; b=aE/TdiiU3zruYYB9ph1qVQLt8dijYKZ/KzDb9b+ZEGw5adLrh3WRBw89kfRZ7dq8pQRMT7 10b2LlVqOE8ju76srmerCoSxWhiqd0SArOTJfxqLp6bMFa/4Uhiuh0UB5jvfFCBuAo6MvT Btj4CFkUv+yh+/7VnBISSJQvREALDdcuob4RzkVkvfsRuBE2TdYXKC/Uj2K6wpoeHKwOMk Z2uYWX4fbZMhLWfRbnNoUHUDE1n/RPOCuqbc87KsUiZaUpljJw4vuzCAgIEpgz48lypO8x pw4usgImK7Cedt9W1b3nFZUBWIWgLOHqu08eo8aeSuaTrEPWyMZv/wF7EC+Fug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxd147NMzyfd; Tue, 16 Apr 2024 21:14: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 43GLEjeX043823; Tue, 16 Apr 2024 21:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEj3r043820; Tue, 16 Apr 2024 21:14:45 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:45 GMT Message-Id: <202404162114.43GLEj3r043820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 35b3504ee63e - main - librpcsec_gss: don't export non-existant symbols List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35b3504ee63e387455fef968377b84f8262bc64a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=35b3504ee63e387455fef968377b84f8262bc64a commit 35b3504ee63e387455fef968377b84f8262bc64a Author: Brooks Davis AuthorDate: 2024-04-16 17:02:14 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:21 +0000 librpcsec_gss: don't export non-existant symbols rpc_gss_mesh_to_oid was never implemented. This doesn't seem to be any reason why we would need to export the _stub functions, but it's also a little unclear to me why the linker thinks they aren't present. Perhaps they should be static. Differential Revision: https://reviews.freebsd.org/D44248 --- lib/librpcsec_gss/Symbol.map | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/librpcsec_gss/Symbol.map b/lib/librpcsec_gss/Symbol.map index 28f66eefd8ea..6c05937193f6 100644 --- a/lib/librpcsec_gss/Symbol.map +++ b/lib/librpcsec_gss/Symbol.map @@ -5,7 +5,6 @@ FBSD_1.1 { rpc_gss_set_defaults; rpc_gss_max_data_length; rpc_gss_get_error; - rpc_gss_mesh_to_oid; rpc_gss_oid_to_mech; rpc_gss_qop_to_num; rpc_gss_get_mechanisms; @@ -21,7 +20,5 @@ FBSD_1.1 { FBSDprivate_1.0 { __rpc_gss_unwrap; - __rpc_gss_unwrap_stub; __rpc_gss_wrap; - __rpc_gss_wrap_stub; }; From nobody Tue Apr 16 21:14:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxd4105Hz5H5pW; Tue, 16 Apr 2024 21:14: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 4VJxd36BrWz4R8s; Tue, 16 Apr 2024 21:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zk4bsw8rEUt8XCP3PrOScCI9B/GnOZTvWU+R6vya6BA=; b=dxq2STCARHN+FtrjRZwXk2euhRBxQU+hToqJGMt8baDeVZv98UF6h5GUlGc2+vAMgIurHD aWyExnCnFZR/4byxp3a0+2TNS+7wiKzvjfzPUUSUYTcw34CNJIMWswA/da7mNtUS728aam oJCxlkOPIqoVK9CFnEj7BYGBubwYS1hfkol42zx9JWAE5Hq9Jvvqj0MxQuFy8+e4q/xrYZ k9zbRFdR072aGmnaAFG3BEC7+Van5yYwkzQ7qhnU5JRUT3lDpk0/tShLWE5OjS7RbVGTXY xkpkQsvJjGL2VP1zeRTO9NvJKD3NpIkL66O64MyxWMPdvjFvS1Y/LOi3N6WncQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302087; a=rsa-sha256; cv=none; b=iGZlUr80Nk/24bZQxu4+L6wlEFGiqc/Fhw9EkUpw8Y3/30VmP2E/GAlXQY7wuO0g7Q+Xj+ be/QUHnUBquziklBK/so6lXvECAQ+CZn/q9Td5YufDWkbI6y9G2Gz5LETeMD3iV8vN1ijX iR/nns8x2v9f6/JWXUi+R0F3LOXUDIpKOAA1aoHf0csjBkXDOdYReAPKYZJdR3mzlXxSGG xeAjqWGSkICXdavVdRMFcLCL9jMJ40kUGQqt9fYhBJQM2nnLiKaTtE2FqXipMeWs4C4GfL EQyRQlasVjEn0XnHBLkMvsLK/+k8CvvK97ODuNzBFNK151pFOCq8E3PCqADyQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zk4bsw8rEUt8XCP3PrOScCI9B/GnOZTvWU+R6vya6BA=; b=shoYrT7gvkjyjPgJhpJoeChzxQAv/l852tWizWYFyWcWtniN8fc/ZKycpgSEKeb1jZVBbq m8WCyakgorPt6A0Q304qo2MMgmWlojaHSqJPGqATV4ctUdZlLW6/tlypbQ16dEnl89VW/I zXJt4wnBnJh88vcNTx/vMVzuN0+UcYhvaTOWTYLVQjHciX4PNimR9R9emiDpR4aHt+NapE qN2r7pIklu8CyPUXcgFibLEZTTBotqlZt12d+1PFUxOVhYLrfqIDk8MHGJluf5BjDz9ak/ aQ55vSYbSfssvLzvADteEJRwgdE5JEUoi3TCeVjJig3nfsozxlCXI1XlWtRiBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxd35pGVzysj; Tue, 16 Apr 2024 21:14: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 43GLElst043933; Tue, 16 Apr 2024 21:14:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEl9r043930; Tue, 16 Apr 2024 21:14:47 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:47 GMT Message-Id: <202404162114.43GLEl9r043930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3f82d8345b17 - main - libgcc_s: only export 128-bit int APIs when available List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f82d8345b17eb1c5a7ae40f3c71e9f42f2ea487 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3f82d8345b17eb1c5a7ae40f3c71e9f42f2ea487 commit 3f82d8345b17eb1c5a7ae40f3c71e9f42f2ea487 Author: Brooks Davis AuthorDate: 2024-04-16 17:03:21 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:21 +0000 libgcc_s: only export 128-bit int APIs when available These interfaces are only compiled when the platform supports 128-bit ints. Use a CRT_HAS_128BIT guard similar to the one used in the compiler_rt sources. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D44323 --- lib/libgcc_s/Symbol.map | 67 ++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map index de19c766fbba..39cfa1809740 100644 --- a/lib/libgcc_s/Symbol.map +++ b/lib/libgcc_s/Symbol.map @@ -1,56 +1,42 @@ /* */ +#if defined(__LP64__) || defined(__SIZEOF_INT128__) +#define CRT_HAS_128BIT +#endif + GCC_3.0 { __absvdi2; __absvsi2; __addvdi3; __addvsi3; __ashldi3; - __ashlti3; __ashrdi3; - __ashrti3; __clear_cache; __cmpdi2; - __cmpti2; __deregister_frame; __deregister_frame_info; __deregister_frame_info_bases; __divdi3; - __divti3; __ffsdi2; - __ffsti2; __fixdfdi; - __fixdfti; __fixsfdi; - __fixsfti; __fixunsdfdi; __fixunsdfsi; - __fixunsdfti; __fixunssfdi; __fixunssfsi; - __fixunssfti; __fixunsxfdi; __fixunsxfsi; - __fixunsxfti; __fixxfdi; - __fixxfti; __floatdidf; __floatdisf; __floatdixf; - __floattidf; - __floattisf; - __floattixf; __lshrdi3; - __lshrti3; __moddi3; - __modti3; __muldi3; - __multi3; __mulvdi3; __mulvsi3; __negdi2; - __negti2; __negvdi2; __negvsi2; __register_frame; @@ -62,13 +48,9 @@ GCC_3.0 { __subvdi3; __subvsi3; __ucmpdi2; - __ucmpti2; __udivdi3; __udivmoddi4; - __udivmodti4; - __udivti3; __umoddi3; - __umodti3; _Unwind_DeleteException; _Unwind_Find_FDE; _Unwind_ForcedUnwind; @@ -82,6 +64,31 @@ GCC_3.0 { _Unwind_Resume; _Unwind_SetGR; _Unwind_SetIP; + +#ifdef CRT_HAS_128BIT + __ashlti3; + __ashrti3; + __cmpti2; + __divti3; + __ffsti2; + __fixdfti; + __fixsfti; + __fixunsdfti; + __fixunssfti; + __fixunsxfti; + __fixxfti; + __floattidf; + __floattisf; + __floattixf; + __lshrti3; + __modti3; + __multi3; + __negti2; + __ucmpti2; + __udivmodti4; + __udivti3; + __umodti3; +#endif }; GCC_3.3 { @@ -97,16 +104,19 @@ GCC_3.3.1 { GCC_3.4 { __clzdi2; __clzsi2; - __clzti2; __ctzdi2; __ctzsi2; - __ctzti2; __paritydi2; __paritysi2; - __parityti2; __popcountdi2; __popcountsi2; + +#ifdef CRT_HAS_128BIT + __clzti2; + __ctzti2; + __parityti2; __popcountti2; +#endif }; GCC_3.4.2 { @@ -114,11 +124,13 @@ GCC_3.4.2 { }; GCC_3.4.4 { +#ifdef CRT_HAS_128BIT __absvti2; __addvti3; __mulvti3; __negvti2; __subvti3; +#endif }; GCC_4.0.0 { @@ -137,10 +149,13 @@ GCC_4.2.0 { __floatundidf; __floatundisf; __floatundixf; + _Unwind_GetIPInfo; + +#ifdef CRT_HAS_128BIT __floatuntidf; __floatuntisf; __floatuntixf; - _Unwind_GetIPInfo; +#endif }; GCC_4.3.0 { From nobody Tue Apr 16 21:14:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxd32dvwz5H5kv; Tue, 16 Apr 2024 21:14: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 4VJxd25YqWz4Qmr; Tue, 16 Apr 2024 21:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nn7fJxvGxkTndzZM/s+vPTDmt/CS8RR7y/+HS+cEErI=; b=tT6/CV6eZtsM8lZ4zmtKmYMH7lK92rq4bHRj4x0HtKvzBHQgRGwDZa1aCYp5Latvg9pgZn 6h9Dd9IdGJ2UP7Hrm1P3KSIR2DaR1D8Omji98xVoUTLjwyxj9gu37i3GIFMe2K3fJQDbey qGoYDA93HS9QDmsrd7JI93I5bfUGuwyQ4sOcFWTvixV+/Nhl9Q/bgF3rWEgiCLubkOmrGB 15QglzN+qZbAC2ZhWasaBTSVNF4Jfrxo+bTaomTrIrgxxfczFEbHzr1KLYx3VN4dVfoeLA 6pxEX/jLdNSa2KSVaPxhr37cZCcDtZjD1/BBow//pfxUZcE926IfuDCh+F7O2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302086; a=rsa-sha256; cv=none; b=Z90mVHWW76i0EjCAHaB6TQcIFGPqvr+HVIITO7T11+tMZt21muWz2g+hyF22tZYj9KwIS2 5lpXAD+xiTlvdrRgSFkO22b+SbA7FLXQZOYfxSJ5m8SfCbeniOG9WKVGv6LSIcN8dwq+9L KKOW3rwJZi5PFyrPdYLlSzg2DkN4T5Drb/1jr7j7xxXAgS2gyJdV/6C2pbbtJXlowjd+h/ 2VDRY7sThuKv66nlfgkMP0uVq6v4PzelsbOrnS/zga1uzjvRCwkFcNxFKT7L4T2JMYVpUp tB+33hjKbcNomaGSF2uIZyy27UI13nXBFc127pwEMfURF6OQbqQmzNUyG9CJxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nn7fJxvGxkTndzZM/s+vPTDmt/CS8RR7y/+HS+cEErI=; b=bpuJgiJ7S4Qnmzxxl3minJoFzIiX8NWT0zEruC8FFSPwvNE2KAk3xhxCndAThpP95yBdoB 2I9MosIpZI1jYzRSv0hSbvCKAmpxbzyYIghEvJvHfDoHZ+6/RAeAVQXuNyZToBt55OQIU+ JLRD+Tt4pY1k07i4WWX7AAOcbmIubPINLFIlOAjkO/M5167Vl7X5OZ4zd5nnSa39nxJvVN PSEaP8tpZyCRJ2FVGFPAmCRYb0FblAXeP2vetV8pBK4VP3ex6c4ZzpQg/3SzX+PrwjX5LT SVnSF8d0FgW6Z6VRqFmNNPWyUQy97BgEYuxfETsOrhod7YkdMPF7XLyb4qCppw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxd25BBHz1017; Tue, 16 Apr 2024 21:14: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 43GLEkkX043874; Tue, 16 Apr 2024 21:14:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEkO5043871; Tue, 16 Apr 2024 21:14:46 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:46 GMT Message-Id: <202404162114.43GLEkO5043871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b8df8b0c2e64 - main - libgcc_s: only export 128-bit long double when available List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8df8b0c2e64b25885f82bd1ba9483ec9b8f497a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b8df8b0c2e64b25885f82bd1ba9483ec9b8f497a commit b8df8b0c2e64b25885f82bd1ba9483ec9b8f497a Author: Brooks Davis AuthorDate: 2024-04-16 17:02:55 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:21 +0000 libgcc_s: only export 128-bit long double when available These functions are only available on aarch64 and riscv so only try to export them on those architectures. Differential Revision: https://reviews.freebsd.org/D44322 --- lib/libgcc_s/Symbol.map | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map index 2aa31ec34542..de19c766fbba 100644 --- a/lib/libgcc_s/Symbol.map +++ b/lib/libgcc_s/Symbol.map @@ -148,6 +148,7 @@ GCC_4.3.0 { __bswapsi2; }; +#if defined(__aarch64__) || defined(__riscv) GCC_4.6.0 { __addtf3; __cmptf2; @@ -180,3 +181,4 @@ GCC_4.6.0 { __trunctfxf2; __unordtf2; }; +#endif From nobody Tue Apr 16 21:14:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxd51m5Hz5H5Rt; Tue, 16 Apr 2024 21:14: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 4VJxd470bzz4Qyb; Tue, 16 Apr 2024 21:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2vDvSPCmEFzY/AQMLWV8TW+luy4fP5h02H83mSFp5p0=; b=KF+6TBF+CItAc5rHoQq8Jc/PBo8heD+XlUI70+pGGIZwIjUswdZXAHLypI3twBE6cAsKjg +tu39Jvrw5qJPZVnWwYIA6RUBxPHCOFYhDSuYc+sGkmJPfXHwEU42+MnpLcC9wn9H/UUli bBjAH47q8TUNR8YHFhXOVbnqXGSmNt7wat2b99mVuC3cIFm/qu1hNxByPC7Nky+I0AKH5C ocfhjg2Utbw2+6SqEYCooHPT+4Zr0O/354jHuwL8G8Ipp5peH86NZw6s03jm8fERSruFAP +qHwbL1fmHnQBqAVAjx1DMA0n1VeaGmDKRI35MwtciEub0LcRJsuGE2z0hLNEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302089; a=rsa-sha256; cv=none; b=aasbldQmGfh+Cq0HSsL7VYJnFIPMDcsFvN6sTVyHLZYcdLFC/5EFTi5AlpiBtNxEBE9m6M rOReF19sJOD+Whv2iKmmdJg1VBZhQ9Q79iMskeJPIDuZTek7WW5ImquYPzJ5Fsh3u8B9z0 hdTjjwntzQnwVdYhD3JBq7bxGK25JpbuP4KHqG20jzASsg3OrV5ZevYIwH2WDQGT0nq7UO gn19J1syDrhApTsHeRz+jqwb1EUZuViRpleux4jVGMW5l9qYIHy7JyQthcGphaSY1ZUQmt nVemf4cLEYNZXm3mgz2s8dhz8QCdiBPrcKgoN4VZt0OHc5wz7DTImHgX3dKH+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2vDvSPCmEFzY/AQMLWV8TW+luy4fP5h02H83mSFp5p0=; b=QhvK5HcPPu0+u26VCV20km2hr1+wfn7BlH8ugnW/WjWuPMhnMBfqTp/0vMKHtetj8TNJ0i zfyovN+7t417Al/24QmYnFWO+129AMcw9NAoDKUBebD4Tp7b9zSVtLuKKbYHNhkToL7B/m F00g9VKvYUGmJ29uXZAjOeCWJd33DtgRxG1wq2rbltemBMPKVMoJllYDBXiSW9iNLIuJmV VmexFhtL9xuNUyRlLC1PbemIoh0rjiv0sOckFYZUT9nrn/T3NAiLs4xNavaqP5RYhtJMrU /sqnM9FZjey4wDM6pBq/NAAf1HfZ3ZvXjywiHMsaJeimuAkEiL9qKogtCAUvHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxd46Yghz1018; Tue, 16 Apr 2024 21:14: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 43GLEmo4043984; Tue, 16 Apr 2024 21:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEmaQ043981; Tue, 16 Apr 2024 21:14:48 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:48 GMT Message-Id: <202404162114.43GLEmaQ043981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: b457144ceaf7 - main - libgcc_s: exclude symbols not present on some arches List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b457144ceaf71be9de20f1879bb376162197cd9b Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b457144ceaf71be9de20f1879bb376162197cd9b commit b457144ceaf71be9de20f1879bb376162197cd9b Author: Brooks Davis AuthorDate: 2024-04-16 17:03:42 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:21 +0000 libgcc_s: exclude symbols not present on some arches arm, aarch64, and riscv lack some/all frame_info interfaces. arm and powerpc lack some numeric functions. Differential Revision: https://reviews.freebsd.org/D44324 --- lib/libgcc_s/Symbol.map | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map index 39cfa1809740..a30403f9811a 100644 --- a/lib/libgcc_s/Symbol.map +++ b/lib/libgcc_s/Symbol.map @@ -14,23 +14,35 @@ GCC_3.0 { __ashrdi3; __clear_cache; __cmpdi2; +#ifndef __arm__ __deregister_frame; +#if !defined(__aarch64__) && !defined(__riscv) __deregister_frame_info; __deregister_frame_info_bases; +#endif +#endif __divdi3; __ffsdi2; __fixdfdi; __fixsfdi; __fixunsdfdi; +#ifndef __arm__ __fixunsdfsi; +#endif __fixunssfdi; +#ifndef __arm__ __fixunssfsi; +#endif +#ifndef __powerpc__ __fixunsxfdi; __fixunsxfsi; __fixxfdi; +#endif __floatdidf; __floatdisf; +#ifndef __powerpc__ __floatdixf; +#endif __lshrdi3; __moddi3; __muldi3; @@ -39,12 +51,16 @@ GCC_3.0 { __negdi2; __negvdi2; __negvsi2; +#ifndef __arm__ __register_frame; +#if !defined(__aarch64__) && !defined(__riscv) __register_frame_info; __register_frame_info_bases; __register_frame_info_table; __register_frame_info_table_bases; __register_frame_table; +#endif +#endif __subvdi3; __subvsi3; __ucmpdi2; @@ -136,19 +152,27 @@ GCC_3.4.4 { GCC_4.0.0 { __divdc3; __divsc3; +#ifndef __powerpc__ __divxc3; +#endif __muldc3; __mulsc3; +#ifndef __powerpc__ __mulxc3; +#endif __powidf2; __powisf2; +#ifndef __powerpc__ __powixf2; +#endif }; GCC_4.2.0 { __floatundidf; __floatundisf; +#ifndef __powerpc__ __floatundixf; +#endif _Unwind_GetIPInfo; #ifdef CRT_HAS_128BIT From nobody Tue Apr 16 21:14:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxd636R1z5H5ph; Tue, 16 Apr 2024 21:14: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 4VJxd60b46z4RFL; Tue, 16 Apr 2024 21:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OIEnaeUJ6Je73O4L3NR6o+AF4GjWszlACTf4RS5ugC4=; b=sCWui5rkHUQVW0hO3a8psyeA6Ni4pYBGis/yrocTZD7xGrVFLwVdSEBp5bTyM9PG4Sh53Y y2HxCvK8msA1xRBiG/uqZ2rJy1nQ4YO4/1y1utmBkH2HY/L/uRR2+8cMGijEA9PvVZXv1j i/Swu18qUkUu80V7/aihqiCZvrAMZxtqMkWFjbGZERQeXabEAbRM5QZ0yrqYXKx+Gmyyqi t0CBukQRxmZaX+lGeu5KIkjUdv632iLnnHrRppbHpNBmu4POxF1yuQukrls8yAX+dtGH2q Q7FXvj+8q8syI6EDv3+jKbS5aeC2xx5mSkFXzx+LzrMXss60fYLR0aQv4Tu8Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302090; a=rsa-sha256; cv=none; b=gpRNr2k4Xyi5b2Cw+UIqdTc6tzyBkwjNB6yMR4JIbVmE5+XQpoZjrSZdCZqBzGHxooIYdp SxhUNvyu5rpqmoIuDdYoirRWmqxSW/L9bknd12whb6tlYP1nDbOY9lILu+eQ5JPsyhJO7T g3IyJg32n+i9SvaKOAxyz5t7DiAGbWZOKPLvq7Wdg9Pp0tQP+hSP8JuX5efWPTjdhhKxSW hNQOPh6J4HnAC426pI2sl8Z8bvUS0/wC/6aCcm87kJ9k0lzZB6vmd9jIDYOIv4NqUhAfBd SorOIwTEtJoaqZ2fArQS1UHkgeZ7K64pDC0YE1gsuDBLXGMR4sJYQYeML/Spyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OIEnaeUJ6Je73O4L3NR6o+AF4GjWszlACTf4RS5ugC4=; b=KAR7SUa3YZNKbARYESD31YK7U2kBIrF6YD33qrurUX9iETlSLKbchZQx/DFMyCq0aZi1N7 mI61rewXFjRAC5326m2rVNcNkl7aOzQ7yLdrmdSr9uYfkspzh+a7BEH8mOCtkwOwkHlv4P yHB1GAarn8PSO8m5SqqqvVrhDWfCVWvkIKDaK9Vf448xeYAspjHNDyrdUN5JsB2iwDC+jy Zem6cs+OoHGhWfJaTuqbf0QniW/aHFDd11potAqzTW+srsukS4TFX7Qq5uUi+Eg6UEAABc m5n56Z67tdj2sBLeOgABQz6CgNhXLQAMrykg+Z7V8nh73R+FF2z7ugA27VUctA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxd60C3Jzysk; Tue, 16 Apr 2024 21:14: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 43GLEnV4044026; Tue, 16 Apr 2024 21:14:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEnx1044023; Tue, 16 Apr 2024 21:14:49 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:49 GMT Message-Id: <202404162114.43GLEnx1044023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: da77a1b4f0df - main - libcxxrt: don't export nonexistant symbols List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da77a1b4f0dffcafee3675375ec71e9ab8319daa Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=da77a1b4f0dffcafee3675375ec71e9ab8319daa commit da77a1b4f0dffcafee3675375ec71e9ab8319daa Author: Brooks Davis AuthorDate: 2024-04-16 17:04:16 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:21 +0000 libcxxrt: don't export nonexistant symbols Remove version entries that we don't build. Add an arm specific Version.map and for other targets run the files through sed to handle int vs long in new and delete. Ideally we'd use the SYMBOL_MAPS functionality to preprocess with cpp, but it doesn't currently handle C++ symbols so be annoyingly duplicative for now. Differential Revision: https://reviews.freebsd.org/D44325 --- lib/libcxxrt/Makefile | 18 ++- lib/libcxxrt/Version.map | 47 +----- lib/libcxxrt/Version.map.arm | 362 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 384 insertions(+), 43 deletions(-) diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile index 48a724dd42f2..57f41e9bf59b 100644 --- a/lib/libcxxrt/Makefile +++ b/lib/libcxxrt/Makefile @@ -1,3 +1,4 @@ +.include PACKAGE= clibs SRCDIR= ${SRCTOP}/contrib/libcxxrt @@ -22,6 +23,21 @@ SRCS+= typeinfo.cc WARNS?= 0 CFLAGS+= -isystem ${SRCDIR} -nostdinc++ CXXSTD?= c++14 -VERSION_MAP= ${.CURDIR}/Version.map + +.if exists(Version.map.${MACHINE}) +VERSION_MAP= ${.CURDIR}/Version.map.${MACHINE} +.else +.if ${MACHINE_ABI:Mlong32} +VERSION_MAP= Version-32.map +.else +VERSION_MAP= Version-64.map +.endif + +Version-32.map: Version.map + sed 's/%%NEW_DELETE_TYPE%%/int/' ${.ALLSRC} > ${.TARGET} + +Version-64.map: Version.map + sed 's/%%NEW_DELETE_TYPE%%/long/' ${.ALLSRC} > ${.TARGET} +.endif .include diff --git a/lib/libcxxrt/Version.map b/lib/libcxxrt/Version.map index a54b6a4daad5..012026079e33 100644 --- a/lib/libcxxrt/Version.map +++ b/lib/libcxxrt/Version.map @@ -10,12 +10,10 @@ CXXABI_1.3 { __cxa_bad_cast; __cxa_bad_typeid; __cxa_begin_catch; - __cxa_begin_cleanup; __cxa_call_unexpected; __cxa_current_exception_type; __cxa_demangle; __cxa_end_catch; - __cxa_end_cleanup; __cxa_free_exception; __cxa_get_globals; __cxa_get_globals_fast; @@ -26,42 +24,20 @@ CXXABI_1.3 { __cxa_rethrow; __cxa_throw; __cxa_throw_bad_array_new_length; - __cxa_type_match; - __cxa_vec_cctor; - __cxa_vec_cleanup; - __cxa_vec_ctor; - __cxa_vec_delete2; - __cxa_vec_delete3; - __cxa_vec_delete; - __cxa_vec_dtor; - __cxa_vec_new2; - __cxa_vec_new3; - __cxa_vec_new; __dynamic_cast; - __gxx_personality_sj0; __gxx_personality_v0; extern "C++" { # Type info classes and their destructors - "__cxxabiv1::__array_type_info"; "__cxxabiv1::__array_type_info::~__array_type_info()"; - "__cxxabiv1::__class_type_info"; "__cxxabiv1::__class_type_info::~__class_type_info()"; - "__cxxabiv1::__enum_type_info"; "__cxxabiv1::__enum_type_info::~__enum_type_info()"; - "__cxxabiv1::__function_type_info::"; "__cxxabiv1::__function_type_info::~__function_type_info()"; - "__cxxabiv1::__fundamental_type_info"; "__cxxabiv1::__fundamental_type_info::~__fundamental_type_info()"; - "__cxxabiv1::__pbase_type_info"; "__cxxabiv1::__pbase_type_info::~__pbase_type_info()"; - "__cxxabiv1::__pointer_to_member_type_info"; "__cxxabiv1::__pointer_to_member_type_info::~__pointer_to_member_type_info()"; - "__cxxabiv1::__pointer_type_info"; "__cxxabiv1::__pointer_type_info::~__pointer_type_info()"; - "__cxxabiv1::__si_class_type_info"; "__cxxabiv1::__si_class_type_info::~__si_class_type_info()"; - "__cxxabiv1::__vmi_class_type_info"; "__cxxabiv1::__vmi_class_type_info::~__vmi_class_type_info()"; # vtables typeinfo classes. @@ -224,10 +200,6 @@ CXXABI_1.3 { _ZTIDi;_ZTIPDi;_ZTIPKDi; # char32_t _ZTIDs;_ZTIPDs;_ZTIPKDs; - # IEEE 754r decimal floating point - _ZTIDd;_ZTIPDd;_ZTIPKDd; - _ZTIDe;_ZTIPDe;_ZTIPKDe; - _ZTIDf;_ZTIPDf;_ZTIPKDf; # IEEE 754r half-precision floating point _ZTIDh;_ZTIPDh;_ZTIPKDh; @@ -238,10 +210,6 @@ CXXABI_1.3 { _ZTSDi;_ZTSPDi;_ZTSPKDi; # char32_t _ZTSDs;_ZTSPDs;_ZTSPKDs; - # IEEE 754r decimal floating point - _ZTSDd;_ZTSPDd;_ZTSPKDd; - _ZTSDe;_ZTSPDe;_ZTSPKDe; - _ZTSDf;_ZTSPDf;_ZTSPKDf; # IEEE 754r half-precision floating point _ZTSDh;_ZTSPDh;_ZTSPKDh; @@ -276,10 +244,8 @@ CXXABI_1.3.9 { "typeinfo name for unsigned __int128 const*"; "typeinfo name for unsigned __int128"; "typeinfo name for unsigned __int128*"; - "operator delete[](void*, unsigned int)"; - "operator delete(void*, unsigned int)"; - "operator delete[](void*, unsigned long)"; - "operator delete(void*, unsigned long)"; + "operator delete[](void*, unsigned %%NEW_DELETE_TYPE%%)"; + "operator delete(void*, unsigned %%NEW_DELETE_TYPE%%)"; }; } CXXABI_1.3.6; @@ -325,12 +291,9 @@ GLIBCXX_3.4 { extern "C++" { "operator delete[](void*)"; "operator delete(void*)"; - "operator new[](unsigned int)"; - "operator new(unsigned int)"; - "operator new(unsigned int, std::nothrow_t const&)"; - "operator new[](unsigned long)"; - "operator new(unsigned long)"; - "operator new(unsigned long, std::nothrow_t const&)"; + "operator new[](unsigned %%NEW_DELETE_TYPE%%)"; + "operator new(unsigned %%NEW_DELETE_TYPE%%)"; + "operator new(unsigned %%NEW_DELETE_TYPE%%, std::nothrow_t const&)"; "std::unexpected()"; "std::get_terminate()"; diff --git a/lib/libcxxrt/Version.map.arm b/lib/libcxxrt/Version.map.arm new file mode 100644 index 000000000000..bc4cf68a3654 --- /dev/null +++ b/lib/libcxxrt/Version.map.arm @@ -0,0 +1,362 @@ +# Define the same version as the libsupc++ from gcc 4.2.1 so that we can use +# libcxxrt as a drop-in replacement. + +CXXABI_1.3 { + + global: + + # ABI functions with C linkage + __cxa_allocate_exception; + __cxa_bad_cast; + __cxa_bad_typeid; + __cxa_begin_catch; + __cxa_call_unexpected; + __cxa_current_exception_type; + __cxa_demangle; + __cxa_end_catch; + __cxa_end_cleanup; + __cxa_free_exception; + __cxa_get_globals; + __cxa_get_globals_fast; + __cxa_guard_abort; + __cxa_guard_acquire; + __cxa_guard_release; + __cxa_pure_virtual; + __cxa_rethrow; + __cxa_throw; + __cxa_throw_bad_array_new_length; + __dynamic_cast; + __gxx_personality_v0; + + extern "C++" { + # Type info classes and their destructors + "__cxxabiv1::__array_type_info::~__array_type_info()"; + "__cxxabiv1::__class_type_info::~__class_type_info()"; + "__cxxabiv1::__enum_type_info::~__enum_type_info()"; + "__cxxabiv1::__function_type_info::~__function_type_info()"; + "__cxxabiv1::__fundamental_type_info::~__fundamental_type_info()"; + "__cxxabiv1::__pbase_type_info::~__pbase_type_info()"; + "__cxxabiv1::__pointer_to_member_type_info::~__pointer_to_member_type_info()"; + "__cxxabiv1::__pointer_type_info::~__pointer_type_info()"; + "__cxxabiv1::__si_class_type_info::~__si_class_type_info()"; + "__cxxabiv1::__vmi_class_type_info::~__vmi_class_type_info()"; + + # vtables typeinfo classes. + "vtable for __cxxabiv1::__array_type_info"; + "vtable for __cxxabiv1::__class_type_info"; + "vtable for __cxxabiv1::__enum_type_info"; + "vtable for __cxxabiv1::__function_type_info"; + "vtable for __cxxabiv1::__fundamental_type_info"; + "vtable for __cxxabiv1::__pbase_type_info"; + "vtable for __cxxabiv1::__pointer_to_member_type_info"; + "vtable for __cxxabiv1::__pointer_type_info"; + "vtable for __cxxabiv1::__si_class_type_info"; + "vtable for __cxxabiv1::__vmi_class_type_info"; + + # Type info for built-in types + "typeinfo for bool const*"; + "typeinfo for bool"; + "typeinfo for char const*"; + "typeinfo for char"; + "typeinfo for double const*"; + "typeinfo for double"; + "typeinfo for float const*"; + "typeinfo for float"; + "typeinfo for int const*"; + "typeinfo for int"; + "typeinfo for long const*"; + "typeinfo for long double const*"; + "typeinfo for long double"; + "typeinfo for long long const*"; + "typeinfo for long long"; + "typeinfo for long"; + "typeinfo for short const*"; + "typeinfo for short"; + "typeinfo for signed char const*"; + "typeinfo for signed char"; + "typeinfo for unsigned char const*"; + "typeinfo for unsigned char"; + "typeinfo for unsigned int const*"; + "typeinfo for unsigned int"; + "typeinfo for unsigned long const*"; + "typeinfo for unsigned long long const*"; + "typeinfo for unsigned long long"; + "typeinfo for unsigned long"; + "typeinfo for unsigned short const*"; + "typeinfo for unsigned short"; + "typeinfo for void const*"; + "typeinfo for void"; + "typeinfo for wchar_t const*"; + "typeinfo for wchar_t"; + + "typeinfo for bool*"; + "typeinfo for wchar_t*"; + "typeinfo for short*"; + "typeinfo for char*"; + "typeinfo for unsigned char*"; + "typeinfo for long long*"; + "typeinfo for unsigned short*"; + "typeinfo for long*"; + "typeinfo for double*"; + "typeinfo for unsigned long*"; + "typeinfo for unsigned long long*"; + "typeinfo for int*"; + "typeinfo for long double*"; + "typeinfo for signed char*"; + "typeinfo for void*"; + "typeinfo for unsigned int*"; + "typeinfo for float*"; + + "typeinfo for __cxxabiv1::__array_type_info"; + "typeinfo for __cxxabiv1::__class_type_info"; + "typeinfo for __cxxabiv1::__enum_type_info"; + "typeinfo for __cxxabiv1::__function_type_info"; + "typeinfo for __cxxabiv1::__fundamental_type_info"; + "typeinfo for __cxxabiv1::__pbase_type_info"; + "typeinfo for __cxxabiv1::__pointer_to_member_type_info"; + "typeinfo for __cxxabiv1::__pointer_type_info"; + "typeinfo for __cxxabiv1::__si_class_type_info"; + "typeinfo for __cxxabiv1::__vmi_class_type_info"; + + # Typeinfo names. + + "typeinfo name for unsigned char const*"; + "typeinfo name for long const*"; + "typeinfo name for double const*"; + "typeinfo name for unsigned long long const*"; + "typeinfo name for unsigned short const*"; + "typeinfo name for char const*"; + "typeinfo name for long long const*"; + "typeinfo name for short const*"; + "typeinfo name for unsigned int const*"; + "typeinfo name for float const*"; + "typeinfo name for bool const*"; + "typeinfo name for wchar_t const*"; + "typeinfo name for int const*"; + "typeinfo name for unsigned long const*"; + "typeinfo name for void const*"; + "typeinfo name for long double const*"; + "typeinfo name for signed char const*"; + "typeinfo name for wchar_t"; + "typeinfo name for short"; + "typeinfo name for char"; + "typeinfo name for float"; + "typeinfo name for void"; + "typeinfo name for unsigned int"; + "typeinfo name for bool"; + "typeinfo name for signed char"; + "typeinfo name for long double"; + "typeinfo name for int"; + "typeinfo name for unsigned long long"; + "typeinfo name for unsigned long"; + "typeinfo name for unsigned char"; + "typeinfo name for long"; + "typeinfo name for long long"; + "typeinfo name for unsigned short"; + "typeinfo name for double"; + + "typeinfo name for bool*"; + "typeinfo name for wchar_t*"; + "typeinfo name for short*"; + "typeinfo name for char*"; + "typeinfo name for unsigned char*"; + "typeinfo name for long long*"; + "typeinfo name for unsigned short*"; + "typeinfo name for long*"; + "typeinfo name for double*"; + "typeinfo name for unsigned long*"; + "typeinfo name for unsigned long long*"; + "typeinfo name for int*"; + "typeinfo name for long double*"; + "typeinfo name for signed char*"; + "typeinfo name for void*"; + "typeinfo name for unsigned int*"; + "typeinfo name for float*"; + + "typeinfo name for __cxxabiv1::__array_type_info"; + "typeinfo name for __cxxabiv1::__class_type_info"; + "typeinfo name for __cxxabiv1::__enum_type_info"; + "typeinfo name for __cxxabiv1::__function_type_info"; + "typeinfo name for __cxxabiv1::__fundamental_type_info"; + "typeinfo name for __cxxabiv1::__pbase_type_info"; + "typeinfo name for __cxxabiv1::__pointer_to_member_type_info"; + "typeinfo name for __cxxabiv1::__pointer_type_info"; + "typeinfo name for __cxxabiv1::__si_class_type_info"; + "typeinfo name for __cxxabiv1::__vmi_class_type_info"; + + "std::type_info::type_info(std::type_info const&)"; + "std::type_info::operator=(std::type_info const&)"; + + + # Extensions + "pathscale::set_terminate(void (*)())"; + "pathscale::set_unexpected(void (*)())"; + "pathscale::set_use_thread_local_handlers(bool)"; + }; + + # C++11 typeinfo not understood by ld.bfd 2.17.50 + # std::nullptr_t + _ZTIDn;_ZTIPDn;_ZTIPKDn; + # char16_t + _ZTIDi;_ZTIPDi;_ZTIPKDi; + # char32_t + _ZTIDs;_ZTIPDs;_ZTIPKDs; + # IEEE 754r half-precision floating point + _ZTIDh;_ZTIPDh;_ZTIPKDh; + + # C++11 typeinfo name not understood by ld.bfd 2.17.50 + # std::nullptr_t + _ZTSDn;_ZTSPDn;_ZTSPKDn; + # char16_t + _ZTSDi;_ZTSPDi;_ZTSPKDi; + # char32_t + _ZTSDs;_ZTSPDs;_ZTSPKDs; + # IEEE 754r half-precision floating point + _ZTSDh;_ZTSPDh;_ZTSPKDh; + + local: + *; +}; + +CXXABI_1.3.1 { + __cxa_get_exception_ptr; +} CXXABI_1.3; + +CXXABI_1.3.5 { + extern "C++" { + "typeinfo for __int128 const*"; + "typeinfo for __int128"; + "typeinfo for __int128*"; + "typeinfo for unsigned __int128 const*"; + "typeinfo for unsigned __int128"; + "typeinfo for unsigned __int128*"; + }; +} CXXABI_1.3.1; + +CXXABI_1.3.6 { + __cxa_deleted_virtual; +} CXXABI_1.3.5; + +CXXABI_1.3.9 { + extern "C++" { + "typeinfo name for __int128 const*"; + "typeinfo name for __int128"; + "typeinfo name for __int128*"; + "typeinfo name for unsigned __int128 const*"; + "typeinfo name for unsigned __int128"; + "typeinfo name for unsigned __int128*"; + "operator delete[](void*, unsigned int)"; + "operator delete(void*, unsigned int)"; + }; +} CXXABI_1.3.6; + +CXXABI_1.3.11 { + __cxa_init_primary_exception; +} CXXABI_1.3.9; + +CXXRT_1.0 { + + extern "C++" { + "std::type_info::name() const"; + "std::type_info::before(std::type_info const&) const"; + "std::type_info::operator==(std::type_info const&) const"; + "std::type_info::operator!=(std::type_info const&) const"; + "std::bad_cast::bad_cast(std::bad_cast const&)"; + "std::bad_cast::bad_cast()"; + "std::bad_cast::operator=(std::bad_cast const&)"; + "std::bad_typeid::bad_typeid(std::bad_typeid const&)"; + "std::bad_typeid::bad_typeid()"; + "std::bad_typeid::operator=(std::bad_typeid const&)"; + "std::exception::exception(std::exception const&)"; + "std::exception::exception()"; + "std::exception::operator=(std::exception const&)"; + "std::bad_alloc::bad_alloc(std::bad_alloc const&)"; + "std::bad_alloc::bad_alloc()"; + "std::bad_alloc::operator=(std::bad_alloc const&)"; + "std::bad_array_new_length::bad_array_new_length(std::bad_array_new_length const&)"; + "std::bad_array_new_length::bad_array_new_length()"; + "std::bad_array_new_length::operator=(std::bad_array_new_length const&)"; + + }; + __cxa_allocate_dependent_exception; + __cxa_current_primary_exception; + __cxa_decrement_exception_refcount; + __cxa_free_dependent_exception; + __cxa_increment_exception_refcount; + __cxa_rethrow_primary_exception; + +} CXXABI_1.3.6; + + +GLIBCXX_3.4 { + extern "C++" { + "operator delete[](void*)"; + "operator delete(void*)"; + "operator new[](unsigned int)"; + "operator new(unsigned int)"; + "operator new(unsigned int, std::nothrow_t const&)"; + + "std::unexpected()"; + "std::get_terminate()"; + "std::get_unexpected()"; + "std::uncaught_exception()"; + "std::terminate()"; + + "std::type_info::~type_info()"; + "std::bad_cast::~bad_cast()"; + "std::bad_typeid::~bad_typeid()"; + "std::exception::~exception()"; + "std::bad_alloc::~bad_alloc()"; + "std::bad_array_new_length::~bad_array_new_length()"; + + "std::exception::what() const"; + + std::set_new_handler*; + std::set_terminate*; + std::set_unexpected*; + std::type_info::__*; + + "vtable for std::bad_alloc"; + "vtable for std::bad_cast"; + "vtable for std::bad_typeid"; + "vtable for std::exception"; + "vtable for std::type_info"; + "vtable for std::bad_array_new_length"; + + "typeinfo for std::bad_alloc"; + "typeinfo for std::bad_typeid"; + "typeinfo for std::bad_cast"; + "typeinfo for std::exception"; + "typeinfo for std::type_info"; + "typeinfo for std::bad_array_new_length"; + "typeinfo name for std::bad_alloc"; + "typeinfo name for std::bad_typeid"; + "typeinfo name for std::bad_cast"; + "typeinfo name for std::exception"; + "typeinfo name for std::type_info"; + "typeinfo name for std::bad_array_new_length"; + + }; +}; + +GLIBCXX_3.4.9 { + extern "C++" { + "std::bad_typeid::what() const"; + "std::bad_cast::what() const"; + "std::bad_alloc::what() const"; + "std::bad_array_new_length::what() const"; + }; +} GLIBCXX_3.4; + +GLIBCXX_3.4.20 { + extern "C++" { + "std::get_new_handler()"; + }; +} GLIBCXX_3.4.9; + +GLIBCXX_3.4.22 { + extern "C++" { + "std::uncaught_exceptions()"; + }; +} GLIBCXX_3.4.20; + From nobody Tue Apr 16 21:14:51 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJxd75WS8z5H5rc; Tue, 16 Apr 2024 21:14: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 4VJxd71Xcmz4R2f; Tue, 16 Apr 2024 21:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GSXU5WmodjrCjZEqqCkfa69HO0Gh3hiJC2cHzpvwNaM=; b=BEQ2fbJZ6w6OcUhX1tQpkqzDl2N8ryQ/O4vB4bA3veQ++lCc0iXfzQBiOzr80P8kNT0+K5 Z52Gd25UJrpJ+OKdDGQeQxoQFap6gu+34fUMGVqKwVqVQYYnGF3vDFI1K3ly+6K22TPJjS t07lwhnohFqgAHTk055D34CR+UjtMeZ/WkPcgV9RSsxpQ+jURQlOqSiTgtYfDBXroc/wMN WZ7eHVVPivaes4ya2dtDMXIcGg2KVW/i7JVAAOkIkOXsRq19je12g5eaMmgX/ghW1uQ/jB nFWjXncGcKgVMKaGEowaHil0Uuj+76ReBj+xId7IXBuk65KJdoZBD03RiGE4kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302091; a=rsa-sha256; cv=none; b=xXoxTPPzczTQHyoup8KTWghUyD7hxwFWm8xRGVrQrqrXeT1YxvPaJRvFj7lQHu6vX0odRR OJGjHoSHR7dNbxtm5OCnswS56JY5Mgl1KUeQ0Pxoqsxwzmna+BXkWdYGHG+1xfRK4Rf5Mj XLRhd/5C2QmCaH+ANPnRVqdqUELfgBtte65EMHo1dzxnBEl4edqpxeR1ofkiqur1EM4UDa eNP0wtvKqpu357moScRiFlnGPZiCIMlKNbEh/K9oIa6bVtnxSMFKMbAluRYgRxunFfLn16 T52LaZ21H/e4n6w3YQ4LwCDojOOXcIbmU2heVaJZATRNntQS4UKrcexulHwz9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GSXU5WmodjrCjZEqqCkfa69HO0Gh3hiJC2cHzpvwNaM=; b=hI+aZUjOh6YaYvn9V6UoDG2cvZM0WOqy9VDdnyj9qFA00qlgKAZQHgUi+zBp347t9mbXjv lVaFYrKLGclxE0wuKLJJ7hv+rg64Bi66KEVCY4qCPl8eQAJM91alxQ7gk6TkaGtVquGlT9 +att8zP+/b5i3x/szsml3iFaV2t7LT/3Z32pGkinSF9LevXr387xqHoBHEK0wemQPTq5eD a6eMqlrtfFNnHxfr3lX9Lgu9QQ8dQwew859T0IhcIc2sz8Wfgke8IN6dgoCU1cZj50Tyey CU/ZBHgpL2VO2cg8wR7vXgFbAIMq23/3NPutICLeicJzMkHUvoRNt/stgRQH4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJxd718wlzyff; Tue, 16 Apr 2024 21:14: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 43GLEpFE044068; Tue, 16 Apr 2024 21:14:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEpKX044065; Tue, 16 Apr 2024 21:14:51 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:51 GMT Message-Id: <202404162114.43GLEpKX044065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e0919a4bac2b - main - libc/arm: export __signalcontext not _signalcontext List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0919a4bac2b57a086688ae8ec58058b91f61d86 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e0919a4bac2b57a086688ae8ec58058b91f61d86 commit e0919a4bac2b57a086688ae8ec58058b91f61d86 Author: Brooks Davis AuthorDate: 2024-04-16 17:05:16 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:21 +0000 libc/arm: export __signalcontext not _signalcontext The former exists and architectures other than aarch64 and riscv provide it. The later does not exist. Differential Revision: https://reviews.freebsd.org/D44329 --- lib/libc/arm/Symbol.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map index d8a62c367514..49476d2e176a 100644 --- a/lib/libc/arm/Symbol.map +++ b/lib/libc/arm/Symbol.map @@ -30,7 +30,7 @@ FBSDprivate_1.0 { ___longjmp; __longjmp; signalcontext; - _signalcontext; + __signalcontext; __siglongjmp; _libc_arm_fpu_present; From nobody Tue Apr 16 21:41:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJyCt2Wmmz5H7p0; Tue, 16 Apr 2024 21:41: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 4VJyCt2BD7z4Y8k; Tue, 16 Apr 2024 21:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713303690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQxpiNNz/2b2V37tCj3bJHkYz0fTyLucNl/B/zu0aMU=; b=gCFy51rSWJ94xWt0aoZv7AXqBc9UPKM370hTm0azbsRRWK12UuKWvrMa52W9Y1eMrZIWj/ 9vHiGYdvp4VgWWko2o56DdvyogNm55EIGMMmp0oAWAlYE3U3D3EF8TwIm6I89TymrBkpAp FIM7Sqkp5JFjZwS5iujtdATPG6NhmwyZEhWLQ1ZaZWdxsnoA41ulGQpQqF1BO6HfDvPFtG Ml1AVLb8YgUI9tmyt/P2EUFY/k6MI3EugY2hjlWBoaQJPoOoQZYnJpkLMx7KpVukolmO4Q OeqxtqZZQuuLAGxSE67w6jB6LRp2w7RIijKw2jpwbPXSEKI8e+LVmHOYoobNeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713303690; a=rsa-sha256; cv=none; b=IHwRsqw2kmaBj684vH+S072WU/RrwDxTqxgGD0HDkKcDUhQ5Vyv4tYP9cUYP/nsCd2ICfz x5tJtQvRNnrAtyRzyXJ5vtkG2ScK3JXsxjV3uf15BqWV4nIwJ9TLDs+3fYlu5Nc0GgHlz8 lC5x+NQ31MqQviFg0zsPoEk9RT+onnIx3YWZ7UEYBHDao/K9xhDfg9ZSHH97xz7G1muRhI sTBEiP9wV5iE4gtSPEb+HkqeeaY6LcVCmGQrSKK/7YagHapjyl1OHA+Z7IDeeBa+loG09m 1rr1Z4O8nuH0b0GK03lKP6u4pNq7kF1dlQxJFlfO6vMPa++UlyNxLok0qI3FsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713303690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQxpiNNz/2b2V37tCj3bJHkYz0fTyLucNl/B/zu0aMU=; b=Pvrp9D62Irg11td//rZ7EcNNXSzN9ielV9WDtFjzsnDp24vid+ijQZwq665juCk1s0pW3X nijWeu0UOIWJFovNoathnK8kbD24Y+VSHm5lSeua64kVYsoZiqBZVfLivu0+cB+jMfj3OV KgLdpwsL6EvV8/NT5SKXfGBHe/bh47zsxgMNRy4VMKbLAKBIVT5SuFctQ/T7GgJQsWYxCt 59cePE6Z8MkUwbcAyBRGgLmBFisoi632+zIV+dMI73Uyl7dwpup5L/w6tXLuytz3UeHWA5 Sdr0SdMvnIPxRMNS4rMY7eBI4SyUMxHevgC4h/RG4tgTlQv58brrekwTcDFiIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJyCt1n7gzyy7; Tue, 16 Apr 2024 21:41: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 43GLfUDa092184; Tue, 16 Apr 2024 21:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLfTJB092181; Tue, 16 Apr 2024 21:41:29 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:41:29 GMT Message-Id: <202404162141.43GLfTJB092181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: b9128a37faaf - main - libarchive: merge from vendor branch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b9128a37faafede823eb456aa65a11ac69997284 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b9128a37faafede823eb456aa65a11ac69997284 commit b9128a37faafede823eb456aa65a11ac69997284 Merge: e0919a4bac2b a509d68f27b9 Author: Martin Matuska AuthorDate: 2024-04-16 21:39:31 +0000 Commit: Martin Matuska CommitDate: 2024-04-16 21:39:31 +0000 libarchive: merge from vendor branch Libarchive 3.7.3 New features: #1941 uudecode filter: support file name and file mode in raw mode #1943 7-zip reader: translate Windows permissions into UNIX permissions #1962 zstd filter now supports the "long" write option #2012 add trailing letter b to bsdtar(1) substitute pattern #2031 PCRE2 support #2054 add support for long options "--group" and "--owner" to tar(1) Security fixes: #2101 Fix possible vulnerability in tar error reporting introduced in f27c173 Important bugfixes: #1974 ISO9660: preserve the natural order of links #2105 rar5: fix infinite loop if during rar5 decompression the last block produced no data #2027 xz filter: fix incorrect eof at the end of an lzip member #2043 zip: fix end-of-data marker processing when decompressing zip archives PR: 278315 (exp-run) MFC after: 1 week contrib/libarchive/.editorconfig | 18 - contrib/libarchive/.github/workflows/cifuzz.yml | 24 - contrib/libarchive/NEWS | 4 + .../build/autoconf/m4_ax_compile_check_sizeof.m4 | 115 -- contrib/libarchive/cat/bsdcat.1 | 2 - contrib/libarchive/cat/bsdcat.c | 36 +- contrib/libarchive/cat/bsdcat.h | 7 - contrib/libarchive/cat/bsdcat_platform.h | 24 +- contrib/libarchive/cat/cmdline.c | 1 - contrib/libarchive/cat/test/test.h | 2 - contrib/libarchive/cpio/bsdcpio.1 | 2 - contrib/libarchive/cpio/cmdline.c | 1 - contrib/libarchive/cpio/cpio.c | 17 +- contrib/libarchive/cpio/cpio.h | 2 - contrib/libarchive/cpio/cpio_platform.h | 18 +- contrib/libarchive/cpio/test/test.h | 2 - contrib/libarchive/cpio/test/test_0.c | 1 - contrib/libarchive/cpio/test/test_basic.c | 1 - contrib/libarchive/cpio/test/test_cmdline.c | 1 - contrib/libarchive/cpio/test/test_extract_cpio_Z.c | 1 - .../libarchive/cpio/test/test_extract_cpio_bz2.c | 1 - .../libarchive/cpio/test/test_extract_cpio_grz.c | 1 - .../libarchive/cpio/test/test_extract_cpio_gz.c | 1 - .../libarchive/cpio/test/test_extract_cpio_lrz.c | 1 - .../libarchive/cpio/test/test_extract_cpio_lz.c | 1 - .../libarchive/cpio/test/test_extract_cpio_lz4.c | 1 - .../libarchive/cpio/test/test_extract_cpio_lzma.c | 1 - .../libarchive/cpio/test/test_extract_cpio_lzo.c | 1 - .../libarchive/cpio/test/test_extract_cpio_xz.c | 1 - .../libarchive/cpio/test/test_extract_cpio_zstd.c | 1 - contrib/libarchive/cpio/test/test_format_newc.c | 1 - contrib/libarchive/cpio/test/test_gcpio_compat.c | 1 - .../cpio/test/test_gcpio_compat_ref.bin.uu | 1 - .../cpio/test/test_gcpio_compat_ref.crc.uu | 1 - .../cpio/test/test_gcpio_compat_ref.newc.uu | 1 - .../cpio/test/test_gcpio_compat_ref.ustar.uu | 1 - contrib/libarchive/cpio/test/test_missing_file.c | 1 - contrib/libarchive/cpio/test/test_option_0.c | 1 - contrib/libarchive/cpio/test/test_option_B_upper.c | 2 - contrib/libarchive/cpio/test/test_option_C_upper.c | 2 - contrib/libarchive/cpio/test/test_option_J_upper.c | 1 - contrib/libarchive/cpio/test/test_option_L_upper.c | 1 - contrib/libarchive/cpio/test/test_option_Z_upper.c | 1 - contrib/libarchive/cpio/test/test_option_a.c | 1 - .../libarchive/cpio/test/test_option_b64encode.c | 1 - contrib/libarchive/cpio/test/test_option_c.c | 1 - contrib/libarchive/cpio/test/test_option_d.c | 2 - contrib/libarchive/cpio/test/test_option_f.c | 1 - contrib/libarchive/cpio/test/test_option_f.cpio.uu | 1 - contrib/libarchive/cpio/test/test_option_grzip.c | 1 - contrib/libarchive/cpio/test/test_option_help.c | 1 - contrib/libarchive/cpio/test/test_option_l.c | 1 - contrib/libarchive/cpio/test/test_option_lrzip.c | 1 - contrib/libarchive/cpio/test/test_option_lz4.c | 1 - contrib/libarchive/cpio/test/test_option_lzma.c | 1 - contrib/libarchive/cpio/test/test_option_lzop.c | 1 - contrib/libarchive/cpio/test/test_option_m.c | 2 - contrib/libarchive/cpio/test/test_option_m.cpio.uu | 1 - .../libarchive/cpio/test/test_option_passphrase.c | 1 - contrib/libarchive/cpio/test/test_option_t.c | 1 - contrib/libarchive/cpio/test/test_option_t.cpio.uu | 1 - .../libarchive/cpio/test/test_option_t.stdout.uu | 1 - .../libarchive/cpio/test/test_option_tv.stdout.uu | 1 - contrib/libarchive/cpio/test/test_option_u.c | 1 - .../libarchive/cpio/test/test_option_uuencode.c | 1 - contrib/libarchive/cpio/test/test_option_xz.c | 1 - contrib/libarchive/cpio/test/test_option_y.c | 1 - contrib/libarchive/cpio/test/test_option_z.c | 1 - contrib/libarchive/cpio/test/test_option_zstd.c | 1 - contrib/libarchive/cpio/test/test_owner_parse.c | 1 - .../libarchive/cpio/test/test_passthrough_dotdot.c | 1 - .../cpio/test/test_passthrough_reverse.c | 1 - contrib/libarchive/libarchive/archive.h | 10 +- contrib/libarchive/libarchive/archive_acl.c | 1 - .../libarchive/libarchive/archive_acl_private.h | 2 - .../libarchive/libarchive/archive_check_magic.c | 20 +- contrib/libarchive/libarchive/archive_cmdline.c | 2 - .../libarchive/archive_cmdline_private.h | 2 - contrib/libarchive/libarchive/archive_crc32.h | 2 - contrib/libarchive/libarchive/archive_cryptor.c | 4 +- contrib/libarchive/libarchive/archive_digest.c | 2 +- contrib/libarchive/libarchive/archive_endian.h | 2 - contrib/libarchive/libarchive/archive_entry.3 | 2 - contrib/libarchive/libarchive/archive_entry.c | 30 +- contrib/libarchive/libarchive/archive_entry.h | 8 +- .../libarchive/archive_entry_copy_stat.c | 1 - .../libarchive/archive_entry_link_resolver.c | 1 - .../libarchive/libarchive/archive_entry_locale.h | 2 - .../libarchive/libarchive/archive_entry_private.h | 6 +- .../libarchive/libarchive/archive_entry_sparse.c | 1 - contrib/libarchive/libarchive/archive_entry_stat.c | 1 - .../libarchive/libarchive/archive_entry_strmode.c | 1 - contrib/libarchive/libarchive/archive_entry_time.3 | 2 - .../libarchive/libarchive/archive_entry_xattr.c | 1 - contrib/libarchive/libarchive/archive_getdate.c | 4 - contrib/libarchive/libarchive/archive_getdate.h | 2 - contrib/libarchive/libarchive/archive_match.c | 1 - contrib/libarchive/libarchive/archive_options.c | 1 - .../libarchive/archive_options_private.h | 2 - contrib/libarchive/libarchive/archive_pack_dev.c | 7 - contrib/libarchive/libarchive/archive_pathmatch.c | 1 - contrib/libarchive/libarchive/archive_pathmatch.h | 2 - contrib/libarchive/libarchive/archive_platform.h | 15 - .../libarchive/libarchive/archive_platform_acl.h | 2 - .../libarchive/libarchive/archive_platform_xattr.h | 2 - contrib/libarchive/libarchive/archive_private.h | 12 +- contrib/libarchive/libarchive/archive_random.c | 3 +- contrib/libarchive/libarchive/archive_read.3 | 2 - contrib/libarchive/libarchive/archive_read.c | 1 - .../libarchive/archive_read_add_passphrase.3 | 2 - .../libarchive/archive_read_add_passphrase.c | 1 - .../libarchive/archive_read_append_filter.c | 1 - contrib/libarchive/libarchive/archive_read_data.3 | 2 - .../libarchive/archive_read_data_into_fd.c | 1 - contrib/libarchive/libarchive/archive_read_disk.3 | 2 - .../libarchive/archive_read_disk_entry_from_file.c | 1 - .../libarchive/archive_read_disk_posix.c | 1 - .../libarchive/archive_read_disk_private.h | 2 - .../archive_read_disk_set_standard_lookup.c | 1 - .../libarchive/libarchive/archive_read_extract.3 | 2 - .../libarchive/libarchive/archive_read_extract.c | 1 - .../libarchive/libarchive/archive_read_extract2.c | 1 - .../libarchive/libarchive/archive_read_filter.3 | 2 - .../libarchive/libarchive/archive_read_format.3 | 2 - contrib/libarchive/libarchive/archive_read_free.3 | 2 - .../libarchive/libarchive/archive_read_header.3 | 2 - contrib/libarchive/libarchive/archive_read_new.3 | 2 - contrib/libarchive/libarchive/archive_read_open.3 | 2 - .../libarchive/libarchive/archive_read_open_fd.c | 1 - .../libarchive/libarchive/archive_read_open_file.c | 1 - .../libarchive/archive_read_open_filename.c | 112 +- .../libarchive/archive_read_open_memory.c | 1 - .../libarchive/libarchive/archive_read_private.h | 2 - .../libarchive/archive_read_set_format.c | 1 - .../libarchive/archive_read_set_options.3 | 2 - .../libarchive/archive_read_set_options.c | 1 - .../libarchive/archive_read_support_filter_all.c | 1 - .../archive_read_support_filter_by_code.c | 1 - .../libarchive/archive_read_support_filter_bzip2.c | 4 +- .../archive_read_support_filter_compress.c | 3 +- .../libarchive/archive_read_support_filter_grzip.c | 3 - .../libarchive/archive_read_support_filter_gzip.c | 5 +- .../libarchive/archive_read_support_filter_lrzip.c | 3 - .../libarchive/archive_read_support_filter_lz4.c | 8 +- .../libarchive/archive_read_support_filter_lzop.c | 6 +- .../libarchive/archive_read_support_filter_none.c | 1 - .../archive_read_support_filter_program.c | 1 - .../libarchive/archive_read_support_filter_rpm.c | 2 +- .../libarchive/archive_read_support_filter_uu.c | 53 +- .../libarchive/archive_read_support_filter_xz.c | 20 +- .../libarchive/archive_read_support_filter_zstd.c | 4 +- .../libarchive/archive_read_support_format_7zip.c | 83 +- .../libarchive/archive_read_support_format_all.c | 1 - .../libarchive/archive_read_support_format_ar.c | 1 - .../archive_read_support_format_by_code.c | 1 - .../libarchive/archive_read_support_format_cpio.c | 1 - .../libarchive/archive_read_support_format_empty.c | 1 - .../archive_read_support_format_iso9660.c | 6 +- .../libarchive/archive_read_support_format_mtree.c | 1 - .../libarchive/archive_read_support_format_rar.c | 2 +- .../libarchive/archive_read_support_format_rar5.c | 12 +- .../libarchive/archive_read_support_format_raw.c | 1 - .../libarchive/archive_read_support_format_tar.c | 1 - .../libarchive/archive_read_support_format_warc.c | 1 - .../libarchive/archive_read_support_format_xar.c | 3 +- .../libarchive/archive_read_support_format_zip.c | 499 ++++--- contrib/libarchive/libarchive/archive_string.c | 16 +- contrib/libarchive/libarchive/archive_string.h | 3 - .../libarchive/archive_string_composition.h | 2 - .../libarchive/libarchive/archive_string_sprintf.c | 1 - contrib/libarchive/libarchive/archive_util.3 | 2 - contrib/libarchive/libarchive/archive_util.c | 1 - .../libarchive/archive_version_details.c | 1 - contrib/libarchive/libarchive/archive_virtual.c | 1 - contrib/libarchive/libarchive/archive_write.3 | 2 - contrib/libarchive/libarchive/archive_write.c | 3 +- .../libarchive/archive_write_add_filter.c | 1 - .../archive_write_add_filter_b64encode.c | 2 - .../libarchive/archive_write_add_filter_by_name.c | 1 - .../libarchive/archive_write_add_filter_bzip2.c | 2 - .../libarchive/archive_write_add_filter_compress.c | 2 - .../libarchive/archive_write_add_filter_grzip.c | 2 - .../libarchive/archive_write_add_filter_gzip.c | 2 - .../libarchive/archive_write_add_filter_lrzip.c | 2 - .../libarchive/archive_write_add_filter_lz4.c | 2 - .../libarchive/archive_write_add_filter_lzop.c | 1 - .../libarchive/archive_write_add_filter_none.c | 1 - .../libarchive/archive_write_add_filter_program.c | 1 - .../libarchive/archive_write_add_filter_uuencode.c | 2 - .../libarchive/archive_write_add_filter_xz.c | 2 - .../libarchive/archive_write_add_filter_zstd.c | 149 +- .../libarchive/archive_write_blocksize.3 | 2 - contrib/libarchive/libarchive/archive_write_data.3 | 2 - contrib/libarchive/libarchive/archive_write_disk.3 | 2 - .../libarchive/archive_write_disk_posix.c | 1 - .../libarchive/archive_write_disk_private.h | 2 - .../archive_write_disk_set_standard_lookup.c | 1 - .../libarchive/libarchive/archive_write_filter.3 | 2 - .../libarchive/archive_write_finish_entry.3 | 2 - .../libarchive/libarchive/archive_write_format.3 | 2 - contrib/libarchive/libarchive/archive_write_free.3 | 2 - .../libarchive/libarchive/archive_write_header.3 | 2 - contrib/libarchive/libarchive/archive_write_new.3 | 2 - contrib/libarchive/libarchive/archive_write_open.3 | 2 - .../libarchive/libarchive/archive_write_open_fd.c | 1 - .../libarchive/archive_write_open_file.c | 1 - .../libarchive/archive_write_open_filename.c | 1 - .../libarchive/archive_write_open_memory.c | 1 - .../libarchive/libarchive/archive_write_private.h | 2 - .../libarchive/archive_write_set_format.c | 1 - .../libarchive/archive_write_set_format_7zip.c | 34 +- .../libarchive/archive_write_set_format_ar.c | 1 - .../libarchive/archive_write_set_format_by_name.c | 1 - .../archive_write_set_format_cpio_binary.c | 1 - .../archive_write_set_format_cpio_newc.c | 1 - .../libarchive/archive_write_set_format_cpio_odc.c | 1 - .../archive_write_set_format_filter_by_ext.c | 1 - .../libarchive/archive_write_set_format_gnutar.c | 2 - .../libarchive/archive_write_set_format_mtree.c | 1 - .../libarchive/archive_write_set_format_pax.c | 1 - .../libarchive/archive_write_set_format_private.h | 2 - .../libarchive/archive_write_set_format_shar.c | 1 - .../libarchive/archive_write_set_format_ustar.c | 2 - .../libarchive/archive_write_set_format_v7tar.c | 2 - .../libarchive/archive_write_set_format_warc.c | 1 - .../libarchive/archive_write_set_format_xar.c | 1 - .../libarchive/archive_write_set_format_zip.c | 189 ++- .../libarchive/archive_write_set_options.3 | 20 +- .../libarchive/archive_write_set_options.c | 1 - .../libarchive/archive_write_set_passphrase.3 | 2 - .../libarchive/archive_write_set_passphrase.c | 1 - contrib/libarchive/libarchive/cpio.5 | 2 - contrib/libarchive/libarchive/filter_fork.h | 2 - contrib/libarchive/libarchive/filter_fork_posix.c | 2 - contrib/libarchive/libarchive/libarchive-formats.5 | 2 - contrib/libarchive/libarchive/libarchive.3 | 2 - contrib/libarchive/libarchive/libarchive_changes.3 | 2 - .../libarchive/libarchive/libarchive_internals.3 | 2 - contrib/libarchive/libarchive/tar.5 | 2 - contrib/libarchive/libarchive/test/README | 2 - .../libarchive/libarchive/test/read_open_memory.c | 1 - contrib/libarchive/libarchive/test/test_acl_nfs4.c | 1 - contrib/libarchive/libarchive/test/test_acl_pax.c | 1 - .../libarchive/test/test_acl_platform_nfs4.c | 1 - .../libarchive/test/test_acl_platform_posix1e.c | 1 - .../libarchive/libarchive/test/test_acl_posix1e.c | 1 - contrib/libarchive/libarchive/test/test_acl_text.c | 1 - .../libarchive/test/test_archive_api_feature.c | 1 - .../libarchive/test/test_archive_clear_error.c | 1 - .../libarchive/test/test_archive_cmdline.c | 1 - .../libarchive/test/test_archive_getdate.c | 1 - .../libarchive/test/test_archive_match_owner.c | 1 - .../libarchive/test/test_archive_match_path.c | 1 - .../libarchive/test/test_archive_match_time.c | 1 - .../libarchive/test/test_archive_pathmatch.c | 1 - .../test/test_archive_read_add_passphrase.c | 1 - .../test/test_archive_read_close_twice.c | 2 - .../test/test_archive_read_close_twice_open_fd.c | 1 - .../test_archive_read_close_twice_open_filename.c | 1 - .../test/test_archive_read_multiple_data_objects.c | 5 +- .../test/test_archive_read_next_header_empty.c | 1 - .../test/test_archive_read_next_header_raw.c | 1 - .../libarchive/test/test_archive_read_open2.c | 1 - .../test/test_archive_read_set_filter_option.c | 1 - .../test/test_archive_read_set_format_option.c | 1 - .../libarchive/test/test_archive_read_set_option.c | 1 - .../test/test_archive_read_set_options.c | 1 - .../libarchive/test/test_archive_read_support.c | 1 - .../libarchive/test/test_archive_set_error.c | 1 - .../libarchive/test/test_archive_string.c | 3 +- .../test/test_archive_string_conversion.c | 4 +- .../test/test_archive_string_conversion.txt.Z.uu | 1 - .../test/test_archive_write_add_filter_by_name.c | 4 +- .../test/test_archive_write_set_filter_option.c | 1 - .../test/test_archive_write_set_format_by_name.c | 2 - .../test_archive_write_set_format_filter_by_ext.c | 2 - .../test/test_archive_write_set_format_option.c | 1 - .../test/test_archive_write_set_option.c | 1 - .../test/test_archive_write_set_options.c | 1 - .../test/test_archive_write_set_passphrase.c | 1 - contrib/libarchive/libarchive/test/test_bad_fd.c | 1 - .../libarchive/libarchive/test/test_compat_bzip2.c | 1 - .../libarchive/test/test_compat_bzip2_1.tbz.uu | 2 - .../libarchive/test/test_compat_bzip2_2.tbz.uu | 2 - .../libarchive/libarchive/test/test_compat_cpio.c | 1 - .../libarchive/test/test_compat_cpio_1.cpio.uu | 2 - .../libarchive/libarchive/test/test_compat_gtar.c | 1 - .../libarchive/test/test_compat_gtar_1.tar.uu | 1 - .../libarchive/test/test_compat_gtar_2.tar.uu | 2 +- .../libarchive/libarchive/test/test_compat_gzip.c | 1 - .../libarchive/test/test_compat_gzip_1.tgz.uu | 2 - .../libarchive/test/test_compat_gzip_2.tgz.uu | 2 - .../libarchive/libarchive/test/test_compat_lz4.c | 1 - .../libarchive/libarchive/test/test_compat_lzip.c | 85 +- .../libarchive/test/test_compat_lzip_3.lz.uu | 1461 +++++++++++++++++++ .../libarchive/test/test_compat_lzip_4.tlz.uu | 1474 ++++++++++++++++++++ .../libarchive/libarchive/test/test_compat_lzma.c | 1 - .../libarchive/test/test_compat_lzma_1.tlz.uu | 2 - .../libarchive/test/test_compat_lzma_2.tlz.uu | 2 - .../libarchive/test/test_compat_lzma_3.tlz.uu | 2 - .../libarchive/libarchive/test/test_compat_lzop.c | 1 - .../libarchive/libarchive/test/test_compat_mac.c | 1 - .../libarchive/test/test_compat_perl_archive_tar.c | 1 - .../test/test_compat_plexus_archiver_tar.c | 1 - .../test/test_compat_solaris_pax_sparse.c | 2 - .../libarchive/test/test_compat_solaris_tar_acl.c | 1 - .../libarchive/test/test_compat_star_acl.c | 1 - .../libarchive/test/test_compat_tar_directory.c | 1 - .../test/test_compat_tar_directory_1.tar.uu | 1 - .../libarchive/test/test_compat_tar_hardlink.c | 1 - .../test/test_compat_tar_hardlink_1.tar.uu | 1 - .../libarchive/test/test_compat_uudecode.c | 1 - .../libarchive/test/test_compat_uudecode_large.c | 1 - .../libarchive/libarchive/test/test_compat_xz.c | 1 - .../libarchive/test/test_compat_xz_1.txz.uu | 3 +- .../libarchive/libarchive/test/test_compat_zip.c | 1 - .../libarchive/test/test_compat_zip_1.zip.uu | 1 - .../libarchive/test/test_compat_zip_8.zip.uu | 12 +- .../libarchive/libarchive/test/test_compat_zstd.c | 2 - .../libarchive/libarchive/test/test_empty_write.c | 1 - contrib/libarchive/libarchive/test/test_entry.c | 1 - .../libarchive/test/test_entry_strmode.c | 1 - .../libarchive/test/test_extattr_freebsd.c | 1 - .../libarchive/libarchive/test/test_filter_count.c | 1 - contrib/libarchive/libarchive/test/test_fuzz.c | 1 - .../libarchive/test/test_fuzz_1.iso.Z.uu | 2 - .../test/test_gnutar_filename_encoding.c | 2 - .../libarchive/test/test_link_resolver.c | 1 - .../libarchive/libarchive/test/test_open_failure.c | 1 - contrib/libarchive/libarchive/test/test_open_fd.c | 1 - .../libarchive/libarchive/test/test_open_file.c | 1 - .../libarchive/test/test_open_filename.c | 1 - .../libarchive/test/test_pax_filename_encoding.c | 1 - .../test/test_pax_filename_encoding.tar.uu | 1 - .../libarchive/test/test_pax_xattr_header.c | 1 - .../test_rar_multivolume_single_file.part1.rar.uu | 2 +- .../test_rar_multivolume_single_file.part2.rar.uu | 2 +- .../test_rar_multivolume_single_file.part3.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part01.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part02.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part03.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part04.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part05.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part06.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part07.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part08.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part09.rar.uu | 2 +- ...ar_multivolume_uncompressed_files.part10.rar.uu | 2 +- .../libarchive/test/test_read_data_large.c | 1 - .../libarchive/libarchive/test/test_read_disk.c | 1 - .../test/test_read_disk_directory_traversals.c | 1 - .../test/test_read_disk_entry_from_file.c | 1 - .../libarchive/libarchive/test/test_read_extract.c | 1 - .../libarchive/test/test_read_file_nonexistent.c | 1 - .../test/test_read_filter_lrzip.tar.lrz.uu | 2 +- .../libarchive/test/test_read_filter_program.c | 1 - .../test/test_read_filter_program_signature.c | 1 - .../libarchive/test/test_read_filter_uudecode.c | 1 - .../test/test_read_filter_uudecode_base64_raw.uu | 11 + .../test/test_read_filter_uudecode_raw.c | 67 + .../test/test_read_filter_uudecode_raw.uu | 14 + .../libarchive/test/test_read_format_7zip.c | 81 +- .../test/test_read_format_7zip_copy.7z.uu | 2 +- .../test/test_read_format_7zip_deflate_arm64.7z.uu | 2 +- .../test/test_read_format_7zip_encryption_data.c | 1 - .../test/test_read_format_7zip_encryption_header.c | 2 - .../test_read_format_7zip_encryption_partially.c | 1 - .../test/test_read_format_7zip_lzma2_arm64.7z.uu | 2 +- .../test/test_read_format_7zip_malformed.c | 1 - .../test/test_read_format_7zip_packinfo_digests.c | 5 +- .../test/test_read_format_7zip_win_attrib.7z.uu | 10 + .../libarchive/test/test_read_format_ar.ar.uu | 2 - .../libarchive/test/test_read_format_ar.c | 2 - .../libarchive/test/test_read_format_cab.c | 1 - .../test/test_read_format_cab_filename.c | 1 - .../test_read_format_cab_filename_cp932.cab.uu | 2 +- .../libarchive/test/test_read_format_cpio_afio.c | 1 - .../libarchive/test/test_read_format_cpio_bin.c | 1 - .../libarchive/test/test_read_format_cpio_bin_Z.c | 1 - .../libarchive/test/test_read_format_cpio_bin_be.c | 1 - .../test/test_read_format_cpio_bin_be.cpio.uu | 1 - .../test/test_read_format_cpio_bin_bz2.c | 1 - .../libarchive/test/test_read_format_cpio_bin_gz.c | 1 - .../libarchive/test/test_read_format_cpio_bin_le.c | 1 - .../test/test_read_format_cpio_bin_lzip.c | 1 - .../test/test_read_format_cpio_bin_lzma.c | 1 - .../libarchive/test/test_read_format_cpio_bin_xz.c | 1 - .../test/test_read_format_cpio_filename.c | 13 +- .../test_read_format_cpio_filename_cp866.cpio.uu | 2 +- .../test_read_format_cpio_filename_eucjp.cpio.uu | 2 +- .../test_read_format_cpio_filename_koi8r.cpio.uu | 2 +- .../test_read_format_cpio_filename_utf8_jp.cpio.uu | 2 +- .../test_read_format_cpio_filename_utf8_ru.cpio.uu | 2 +- .../libarchive/test/test_read_format_cpio_odc.c | 1 - .../test/test_read_format_cpio_svr4_gzip.c | 1 - .../test/test_read_format_cpio_svr4c_Z.c | 1 - .../libarchive/test/test_read_format_empty.c | 1 - .../test/test_read_format_gtar_filename.c | 1 - .../test_read_format_gtar_filename_cp866.tar.Z.uu | 2 +- .../test_read_format_gtar_filename_eucjp.tar.Z.uu | 2 +- .../test_read_format_gtar_filename_koi8r.tar.Z.uu | 2 +- .../libarchive/test/test_read_format_gtar_gz.c | 1 - .../libarchive/test/test_read_format_gtar_lzma.c | 1 - .../libarchive/test/test_read_format_gtar_sparse.c | 2 - .../test/test_read_format_gtar_sparse_1_13.tar.uu | 1 - .../test/test_read_format_gtar_sparse_1_17.tar.uu | 1 - ...est_read_format_gtar_sparse_1_17_posix00.tar.uu | 1 - ...est_read_format_gtar_sparse_1_17_posix01.tar.uu | 1 - ...est_read_format_gtar_sparse_1_17_posix10.tar.uu | 1 - ...format_gtar_sparse_1_17_posix10_modified.tar.uu | 1 - .../test/test_read_format_gtar_sparse_skip_entry.c | 1 - ...est_read_format_gtar_sparse_skip_entry.tar.Z.uu | 2 +- .../libarchive/test/test_read_format_iso.iso.Z.uu | 2 - .../libarchive/test/test_read_format_iso_Z.c | 1 - .../test/test_read_format_iso_joliet.iso.Z.uu | 2 - .../test/test_read_format_iso_joliet_long.iso.Z.uu | 2 - .../test_read_format_iso_joliet_rockridge.iso.Z.uu | 2 - .../test/test_read_format_iso_multi_extent.c | 1 - .../test_read_format_iso_multi_extent.iso.Z.uu | 2 - .../test/test_read_format_iso_rockridge.iso.Z.uu | 2 - .../test_read_format_iso_rockridge_ce.iso.Z.uu | 2 - .../test_read_format_iso_rockridge_new.iso.Z.uu | 2 - ...est_read_format_iso_rockridge_rr_moved.iso.Z.uu | 2 - .../libarchive/test/test_read_format_iso_xorriso.c | 2 - .../test/test_read_format_iso_zisofs.iso.Z.uu | 2 - .../test/test_read_format_isojoliet_bz2.c | 1 - .../test/test_read_format_isojoliet_long.c | 7 +- .../test/test_read_format_isojoliet_rr.c | 1 - .../test/test_read_format_isojoliet_versioned.c | 1 - .../libarchive/test/test_read_format_isorr_bz2.c | 1 - .../libarchive/test/test_read_format_isorr_ce.c | 1 - .../test/test_read_format_isorr_new_bz2.c | 2 - .../test/test_read_format_isorr_rr_moved.c | 1 - .../test/test_read_format_isozisofs_bz2.c | 1 - .../libarchive/test/test_read_format_lha.c | 1 - .../test/test_read_format_lha_bugfix_0.c | 1 - .../test/test_read_format_lha_filename.c | 1 - .../test_read_format_lha_filename_cp932.lzh.uu | 2 +- .../test/test_read_format_lha_filename_utf16.c | 1 - .../test_read_format_lha_filename_utf16.lzh.uu | 38 +- .../libarchive/test/test_read_format_mtree.c | 1 - .../libarchive/test/test_read_format_pax_bz2.c | 1 - .../libarchive/test/test_read_format_rar.c | 85 +- .../libarchive/test/test_read_format_rar.rar.uu | 2 +- .../libarchive/test/test_read_format_rar5.c | 30 + ...format_rar5_bad_window_sz_in_mltarc_file.rar.uu | 2 +- .../test/test_read_format_rar5_compressed.rar.uu | 2 +- ...d_format_rar5_different_winsize_on_merge.rar.uu | 2 +- ...est_read_format_rar5_multiarchive.part01.rar.uu | 2 +- ...est_read_format_rar5_multiarchive.part02.rar.uu | 2 +- ...est_read_format_rar5_multiarchive.part03.rar.uu | 2 +- ...est_read_format_rar5_multiarchive.part04.rar.uu | 2 +- ...est_read_format_rar5_multiarchive.part05.rar.uu | 2 +- ...est_read_format_rar5_multiarchive.part06.rar.uu | 2 +- ...est_read_format_rar5_multiarchive.part07.rar.uu | 2 +- ...est_read_format_rar5_multiarchive.part08.rar.uu | 2 +- .../test_read_format_rar5_multiple_files.rar.uu | 2 +- ...st_read_format_rar5_multiple_files_solid.rar.uu | 2 +- .../test/test_read_format_rar5_sfx.exe.uu | 2 +- .../test/test_read_format_rar5_stored.rar.uu | 2 +- .../test/test_read_format_rar5_unicode.rar.uu | 9 + .../test/test_read_format_rar_binary_data.rar.uu | 2 +- .../test/test_read_format_rar_compress_best.rar.uu | 2 +- .../test_read_format_rar_compress_normal.rar.uu | 2 +- .../test/test_read_format_rar_encryption_data.c | 1 - .../test/test_read_format_rar_encryption_header.c | 1 - .../test_read_format_rar_encryption_partially.c | 1 - .../libarchive/test/test_read_format_rar_filter.c | 1 - .../test/test_read_format_rar_invalid1.c | 1 - .../test_read_format_rar_multi_lzss_blocks.rar.uu | 2 +- ...est_read_format_rar_multivolume.part0001.rar.uu | 2 +- ...est_read_format_rar_multivolume.part0002.rar.uu | 2 +- ...est_read_format_rar_multivolume.part0003.rar.uu | 2 +- ...est_read_format_rar_multivolume.part0004.rar.uu | 2 +- .../test/test_read_format_rar_noeof.rar.uu | 2 +- ...est_read_format_rar_ppmd_lzss_conversion.rar.uu | 2 +- .../test/test_read_format_rar_sfx.exe.uu | 2 +- .../test/test_read_format_rar_subblock.rar.uu | 2 +- .../test/test_read_format_rar_windows.rar.uu | 2 +- .../libarchive/test/test_read_format_raw.bufr.uu | 2 +- .../libarchive/test/test_read_format_raw.c | 1 - .../libarchive/test/test_read_format_raw.data.Z.uu | 1 - .../libarchive/test/test_read_format_raw.data.uu | 1 - .../libarchive/test/test_read_format_tar.c | 1 - .../test/test_read_format_tar_concatenated.c | 1 - .../test/test_read_format_tar_empty_filename.c | 1 - .../test_read_format_tar_empty_filename.tar.uu | 3 +- .../test/test_read_format_tar_empty_pax.c | 1 - .../test/test_read_format_tar_empty_pax.tar.Z.uu | 2 +- .../test_read_format_tar_empty_with_gnulabel.c | 1 - .../test/test_read_format_tar_filename.c | 1 - .../test/test_read_format_tar_invalid_pax_size.c | 1 - .../test_read_format_tar_invalid_pax_size.tar.uu | 2 +- .../libarchive/test/test_read_format_tbz.c | 1 - .../libarchive/test/test_read_format_tgz.c | 1 - .../libarchive/test/test_read_format_tlz.c | 1 - .../libarchive/test/test_read_format_txz.c | 1 - .../libarchive/test/test_read_format_tz.c | 1 - .../test/test_read_format_ustar_filename.c | 1 - .../libarchive/test/test_read_format_warc.c | 2 - .../libarchive/test/test_read_format_xar.c | 1 - .../libarchive/test/test_read_format_zip.c | 3 +- .../test/test_read_format_zip_7075_utf8_paths.c | 1 - .../test/test_read_format_zip_bzip2.zipx.uu | 2 +- .../test/test_read_format_zip_comment_stored.c | 1 - .../test/test_read_format_zip_encryption_data.c | 1 - .../test/test_read_format_zip_encryption_header.c | 1 - .../test_read_format_zip_encryption_partially.c | 1 - .../test/test_read_format_zip_filename.c | 7 +- .../test_read_format_zip_filename_cp866.zip.uu | 2 +- .../test_read_format_zip_filename_cp932.zip.uu | 2 +- .../test_read_format_zip_filename_koi8r.zip.uu | 2 +- .../test_read_format_zip_filename_utf8_jp.zip.uu | 2 +- .../test_read_format_zip_filename_utf8_ru.zip.uu | 2 +- .../test_read_format_zip_filename_utf8_ru2.zip.uu | 2 +- .../test/test_read_format_zip_high_compression.c | 2 - .../libarchive/test/test_read_format_zip_jar.c | 1 - .../test/test_read_format_zip_lzma.zipx.uu | 2 +- .../test/test_read_format_zip_mac_metadata.c | 1 - .../test/test_read_format_zip_malformed.c | 1 - .../libarchive/test/test_read_format_zip_nested.c | 3 +- .../test/test_read_format_zip_nofiletype.c | 1 - .../libarchive/test/test_read_format_zip_padded.c | 1 - .../test/test_read_format_zip_ppmd8.zipx.uu | 2 +- .../libarchive/test/test_read_format_zip_sfx.c | 1 - ...t_read_format_zip_traditional_encryption_data.c | 1 - .../test/test_read_format_zip_winzip_aes.c | 1 - .../test/test_read_format_zip_winzip_aes128.zip.uu | 2 +- .../test/test_read_format_zip_winzip_aes256.zip.uu | 2 +- ...est_read_format_zip_winzip_aes256_stored.zip.uu | 2 +- .../test/test_read_format_zip_winzip_aes_large.c | 1 - ...read_format_zip_with_invalid_traditional_eocd.c | 2 - ...format_zip_with_invalid_traditional_eocd.zip.uu | 2 +- .../libarchive/test/test_read_format_zip_zip64.c | 1 - .../libarchive/libarchive/test/test_read_large.c | 1 - .../test/test_read_large_splitted_rar_aa.uu | 2 +- .../test/test_read_large_splitted_rar_ab.uu | 2 +- .../test/test_read_large_splitted_rar_ac.uu | 2 +- .../test/test_read_large_splitted_rar_ad.uu | 2 +- .../test/test_read_large_splitted_rar_ae.uu | 2 +- .../libarchive/test/test_read_pax_truncated.c | 1 - .../test/test_read_pax_xattr_schily.tar.uu | 2 +- .../libarchive/test/test_read_position.c | 1 - .../libarchive/test/test_read_splitted_rar_aa.uu | 2 +- .../libarchive/test/test_read_splitted_rar_ab.uu | 2 +- .../libarchive/test/test_read_splitted_rar_ac.uu | 2 +- .../libarchive/test/test_read_splitted_rar_ad.uu | 2 +- .../libarchive/test/test_read_truncated.c | 1 - .../libarchive/test/test_read_truncated_filter.c | 1 - .../libarchive/libarchive/test/test_sparse_basic.c | 3 +- .../test/test_splitted_rar_seek_support_aa.uu | 2 +- .../test/test_splitted_rar_seek_support_ab.uu | 2 +- .../test/test_splitted_rar_seek_support_ac.uu | 2 +- .../libarchive/test/test_tar_filenames.c | 1 - .../libarchive/libarchive/test/test_tar_large.c | 1 - .../libarchive/test/test_ustar_filename_encoding.c | 1 - .../libarchive/test/test_ustar_filenames.c | 1 - .../libarchive/libarchive/test/test_write_disk.c | 1 - .../libarchive/test/test_write_disk_appledouble.c | 1 - .../libarchive/test/test_write_disk_failures.c | 1 - .../libarchive/test/test_write_disk_hardlink.c | 1 - .../test/test_write_disk_hfs_compression.c | 1 - .../libarchive/test/test_write_disk_lookup.c | 1 - .../libarchive/test/test_write_disk_mac_metadata.c | 1 - .../test/test_write_disk_no_hfs_compression.c | 1 - .../libarchive/test/test_write_disk_perms.c | 1 - .../libarchive/test/test_write_disk_secure.c | 1 - .../libarchive/test/test_write_disk_secure744.c | 1 - .../libarchive/test/test_write_disk_secure745.c | 1 - .../libarchive/test/test_write_disk_secure746.c | 1 - .../libarchive/test/test_write_disk_sparse.c | 1 - .../libarchive/test/test_write_disk_symlink.c | 1 - .../libarchive/test/test_write_disk_times.c | 1 - .../libarchive/test/test_write_filter_b64encode.c | 1 - .../libarchive/test/test_write_filter_bzip2.c | 1 - .../libarchive/test/test_write_filter_compress.c | 1 - .../libarchive/test/test_write_filter_gzip.c | 1 - .../test/test_write_filter_gzip_timestamp.c | 1 - .../libarchive/test/test_write_filter_lz4.c | 5 +- .../libarchive/test/test_write_filter_lzip.c | 1 - .../libarchive/test/test_write_filter_lzma.c | 1 - .../libarchive/test/test_write_filter_lzop.c | 4 +- .../libarchive/test/test_write_filter_program.c | 1 - .../libarchive/test/test_write_filter_uuencode.c | 1 - .../libarchive/test/test_write_filter_xz.c | 1 - .../libarchive/test/test_write_filter_zstd.c | 107 +- .../libarchive/test/test_write_format_7zip.c | 1 - .../libarchive/test/test_write_format_7zip_empty.c | 1 - .../libarchive/test/test_write_format_7zip_large.c | 1 - .../libarchive/test/test_write_format_ar.c | 1 - .../libarchive/test/test_write_format_cpio.c | 1 - .../libarchive/test/test_write_format_cpio_empty.c | 1 - .../libarchive/test/test_write_format_cpio_newc.c | 2 - .../libarchive/test/test_write_format_cpio_odc.c | 2 - .../libarchive/test/test_write_format_gnutar.c | 1 - .../test/test_write_format_gnutar_filenames.c | 1 - .../libarchive/test/test_write_format_iso9660.c | 21 +- .../libarchive/test/test_write_format_mtree.c | 1 - .../test/test_write_format_mtree_absolute_path.c | 1 - .../test/test_write_format_mtree_classic.c | 1 - .../test/test_write_format_mtree_classic_indent.c | 1 - .../test/test_write_format_mtree_fflags.c | 2 +- .../test/test_write_format_mtree_no_separator.c | 2 +- .../test/test_write_format_mtree_quoted_filename.c | 1 - .../libarchive/test/test_write_format_pax.c | 1 - .../libarchive/test/test_write_format_shar_empty.c | 1 - .../libarchive/test/test_write_format_tar.c | 1 - .../libarchive/test/test_write_format_tar_empty.c | 1 - .../libarchive/test/test_write_format_tar_sparse.c | 1 - .../libarchive/test/test_write_format_tar_ustar.c | 1 - .../libarchive/test/test_write_format_tar_v7tar.c | 1 - .../libarchive/test/test_write_format_warc.c | 1 - .../libarchive/test/test_write_format_warc_empty.c | 1 - .../libarchive/test/test_write_format_xar.c | 1 - .../libarchive/test/test_write_format_xar_empty.c | 1 - .../libarchive/test/test_write_format_zip.c | 50 +- .../test/test_write_format_zip64_stream.c | 276 ++++ .../test/test_write_format_zip_compression_store.c | 66 +- .../libarchive/test/test_write_format_zip_empty.c | 1 - .../test/test_write_format_zip_empty_zip64.c | 1 - .../test/test_write_format_zip_entry_size_unset.c | 13 +- .../libarchive/test/test_write_format_zip_file.c | 43 +- .../test/test_write_format_zip_file_zip64.c | 47 +- .../libarchive/test/test_write_format_zip_large.c | 31 +- .../libarchive/test/test_write_format_zip_stream.c | 247 ++++ .../libarchive/test/test_write_format_zip_zip64.c | 1 - .../libarchive/test/test_write_open_memory.c | 1 - .../libarchive/test/test_write_read_format_zip.c | 56 +- .../libarchive/test/test_xattr_platform.c | 1 - .../libarchive/test/test_zip_filename_encoding.c | 4 +- contrib/libarchive/libarchive_fe/err.c | 2 - contrib/libarchive/libarchive_fe/err.h | 11 +- contrib/libarchive/libarchive_fe/lafe_platform.h | 12 - contrib/libarchive/libarchive_fe/line_reader.c | 2 - contrib/libarchive/libarchive_fe/passphrase.c | 4 +- contrib/libarchive/tar/bsdtar.1 | 77 +- contrib/libarchive/tar/bsdtar.c | 82 +- contrib/libarchive/tar/bsdtar.h | 8 +- contrib/libarchive/tar/bsdtar_platform.h | 24 +- contrib/libarchive/tar/cmdline.c | 3 +- contrib/libarchive/tar/creation_set.c | 1 - contrib/libarchive/tar/read.c | 1 - contrib/libarchive/tar/subst.c | 28 +- contrib/libarchive/tar/test/test.h | 2 - contrib/libarchive/tar/test/test_0.c | 1 - contrib/libarchive/tar/test/test_basic.c | 1 - contrib/libarchive/tar/test/test_copy.c | 1 - contrib/libarchive/tar/test/test_empty_mtree.c | 1 - contrib/libarchive/tar/test/test_extract_tar_Z.c | 1 - contrib/libarchive/tar/test/test_extract_tar_bz2.c | 1 - contrib/libarchive/tar/test/test_extract_tar_grz.c | 1 - contrib/libarchive/tar/test/test_extract_tar_gz.c | 1 - contrib/libarchive/tar/test/test_extract_tar_lrz.c | 1 - contrib/libarchive/tar/test/test_extract_tar_lz.c | 1 - contrib/libarchive/tar/test/test_extract_tar_lz4.c | 1 - .../libarchive/tar/test/test_extract_tar_lzma.c | 1 - contrib/libarchive/tar/test/test_extract_tar_lzo.c | 1 - contrib/libarchive/tar/test/test_extract_tar_xz.c | 1 - .../libarchive/tar/test/test_extract_tar_zstd.c | 1 - contrib/libarchive/tar/test/test_format_newc.c | 1 - contrib/libarchive/tar/test/test_help.c | 1 - contrib/libarchive/tar/test/test_leading_slash.c | 1 - contrib/libarchive/tar/test/test_missing_file.c | 1 - contrib/libarchive/tar/test/test_option_C_mtree.c | 1 - contrib/libarchive/tar/test/test_option_C_upper.c | 1 - contrib/libarchive/tar/test/test_option_H_upper.c | 1 - contrib/libarchive/tar/test/test_option_L_upper.c | 1 - contrib/libarchive/tar/test/test_option_O_upper.c | 1 - contrib/libarchive/tar/test/test_option_T_upper.c | 1 - contrib/libarchive/tar/test/test_option_U_upper.c | 1 - contrib/libarchive/tar/test/test_option_X_upper.c | 1 - contrib/libarchive/tar/test/test_option_a.c | 1 - contrib/libarchive/tar/test/test_option_acls.c | 1 - contrib/libarchive/tar/test/test_option_b.c | 1 - .../libarchive/tar/test/test_option_b64encode.c | 1 - contrib/libarchive/tar/test/test_option_exclude.c | 1 - .../libarchive/tar/test/test_option_exclude_vcs.c | 2 +- contrib/libarchive/tar/test/test_option_fflags.c | 1 - .../libarchive/tar/test/test_option_gid_gname.c | 1 - contrib/libarchive/tar/test/test_option_group.c | 84 ++ contrib/libarchive/tar/test/test_option_grzip.c | 1 - .../libarchive/tar/test/test_option_ignore_zeros.c | 1 - contrib/libarchive/tar/test/test_option_j.c | 1 - contrib/libarchive/tar/test/test_option_k.c | 1 - .../tar/test/test_option_keep_newer_files.c | 1 - contrib/libarchive/tar/test/test_option_lrzip.c | 1 - contrib/libarchive/tar/test/test_option_lz4.c | 1 - contrib/libarchive/tar/test/test_option_lzma.c | 1 - contrib/libarchive/tar/test/test_option_lzop.c | 1 - contrib/libarchive/tar/test/test_option_n.c | 1 - .../libarchive/tar/test/test_option_newer_than.c | 1 - contrib/libarchive/tar/test/test_option_nodump.c | 1 - .../libarchive/tar/test/test_option_older_than.c | 1 - contrib/libarchive/tar/test/test_option_owner.c | 84 ++ .../libarchive/tar/test/test_option_passphrase.c | 1 - contrib/libarchive/tar/test/test_option_q.c | 1 - contrib/libarchive/tar/test/test_option_r.c | 1 - contrib/libarchive/tar/test/test_option_s.c | 12 +- .../libarchive/tar/test/test_option_safe_writes.c | 1 - .../libarchive/tar/test/test_option_uid_uname.c | 1 - contrib/libarchive/tar/test/test_option_uuencode.c | 1 - contrib/libarchive/tar/test/test_option_xattrs.c | 1 - contrib/libarchive/tar/test/test_option_xz.c | 1 - contrib/libarchive/tar/test/test_option_z.c | 1 - contrib/libarchive/tar/test/test_option_zstd.c | 1 - contrib/libarchive/tar/test/test_patterns.c | 1 - contrib/libarchive/tar/test/test_print_longpath.c | 1 - contrib/libarchive/tar/test/test_stdio.c | 1 - .../libarchive/tar/test/test_strip_components.c | 1 - contrib/libarchive/tar/test/test_symlink_dir.c | 1 - contrib/libarchive/tar/util.c | 3 +- contrib/libarchive/tar/write.c | 1 - contrib/libarchive/test_utils/test_common.h | 15 +- contrib/libarchive/test_utils/test_main.c | 18 +- contrib/libarchive/unzip/bsdunzip.1 | 2 - contrib/libarchive/unzip/bsdunzip.c | 17 +- contrib/libarchive/unzip/bsdunzip_platform.h | 24 +- contrib/libarchive/unzip/cmdline.c | 3 +- contrib/libarchive/unzip/test/test.h | 2 - contrib/libarchive/unzip/test/test_I.c | 41 + contrib/libarchive/unzip/test/test_I.zip.uu | 8 + contrib/libarchive/unzip/test/test_doubledash.c | 44 + lib/libarchive/Makefile.inc | 2 +- lib/libarchive/tests/Makefile | 7 + usr.bin/unzip/tests/Makefile | 3 + 725 files changed, 5735 insertions(+), 1735 deletions(-) diff --cc contrib/libarchive/libarchive/test/test_compat_lzip_3.lz.uu index 000000000000,d72f533f8e5a..d72f533f8e5a mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_compat_lzip_3.lz.uu +++ b/contrib/libarchive/libarchive/test/test_compat_lzip_3.lz.uu diff --cc contrib/libarchive/libarchive/test/test_compat_lzip_4.tlz.uu index 000000000000,6a230c5e1322..6a230c5e1322 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_compat_lzip_4.tlz.uu +++ b/contrib/libarchive/libarchive/test/test_compat_lzip_4.tlz.uu diff --cc contrib/libarchive/libarchive/test/test_read_filter_uudecode_base64_raw.uu index 000000000000,b4ddfb0a22e8..b4ddfb0a22e8 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_filter_uudecode_base64_raw.uu +++ b/contrib/libarchive/libarchive/test/test_read_filter_uudecode_base64_raw.uu diff --cc contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.c index 000000000000,6f02dc5de147..6f02dc5de147 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.c +++ b/contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.c diff --cc contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.uu index 000000000000,8a5f8b5a607d..8a5f8b5a607d mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.uu +++ b/contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_win_attrib.7z.uu index 000000000000,dc7495bcbf37..dc7495bcbf37 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_win_attrib.7z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_win_attrib.7z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_unicode.rar.uu index 000000000000,e011ab64e689..e011ab64e689 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_unicode.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_unicode.rar.uu diff --cc contrib/libarchive/libarchive/test/test_write_format_zip64_stream.c index 000000000000,bed97894e8da..bed97894e8da mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_write_format_zip64_stream.c +++ b/contrib/libarchive/libarchive/test/test_write_format_zip64_stream.c diff --cc contrib/libarchive/libarchive/test/test_write_format_zip_stream.c index 000000000000,aff6a31ae171..aff6a31ae171 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_write_format_zip_stream.c +++ b/contrib/libarchive/libarchive/test/test_write_format_zip_stream.c diff --cc contrib/libarchive/libarchive_fe/err.h index 2f84c2fe6fe0,000000000000..f4a66350a669 mode 100644,000000..100644 --- a/contrib/libarchive/libarchive_fe/err.h +++ b/contrib/libarchive/libarchive_fe/err.h @@@ -1,57 -1,0 +1,58 @@@ +/*- + * Copyright (c) 2009 Joerg Sonnenberger + * 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(S) ``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(S) 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. + * + * $FreeBSD$ + */ + +#ifndef LAFE_ERR_H +#define LAFE_ERR_H + +#if defined(__GNUC__) && (__GNUC__ > 2 || \ - (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) - #define __LA_DEAD __attribute__((__noreturn__)) ++ (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) ++#define __LA_NORETURN __attribute__((__noreturn__)) ++#elif defined(_MSC_VER) ++#define __LA_NORETURN __declspec(noreturn) +#else - #define __LA_DEAD ++#define __LA_NORETURN +#endif + +#if defined(__GNUC__) && (__GNUC__ > 2 || \ + (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) +# ifdef __MINGW_PRINTF_FORMAT +# define __LA_PRINTF_FORMAT __MINGW_PRINTF_FORMAT +# else +# define __LA_PRINTF_FORMAT __printf__ +# endif +# define __LA_PRINTFLIKE(f,a) __attribute__((__format__(__LA_PRINTF_FORMAT, f, a))) +#else +# define __LA_PRINTFLIKE(f,a) +#endif + +void lafe_warnc(int code, const char *fmt, ...) __LA_PRINTFLIKE(2, 3); - void lafe_errc(int eval, int code, const char *fmt, ...) __LA_DEAD - __LA_PRINTFLIKE(3, 4); ++__LA_NORETURN void lafe_errc(int eval, int code, const char *fmt, ...) __LA_PRINTFLIKE(3, 4); + +const char * lafe_getprogname(void); +void lafe_setprogname(const char *name, const char *defaultname); + +#endif diff --cc contrib/libarchive/tar/test/test_option_group.c index 000000000000,d429ddab9f9f..d429ddab9f9f mode 000000,100644..100644 --- a/contrib/libarchive/tar/test/test_option_group.c +++ b/contrib/libarchive/tar/test/test_option_group.c diff --cc contrib/libarchive/tar/test/test_option_owner.c index 000000000000,04c86cc0e8d4..04c86cc0e8d4 mode 000000,100644..100644 --- a/contrib/libarchive/tar/test/test_option_owner.c +++ b/contrib/libarchive/tar/test/test_option_owner.c diff --cc contrib/libarchive/unzip/test/test_I.c index 000000000000,a6bad85a011f..a6bad85a011f mode 000000,100644..100644 --- a/contrib/libarchive/unzip/test/test_I.c +++ b/contrib/libarchive/unzip/test/test_I.c diff --cc contrib/libarchive/unzip/test/test_I.zip.uu index 000000000000,8a1e7afa5b92..8a1e7afa5b92 mode 000000,100644..100644 --- a/contrib/libarchive/unzip/test/test_I.zip.uu +++ b/contrib/libarchive/unzip/test/test_I.zip.uu diff --cc contrib/libarchive/unzip/test/test_doubledash.c index 000000000000,eb7d34e4f6cc..eb7d34e4f6cc mode 000000,100644..100644 --- a/contrib/libarchive/unzip/test/test_doubledash.c +++ b/contrib/libarchive/unzip/test/test_doubledash.c diff --cc lib/libarchive/Makefile.inc index 95d96df24eef,000000000000..153f96b12165 mode 100644,000000..100644 --- a/lib/libarchive/Makefile.inc +++ b/lib/libarchive/Makefile.inc @@@ -1,23 -1,0 +1,23 @@@ +# These defines are needed for both libarchive and the tests. If we don't keep +# them in sync we can get run-time crashes while running tests due to mismatches +# between structures such as archive_md5_ctx, etc. + +LIBADD= z bz2 lzma bsdxml zstd +CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 \ - -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_LIBZSTD_COMPRESSOR=1 ++ -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_ZSTD_compressStream=1 +CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" + +.if ${MK_OPENSSL} != "no" +CFLAGS+= -DWITH_OPENSSL +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L +LIBADD+= crypto +CFLAGS.archive_hmac.c+=-Wno-error=cast-qual +.else +LIBADD+= md +.endif + +.if ${MK_ICONV} != "no" +# TODO: This can be changed back to CFLAGS once iconv works correctly +# with statically linked binaries. +SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST= +.endif diff --cc lib/libarchive/tests/Makefile index 2fe9bbcc7c2d,000000000000..0d47e1a5ed3c mode 100644,000000..100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@@ -1,677 -1,0 +1,684 @@@ +.include + +PACKAGE= tests + +WARNS?= 3 + +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +ATF_TESTS_SH+= functional_test + +TEST_METADATA.functional_test+= timeout="600" + +BINDIR= ${TESTSDIR} + +PROGS+= libarchive_test + +CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I${.OBJDIR} +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/libarchive/test +CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils + +CFLAGS.test_utils.c+= -Wno-cast-align + +# Uncomment to link against dmalloc +#LDADD+= -L/usr/local/lib -ldmalloc +#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC + +.PATH: ${_LIBARCHIVEDIR}/libarchive/test +TESTS_SRCS= \ + test_acl_nfs4.c \ + test_acl_pax.c \ + test_acl_platform_nfs4.c \ + test_acl_platform_posix1e.c \ + test_acl_posix1e.c \ + test_acl_text.c \ + test_archive_api_feature.c \ + test_archive_clear_error.c \ + test_archive_cmdline.c \ + test_archive_digest.c \ + test_archive_getdate.c \ + test_archive_match_time.c \ + test_archive_match_owner.c \ + test_archive_match_path.c \ + test_archive_pathmatch.c \ + test_archive_read_add_passphrase.c \ + test_archive_read_close_twice.c \ *** 721 LINES SKIPPED *** From nobody Tue Apr 16 22:31:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJzKq5Dqwz5HDB5; Tue, 16 Apr 2024 22:31: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 4VJzKq4kvxz4m5G; Tue, 16 Apr 2024 22:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713306703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAJSe0GmUX+hZGvjMIvv8xOUsruO9+iUOJeiiugYvzE=; b=ynkTJgbSfP4tuOeNJ/+2FOYnWS05Vif8Z/ShmznmnfhkKFG23OcbRGU03Vc0x+ve7bvJaz VjnQKCAylAp5A88plZUvdDxVyjGygXPHx8ut5au/V9mxl72tzTSyJh1IHMhBWao4telqgC wZHmu7vKD7pzPule9kMoYDk2LdPxZskbykDDoQKMJYmHc3th2qYZ3jB81Sq1sXCms7admR MwHlz6y9lM3SgXq+4ClO7H0MrI9EAbwzdxgWoPO4qpWzsb3Dl1ZcPBJFEeg57vcWS7i/zw gWZORE5ShbiW7mGrTfmKrypMjru0VaCkLt7c5nKBDYREDI3jcNbZEn0uRYbJlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713306703; a=rsa-sha256; cv=none; b=BE5qZMt3Ji+pLMEQJPsDrt3IyXSRoZD4EIWosXDYpmyeT42Bg2nihyT5naxylUYWuKFX1D /VLCBFCTKIzYMQEf0wZDuFTrGdjlZxHTRdwCgRdyEbfXNjaMPg62yMj7ecEhArA57+qQdR TlTYf3rZ+JrncBw/o+Jpyf94MTr1m0FYXwiAfJeF0ZzylyDYljcHSrY+lQ/Dm3L0xZW04X hjdURvK9XLZfv6qCQQjqYkKhdE/BzPppVrVe130an43S071rYBHofgq0Lxaa0xpeSI/1kd sySLR8vsXz8EcaH4c6DETHsRyKjr2CblKhQLO5WknS4PVpuopkVRzXwlOg+gTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713306703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAJSe0GmUX+hZGvjMIvv8xOUsruO9+iUOJeiiugYvzE=; b=FNnr1IIWN8S3ulUxBdNa1nPlNaJM5maYsGccjHkr97xAzq+JU2oTFJt8LFsCXwD7oDW3JU 3mU9BqomptGf23n4ovpVCfBeHWJ19qDDXkE4RgResX4wUZuMHB6igpe9ZCqIRQ3rCjAr75 TWZW1P8z0ZvIn/cGkobvjl5uAFSd0ACrRJ03R4NApdgVzVrjhJ97bZrgeP1WvnJqYmZuT1 xcX737iLuklS3YPsbERfwfxswHrOvlZlZIcQcZNcQGdKdtH3vKrDMcKPg9x0vCdDiV/UEh ylpzS2sylcSiboZSmh+qf2MBZINt88M3d/zRKoNe19/4NqfqpDMKg7PbGIQsaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJzKq4Kw1z11QW; Tue, 16 Apr 2024 22:31: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 43GMVhcp076317; Tue, 16 Apr 2024 22:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GMVhg1076314; Tue, 16 Apr 2024 22:31:43 GMT (envelope-from git) Date: Tue, 16 Apr 2024 22:31:43 GMT Message-Id: <202404162231.43GMVhg1076314@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: 88d09ddea011 - main - exports.5: Update an example to use service(8) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 88d09ddea0111abd74579e5c3c4ed029351feccb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=88d09ddea0111abd74579e5c3c4ed029351feccb commit 88d09ddea0111abd74579e5c3c4ed029351feccb Author: Mark Johnston AuthorDate: 2024-04-16 22:25:19 +0000 Commit: Mark Johnston CommitDate: 2024-04-16 22:25:19 +0000 exports.5: Update an example to use service(8) MFC after: 1 week --- usr.sbin/mountd/exports.5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index 33ab4f693978..a94b5348b572 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -402,7 +402,7 @@ utility can be made to re-read the .Nm file by sending it a hangup signal as follows: .Bd -literal -offset indent -/etc/rc.d/mountd reload +service mountd reload .Ed .Pp After sending the @@ -600,6 +600,7 @@ afterwards, whereas NFSv3 rejects the mount request. .Xr mountd 8 , .Xr nfsd 8 , .Xr rpc.tlsservd 8 , +.Xr service 8 , .Xr showmount 8 .Sh STANDARDS The implementation is based on the following documents: From nobody Tue Apr 16 22:31:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJzKs0dxNz5HDVb; Tue, 16 Apr 2024 22:31: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 4VJzKr5XDKz4ltt; Tue, 16 Apr 2024 22:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713306704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZKB+3FY8Y8dUhJFBwcZhMoAMZskvibNDGaRLXay+AM=; b=laJav9NOngpJ3EXy1KMqp91g0Ot6wjuvvRJiws2lMiXCagZL3tRXxz3OSFnHqdqMoIbj2+ ejVbrkodrIgzDHOKdh8K29WATMfePh4KdMwjhANK3iuyOqmk5v4OQy/4CRpKvT4k3s4ou6 Jk4xxLWPHrEgCzKcVt7LYFNqbT8ilv792Kz57OHnI/DlrxM5vXx89MLLhqB/1G/Hyu/glb xJR6/7IyrJc+0lSYNaSuyRgQtPmQl+m5h3oEqLpglDy1jMEAsohYBVYBbsXs9h20GiBvms 3LbRLwCa704CjKY0vFHoIw0LUfVMPIXUPMhMyWj5Fv0z2GFGnc9WQvQ0+yiYGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713306704; a=rsa-sha256; cv=none; b=Gk0a5yL8GnYo5jeuFKxH9q28wR4jpo/J8Ydo5ngzFGRHTjrontLZJzA83k50OQvHhpYiA7 eMMhnkL0kDPgUMVLO/yRY4jcbcA/nFJpbfhAy10inRCwRqN6b8UwPoPyKEaMdnf2YpYRFP 4SFMcuQLYgYorb/8IgK/QH7wOGjqtNXJ+9TlAok3EK2FLQu2pNGjhUD0jjG3uYlEitaX0B SAVax9bUBSefnkGFsr0X68/cc7oYAcVgy8ONrhl3g51Tt09ZVRGQeFgcAIJC/vsMCx8H8v L5LPSWKbXm3fIuwpPWEEkTGQqds9ncRbjXTxZ+C5XTODub4IF/aGPAmKgEhuwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713306704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZKB+3FY8Y8dUhJFBwcZhMoAMZskvibNDGaRLXay+AM=; b=RCcu2QCfP09hF5JpZjtIqkuWBnbxs8C9qbV5wwAQT79qdHlOmoVx/Tz5P/JUxrk4xhfeOy gkd1mL3Skngt2kPm/b+AMx648EnfT5p3CuKNowoAkl8RCvUmEEN/ivSIxxBCGGksFgvYnR Suvj/dWXyF4p/oO2/g/F8EpDRjBihcx+gj9dbjpvrofjPs79n3ILgYl3SNEzYhaDeaaP/l NQnHm7uBF32v1ojKBMl+zY0XRMIr3jQ+//yv82AJGA3vIad3Cj7D3fZz7+pRIgAQUZPeI9 +za7mtZG+77Xf3PhKztUPpGFKhKGuJ2dQzDJkk9kdoKwZE3Y6RMTyedPIoQHPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJzKr5829z11Nf; Tue, 16 Apr 2024 22:31: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 43GMViCY076383; Tue, 16 Apr 2024 22:31:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GMViid076380; Tue, 16 Apr 2024 22:31:44 GMT (envelope-from git) Date: Tue, 16 Apr 2024 22:31:44 GMT Message-Id: <202404162231.43GMViid076380@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: 9d975e47d5a3 - main - exports.5: Clarify that exported dirs should be local mount points List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9d975e47d5a3638d4f575b2cf97e07bf22b53c7e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9d975e47d5a3638d4f575b2cf97e07bf22b53c7e commit 9d975e47d5a3638d4f575b2cf97e07bf22b53c7e Author: Mark Johnston AuthorDate: 2024-04-16 22:25:57 +0000 Commit: Mark Johnston CommitDate: 2024-04-16 22:27:02 +0000 exports.5: Clarify that exported dirs should be local mount points If not, then in general the entire filesystem containing the exported directory is accessiable. This may be surprising, so try to make it more clear. Reviewed by: rmacklem, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44614 --- usr.sbin/mountd/exports.5 | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/exports.5 b/usr.sbin/mountd/exports.5 index a94b5348b572..ee3e9a89f114 100644 --- a/usr.sbin/mountd/exports.5 +++ b/usr.sbin/mountd/exports.5 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 7, 2024 +.Dd April 16, 2024 .Dt EXPORTS 5 .Os .Sh NAME @@ -55,8 +55,8 @@ file system or the NFSv4 tree root for one or more hosts. A long line may be split over several lines by ending all but the last line with a backslash .Pq Ql \e . -A host may be specified only once for each local file or the NFSv4 tree root on the -server and there may be only one default entry for each server +A host may be specified only once for each local file system or the NFSv4 tree +root on the server and there may be only one default entry for each server file system that applies to all other hosts. The latter exports the file system to the .Dq world @@ -66,7 +66,26 @@ be used only when the file system contains public information. In a mount entry, the first field(s) specify the directory path(s) within a server file system that can be mounted on by the corresponding client(s). -There are three forms of this specification. +Note well that exporting a directory on the server does not guarantee that only +files below the exported directory will be accessible. +This is true even in the absence of the +.Fl alldirs +flag. +To provide this guarantee, the exported directories must be local file system +mount points on the server. +For example, if one exports +.Pa /home , +and +.Pa /home +is not a file system mount point, then clients will be able to access arbitrary +files on the root file system. +As such, to avoid confusion with respect to what is exported, it may be prudent +to limit exported directories to server local file system mount points. +When exporting ZFS datasets with the +.Sy sharenfs +property, this is auomatically the case. +.Pp +There are three forms of the directory path specification. The first is to list all mount points as absolute directory paths separated by whitespace. This list of directory paths should be considered an @@ -597,6 +616,7 @@ afterwards, whereas NFSv3 rejects the mount request. .Xr strunvis 3 , .Xr nfsv4 4 , .Xr netgroup 5 , +.Xr zfsprops 7 , .Xr mountd 8 , .Xr nfsd 8 , .Xr rpc.tlsservd 8 , From nobody Tue Apr 16 23:40:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK0rm3kvrz5HLR8; Tue, 16 Apr 2024 23:40: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 4VK0rm2qn7z41kP; Tue, 16 Apr 2024 23:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713310808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2RnoMMenQspH/ObmnDf7IXVrJV8pvwsMqWVOvlKGwhw=; b=gPweH3rMpmwLyQUA23Jf4rMOBdKki744RMVEaaoeCv/p7dRTWQGMizORYALHFhputtqtyq +7FOPMj4UQT/ZDGHoPTTA2pvPwZt6wn+xqdJw+RFoLAECprt2hV8opAlLVQAaoRG3EutJy XN3eq8r0uWQDN9XP5wwYF7G342ap7KJMA42mZaeKxBKshrqciinivuSAXQH04U+rXvPPhu n/VxGi7CnfJtTTPprqOPMvAfODfEy7TXL8h2Ls6L6KQi8tgMDFksy88PlovyFsbivbVQUi 1tCt9dn03jEcrrSZismuvYgvtHdoa0HN0e4ODHuWevpgFE4ngmENVw7Es/ViTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713310808; a=rsa-sha256; cv=none; b=VnOsfFCJoGJ3o4zKrdbHoCYYmQw5xrVhsfyVhFENF+L0/KkiJ9+ULZr5OtCWkZ+QDbvcNF pZvyyT8TPVIOEpokp68WQ4WwcZx0v1gZbGxIPcCxV8L2KXiTqiVAAwmtcsPCT/CqgXQLRg 3nuDHYxbBojHQzvn3kYARp8e3TV08dVJ6fPFCHpZm8G68UF57lhmHrsQWefvq2rZvelIm0 MQ3bXQAOItdjXcQ9qte8n82ha2Zqn6l1YonbauD84RYBSKh7B3myeu2f5GDcm5b/ijzKeI bSlN/RZol6tqGmuKwFjcD6NJNCckCY/6N83aesdErcR+QA4on6blE3vs9KW1Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713310808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2RnoMMenQspH/ObmnDf7IXVrJV8pvwsMqWVOvlKGwhw=; b=f0cpGptbFIQ+GFbznvcrL92ItO2rZyRe8ieETxvdN1CQq5qpBaDNvYPUV05QgOyp3/nZsj AedOuST5MWzyvTP6BESCwHVst5L+HAIM4bm7agJ/eG0gMyfb2hRkiMoIyzlO+W7qbQQsxe 1HEsDRclvy+gIIR3VRL/6suASyk0Qzuc+mQN068NdK2A+wUAheQD7/Ux6ZRbfNuSGEe6dF KqFh2JWGcyd2J8x5ToZGK1ANRg7cF2anIG50FaNVVaDYki6/OfR+FfSIHadeLt1AQIKweV BtlAQWAp65Po5qoIwugoyAg5IdhOjQpYWdKqFNl+16xlbhGL13zqsgbxWQIG5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK0rm2Qwkz13L3; Tue, 16 Apr 2024 23:40: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 43GNe8h9084761; Tue, 16 Apr 2024 23:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GNe8tn084756; Tue, 16 Apr 2024 23:40:08 GMT (envelope-from git) Date: Tue, 16 Apr 2024 23:40:08 GMT Message-Id: <202404162340.43GNe8tn084756@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: 2e850b832f5d - main - acpi_battery: avoid divide-by-zero when no devices have capacity info List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 2e850b832f5d2adb9b230d191277d67c00caaab9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e850b832f5d2adb9b230d191277d67c00caaab9 commit 2e850b832f5d2adb9b230d191277d67c00caaab9 Author: Josef 'Jeff' Sipek AuthorDate: 2024-04-16 23:01:28 +0000 Commit: Ed Maste CommitDate: 2024-04-16 23:39:45 +0000 acpi_battery: avoid divide-by-zero when no devices have capacity info On laptops with builtin batteries, disconnecting the battery may show up as a battery without any capacity information. (The theory is that one is disconnecting the cells but the electronics identifying the battery are still connected.) As a result, the loop over all batteries in acpi_battery_get_battinfo results in total_lfcap == 0. So, just check that total_lfcap is non-zero to avoid a division by zero (triggerable by sysctl hw.acpi.battery). Reported by: Stefano Marinelli Tested by: Stefano Marinelli Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D44818 --- sys/dev/acpica/acpi_battery.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c index 7455c6afc6a6..cfd8261d5eab 100644 --- a/sys/dev/acpica/acpi_battery.c +++ b/sys/dev/acpica/acpi_battery.c @@ -266,7 +266,14 @@ acpi_battery_get_battinfo(device_t dev, struct acpi_battinfo *battinfo) */ if (valid_units > 0) { if (dev == NULL) { - battinfo->cap = (total_cap * 100) / total_lfcap; + /* + * Avoid division by zero if none of the batteries had valid + * capacity info. + */ + if (total_lfcap > 0) + battinfo->cap = (total_cap * 100) / total_lfcap; + else + battinfo->cap = 0; battinfo->min = total_min; battinfo->state = batt_stat; battinfo->rate = valid_rate; From nobody Wed Apr 17 00:42:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK2DP6s5wz5HRMn; Wed, 17 Apr 2024 00:42:13 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK2DP4Dk4z46PM; Wed, 17 Apr 2024 00:42:13 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; none Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id DB1AB8D4A169; Wed, 17 Apr 2024 00:42:03 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 876462D029D8; Wed, 17 Apr 2024 00:42:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id ELjSlnjBOBhT; Wed, 17 Apr 2024 00:42:02 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 1B8D72D029D2; Wed, 17 Apr 2024 00:42:01 +0000 (UTC) Date: Wed, 17 Apr 2024 00:42:01 +0000 (UTC) From: "Bjoern A. Zeeb" To: Martin Matuska cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1719886f6d08 - main - zfs: merge openzfs/zfs@90ba19eb7 In-Reply-To: <202404162054.43GKssXB009354@gitrepo.freebsd.org> Message-ID: <2sr0q7r2-o2q7-41pq-6qpn-n1o2r0q22q3p@yvfgf.mnoonqbm.arg> References: <202404162054.43GKssXB009354@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed 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:24940, ipnet:2a01:4f8::/32, country:DE] X-Rspamd-Queue-Id: 4VK2DP4Dk4z46PM On Tue, 16 Apr 2024, Martin Matuska wrote: > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1719886f6d08408b834d270c59ffcfd821c8f63a > > commit 1719886f6d08408b834d270c59ffcfd821c8f63a > Merge: e4a0c92e7aea 90ba19eb7b81 > Author: Martin Matuska > AuthorDate: 2024-04-16 20:52:34 +0000 > Commit: Martin Matuska > CommitDate: 2024-04-16 20:54:07 +0000 > > zfs: merge openzfs/zfs@90ba19eb7 > > Notable upstream pull request merges: > #15784 90ba19eb7b Do no use .cfi_negate_ra_state within the assembly > on Arm64 > #15942 b6bbaa8372 Give a better message from 'zpool get' with invalid > pool name > #15943 ca678bc0bc Makefile.bsd: sort and cleanup source file list > #15953 fa480fe5ba zinject: show more device fault fields > #15983 30c4eba4ea Fix panics when truncating/deleting files > #15992 99741bde59 zvol: use multiple taskq > #16015 a100a195fa Add support for zfs mount -R > #16022 5e5fd0a178 Speculative prefetch for reordered requests > #16040 997f85b4d3 L2ARC: Relax locking during write > #16042 b12738182c Improve dbuf_read() error reporting > #16051 a9a4290173 xdr: header cleanup > #16052 eeca9a91d6 Fix read errors race after block cloning > #16057 aa5445c28b Remove db_state DB_NOFILL checks from syncing context > #16061 76d1dde94c zinject: inject device errors into ioctls > #16072 9e63631dea Small fix to prefetch ranges aggregation > #16077 44f337be30 Illumos#16463 zfs_ioc_recv leaks nvlist > #16085 4725e543be zinject: "no-op" error injection > #16086 c6da985e28 Add the BTI elf note to the AArch64 SHA2 assembly > > Obtained from: OpenZFS > OpenZFS commit: 90ba19eb7b81f0225e63bedfb902000d23383921 This breaks aarch64 /usr/src/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S:37:5: error: 'LD_VERSION' is not defined, evaluates to 0 [-Werror,-Wundef] -- Bjoern A. Zeeb r15:7 From nobody Wed Apr 17 02:04:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK42q1H0Cz5HZ5B; Wed, 17 Apr 2024 02:04: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 4VK42q0dcLz4FvD; Wed, 17 Apr 2024 02:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tBjmcHOPAyxcyCB/Gvjr9Zd8MV+f9v7pD809VGWAsPU=; b=r9B2G53txmNG+H+d+l3je+NV9J3R/jtYHhsxYUNR2Rf6uGwwNdCRMzDzPdDPmf4LhdGtfB qyoxwH8J85rNEI0IVVj23jG7/jXt28Jhe9gvKWxWe3wr2rMwAd3Wc9+SUme+JHvnr6Wesz QkP0L9eJWb51S5hKg8QB9WIBaGj9ouQPOhd9QhRxjPersSHsYTA5AAzkexftOwR56OypaK xbsbQCypuxOwiEsEJKdUaH1PSxXq1slITjHoo7ep4jDYpY4xXVwQKz6tPNTY2Ba2BuiQwx RIr4uQh/5HguQ3PW95gycDgQthACmSyMyGjm4jWv79VSvFVLTSs9NJSJF7bk5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713319443; a=rsa-sha256; cv=none; b=pzhOrL3EUYtkYHtzOeBCXIDsCkL8ZsxOnkji72ZKZ/4Aydxfdd4nZ3g1TykoUIrhf1Y7Al gIDoxXgAZLyxoRstOb4NS+CppU8t8vg/N91im2c6KN/w79ynVpSyymxWQjseUKGs4wZWZf 9y0jfR8zzoo75lKGorQYWy+eq6wsE1mtwS0sQl56a0gooaql6lEdamwBKsklw2LM9iRJXt Lo3BoM2VrMi5QJLNmculnpdV5OFl26js8ci7FsNky0uHrzfs0QsmLklx9/gkEUFrG+avTE PMYEYuypVGsvyYP48ApWky4OtZLkCuimjUeCOoyeb5osbynPIDdA3p6BiF+QAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tBjmcHOPAyxcyCB/Gvjr9Zd8MV+f9v7pD809VGWAsPU=; b=Z8zRYm+QbATwzgmBvmS0utGxaq1NB5647BzRmDFTo3DJMTybEjDXfs9VxsHMZxnXSZLCgw Mkg/afbvA64tRWHldKAxA+iIY19XSojFgkCJRKZTbmCp7vXZUoEk6FHZayahuEQ3YyS2lO bVJHvSkRiA5Kl/NIvxdQBdVjOUDXoKdy17JclRTcAxjmtMCOC19VbbXFbz1fpdEP8NXl2J s0LY+v7RzQrt7OqbDg5IwFpybOv4rQ8utWOY/zQMw39CRBUzr/yKRVHlYA6MoC+HLQuGma bkt1q2hoGueesMQur+l1TTzL2TMVRGIWG3Gda7X2xDukCb6DlvBkIIlRguVupQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK42q0Fcsz178t; Wed, 17 Apr 2024 02:04: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 43H242Qm033881; Wed, 17 Apr 2024 02:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H242ll033878; Wed, 17 Apr 2024 02:04:02 GMT (envelope-from git) Date: Wed, 17 Apr 2024 02:04:02 GMT Message-Id: <202404170204.43H242ll033878@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: 64d6925d1901 - main - cp: Clarify an obscure comment. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 64d6925d1901637125f9f739282e72c992657dc8 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=64d6925d1901637125f9f739282e72c992657dc8 commit 64d6925d1901637125f9f739282e72c992657dc8 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 01:36:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-17 02:03:21 +0000 cp: Clarify an obscure comment. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44805 --- bin/cp/cp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index cee412e57264..98697ba2b06f 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -452,13 +452,19 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) switch (curr->fts_statp->st_mode & S_IFMT) { case S_IFLNK: - /* Catch special case of a non-dangling symlink. */ if ((fts_options & FTS_LOGICAL) || ((fts_options & FTS_COMFOLLOW) && curr->fts_level == 0)) { + /* + * We asked FTS to follow links but got + * here anyway, which means the target is + * nonexistent or inaccessible. Let + * copy_file() deal with the error. + */ if (copy_file(curr, dne)) badcp = rval = 1; - } else { + } else { + /* Copy the link. */ if (copy_link(curr, !dne)) badcp = rval = 1; } From nobody Wed Apr 17 02:04:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK42r31nDz5HZ7D; Wed, 17 Apr 2024 02:04: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 4VK42r1M0Lz4G2p; Wed, 17 Apr 2024 02:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=97Dn+T8G72equJzqJOcepPBQi6prjV12Pos35nKKvKY=; b=E6HaU9OrUhtBW2twwWqe2Qn/tucJnC0DhKeRNnhIFEzt4q1DENJcieN/1sVb3iUQpZ4Zbt 1itw1MSpl0wwu23f/pLKRGbVy2s0+7fvLNwDgLFnDERDqEr55oRNU+HJcrvsyK7gQ4Q1Xo X94qzl+p/0IhL/k/ZhI3WNZPCsEmlOLbVw+uUMOoYy3RqnMB0n+lAhkHih/aJb6MgJXqJa CW6jCLqhzYBcYtNimHuZBPn+xW6eSzZVlNI0/YHq1feHz20VfbyzP72B1j/nqau5JbWx3h 8WeeNVqL/16Z5ukMAqqdtwVlFLhaQvAF1RudK3QeEzCEWf2dprxVwzCvd6mO2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713319444; a=rsa-sha256; cv=none; b=hewwI8iBVg1DDLabiwhzKdCI4FBRXnALiAvWH9UuMEs44sxpUp8RzvvZcUiMhPgEb1b1yw x0ZLE/GtqVDF82oWJwXMjkOxPRRLG+o8MLUeylHx43uIdAcCi31g594MXnEpFZYnNo/wfi KEZqEZduxzfv5qskib1am2fF2Dcoc/JV/wqH/YR/WaUmanEtTYqYcXt2aWu/pIPua6ztg9 DYuBi9sah8sD4tNCyPjoOuflM0tqAoRYWVq0NdmlGhIdFAffd9czWVLi2uB7yzZEfInIvG yCJV6MCGL4kxm/eV4p5ptaPxq5edDYIeB35qA9741rfh+pClbS+TeONwRPI1FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=97Dn+T8G72equJzqJOcepPBQi6prjV12Pos35nKKvKY=; b=kUMhHw7wE4qoP7ASUE3ReS5Y8KlmwN446jEXUeSNvBxpNTdhjZY7KIvaEZyzyVINccfPS8 XMlYhtHvNXZKQ2TrKcfyeE/x6ULbPPaDniJZuUfUvJjgXLzyqQDsKynYwqa9c/Te+6MO+7 HotnO5WPAtLvuWlLCzhXGJcJ/k6QL7FS4Zc0eS30u9t9+3/XCoJk54Q5Fv+fuwvhH75Vrs ilMIFEo6DcOTH/CxIv2GwSQUzjkbx7dTK5ccYo381XOlys3+xyvpNme1F9cdoLzUvpxlzo ujQ/ieYlZuUynhiaivgaZO2+9Uuo0805n0A2jSFUH7d8jiD7yijeP9JYOeB7jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK42r0y34z1746; Wed, 17 Apr 2024 02:04: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 43H244Xv033929; Wed, 17 Apr 2024 02:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H244oL033926; Wed, 17 Apr 2024 02:04:04 GMT (envelope-from git) Date: Wed, 17 Apr 2024 02:04:04 GMT Message-Id: <202404170204.43H244oL033926@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: 9075d4cfad5b - main - cp: Additional sanity check. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9075d4cfad5b339aabdf8033623a2164898c2786 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9075d4cfad5b339aabdf8033623a2164898c2786 commit 9075d4cfad5b339aabdf8033623a2164898c2786 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 01:36:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-17 02:03:28 +0000 cp: Additional sanity check. Once we've successfully opened the file we've been asked to copy, check that it's of the same type as FTS told us it was. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D44806 --- bin/cp/utils.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 6c99d4c63f4a..d102fb076139 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -100,21 +100,34 @@ copy_fallback(int from_fd, int to_fd) int copy_file(const FTSENT *entp, int dne) { - struct stat *fs; + struct stat sb, *fs; ssize_t wcount; off_t wtotal; int ch, checkch, from_fd, rval, to_fd; int use_copy_file_range = 1; + fs = entp->fts_statp; from_fd = to_fd = -1; - if (!lflag && !sflag && - (from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) { - warn("%s", entp->fts_path); - return (1); + if (!lflag && !sflag) { + if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) < 0 || + fstat(from_fd, &sb) != 0) { + warn("%s", entp->fts_path); + return (1); + } + /* + * Check that the file hasn't been replaced with one of a + * different type. This can happen if we've been asked to + * copy something which is actively being modified and + * lost the race, or if we've been asked to copy something + * like /proc/X/fd/Y which stat(2) reports as S_IFREG but + * is actually something else once you open it. + */ + if ((sb.st_mode & S_IFMT) != (fs->st_mode & S_IFMT)) { + warnx("%s: File changed", entp->fts_path); + return (1); + } } - fs = entp->fts_statp; - /* * If the file exists and we're interactive, verify with the user. * If the file DNE, set the mode to be the from file, minus setuid From nobody Wed Apr 17 02:04:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK42s3wX7z5HYs3; Wed, 17 Apr 2024 02:04: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 4VK42s2L7cz4G49; Wed, 17 Apr 2024 02:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ossTn0FCz+qK2hLZ6qfwqEIqhFjH9p6BohtaoEtQ770=; b=IzdyekvqgTpxQqB08ffvli67zKd0Bp27W2XkInp/+fcty6L7ZN77TTGKEpghXUVnL6JU7W 3FBdU2nGtvCb1wfiNwqDntJ0rnRkHIjFC2afmChM8CEQjOzKxK5jfOK1zne774Aa9b2Yxw VEQqYMOePyqeSjkiyS9tTq65MHtoB4E0EsntiLrNI2ZK0QJm+yXREXh5he5CLzhKA0QG+y jaZ1NjziL66WV35BjXgMdbqtJjjAtvk/GE+IDyfVBoktssAH2yYQ4B7NTFE2MTO+3T1MAt leGLg20+3vwQRP2/yod6OlKaDASi4e7KGqAeu4G/3ibECR7dneSMfOQhUDOTDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713319445; a=rsa-sha256; cv=none; b=CEAL0+UcqPVKhRlxsLaCU+s2MK0x7VgVN7J31d9u0P1o2cJs56xGVH2oN8O0gQI1EMxH3j 9Y651e5ittsbTcwf505XuKIQPi+mCxWzq6kWiA6TSoej/jtt8068x5/hdgbcR9SuH4nKKW nbWD4pWCX+CHf0eEwd2DS74Cm4BiYjaq9bEduIE8ntoFWz1Wzm3zvkaX9obpgVUZFais6o tubmeF7Z93y2XImQEBybHdjE/kLv3pMnkbI+M+yC7cx5cmyNclsWpCSyl5AhWi4lNHVwVy Ag2sBEPeYxUKLTJIpMxn8b9fWeynTJ62pNjreTYjUhSW3YTBfyYrHtDlJCAOMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ossTn0FCz+qK2hLZ6qfwqEIqhFjH9p6BohtaoEtQ770=; b=SpeqR3Tt8dKnp/sLS20WYdfbuVYBOUDXALdf6xgQhRVSorcNJD3BM/C8sL0RUNjRo8p0yW m2dVc7OxNLc8sjTJCgyzKKvSEr3swvV9KghrBOB/UmdQTvyckRH/0sTLizg1tp+pxv2/VG 9A5m0S2DvGlQsGJ05haSkb76tDUCf6M88td1yYOsIGriaG3L1jBGTPmli7MvpyEUANaaEi SE7ibhn5BjhcZWqgtBfjRPKBjHSzm5jEILUpFu4jt6Rr4OwLXE3Ti8enJeMoKx6uNlUvRm uOUGM1aAJqXxIwvPx68+5GnpzD9LXR719whu7OHNRM9kMjzCIkxvpJ5GXZ/SqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK42s1yGhz178v; Wed, 17 Apr 2024 02:04: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 43H245gG033974; Wed, 17 Apr 2024 02:04:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H245tn033971; Wed, 17 Apr 2024 02:04:05 GMT (envelope-from git) Date: Wed, 17 Apr 2024 02:04:05 GMT Message-Id: <202404170204.43H245tn033971@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: a0439a1b820f - main - install: Remove the mmap(2) option. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: a0439a1b820fa0e742c00d095f5f5c06f5f19432 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a0439a1b820fa0e742c00d095f5f5c06f5f19432 commit a0439a1b820fa0e742c00d095f5f5c06f5f19432 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 01:36:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-17 02:03:31 +0000 install: Remove the mmap(2) option. We already removed it from cp(1) over a year ago but never followed up here. Do so now, for the same reasons: significant complexity for little to no benefit. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44809 --- usr.bin/xinstall/install.1 | 3 +- usr.bin/xinstall/xinstall.c | 212 ++++++++++++++------------------------------ 2 files changed, 67 insertions(+), 148 deletions(-) diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1 index c87a1f464555..c923321f20fe 100644 --- a/usr.bin/xinstall/install.1 +++ b/usr.bin/xinstall/install.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 10, 2024 +.Dd April 16, 2024 .Dt INSTALL 1 .Os .Sh NAME @@ -325,7 +325,6 @@ The default was changed to copy in .Xr cp 1 , .Xr mv 1 , .Xr strip 1 , -.Xr mmap 2 , .Xr getgrnam 3 , .Xr getpwnam 3 , .Xr chown 8 diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index d696a8429c88..b824c860e9a8 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#include -#include -#include #include #include #include @@ -159,7 +156,6 @@ static void metadata_log(const char *, const char *, struct timespec *, const char *, const char *, off_t); static int parseid(const char *, id_t *); static int strip(const char *, int, const char *, char **); -static int trymmap(size_t); static void usage(void); int @@ -1093,86 +1089,62 @@ compare(int from_fd, const char *from_name __unused, size_t from_len, int to_fd, const char *to_name __unused, size_t to_len, char **dresp) { - char *p, *q; int rv; - int do_digest, done_compare; + int do_digest; DIGEST_CTX ctx; - rv = 0; if (from_len != to_len) return 1; do_digest = (digesttype != DIGEST_NONE && dresp != NULL && *dresp == NULL); if (from_len <= MAX_CMP_SIZE) { + static char *buf, *buf1, *buf2; + static size_t bufsize; + int n1, n2; + if (do_digest) digest_init(&ctx); - done_compare = 0; - if (trymmap(from_len) && trymmap(to_len)) { - p = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - from_fd, (off_t)0); - if (p == MAP_FAILED) - goto out; - q = mmap(NULL, from_len, PROT_READ, MAP_SHARED, - to_fd, (off_t)0); - if (q == MAP_FAILED) { - munmap(p, from_len); - goto out; - } - rv = memcmp(p, q, from_len); - if (do_digest) - digest_update(&ctx, p, from_len); - munmap(p, from_len); - munmap(q, from_len); - done_compare = 1; + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize * 2); + if (buf == NULL) + err(1, "Not enough memory"); + buf1 = buf; + buf2 = buf + bufsize; } - out: - if (!done_compare) { - static char *buf, *buf1, *buf2; - static size_t bufsize; - int n1, n2; - - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + rv = 0; + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + while (rv == 0) { + n1 = read(from_fd, buf1, bufsize); + if (n1 == 0) + break; /* EOF */ + else if (n1 > 0) { + n2 = read(to_fd, buf2, n1); + if (n2 == n1) + rv = memcmp(buf1, buf2, n1); else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize * 2); - if (buf == NULL) - err(1, "Not enough memory"); - buf1 = buf; - buf2 = buf + bufsize; - } - rv = 0; - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); - while (rv == 0) { - n1 = read(from_fd, buf1, bufsize); - if (n1 == 0) - break; /* EOF */ - else if (n1 > 0) { - n2 = read(to_fd, buf2, n1); - if (n2 == n1) - rv = memcmp(buf1, buf2, n1); - else - rv = 1; /* out of sync */ - } else - rv = 1; /* read failure */ - if (do_digest) - digest_update(&ctx, buf1, n1); - } - lseek(from_fd, 0, SEEK_SET); - lseek(to_fd, 0, SEEK_SET); + rv = 1; /* out of sync */ + } else + rv = 1; /* read failure */ + if (do_digest) + digest_update(&ctx, buf1, n1); } - } else + lseek(from_fd, 0, SEEK_SET); + lseek(to_fd, 0, SEEK_SET); + } else { rv = 1; /* don't bother in this case */ + } if (do_digest) { if (rv == 0) @@ -1219,8 +1191,6 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, #ifndef BOOTSTRAP_XINSTALL ssize_t ret; #endif - char *p; - int done_copy; DIGEST_CTX ctx; /* Rewind file descriptors. */ @@ -1246,69 +1216,45 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, } /* Fall back */ } - #endif digest_init(&ctx); - done_copy = 0; - if (trymmap((size_t)size) && - (p = mmap(NULL, (size_t)size, PROT_READ, MAP_SHARED, - from_fd, (off_t)0)) != MAP_FAILED) { - nw = write(to_fd, p, size); - if (nw != size) { + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize); + if (buf == NULL) + err(1, "Not enough memory"); + } + while ((nr = read(from_fd, buf, bufsize)) > 0) { + if ((nw = write(to_fd, buf, nr)) != nr) { serrno = errno; (void)unlink(to_name); if (nw >= 0) { errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, (uintmax_t)size); + "short write to %s: %jd bytes written, " + "%jd bytes asked to write", + to_name, (uintmax_t)nw, + (uintmax_t)size); } else { errno = serrno; err(EX_OSERR, "%s", to_name); } } - digest_update(&ctx, p, size); - (void)munmap(p, size); - done_copy = 1; + digest_update(&ctx, buf, nr); } - if (!done_copy) { - if (buf == NULL) { - /* - * Note that buf and bufsize are static. If - * malloc() fails, it will fail at the start - * and not copy only some files. - */ - if (sysconf(_SC_PHYS_PAGES) > - PHYSPAGES_THRESHOLD) - bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); - else - bufsize = BUFSIZE_SMALL; - buf = malloc(bufsize); - if (buf == NULL) - err(1, "Not enough memory"); - } - while ((nr = read(from_fd, buf, bufsize)) > 0) { - if ((nw = write(to_fd, buf, nr)) != nr) { - serrno = errno; - (void)unlink(to_name); - if (nw >= 0) { - errx(EX_OSERR, - "short write to %s: %jd bytes written, %jd bytes asked to write", - to_name, (uintmax_t)nw, - (uintmax_t)size); - } else { - errno = serrno; - err(EX_OSERR, "%s", to_name); - } - } - digest_update(&ctx, buf, nr); - } - if (nr != 0) { - serrno = errno; - (void)unlink(to_name); - errno = serrno; - err(EX_OSERR, "%s", from_name); - } + if (nr != 0) { + serrno = errno; + (void)unlink(to_name); + errno = serrno; + err(EX_OSERR, "%s", from_name); } done: if (safecopy && fsync(to_fd) == -1) { @@ -1543,29 +1489,3 @@ usage(void) exit(EX_USAGE); /* NOTREACHED */ } - -/* - * trymmap -- - * return true (1) if mmap should be tried, false (0) if not. - */ -static int -trymmap(size_t filesize) -{ - /* - * This function existed to skip mmap() for NFS file systems whereas - * nowadays mmap() should be perfectly safe. Nevertheless, using mmap() - * only reduces the number of system calls if we need multiple read() - * syscalls, i.e. if the file size is > MAXBSIZE. However, mmap() is - * more expensive than read() so set the threshold at 4 fewer syscalls. - * Additionally, for larger file size mmap() can significantly increase - * the number of page faults, so avoid it in that case. - * - * Note: the 8MB limit is not based on any meaningful benchmarking - * results, it is simply reusing the same value that was used before - * and also matches bin/cp. - * - * XXX: Maybe we shouldn't bother with mmap() at all, since we use - * MAXBSIZE the syscall overhead of read() shouldn't be too high? - */ - return (filesize > 4 * MAXBSIZE && filesize < 8 * 1024 * 1024); -} From nobody Wed Apr 17 02:04:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK42t5dTCz5HZ7J; Wed, 17 Apr 2024 02:04: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 4VK42t3P24z4Fyl; Wed, 17 Apr 2024 02:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IG6ujuCm91VmmHfoGH5G/Arnr/zYHWDdBDfDatNPZc=; b=MAGm1L21JxhpLMhCEWme2br6zbnN0dYDHpfV3n5y1kzgRGtIz4wu1O8bphUDzdt62PA2/I RgUq5uPNBuqHmCPobg5cQbT+sH2i6oxM4BOQR1MlM8OoXTV+l7cfm6D9WscZLlvE5U7hm4 qcH0WGTlpIICvtsrL88rGeZvEPDvW7AJZgGbCTDm/0SFoyZIWf1/zE6uoqhHBVo8FrUp2r Oo9XwTQfh8Z8UrKfoRR4AAi9W13x5ZNlL1WInFheOhmlSfuXU2/ppvtLaT3k6qmOxCC+aN CprIw88HkGyY8yWYR4PAwqhTyY1hTXaGYtB3UbeeTWEZ35tc9TkbLFSTB9VOJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713319446; a=rsa-sha256; cv=none; b=T2QNOZrsQ9mTZGbeH5acO8ivDWYJmvlO8fVBLWDhWjwRCwNJGFIXl8pIfaphtRoe64ILrI iHTXF1YHvE/tHCuqhvUFu/PhEiovgAQFIDMy5B2eISn5RI42Inp+1wJw1oNgEkb+ddAVMR 8sMSjxMlUva6qCtns1CFlLMNdrCfca+p44qPFAjuwzvag+05Z9RBtkplDwAbswX/Pjvkgc kmwXNjAte97rFf1owG0NR7iVpclltqW4rBAmlo5WOL+QBjtKFQKP/+OhMeZ3K+labb5XvF eSreIVmmpCKTt5484uWHlrLHq7E0dh9RIzYvhsIOFtDTLF70x/uT716jF3XWfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IG6ujuCm91VmmHfoGH5G/Arnr/zYHWDdBDfDatNPZc=; b=YoTvtPkCUY/JXucKrLOkiU31GL0iE4S+DnQeScAbWChpz03wXDqnG714F1CmCSq/5iLCR2 bxojNo1ml4BgQOdIQrLtb3MFVET9aY9zvNE3KCq4nKr+ZRp3jpAr069y5uQtqd/ytnCY4h Nd+lR5p5z0lU0jsd3p/VaNeuVqSzGS6eCFuVwHo/nKufB/u6vmAm5yuACxwBYZ9jVWyyq7 1IdOWBNDL20wPN4A3cK0s/iBQKMi563XI59z/C1ZmoO/ZmQ9MrDypyfGNGSIgnP++T5cXi jldT6W//f4QrVRzA+RcoVwHg1nYS60eWXnW+GLLl9hTu8raQKyrK23c57xWwKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK42t2ynsz16MM; Wed, 17 Apr 2024 02:04: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 43H246FI034015; Wed, 17 Apr 2024 02:04:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H246ht034012; Wed, 17 Apr 2024 02:04:06 GMT (envelope-from git) Date: Wed, 17 Apr 2024 02:04:06 GMT Message-Id: <202404170204.43H246ht034012@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: 000a533e6d1d - main - install: Assorted nitpickery. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 000a533e6d1db9878296b32d1cc212e11a2cc718 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=000a533e6d1db9878296b32d1cc212e11a2cc718 commit 000a533e6d1db9878296b32d1cc212e11a2cc718 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 01:36:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-17 02:03:31 +0000 install: Assorted nitpickery. * Use `errc()` instead of manually setting `errno` before calling `err()`. * Change one warning into a fatal error. * Drop some unnecessary casts. * `strlcat()` bounds checks were off-by-one. This does not matter in practice because the subsequent code renders an overrun harmless. * We were passing `SSIZE_MAX` to `copy_file_range()` instead of the requested size. This only matters if we're asked to install a file which is still being written to while we are copying it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44810 --- usr.bin/xinstall/xinstall.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index b824c860e9a8..e25ccf5c6eb1 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -371,8 +371,8 @@ main(int argc, char *argv[]) err(EX_OSERR, "%s vanished", to_name); if (S_ISLNK(to_sb.st_mode)) { if (argc != 2) { - errno = ENOTDIR; - err(EX_USAGE, "%s", to_name); + errc(EX_CANTCREAT, ENOTDIR, "%s", + to_name); } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -398,14 +398,13 @@ main(int argc, char *argv[]) if (!no_target && !dolink) { if (stat(*argv, &from_sb)) err(EX_OSERR, "%s", *argv); - if (!S_ISREG(to_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", to_name); - } + if (!S_ISREG(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (to_sb.st_dev == from_sb.st_dev && - to_sb.st_ino == from_sb.st_ino) - errx(EX_USAGE, - "%s and %s are the same file", *argv, to_name); + to_sb.st_ino == from_sb.st_ino) { + errx(EX_USAGE, "%s and %s are the same file", + *argv, to_name); + } } install(*argv, to_name, fset, iflags); exit(EX_OK); @@ -749,10 +748,10 @@ makelink(const char *from_name, const char *to_name, if (realpath(dir, dst) == NULL) err(EX_OSERR, "%s: realpath", dir); if (strcmp(dst, "/") != 0 && - strlcat(dst, "/", sizeof(dst)) > sizeof(dst)) + strlcat(dst, "/", sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); } - if (strlcat(dst, base, sizeof(dst)) > sizeof(dst)) + if (strlcat(dst, base, sizeof(dst)) >= sizeof(dst)) errx(1, "resolved pathname too long"); free(to_name_copy); @@ -819,10 +818,8 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) if (!dolink) { if (stat(from_name, &from_sb)) err(EX_OSERR, "%s", from_name); - if (!S_ISREG(from_sb.st_mode)) { - errno = EFTYPE; - err(EX_OSERR, "%s", from_name); - } + if (!S_ISREG(from_sb.st_mode)) + errc(EX_OSERR, EFTYPE, "%s", from_name); } /* Build the target path. */ if (flags & DIRECTORY) { @@ -846,11 +843,8 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) return; } - if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) { - errno = EFTYPE; - warn("%s", to_name); - return; - } + if (target && !S_ISREG(to_sb.st_mode) && !S_ISLNK(to_sb.st_mode)) + errc(EX_CANTCREAT, EFTYPE, "%s", to_name); if (!devnull && (from_fd = open(from_name, O_RDONLY, 0)) < 0) err(EX_OSERR, "%s", from_name); @@ -1194,9 +1188,9 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, DIGEST_CTX ctx; /* Rewind file descriptors. */ - if (lseek(from_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(from_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", from_name); - if (lseek(to_fd, (off_t)0, SEEK_SET) == (off_t)-1) + if (lseek(to_fd, 0, SEEK_SET) < 0) err(EX_OSERR, "lseek: %s", to_name); #ifndef BOOTSTRAP_XINSTALL @@ -1204,7 +1198,7 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, if (digesttype == DIGEST_NONE) { do { ret = copy_file_range(from_fd, NULL, to_fd, NULL, - SSIZE_MAX, 0); + (size_t)size, 0); } while (ret > 0); if (ret == 0) goto done; From nobody Wed Apr 17 02:08:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK48L20rqz5HZ3t; Wed, 17 Apr 2024 02:08: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 4VK48L1Lvyz4H6W; Wed, 17 Apr 2024 02:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WbICc+UVSM0lBepTbLaBEwSNTUbn2ZJ/Kdi+OqGd21g=; b=Dr3zs5t9a82n63zU5mg3XTBbXYtr1yjtdEv7bgfmRD9JdX5H+pSjrdBw/6i+k6Df9LWJqz oJBAGP9LBIsjF0EVc+4yfxk/ORJ+i7RiMqBAlvcfca9bqPFS0b7E4ykqzZWjkeBGoGNmh5 fxzsJiD+p+z9Z9+9t1978IiKZok0FBEv1EZdpN92ztq24b4ZqiIniShsMkbu8WME35ZkVm E9XBkaascLvMMHYl9r5NhsXkNTTYhXMMSeWtNnNLQ+6aaCNpej2veT6kqvYhPNXgT3M9bd dLNIWZJ6NLyQgJnYpYH9e7+2Gv4f18Yv2YyoJZTB0Y4q5PPHCgtyxHVDEL2ddw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713319730; a=rsa-sha256; cv=none; b=oe2PASOBcxAqce5/klxpJ1W698kXeaGpPNr0Cm85ZTlaJ2P2VlYnQe3QcrITxGNRhOagQO EpFSMSZYzMwzcoazB0kli9y523fNxX+C5MK3Xjj7K1y/NrfWXtAwYEt641WNUqvjcs0duc lWXHNTZn854ZJZwvkjgV3hQVlDxHhM2MVojpNyzuu7i1SvFzf0MLAjWsHfHyJ4VtU4BjeT L90E/aTC3EFtF6iMAUFkC0aBYbc1EpED2N2wtqv4BIyu9j/YK66DTIhpukiQSEwX/UoD3d xOPYtl+f9eAL6MZHTwkq7kLCe4G3hl/HC7o5Uyks2ohiuOO55mVgntnryLKzcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713319730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WbICc+UVSM0lBepTbLaBEwSNTUbn2ZJ/Kdi+OqGd21g=; b=UrtWUSPgu6yDAOSSrQbfPZbZD9g0sUk36NWUeU0VoMG5ky+uGCoig3MY2ZO4WdgAaYkTWU t7QV0uf0WEKXmBtHZ5+izvYhsOQeHKwBJlIzaa936uAlQTWYiOQpqGgVxml9DTzo/Q5qRj DZClHBYqEIiLDZi3147hjj/UOYunqcJWRsZez+2fxxsRWd7z206r6D+f1UW7NWFWCps3fM Epvaxt2syXT0lZduUlLkMeOwXlbtCoYGrWw0geYQPmemXHdzx6o+P4co6pg3GKtxhOr9QQ 5baJsNU8hfM1QPoU5uoR2abtCoufbSBp8fhWj7DF3cvCPPcafysgfIGmpD2vew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK48L0d9Vz16mL; Wed, 17 Apr 2024 02:08: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 43H28n9P034727; Wed, 17 Apr 2024 02:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H28nY4034724; Wed, 17 Apr 2024 02:08:49 GMT (envelope-from git) Date: Wed, 17 Apr 2024 02:08:49 GMT Message-Id: <202404170208.43H28nY4034724@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: f070188c3ad6 - main - cp: Use warnc(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f070188c3ad6b87ee9ce220b21718333d1bd9d52 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f070188c3ad6b87ee9ce220b21718333d1bd9d52 commit f070188c3ad6b87ee9ce220b21718333d1bd9d52 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-17 02:07:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-17 02:08:38 +0000 cp: Use warnc(). MFC after: 1 week Sponsored by: Klara, Inc. --- bin/cp/cp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 98697ba2b06f..823376964bd1 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -287,8 +287,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) case FTS_NS: case FTS_DNR: case FTS_ERR: - warnx("%s: %s", - curr->fts_path, strerror(curr->fts_errno)); + warnc(curr->fts_errno, "%s", curr->fts_path); badcp = rval = 1; continue; case FTS_DC: /* Warn, continue. */ From nobody Wed Apr 17 03:33:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62C6PN9z5Hj0t; Wed, 17 Apr 2024 03:33: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 4VK62C5sz1z4QTN; Wed, 17 Apr 2024 03:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BzeCKGodOENO2b41L1SWkdZHAAnOoIpXqL6z8VXH4RM=; b=jr3rCWWPrLFL3VVxwp7KOjQKQOP4qNL+dVPPsROvrYLM4c69VW5z+OHodGulER0qPm7Fnh X/O3+bY2WNG3vITzS4DXYujKE1w7sSdq5z4sjmwAGVlY2hgiAwzEPoHk+i3rs6VBO+KS25 aZU2F1SM+ZEcK3MFPh3ulQ3RBlihRP3wlO7WtxQx14PnATXK03xKjkvkYaqJsHEz+guRxW 2xm15NL/czrEFj2mhAZl2i/yC4Ywmno9kcycyw5eQ+1UPRBgwsJD4NAPGKwhxFiB4IFFQa vt4z3cdSrxS9AODBF54eV4LcRbsWT2YGlRlR/B+mD56QY6XpF1IJNgEfHE1zGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324819; a=rsa-sha256; cv=none; b=axillVXLZxaEnrv7kpoM13Mlh9skzxT89htr28XFmmoiUZ9b1Jb+lHe+5Lj77BlAwawP8x lxrj2HjX5FUKxMQkdhMg4XN8JNgQzhNavd81JRIkvewWvYhgUx7FGxkIC8ADapR1PIEY+n w0kOMmk/UAn+dLaetqqckngzXEOtkGwwJxf5LSXyxFoC2sQ4RYJA1hH5XQlgH2w0UZKvoW 8UT+ExGbN/g5JX0+e5ZqfZTWsGH2BIhnb+Msjsycm8wD5fE62FYHsOn08v/kW8qKNeIPIz RjhUy9QAjUmXMRj6vBWRvHQ9hOdi7v72i+1HdmAl5IRpA9rP1F7dud8y0oMWRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BzeCKGodOENO2b41L1SWkdZHAAnOoIpXqL6z8VXH4RM=; b=EaQ3DnKHbzI9kfCZpjIeymhVGwHy7ZeAa5VKEprGlH1XXiyI6Uz2uL85s4SDKGHKcEqiWP ADabpoD+Vn2iwST+aveWYgKUr+aYVtrYrJp1nQgZvtqa6Uy7D2LmfmGNg1brkJNm7fvsYb 9ogpRYfsNWKH/0qA8UpnL1cQTcLN00r91EmWnqH6cX0u68VXpuUYjtR0bGMa5/gndMSYQ/ NWRYkKcnV5WIGBPf8uti+EkhogzIbSTPpiPqQxxjCCbH4lQu7IxgWgvLgFjXxno11Awcii 46tK8FYbSFWKC0xcsQme81L95Zfjl/kfQPmijlaS++si2VoxPnXBVXV5vOkBRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62C5SHyz18Wd; Wed, 17 Apr 2024 03:33: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 43H3XdgG086545; Wed, 17 Apr 2024 03:33:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XdLZ086542; Wed, 17 Apr 2024 03:33:39 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:39 GMT Message-Id: <202404170333.43H3XdLZ086542@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: de22251127cd - main - arm_kernel_bothdr.awk: Update to latest ota List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: de22251127cd0e89ce1edb56c58b202496a97ba3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=de22251127cd0e89ce1edb56c58b202496a97ba3 commit de22251127cd0e89ce1edb56c58b202496a97ba3 Author: Warner Losh AuthorDate: 2024-04-15 21:07:46 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:17 +0000 arm_kernel_bothdr.awk: Update to latest ota The latest ota is the first one in FreeBSD that treats 0 + "0xf" as being '0' instead of '15'. Don't use this old trick anymore to convert from hexidecimal to a number. Write a function to do that instead. This fixes kernel.bin building on arm*. awk on 14 doesn't need this, but to build FreeBSD stable/14's kernel.bin on 15 we'll need it, so fast MFC. MFC After: 3 days Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44801 --- sys/tools/arm_kernel_boothdr.awk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/tools/arm_kernel_boothdr.awk b/sys/tools/arm_kernel_boothdr.awk index dcc65ab40b66..e0f193f7922c 100644 --- a/sys/tools/arm_kernel_boothdr.awk +++ b/sys/tools/arm_kernel_boothdr.awk @@ -47,6 +47,10 @@ BEGIN { } gHdrType = hdrtype + for (i = 0; i < 16; i++) { + hex[sprintf("%x", i)] = i; + hex[sprintf("%X", i)] = i; + } } function addr_to_offset(addr) { @@ -56,11 +60,13 @@ function addr_to_offset(addr) { function hexstr_to_num(str) { - # Prepend a 0x onto the string, then coerce it to a number by doing - # arithmetic with it, which makes awk run it through strtod(), - # which handles hex numbers that have a 0x prefix. + sum = 0; + len = length(str); + for (i = 1; i <= len; i++) { + sum = sum * 16 + hex[substr(str, i, 1)]; + } - return 0 + ("0x" str) + return sum; } function write_le32(num) { From nobody Wed Apr 17 03:33:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62F1SXKz5Hj0v; Wed, 17 Apr 2024 03:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK62D6mqvz4Qff; Wed, 17 Apr 2024 03:33:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA2waD1z4c6h9aEnSso9+KRX1khpF2YRX9rujIHwMGU=; b=qhUf8MUUioXoRfRSGakQVCz0+mL/kxMQpg5klEVLaMyc8Oz+kVnG6CtyfvGxPazhLNeDUJ JlEcYNr2mgZBuGQANrsU4rkaRTXUfUnKWoOEBaEAqtPTd7XFlCqTtRvDCvvROVl+C349tn sOLAOYFuqjCh+HnBT7cif5My7gJ1qJHvjpuEGddRzUvhfFO17tgrrXODSI1er0x39YlU4T U8AxLHF1oKm+4SCcGpvLbDSBlpJ666REDSLdwWtrkZL3Zbv2umMFtF7h9HCgzDsT7AR9Vn T2hsYzqFRUsv/gvXD0bZoChyP6pW0n8ojIU54QZCI31iAkvWhLFcYNnoclN/pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324821; a=rsa-sha256; cv=none; b=A3RIS8uvUUlwCn2wBtpCMZBjH5L7NjZhLtdmsV7XIhHC6V14XptgjDXHdagj6Mtyd2f/TP oQ4PcH5aNRw4C9QcSFWr0+f7MMVUQuNZRB5TBQxlqdY1N4v4YYg6PhiWivpsTbeO9Illg9 VSwYkJOSEPESZPj0uCs1XuReOMIrD0gD8hyL3v0Qew1qBKkcCGSFsDlL1h/4/y7HQ5dV7r EQGNodtq9TPlO/SeuF4MYSdlVQ2DQfyzYz3GSNIC9vxkAC5Xt0Xj8Ui8iVTtagguEspxNP PrBU3W6HKdm2zk3y6mD4Qz88eEEvi4K94jfeHfVyLQ6YZ1z1MvHQHjO+fvYFxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA2waD1z4c6h9aEnSso9+KRX1khpF2YRX9rujIHwMGU=; b=JyDqjb2Af+Id3EDdjPmAdWNAt5gPoFWaNlS+xPvknLwgbqa1ibOMgJX8dJC5cuShYCHDI0 Pw5YTbmI0TFi/VnMYuRMzfL+lO6gIiEe4QiAIZSLNQxQvNI0teOWvMs3OisPgWurNyHdOj WA82OATfQlqBOY5LWiv1TUnO52enAjfgP2z9s3+TcPHwS6RlMd/yFS4DUCjCJy5W+o7sDs O+37SmLjgqO4Md/X3ghyWfOelV4Iz5JrStYreJNpvtzCM6z14pkvOkPx1ASgkXzWDu8pf0 y3gH5NFsDtHVeyQYL4UN1Hyi3XKL61mORXBhLtE6N8PKWKcNUyQT4/Pk6eGTFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62D6Mcrz19WQ; Wed, 17 Apr 2024 03:33: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 43H3Xe4L086602; Wed, 17 Apr 2024 03:33:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3Xe86086599; Wed, 17 Apr 2024 03:33:40 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:40 GMT Message-Id: <202404170333.43H3Xe86086599@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: 67163bc485a5 - main - nvmecontrol: Create letoh to generically convert to host order List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 67163bc485a56d960b72fb26f19685682b92dd6b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=67163bc485a56d960b72fb26f19685682b92dd6b commit 67163bc485a56d960b72fb26f19685682b92dd6b Author: Warner Losh AuthorDate: 2024-04-16 22:35:33 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:17 +0000 nvmecontrol: Create letoh to generically convert to host order Using _Generic, create letoh which will generically convert uintXX_t types from little endian to host, regardless of the size. This name has been floated as a possible addition to endian.h. Sponsored by: Netflix Discussed with: jhb Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44649 --- sbin/nvmecontrol/nvmecontrol.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h index ce717e5732c3..a098da4c9c45 100644 --- a/sbin/nvmecontrol/nvmecontrol.h +++ b/sbin/nvmecontrol/nvmecontrol.h @@ -60,6 +60,17 @@ struct kv_name { const char *name; }; +/* + * Generically convert little endian to host endian, based on the type of the thing + * being converted. Use the proposed name for future changes to endian.h. + */ +#define letoh(x) \ + _Generic(x, \ + uint8_t: (x), \ + uint16_t: le16toh(x), \ + uint32_t: le32toh(x), \ + uint64_t: le64toh(x)) + const char *kv_lookup(const struct kv_name *kv, size_t kv_count, uint32_t key); void logpage_register(struct logpage_function *p); From nobody Wed Apr 17 03:33:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62G236Fz5HjR4; Wed, 17 Apr 2024 03:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK62G0jLjz4QjK; Wed, 17 Apr 2024 03:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flEUDPJfsOWAZ5dO1QZ1Sug5RP0q7XXZmGt3+Ht+HAI=; b=fVDtbPtYNNKfq6vRpe/0GJj/a9GQ/xrKvXxQ+XN/jCpgi7wMvuo4G2tP6NFQtVFeeiDr67 P9deQyNFgt71G+yrwjkb+3NDKGmBEja7GfbHc/lxwlCj6NvEKBLLEjWK0XXy/rO5mwFOXe /pKYwwuKV88JjFgZt3TauTt9c5ERmt18uOr9fvftoubY++4U+/hSAYc7hsvXDvDAxPEC/6 wC/8GXzFqth0iTRTOosDNoO5a8g/9wEqfbpaoKqLsIypPzHu21huds4EJvAkPGH85ibRl+ 8ev8SZQWYSMcACWB4gvsWtK2UsSGdBmTf6uzpRVOpyxPkbapZCrXeaJ3yJ/KLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324822; a=rsa-sha256; cv=none; b=eIgmAHlDKaTbaTC1OXHvRhJrapQmz4g0m8vBeOlkPICTFdsYGUMaLBWlZIanI/a4I8E8Bg 81IYONTHctNBR+fUhmUnzE7j2rg/bHF4jZx/btmQSokphJYc9vkgB8p6fBpgG9yQDeRFe1 yhLRvoqUPBtHIezKaEa+91ISw3H2gQM9dQgXJscfZq/tZvYRqBsL+R7RbkzPjQBBTv6RZe sJvhDT+UjzOf/MCCGoB9A8XMx1U+sqrtY2iIeReTq+I/+22Gw/oqhLFKP4UvhHzc5xxSra 8k2ZmVJaz4qfY5sNZVu+2FX84tYlJJSv+qox3uTceli17pDffO8sNGzZmtFIgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flEUDPJfsOWAZ5dO1QZ1Sug5RP0q7XXZmGt3+Ht+HAI=; b=uYZxSLbsUhelFgelkdnW8GZgrHvSfPN//7tq5gL08f5MC6m8P3Zan8px5Ew49LSbjE3tu0 qsL/sBMJXO3de5/5JGGsp/i/IrwuL/WuZONkyqygNfGEwWf5AwYPZhwc/OJm7TcPpj2I7d quZ9ibMKhLtZ6qEFyQuvgDPAlX3aYsOh0fS2/zI7Od96JJXmjQzDeN1qklTVRHZPovTkDm w2itaRzKvrY3Wc9gRfAJwrsctAIo1RFuphqMzoh4E2sqcstl7bA0x9D1B1Hxerhnc4N3z0 xAvruobVGX56NF9oE1JF+AWCPLkaPHVMzu8798qEEs4LnPkpEpu5QS6c3bA66Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62G0H7sz19WR; Wed, 17 Apr 2024 03:33: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 43H3XfE9086664; Wed, 17 Apr 2024 03:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XfBo086661; Wed, 17 Apr 2024 03:33:41 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:41 GMT Message-Id: <202404170333.43H3XfBo086661@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: 85656a9a0153 - main - nvmecontrol: Make the error log page work on native format List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 85656a9a015339f3d412e5b1888e798bb3e7d4ba Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=85656a9a015339f3d412e5b1888e798bb3e7d4ba commit 85656a9a015339f3d412e5b1888e798bb3e7d4ba Author: Warner Losh AuthorDate: 2024-04-16 22:35:46 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:17 +0000 nvmecontrol: Make the error log page work on native format As the number of page types proliferates, it becomes untennable to convert them in read_logpage (especailly since new UUID page types will need to be supported). Convert the error page printing code to operate on little endian data. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44680 --- sbin/nvmecontrol/logpage.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 0df342fa51e8..276932d363e5 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -193,8 +193,7 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, uint16_t lsi, uint8_t rae, void *payload, uint32_t payload_size) { struct nvme_pt_command pt; - struct nvme_error_information_entry *err_entry; - u_int i, err_pages, numd; + u_int numd; numd = payload_size / sizeof(uint32_t) - 1; memset(&pt, 0, sizeof(pt)); @@ -220,12 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, /* Convert data to host endian */ switch (log_page) { - case NVME_LOG_ERROR: - err_entry = (struct nvme_error_information_entry *)payload; - err_pages = payload_size / sizeof(struct nvme_error_information_entry); - for (i = 0; i < err_pages; i++) - nvme_error_information_entry_swapbytes(err_entry++); - break; case NVME_LOG_HEALTH_INFORMATION: nvme_health_information_page_swapbytes( (struct nvme_health_information_page *)payload); @@ -272,17 +265,17 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf("Error Information Log\n"); printf("=====================\n"); - if (entry->error_count == 0) { + if (LE2H(entry->error_count) == 0) { printf("No error entries found\n"); return; } - nentries = size/sizeof(struct nvme_error_information_entry); + nentries = size / sizeof(struct nvme_error_information_entry); for (i = 0; i < nentries; i++, entry++) { - if (entry->error_count == 0) + if (LE2H(entry->error_count) == 0) break; - status = entry->status; + status = LE2H(entry->status); p = NVME_STATUS_GET_P(status); sc = NVME_STATUS_GET_SC(status); @@ -292,9 +285,9 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf("Entry %02d\n", i + 1); printf("=========\n"); - printf(" Error count: %ju\n", entry->error_count); - printf(" Submission queue ID: %u\n", entry->sqid); - printf(" Command ID: %u\n", entry->cid); + printf(" Error count: %ju\n", LE2H(entry->error_count)); + printf(" Submission queue ID: %u\n", LE2H(entry->sqid)); + printf(" Command ID: %u\n", LE2H(entry->cid)); /* TODO: Export nvme_status_string structures from kernel? */ printf(" Status:\n"); printf(" Phase tag: %d\n", p); @@ -302,13 +295,13 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf(" Status code type: %d\n", sct); printf(" More: %d\n", m); printf(" DNR: %d\n", dnr); - printf(" Error location: %u\n", entry->error_location); - printf(" LBA: %ju\n", entry->lba); - printf(" Namespace ID: %u\n", entry->nsid); - printf(" Vendor specific info: %u\n", entry->vendor_specific); - printf(" Transport type: %u\n", entry->trtype); - printf(" Command specific info:%ju\n", entry->csi); - printf(" Transport specific: %u\n", entry->ttsi); + printf(" Error location: %u\n", LE2H(entry->error_location)); + printf(" LBA: %ju\n", LE2H(entry->lba)); + printf(" Namespace ID: %u\n", LE2H(entry->nsid)); + printf(" Vendor specific info: %u\n", LE2H(entry->vendor_specific)); + printf(" Transport type: %u\n", LE2H(entry->trtype)); + printf(" Command specific info:%ju\n", LE2H(entry->csi)); + printf(" Transport specific: %u\n", LE2H(entry->ttsi)); } } From nobody Wed Apr 17 03:33:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62H4NLbz5Hj0y; Wed, 17 Apr 2024 03:33: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 4VK62H1jKWz4QlT; Wed, 17 Apr 2024 03:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHoS2RIjiuLBodeBW92pE2xdXtc+eBDhZT+A7qREs/c=; b=rdiX+k6jBVVGzdmBUL/Z7+DGEXEqIeVW93mZFxk/W7ZEF/ImF6funK0y2ovHlDoxS2ekcR rQBJccUd1imysUflBWbXEPHaW2KEzFqVELh5S8KLiw6l55w6NGZV6KZ8MmnfBt65L05SXo pVG0hp961JzFSyrPT348xm/5sZBOo2MVyzUl+SK5JRcNQWHiHrUWWxyElJKG801RnigXq/ AtVlt4Fx84WkxNyCeDd0WxZyp7U/1OyC39UdoP8gkdzvEH/i5Ca+unLETybi3w9VQiX4sI m+UDZXWEAg+6ngdj7LyyrFQQTx2z3cwjb1DeYiE3DwNqyfvlJ049S8TEdd5o4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324823; a=rsa-sha256; cv=none; b=dX0T3Vr5B+sJW7xlm32cAKOYw32R6k8U4kTvmzTl+MC4ojUtSzag8/zXojPCHTBr4CsOEN DOsgWxIi+yLzbIFf0LhI4GlhHSI6wJ3g1UlqreV1Jvw/B9Fc1W7v7mXmeUwSdK9nZjwONS Gt9KcAgvefTwzHgkXHVUpnnMrnD0+7Jp9bROJCCUXd7Vx+veCPcrThU5crOfkV4fpH79rA 7Kfb8IwB9bBn22kubDO0/cOt5W4m3OBvBLU1KsgEqeV0TFtI0aBr8VVblw2PTXx+Wd4j1k n6UcpRAaHlJWp4pesgTnorNP7vygAgFom/DZ0Pov+wvn4K04WylQ0WjhRjyH8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHoS2RIjiuLBodeBW92pE2xdXtc+eBDhZT+A7qREs/c=; b=TyS306s8cMpPJ9CPr+sNy3v8Dr1aYbHRodWCkA4xAmauI2hwqoslPxnGdoYmG1DIvDIZTY Yh0Z7kw0cgjGKlMkIE/5Djh2bO6GmHeS8LgqnLb32dPIjOmZWbJz7uHtR5uOcLbflkeEQD B5zIoU5Q+AQ/ch4bt5qwvX6xh51YK2iWKR7HkEMmdXvzsCLIL0uybCkC+EaIXCw/Xirutt f2RVTq04aiRCgzOBLMhLNpZBQkoUIov3z00lvl4hzjonC62TmEkSWDa0uXWcAlk3/5MyM7 S3+Hnm+OrCyB1FtkKRla0Y48/65eeC7rW8UTtn1IVtWgG8+eOKfEs9NActFLBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62H1K15z19Sn; Wed, 17 Apr 2024 03:33: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 43H3Xh5f086717; Wed, 17 Apr 2024 03:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3Xh9v086715; Wed, 17 Apr 2024 03:33:43 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:43 GMT Message-Id: <202404170333.43H3Xh9v086715@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: e098d24b5290 - main - nvmecontrol: Have to truncate on all 32-bit architectures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e098d24b5290a9f59734587ded783c19d4dc6e31 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e098d24b5290a9f59734587ded783c19d4dc6e31 commit e098d24b5290a9f59734587ded783c19d4dc6e31 Author: Warner Losh AuthorDate: 2024-04-16 22:35:53 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:17 +0000 nvmecontrol: Have to truncate on all 32-bit architectures armv7, powerpc, powerpcspe and i386 all lack 128-bit integer types. Adjust the comment and #ifdef. I don't think we support nvme on any of these other architectures at the moment, but it won't hurt to be more precise. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44650 --- sbin/nvmecontrol/nvmecontrol.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h index a098da4c9c45..ed331327ae9e 100644 --- a/sbin/nvmecontrol/nvmecontrol.h +++ b/sbin/nvmecontrol/nvmecontrol.h @@ -92,12 +92,12 @@ void print_intel_add_smart(const struct nvme_controller_data *cdata __unused, vo /* Utility Routines */ /* * 128-bit integer augments to standard values. On i386 this - * doesn't exist, so we use 64-bit values. So, on 32-bit i386, + * doesn't exist, so we use 64-bit values. So, on 32-bit systems, * you'll get truncated values until someone implement 128bit * ints in software. */ #define UINT128_DIG 39 -#ifdef __i386__ +#ifdef __ILP32__ typedef uint64_t uint128_t; #else typedef __uint128_t uint128_t; From nobody Wed Apr 17 03:33:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62J3yGVz5HjR9; Wed, 17 Apr 2024 03:33: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 4VK62J2Ptkz4Qjq; Wed, 17 Apr 2024 03:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDGRUuDVoMEfw4D5GvusSV3AccVVCC/pk2GMgW25D2c=; b=cw94RSUMUYzmKGJCSWJVUICBaBSyXsBKTzpLz/SBmprxlGTM++qYtkgQd0nRV1t1i/c6MU pYOMS/9yrgXIn7mv8C4Jjb6SmFz+14Daa0nkc2cqyBMF14gO0VcyVXu3IXeJzu2wC+mmF9 T3Quj8Fx+fLF/U40BfPEOvXJcZ61OHCa/x6O2TFhUgs4G9sdPvO0G5KtKlDKehHx77uEEd ShBuxjbzRMmVgWxu2pxuhq+BGz9juqwUXgbiIli0yJ4J7WwwYX7JqX1k1IKLajnhCzcXff EBOrIU23nLainepez/kjGZNipzFX4yQ3vgntiO/T7lHMvTxfEftbiB8XqiJtCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324824; a=rsa-sha256; cv=none; b=O3ZlnBoT6/e+WqQTwZFy0ap42f5eBrVhD2gCd+VMr13DPcX3vGx0FP2aK15kKhucPbhyP5 OG1mAPR7erBna5IqdrFY8wgSUpP90rm2GOomJvWi2hNAnOZYOPddXSFAn0KPPSMFlpX6Yg pXnojYQpYx7ty8dOmhWClkfZyglsp70b2VXuFu1dtFXRrRKouTqayEu5G4pMMtSb3SnT5Q onazvZ1n5KkIV7ZmKA/diKoVuLR28epb9c4GPeVcyDX2udIt12ajxlYLRcsdctbQmq8+P+ mzIOSTZYUJwN+EENe9cZJ7Igv/z9LWpz9IGvZYDIFFDkQF5ESMSforP7+Voi0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDGRUuDVoMEfw4D5GvusSV3AccVVCC/pk2GMgW25D2c=; b=qUikLBbkk9ylIuhfGHFIwV7Lh4NMtOb3xz/BjpnejxZFqHsRiOTGGhffqiHW9MaIV6JJHn gZpZ61IPABU5NsgLGNG4ZeTWYM3kBVYNY2UrQtuVlSSxj24KDZKuGyoBTdAO8NqX0Z4nVo EW3WLVhLyPExU0wduFD9gnPXoNm8MC58FlzEXS1ehQp33kMNtlFEV7UjiyHSw7uYf68PL5 E/o+57oswS/wr2s+CnPg4kak4mHYhZpmDH1SN+g5wlK6TpS5HNbCqqcw5+zTUGgv6IHFj0 Jx4RBbPnvP4mQ1+avvQ5stIThZaiPPrWozQRoMD8zsbbP1SdDrevLFWaqPwGYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62J211cz19Sp; Wed, 17 Apr 2024 03:33: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 43H3XiD5086765; Wed, 17 Apr 2024 03:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XiCH086762; Wed, 17 Apr 2024 03:33:44 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:44 GMT Message-Id: <202404170333.43H3XiCH086762@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: 1c4b7effa7f9 - main - nvmecontrol: Fix to128 for big endian targets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1c4b7effa7f9df64bf72c6291b4719cffb2ffe22 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c4b7effa7f9df64bf72c6291b4719cffb2ffe22 commit 1c4b7effa7f9df64bf72c6291b4719cffb2ffe22 Author: Warner Losh AuthorDate: 2024-04-16 22:35:59 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:18 +0000 nvmecontrol: Fix to128 for big endian targets The source is always 128-bits in little endian format. For big endian hosts, we have to convert, or we print bogus numbers. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44651 --- sbin/nvmecontrol/Makefile | 1 - sbin/nvmecontrol/nvmecontrol.h | 27 +++++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/sbin/nvmecontrol/Makefile b/sbin/nvmecontrol/Makefile index facb5f09835d..e3d363b123ed 100644 --- a/sbin/nvmecontrol/Makefile +++ b/sbin/nvmecontrol/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=nvme-tools diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h index ed331327ae9e..4187c9bee432 100644 --- a/sbin/nvmecontrol/nvmecontrol.h +++ b/sbin/nvmecontrol/nvmecontrol.h @@ -91,22 +91,33 @@ void print_intel_add_smart(const struct nvme_controller_data *cdata __unused, vo /* Utility Routines */ /* - * 128-bit integer augments to standard values. On i386 this - * doesn't exist, so we use 64-bit values. So, on 32-bit systems, - * you'll get truncated values until someone implement 128bit - * ints in software. + * C23 supports 128-bit integers via _BitInt(128). clang 16 and gcc 13 support + * this. Older compilers will support 128-bit ints on 64-bit + * platforms. Otherwise we truncate this to 64-bit on 32-bit systems with older + * compilers. We also check for > C18 instead of >= C23 because clang 17 was + * released before the the __STDC_VERSION__ was defined. */ #define UINT128_DIG 39 -#ifdef __ILP32__ -typedef uint64_t uint128_t; -#else +#if __STDC_VERSION__ >= 202311L +typedef unsigned _BitInt(128) uint128_t; +#elif defined(__SIZEOF_INT128__) typedef __uint128_t uint128_t; +#else +typedef uint64_t uint128_t; #endif static __inline uint128_t to128(void *p) { - return *(uint128_t *)p; +#if __STDC_VERSION__ >= 202311L || defined(__SIZEOF_INT128__) + uint64_t lo, hi; + + lo = le64dec(p); + hi = le64dec((const char *)p + 8); + return ((uint128_t)hi << 64 | lo); +#else + return (le64dec(p)); +#endif } uint64_t le48dec(const void *pp); From nobody Wed Apr 17 03:33:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62K5wQKz5HjSc; Wed, 17 Apr 2024 03:33: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 4VK62K3l1tz4Qk5; Wed, 17 Apr 2024 03:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGuWswC+stepEtRcOhaJBN1HScVXtxlLNBMwu45RJdU=; b=MQpRqL6p5vqp/SVDppE1iHEfhADkaDiWfGTMUjqmS2mbV2fN9LK5OS3njsvulvGuCdYEJy 3k7l0DJTIO4SXtyctQAl708sb0mCBRcQdZAcyABlU0rDqBkJtDGDFtc9Cpviz/Ck5YOz3j awGCDoXHrdP0MZRK/UQ61CMq8wofw3BVOft92sS7/gBKx74/JhE+ue1PVeg/EcFn6JRB87 nFKu1O4heNI0UH3O1LbmgCrsTGvuHaX9zGi1gct5yIwDju61E1Gu+jYleK1CbKTOGs/h3H VxHIIq9OmmetdlnfcwSojlwbV0KO58s6IU/4XmiZ4mjf/NHi/Ivy//JHQY5DFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324825; a=rsa-sha256; cv=none; b=O1rwDfwMXF0HKfN7n8PMEvaskKNfWgOn9PbUVld9ZJVPoxqmwGHj+hYT1IXkyx2D6rrbNQ PTtJxgsu0La2DMCSoCkzDo63N57GrL5dg9KDkWdCd9AJX3eyi0jb58msIIXp1jljKNV/GR 3AD3SyYsopwpns/5eLjtMZvjJD56r6kwYxwYDW2xlufAgixEFSPppXWyqoCpyCSynPvZw4 YVPMZN+Sd7Ki9fVWL8ic30NjZEfYUA9yFbH8YHnhd6b7YomE25Rkkmln8V2z+SnbO+8Fcg 5je1W3qfAKCfcuaxEjgTmkspLJgLtlwGkxOuoTkqGQNrw6upXGVsIV42SRw/7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGuWswC+stepEtRcOhaJBN1HScVXtxlLNBMwu45RJdU=; b=DEyl46IeDSUToVSKcqbMK0poxpy4iEZUfIg7hx9ntAaszptIjScNyYNGx7oFPc2xvOq+hT ho1GWn8hzqHCcTYCEtocZHgSa8+HBG5OF2MwTrgdwod9wqc8FlhR7KYfuiWFRJXTIuip4a RrKJw2Jw70UYmsfQLc4KTIeqRSf4GWo05nFWZvAZkukY1ZlfCzgYg+p+Za7ntHSgxL8Y/j VuVGE+FkO1XRjlbHgVPNrerGzuxfWGtm3ZJJic5DNruMyM0mFtiaMOwhLVT4fcQs1tgyir 4VaZy/JVK/0OvkyKRHk0xnzptHztHdYcZGqEBkPTGwCE7fG9EnoR+zJJl8ilGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62K3JnGz18vK; Wed, 17 Apr 2024 03:33: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 43H3Xj2R086816; Wed, 17 Apr 2024 03:33:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XjG2086813; Wed, 17 Apr 2024 03:33:45 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:45 GMT Message-Id: <202404170333.43H3XjG2086813@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: 729ee4c88f2a - main - nvmecontrol: Move smart/health printing to little endian orderinng List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 729ee4c88f2af4560adec39fd709ff89bb597e4a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=729ee4c88f2af4560adec39fd709ff89bb597e4a commit 729ee4c88f2af4560adec39fd709ff89bb597e4a Author: Warner Losh AuthorDate: 2024-04-16 22:36:05 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:18 +0000 nvmecontrol: Move smart/health printing to little endian orderinng Move health printing to little endian ordering... Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44652 --- sbin/nvmecontrol/logpage.c | 56 +++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 276932d363e5..0ae2c52155b4 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -219,10 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, /* Convert data to host endian */ switch (log_page) { - case NVME_LOG_HEALTH_INFORMATION: - nvme_health_information_page_swapbytes( - (struct nvme_health_information_page *)payload); - break; case NVME_LOG_CHANGED_NAMESPACE: nvme_ns_list_swapbytes((struct nvme_ns_list *)payload); break; @@ -265,17 +261,17 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf("Error Information Log\n"); printf("=====================\n"); - if (LE2H(entry->error_count) == 0) { + if (letoh(entry->error_count) == 0) { printf("No error entries found\n"); return; } nentries = size / sizeof(struct nvme_error_information_entry); for (i = 0; i < nentries; i++, entry++) { - if (LE2H(entry->error_count) == 0) + if (letoh(entry->error_count) == 0) break; - status = LE2H(entry->status); + status = letoh(entry->status); p = NVME_STATUS_GET_P(status); sc = NVME_STATUS_GET_SC(status); @@ -285,9 +281,9 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf("Entry %02d\n", i + 1); printf("=========\n"); - printf(" Error count: %ju\n", LE2H(entry->error_count)); - printf(" Submission queue ID: %u\n", LE2H(entry->sqid)); - printf(" Command ID: %u\n", LE2H(entry->cid)); + printf(" Error count: %ju\n", letoh(entry->error_count)); + printf(" Submission queue ID: %u\n", letoh(entry->sqid)); + printf(" Command ID: %u\n", letoh(entry->cid)); /* TODO: Export nvme_status_string structures from kernel? */ printf(" Status:\n"); printf(" Phase tag: %d\n", p); @@ -295,13 +291,13 @@ print_log_error(const struct nvme_controller_data *cdata __unused, void *buf, ui printf(" Status code type: %d\n", sct); printf(" More: %d\n", m); printf(" DNR: %d\n", dnr); - printf(" Error location: %u\n", LE2H(entry->error_location)); - printf(" LBA: %ju\n", LE2H(entry->lba)); - printf(" Namespace ID: %u\n", LE2H(entry->nsid)); - printf(" Vendor specific info: %u\n", LE2H(entry->vendor_specific)); - printf(" Transport type: %u\n", LE2H(entry->trtype)); - printf(" Command specific info:%ju\n", LE2H(entry->csi)); - printf(" Transport specific: %u\n", LE2H(entry->ttsi)); + printf(" Error location: %u\n", letoh(entry->error_location)); + printf(" LBA: %ju\n", letoh(entry->lba)); + printf(" Namespace ID: %u\n", letoh(entry->nsid)); + printf(" Vendor specific info: %u\n", letoh(entry->vendor_specific)); + printf(" Transport type: %u\n", letoh(entry->trtype)); + printf(" Command specific info:%ju\n", letoh(entry->csi)); + printf(" Transport specific: %u\n", letoh(entry->ttsi)); } } @@ -325,7 +321,7 @@ print_log_health(const struct nvme_controller_data *cdata __unused, void *buf, u uint8_t warning; int i; - warning = health->critical_warning; + warning = letoh(health->critical_warning); printf("SMART/Health Information Log\n"); printf("============================\n"); @@ -342,13 +338,13 @@ print_log_health(const struct nvme_controller_data *cdata __unused, void *buf, u printf(" Volatile memory backup: %d\n", !!(warning & NVME_CRIT_WARN_ST_VOLATILE_MEMORY_BACKUP)); printf("Temperature: "); - print_temp_K(health->temperature); + print_temp_K(letoh(health->temperature)); printf("Available spare: %u\n", - health->available_spare); + letoh(health->available_spare)); printf("Available spare threshold: %u\n", - health->available_spare_threshold); + letoh(health->available_spare_threshold)); printf("Percentage used: %u\n", - health->percentage_used); + letoh(health->percentage_used)); printf("Data units (512,000 byte) read: %s\n", uint128_to_str(to128(health->data_units_read), cbuf, sizeof(cbuf))); @@ -371,18 +367,18 @@ print_log_health(const struct nvme_controller_data *cdata __unused, void *buf, u printf("No. error info log entries: %s\n", uint128_to_str(to128(health->num_error_info_log_entries), cbuf, sizeof(cbuf))); - printf("Warning Temp Composite Time: %d\n", health->warning_temp_time); - printf("Error Temp Composite Time: %d\n", health->error_temp_time); + printf("Warning Temp Composite Time: %d\n", letoh(health->warning_temp_time)); + printf("Error Temp Composite Time: %d\n", letoh(health->error_temp_time)); for (i = 0; i < 8; i++) { - if (health->temp_sensor[i] == 0) + if (letoh(health->temp_sensor[i]) == 0) continue; printf("Temperature Sensor %d: ", i + 1); - print_temp_K(health->temp_sensor[i]); + print_temp_K(letoh(health->temp_sensor[i])); } - printf("Temperature 1 Transition Count: %d\n", health->tmt1tc); - printf("Temperature 2 Transition Count: %d\n", health->tmt2tc); - printf("Total Time For Temperature 1: %d\n", health->ttftmt1); - printf("Total Time For Temperature 2: %d\n", health->ttftmt2); + printf("Temperature 1 Transition Count: %d\n", letoh(health->tmt1tc)); + printf("Temperature 2 Transition Count: %d\n", letoh(health->tmt2tc)); + printf("Total Time For Temperature 1: %d\n", letoh(health->ttftmt1)); + printf("Total Time For Temperature 2: %d\n", letoh(health->ttftmt2)); } static void From nobody Wed Apr 17 03:33:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62N0LTSz5HjWd; Wed, 17 Apr 2024 03:33: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 4VK62M5h8Sz4Qrh; Wed, 17 Apr 2024 03:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dvyIJWMi0APUYT5kRfYGJTVJfZFhpC5vOUCeyZQ2DJ4=; b=oR8CSiaWaXqj+b8YMPXl5oA4ZbIT+1HANVUUfWO6p8qvXg8PRVanJWYKnj2TfvNIgXtXn5 RNxZwrlwhXtkR1sXuBeHQt6fjqe5O2KQvhpkGeMGJEOFAsyED92gXHQZj8UGm+A4KMCxXy LKavDlH+zjYsWdpbPi1IB1MywpQsb0pobcTcyBaE6R1L38ZlBA/iDj9J+kcCYd4Ypfke+h 2942xpKXGcPCxy8FPOyvq70nCdTFByuCBOVIT5bxvwzD0iYih5BL/sNv85fyx/e83Bj/og 3k/x/mHRqrWrScT5IUXo5qWn2njP/WX3Cd6YKNbdqHCV1buDDPFzYD/fO+w00w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324827; a=rsa-sha256; cv=none; b=Yo9OHRW8CE9a+/Y3xVmFaUQEqyY6bRCqwE8HIhyHizdhIeCtiKG04ea6gqQDA+bmxjUB5T v/kyMluJ+ZKu2S87ZZr3ngdNHGVQHU+89JPcH3pDGvGKClFWuUfBZS0hnlcBuzVldHVLit A/iTrGr4B1p+8y3Wk4XmZikoed9henEG5LQv7TPx2hcMfPwTTifcxCVFyiFJ7ou0rtCN1N mOapaj7iVgA3zIbwjSb9TeH1+r7k8YIAq6wWYs/x9D1XimFn6unkSG24CxXAIQt4y8rNLJ v3DzDRcU31AeXtrXkGPF6enjf7e9mutSOIlufZMaU1VxxI/IVRETP9uOx2tWiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dvyIJWMi0APUYT5kRfYGJTVJfZFhpC5vOUCeyZQ2DJ4=; b=KRgCL8tIhWHYvf0+ERmCwnQp4cwZqZAypg5dUUjsxnKfLgHhK0hGDm5KSaw6NDmdqqKfTq j0GADor+4z61q/+JENoPyQLSUuvL/+xwXW6gp3Mp/kbgkQdWINIlHw5xKExEZYIAZayK0q XkKrUEArIge9ZcXQBfA9cm/9jvSLCwr3+qrpLU6ocBQXtlZpQqhviPR1Zd/ZJjiozr3tsk LTlIAkm3+hzYFXkA5hjiWWwdpUNi275Hg+qGqU6c7Hureo6PLcJPeRVvVbx1UgtDJxQJ/w 4HotNW5jajt6MRh/4t0rGLFFrE9dtTi2c+f9DPnMoacCl3OAZbYKF8l3sZwV/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62M5GmBz18vL; Wed, 17 Apr 2024 03:33: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 43H3Xlh0086935; Wed, 17 Apr 2024 03:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3Xl3F086932; Wed, 17 Apr 2024 03:33:47 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:47 GMT Message-Id: <202404170333.43H3Xl3F086932@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: 98f841efd8ce - main - nvmecontrol: Move self test status page printing to little endian orderinng List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 98f841efd8ce387d9cd060174b9dcc9ff9850648 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=98f841efd8ce387d9cd060174b9dcc9ff9850648 commit 98f841efd8ce387d9cd060174b9dcc9ff9850648 Author: Warner Losh AuthorDate: 2024-04-16 22:36:19 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:18 +0000 nvmecontrol: Move self test status page printing to little endian orderinng Also, add printing vnedor_specific field, which doesn't have a valid bit, so is always valid. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44654 --- sbin/nvmecontrol/logpage.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 0cf6e5f9fa94..9a8aa691d5db 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -219,10 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, /* Convert data to host endian */ switch (log_page) { - case NVME_LOG_DEVICE_SELF_TEST: - nvme_device_self_test_swapbytes( - (struct nvme_device_self_test_page *)payload); - break; case NVME_LOG_COMMAND_EFFECT: nvme_command_effects_page_swapbytes( (struct nvme_command_effects_page *)payload); @@ -573,13 +569,14 @@ print_log_self_test_status(const struct nvme_controller_data *cdata __unused, { struct nvme_device_self_test_page *dst; uint32_t r; + uint16_t vs; dst = buf; printf("Device Self-test Status\n"); printf("=======================\n"); printf("Current Operation: "); - switch (dst->curr_operation) { + switch (letoh(dst->curr_operation)) { case 0x0: printf("No device self-test operation in progress\n"); break; @@ -593,19 +590,20 @@ print_log_self_test_status(const struct nvme_controller_data *cdata __unused, printf("Vendor specific\n"); break; default: - printf("Reserved (0x%x)\n", dst->curr_operation); + printf("Reserved (0x%x)\n", letoh(dst->curr_operation)); } - if (dst->curr_operation != 0) - printf("Current Completion: %u%%\n", dst->curr_compl & 0x7f); + if (letoh(dst->curr_operation) != 0) + printf("Current Completion: %u%%\n", letoh(dst->curr_compl) & 0x7f); printf("Results\n"); for (r = 0; r < 20; r++) { uint64_t failing_lba; - uint8_t code, res; + uint8_t code, res, status; - code = (dst->result[r].status >> 4) & 0xf; - res = dst->result[r].status & 0xf; + status = letoh(dst->result[r].status); + code = (status >> 4) & 0xf; + res = status & 0xf; if (res == 0xf) continue; @@ -630,21 +628,24 @@ print_log_self_test_status(const struct nvme_controller_data *cdata __unused, printf(" Reserved status 0x%x", res); if (res == 7) - printf(" starting in segment %u", dst->result[r].segment_num); + printf(" starting in segment %u", + letoh(dst->result[r].segment_num)); #define BIT(b) (1 << (b)) - if (dst->result[r].valid_diag_info & BIT(0)) - printf(" NSID=0x%x", dst->result[r].nsid); - if (dst->result[r].valid_diag_info & BIT(1)) { + if (letoh(dst->result[r].valid_diag_info) & BIT(0)) + printf(" NSID=0x%x", letoh(dst->result[r].nsid)); + if (letoh(dst->result[r].valid_diag_info) & BIT(1)) { memcpy(&failing_lba, dst->result[r].failing_lba, sizeof(failing_lba)); - printf(" FLBA=0x%jx", failing_lba); + printf(" FLBA=0x%jx", (uintmax_t)letoh(failing_lba)); } - if (dst->result[r].valid_diag_info & BIT(2)) - printf(" SCT=0x%x", dst->result[r].status_code_type); - if (dst->result[r].valid_diag_info & BIT(3)) - printf(" SC=0x%x", dst->result[r].status_code); + if (letoh(dst->result[r].valid_diag_info) & BIT(2)) + printf(" SCT=0x%x", letoh(dst->result[r].status_code_type)); + if (letoh(dst->result[r].valid_diag_info) & BIT(3)) + printf(" SC=0x%x", letoh(dst->result[r].status_code)); #undef BIT + memcpy(&vs, dst->result[r].vendor_specific, sizeof(vs)); + printf(" VENDOR_SPECIFIC=0x%x", letoh(vs)); printf("\n"); } } From nobody Wed Apr 17 03:33:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62M21zmz5Hjdm; Wed, 17 Apr 2024 03:33: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 4VK62L4cmLz4Qgk; Wed, 17 Apr 2024 03:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0q/GjtleXKM5aMCo9reW5Nb+WKWJ0mUk2dI/61QNawU=; b=JZoSOfFuMTTMo11NBvOOmH0sDiHbTZ1pErH/biXsVeBImhRfL36RBFMvha+ircbcCidRpD 7/0jaiQ+5Xy/hGdA7DBsQxTqtrKwONQ7cDDqF4UrD2ILcmner8hT2YOjw/vf1t5XiyE0pF DlpDw5VhQPHRIS9nXKzOGPitMm9MmnT683dWhOQ37HGiMjad9X+TlG/cOZecfV5LeE55H9 24gLnZ7tTnNXrvJ98HW9tpuovhDm7kPyM6ZImyk/qh3pVhs2DmlZdOTteYiYxEAwjMAml2 mY+pDyx7lx/hjfmKfcdR3KCT4iFNc4j/pqidB1we8T/rzoMaCfvQoTnMPuWKDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324826; a=rsa-sha256; cv=none; b=uRMfiTX1WSbUjkRaoFnvxJM4b0lVma8PEpIda2ntnHrBc+sqVKSYROdCxgFWuKXNq+5ewC QSZlj8YkG/3ItcgZ8hHmKN38WsFfsyHqafIP0TJbNeZDm/gUjcXeg4QGl7MGR/Y4abUVVI tKju6ZUX6nJMET9TUOaZ9iKjv41bTcilC23CWDFC/AEHm3eszMJOis/0k8h9Z3v/lhHex/ hXMBpA8nhvhUvRiN/hJaLyIaQ55VlqBuOI0VWUQfmhOKBj0MP6kmCfnVV2yS5GV4gXNmpp Ip+OQrusdw0px9VZUwqrvIeW45fgaZHnsR+bKejomdmEsGcXtC/6DS9lc5eiaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0q/GjtleXKM5aMCo9reW5Nb+WKWJ0mUk2dI/61QNawU=; b=e+8BOfhHoSGk1ZV6V1VaPY2CwB8IpNjMtoUv41oYvjFnX9lk3m9tceepLYbRnoJocSjlDP XVDBS2onI7NDkoM6ZmSR5nqbF47N+RddH9BzaOBXWp9UcXgwIGXlN+cr2aNEmByamT90v2 qmNfDN0XwcahdtRuims9001JKHCGR/ksMYztpwYOsL2aON5BMimZU/V4H6884jduPms767 nhLTfuj4LB1GtiYgGFeAnXLX6neAWapjh2SFFbP13xsBgpcpk0CjSepMLejTi/svWsKjg2 OHf7rEB6cfCk/1r66peSXic2zGAHKDI+IHT1QTqjywFUDPMA+cKuq1iOhcqOkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62L4F5cz19Hl; Wed, 17 Apr 2024 03:33: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 43H3XkY8086873; Wed, 17 Apr 2024 03:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XkhT086870; Wed, 17 Apr 2024 03:33:46 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:46 GMT Message-Id: <202404170333.43H3XkhT086870@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: acdf72f7bbe5 - main - nvmecontrol: Move namespace change page printing to little endian orderinng List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: acdf72f7bbe582b8eabf09576dc93eb4fcfbd19b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=acdf72f7bbe582b8eabf09576dc93eb4fcfbd19b commit acdf72f7bbe582b8eabf09576dc93eb4fcfbd19b Author: Warner Losh AuthorDate: 2024-04-16 22:36:13 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:18 +0000 nvmecontrol: Move namespace change page printing to little endian orderinng Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44653 --- sbin/nvmecontrol/logpage.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 0ae2c52155b4..0cf6e5f9fa94 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -219,9 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, /* Convert data to host endian */ switch (log_page) { - case NVME_LOG_CHANGED_NAMESPACE: - nvme_ns_list_swapbytes((struct nvme_ns_list *)payload); - break; case NVME_LOG_DEVICE_SELF_TEST: nvme_device_self_test_swapbytes( (struct nvme_device_self_test_page *)payload); @@ -429,8 +426,8 @@ print_log_ns(const struct nvme_controller_data *cdata __unused, void *buf, printf("Changed Namespace List\n"); printf("======================\n"); - for (i = 0; i < nitems(nsl->ns) && nsl->ns[i] != 0; i++) { - printf("%08x\n", nsl->ns[i]); + for (i = 0; i < nitems(nsl->ns) && letoh(nsl->ns[i]) != 0; i++) { + printf("%08x\n", letoh(nsl->ns[i])); } } From nobody Wed Apr 17 03:33:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62P2KzZz5HjNk; Wed, 17 Apr 2024 03:33: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 4VK62N6mrmz4QvQ; Wed, 17 Apr 2024 03:33:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G5egkH9APeJS1NPVpe/7d0y6ixqxCbxse+5eoZcnxyk=; b=ANJwhnR2YmEuWOuph2LO6pD4mL8rNqa5YHTZe5dMOv7lef2zV2LSdKS6vYbHqJa/ZIZO+N nqM8hnPOwvzc1Uv1Dz19pnxJulbkInugBOjohTAmBVq9PhhfoEd3YaqDUqy5iiIxrvkFEa TdpQe1wp8c4hxH2SCJ9IYiwRBZsC2bWr6BSR/o7TJFP3Xxo2nVe70KNt8SJjPUZ/JFcfgr OCXXiNqI4Of/ls5wSIuPtUtDr25M1vRTaEc1ToJyJlIiYQXrTH1b/dFq//rsE7099OmED2 0KP9wvtRFLucDGYMm0QzLWLqD/2fJB6U0oad40rvWez9orRwCkv0tKyYS/CvBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324829; a=rsa-sha256; cv=none; b=bQTWg/syREXE0CVFNwk3YOquL5V6oMgg/Cwc2k+ODq5WsjUVFj3eli7QEJ/6A6JEj1EmtY GGhIVJiDe3jhwr+89/yTrcmKFOBk/HYfFSrQBD+je2ycdowrc8p3b9u2Ff/GF6JdC/igCv 5QcASDf1Xrl2XaniJHH4IcKl45tYET41KaXEuINUnQ6ZgP6eBLap01MKfzQLDwa9VJzHq8 4fAZmyWHlVhT7phhojuTKanmgn8WR80SQXgINuZ2KeABqjDNcn/U68uPo9rP2/pEK1+Qrr QmX9ZHT81f6pVnquYZPdn7vBMcHHTwcCBSbchqERsH31BMepI/3Ax9AGPP5D9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G5egkH9APeJS1NPVpe/7d0y6ixqxCbxse+5eoZcnxyk=; b=A+uwAmlj6IvMrtA8h1duIM3Y+yALZwCK/7BcaARo+BD7vvy9cTIbP6zglHjzuPYQBHajUp 4YAGzL4+Jnf4Pi7ChCWxmNhP31XFs7xfSu3HIK4klDYEx52XlAby5eJC6hQFhv5f7m57ET 3HSxlmMsw0O72SAjAN4jn/JBxcrDv6airVDgDGSToT9hkT+joCvcBiGNI7n37ROS2RnV8D LSgTRmBIfalki/SNmJEqs74eTdEmbH4Mx8qtgqFmzHo2qe0JbFOlHZnOGvOrRMxhnTK/V7 HH8qmjokcWLnY1ravf2OhnI15YAWgZFSfFWwnM6CEG1/upOnyTnZSOx5XFhx7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62N6Krvz19WS; Wed, 17 Apr 2024 03:33: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 43H3XmGq086997; Wed, 17 Apr 2024 03:33:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XmKt086994; Wed, 17 Apr 2024 03:33:48 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:48 GMT Message-Id: <202404170333.43H3XmKt086994@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: b850caf7b709 - main - nvmecontrol: Move command effeccts page printing to little endian orderinng List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b850caf7b7099636fd4323cb47a82f5201309fed Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b850caf7b7099636fd4323cb47a82f5201309fed commit b850caf7b7099636fd4323cb47a82f5201309fed Author: Warner Losh AuthorDate: 2024-04-16 22:36:25 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:18 +0000 nvmecontrol: Move command effeccts page printing to little endian orderinng Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44655 --- sbin/nvmecontrol/logpage.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 9a8aa691d5db..bdabc1078166 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -219,10 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, /* Convert data to host endian */ switch (log_page) { - case NVME_LOG_COMMAND_EFFECT: - nvme_command_effects_page_swapbytes( - (struct nvme_command_effects_page *)payload); - break; case NVME_LOG_RES_NOTIFICATION: nvme_res_notification_page_swapbytes( (struct nvme_res_notification_page *)payload); @@ -441,7 +437,7 @@ print_log_command_effects(const struct nvme_controller_data *cdata __unused, printf(" Command\tLBCC\tNCC\tNIC\tCCC\tCSE\tUUID\n"); for (i = 0; i < 255; i++) { - s = ce->acs[i]; + s = letoh(ce->acs[i]); if (NVMEV(NVME_CE_PAGE_CSUP, s) == 0) continue; printf("Admin\t%02x\t%s\t%s\t%s\t%s\t%u\t%s\n", i, @@ -453,7 +449,7 @@ print_log_command_effects(const struct nvme_controller_data *cdata __unused, NVMEV(NVME_CE_PAGE_UUID, s) != 0 ? "Yes" : "No"); } for (i = 0; i < 255; i++) { - s = ce->iocs[i]; + s = letoh(ce->iocs[i]); if (NVMEV(NVME_CE_PAGE_CSUP, s) == 0) continue; printf("I/O\t%02x\t%s\t%s\t%s\t%s\t%u\t%s\n", i, From nobody Wed Apr 17 03:33:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62Q3TGXz5HjWg; Wed, 17 Apr 2024 03:33: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 4VK62Q0cl3z4QhQ; Wed, 17 Apr 2024 03:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/4wZOwYcMPX+CUJn62msfxrAuUn5efMAnhMNhglhddI=; b=wi3Zytl3o9Dn3hnminpFTr3ExyPvt90Csw4g6kFzbmL+44wli4Yqz8wunt2Ncwwm6ZN6dp xFEvWcN7Em/oaLf89S8ZoH8Jy6RrYO0ufR5inG0PGmRj1WdI/6swNId3JcCYeyScrTCD7p dA8hhfS7bmCS5+V3brtSPu+BA+xs81h3+mDrs5CoiHsYg51avU7iR5PpAQTq4t9UOpWFIj F3osFx1L4h7FmrTKmWjKDnTIvIBv3DO+vCtSTfnvkrJeF44HAMuUM50PHcV2TBi3aAeaSX 4KeFn5MTI4gT7oa5RiDxFRiaWUFwsIq4rXtQd6fvdSIVGKbQqo1va51noU1k+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324830; a=rsa-sha256; cv=none; b=IXwkcQaa/Qy8czfBlEVlcDu9d1KUBPYEWmd+Wqj3fyOMWdFgtJVC+LwMyQ4CMKKlh/olXb TamDnBdN0qVhfK3fjUd8PLmz/cs/fjEHiS8rKzf/EJwu1IQWGeQ/WUgheMlyldSbc1uI/9 euqtL7OJt6ZKn/0APLwGgCXyS6ZE8Fu+4JLYGmNeK/TYOlWvNsqxIL3N0pTO3RDpo4eBoJ IZP8dkfgXkWAflbMWiLoeNdsOMsy+tzPcV85j0jygCqCK9rXCfEi0wl+W2fOzYp5hFZedq PLWCAYBwRlYFkyIBXRAX0QdmCIHl3t0LMYSoapc3m0qPIW9NVZvnvjPfcg8Heg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/4wZOwYcMPX+CUJn62msfxrAuUn5efMAnhMNhglhddI=; b=IeS7ER6OM7ieDDiLN+PJOHLN/jOCvQSOvuYjgVTNTXv2v1fJ9QyT7qm5dmwaB8i/6yO4D7 jyU4bUY59HZlSz8LeYkRn9H6EtkszZPPUmNLnamnlyRcQOxfRcIjf8aZpL4Dwo4pDejdi6 UZNmzmayS4U7l3GsSfJSTox8tR+xSAp8tlablf1yQUQnFP8JozVcshJvZZfFgnXvJWWGNz DruE3JD+iOvjqHb6mIhQxxSMAepevhCmBXltdTxlt7UCFKXQyZAyR3W3OBWC3aTyDKgKWa n/PX2b0vRUG7RT8BW8kvub3HBbvIsRZtI8Fn3EJ9sYmWECEFt8oUoZb5Iw2Mxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62Q0DJSz19Yh; Wed, 17 Apr 2024 03:33: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 43H3XnLW087054; Wed, 17 Apr 2024 03:33:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XnsQ087051; Wed, 17 Apr 2024 03:33:49 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:49 GMT Message-Id: <202404170333.43H3XnsQ087051@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: 3d28a9c608a3 - main - nvmecontrol: Move reservation notifcation page printing to little endian orderinng List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 3d28a9c608a382af669e22e9e8eda7fd0bc02cad Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3d28a9c608a382af669e22e9e8eda7fd0bc02cad commit 3d28a9c608a382af669e22e9e8eda7fd0bc02cad Author: Warner Losh AuthorDate: 2024-04-16 22:36:31 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:18 +0000 nvmecontrol: Move reservation notifcation page printing to little endian orderinng Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44656 --- sbin/nvmecontrol/logpage.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index bdabc1078166..2ab97294e976 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -219,10 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, /* Convert data to host endian */ switch (log_page) { - case NVME_LOG_RES_NOTIFICATION: - nvme_res_notification_page_swapbytes( - (struct nvme_res_notification_page *)payload); - break; case NVME_LOG_SANITIZE_STATUS: nvme_sanitize_status_page_swapbytes( (struct nvme_sanitize_status_page *)payload); @@ -472,9 +468,10 @@ print_log_res_notification(const struct nvme_controller_data *cdata __unused, printf("Reservation Notification\n"); printf("========================\n"); - printf("Log Page Count: %ju\n", rn->log_page_count); + printf("Log Page Count: %ju\n", + (uintmax_t)letoh(rn->log_page_count)); printf("Log Page Type: "); - switch (rn->log_page_type) { + switch (letoh(rn->log_page_type)) { case 0: printf("Empty Log Page\n"); break; @@ -488,11 +485,11 @@ print_log_res_notification(const struct nvme_controller_data *cdata __unused, printf("Reservation Preempted\n"); break; default: - printf("Unknown %x\n", rn->log_page_type); + printf("Unknown %x\n", letoh(rn->log_page_type)); break; }; - printf("Number of Available Log Pages: %d\n", rn->available_log_pages); - printf("Namespace ID: 0x%x\n", rn->nsid); + printf("Number of Available Log Pages: %d\n", letoh(rn->available_log_pages)); + printf("Namespace ID: 0x%x\n", letoh(rn->nsid)); } static void From nobody Wed Apr 17 03:33:51 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62R41gxz5HjSp; Wed, 17 Apr 2024 03:33: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 4VK62R1cMmz4Qw1; Wed, 17 Apr 2024 03:33:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+ssxVhImLPV4k6S8kZ+qCLkoiFm867nDRSOb66L6Ng=; b=YoUNlTTiOVzenp6eHv3NYV285i//cuaiSkrsbOLOnQrW28TrBIJ9fGxIlOsNqfO6AuePRO mUClgPnSBPGbgvOA1vt80X2Ff6/OrEu2Dvn7fHT56pAX1hjEKHx7tw01WYMh6HB65pCJ4b Gfs8EVetlSyyvxLit2YsM4VxEfFHtIOCTJGcrHjULkKVnEVtrBuzs2L7QdnQ7r+rd6DZFR jlcqpw376b9c9XsKrJFWJj5hlaC0muB5qXPxH5XV+x91JTJliH0NAdcuGo4f1qNGkCTPvk KxrcouEZPNvnsGl0YirYa6OFHbaGN3Y5uCSNP+ktgV5+Utiu+8fDlmvxUfceIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324831; a=rsa-sha256; cv=none; b=eUEguR7VTqdNFh4cwKfdPZCrT0A3Sv5roJ6MT6PLV6ywqaUAa3JAS7XiApjjyLt99UA53Q WGstLga/rh3HhZvh3JSdWv85/HZCV0MXx0SmN9H2x0L7hDRt6k7AD1Mv4x2I3rfC+JCqw1 TU4i39h1iEC2r+M5Yuhyv15+7gPU68IYqbp/W88PjCQpOUJMGeJGQe5pIeBG0trRFLAY/M I09++rgyedsdJ8IR4glEfinmzBs4hnvFeEdwuEPCky/NMHg/iP5zcedS1XIXl0JlXhQen3 2cl6xaJgPZnCzfoeTHZrjzW/NZ97f33PINatZlB4/Ym1MH3Puwmi18sy1vihDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+ssxVhImLPV4k6S8kZ+qCLkoiFm867nDRSOb66L6Ng=; b=nujYJ/PrIrt6x1YmXC5EOljivh46iIy5LoyFzlv08UhieKEGWsjqf9rGhkysgIPYuVmEoA bCdLCcJ7pqqxV6oxL7GDCUa2hp/5fqF+boXvDJ2CBLIpPw3JmqC/7B+kmkzOV6oGytWX82 H9e4+ENpJHmU8d2DIEYSO84K8NCbf3ZIEBCdTDqYwlJ3I5QcnnrxGkiqG/YUT321lXTsuz sHybh5JetgJTZpHpmeCMBVaQC0HZJ2Q/QBKIpdsbGy1Pwwx5Fx4HOEd4fKlx+163FPDUnn x58iLKcNPbBhQVdKLdPiGO3Mu9LHOvTeQj0IdrmDdZgzyrjkdUXD0SVEaLjt6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62R19dsz18vM; Wed, 17 Apr 2024 03:33: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 43H3XpPE087113; Wed, 17 Apr 2024 03:33:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XpPN087110; Wed, 17 Apr 2024 03:33:51 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:51 GMT Message-Id: <202404170333.43H3XpPN087110@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: 55a1679ece1f - main - nvmecontrol: Move sanitize status page printing to little endian orderinng List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 55a1679ece1f56beda5f68e929a6b2fc553fb501 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=55a1679ece1f56beda5f68e929a6b2fc553fb501 commit 55a1679ece1f56beda5f68e929a6b2fc553fb501 Author: Warner Losh AuthorDate: 2024-04-16 22:36:36 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:18 +0000 nvmecontrol: Move sanitize status page printing to little endian orderinng Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44657 --- sbin/nvmecontrol/logpage.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 2ab97294e976..ede4ff82946d 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -219,10 +219,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, /* Convert data to host endian */ switch (log_page) { - case NVME_LOG_SANITIZE_STATUS: - nvme_sanitize_status_page_swapbytes( - (struct nvme_sanitize_status_page *)payload); - break; case INTEL_LOG_TEMP_STATS: intel_log_temp_stats_swapbytes( (struct intel_log_temp_stats *)payload); @@ -498,15 +494,18 @@ print_log_sanitize_status(const struct nvme_controller_data *cdata __unused, { struct nvme_sanitize_status_page *ss; u_int p; + uint16_t sprog, sstat; ss = (struct nvme_sanitize_status_page *)buf; printf("Sanitize Status\n"); printf("===============\n"); + sprog = letoh(ss->sprog); printf("Sanitize Progress: %u%% (%u/65535)\n", - (ss->sprog * 100 + 32768) / 65536, ss->sprog); + (sprog * 100 + 32768) / 65536, sprog); printf("Sanitize Status: "); - switch (NVMEV(NVME_SS_PAGE_SSTAT_STATUS, ss->sstat)) { + sstat = letoh(ss->sstat); + switch (NVMEV(NVME_SS_PAGE_SSTAT_STATUS, sstat)) { case NVME_SS_PAGE_SSTAT_STATUS_NEVER: printf("Never sanitized"); break; @@ -523,22 +522,22 @@ print_log_sanitize_status(const struct nvme_controller_data *cdata __unused, printf("Completed with deallocation"); break; default: - printf("Unknown"); + printf("Unknown 0x%x", sstat); break; } - p = NVMEV(NVME_SS_PAGE_SSTAT_PASSES, ss->sstat); + p = NVMEV(NVME_SS_PAGE_SSTAT_PASSES, sstat); if (p > 0) printf(", %d passes", p); - if (NVMEV(NVME_SS_PAGE_SSTAT_GDE, ss->sstat) != 0) + if (NVMEV(NVME_SS_PAGE_SSTAT_GDE, sstat) != 0) printf(", Global Data Erased"); printf("\n"); - printf("Sanitize Command Dword 10: 0x%x\n", ss->scdw10); - printf("Time For Overwrite: %u sec\n", ss->etfo); - printf("Time For Block Erase: %u sec\n", ss->etfbe); - printf("Time For Crypto Erase: %u sec\n", ss->etfce); - printf("Time For Overwrite No-Deallocate: %u sec\n", ss->etfownd); - printf("Time For Block Erase No-Deallocate: %u sec\n", ss->etfbewnd); - printf("Time For Crypto Erase No-Deallocate: %u sec\n", ss->etfcewnd); + printf("Sanitize Command Dword 10: 0x%x\n", letoh(ss->scdw10)); + printf("Time For Overwrite: %u sec\n", letoh(ss->etfo)); + printf("Time For Block Erase: %u sec\n", letoh(ss->etfbe)); + printf("Time For Crypto Erase: %u sec\n", letoh(ss->etfce)); + printf("Time For Overwrite No-Deallocate: %u sec\n", letoh(ss->etfownd)); + printf("Time For Block Erase No-Deallocate: %u sec\n", letoh(ss->etfbewnd)); + printf("Time For Crypto Erase No-Deallocate: %u sec\n", letoh(ss->etfcewnd)); } static const char * From nobody Wed Apr 17 03:33:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62S50S0z5HjYM; Wed, 17 Apr 2024 03:33: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 4VK62S2Q93z4R3f; Wed, 17 Apr 2024 03:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JM5MPER8lJru5ZOhACBInwkK27F759ZWMqUS3HlX1ZU=; b=EIDpUZXcxgC9SM8hqUt7hzv42OQBQauyCULpNT8JaxdE56nx3BSiNIrtuObCGwnIpXvQju +x5NhUD0a4v9J1+C2Fr3kOdvDbPAnZQYslPOgPDvl8I/yT2Dyq++o5N/sv7tFJyh01FuWC rKgZcqRhkslBEok0knTxSmu1ZvkTj1VRSznkYkJ/ONkFYV6jkAoK8xulSG704InbJFdwi6 39OLeK+/B96EU50OHOLgdCBLw8VSDdZBxXDlbOUlRVJh9fV9I1wyIcdScLCXKNnahEU5bn 5FY2K1a/JvOl1Pxb8cWgauk8UbkoCR6sjKlJiCiKtZ7EMGPx3R4xBChJrK/Khw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324832; a=rsa-sha256; cv=none; b=RTxYQlP3K6zOusXpo7B1UHkvNvqHNFHXJuTei+6Y2zpq4hMNjyvKWxzJ/eU37bnG2aDWpD C2Rzl7cuo54PPqeeblx89QHr2prh6vF9ik9RorjXbNAhhVd4J1vCvZUwBrRM/Lam5tzIy7 2dgkUQEnxNOR48V/ZsH/wZoysTh79wIo7VGCXSg0QSWjCk0LAn2ek+DodauweXq15wNER0 v6H3Fn5AaUaRIqLiJjn1gku7Yk8MG/rW11mmgxyNJO0yo4DcOiTPnKBqd3BtAqxUzU4Wmo WAbccidpxu+hocXDHxOFZwsO6I+fybB8xC5o5XqSnuOKAef+EDbqmeIFWP4hWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JM5MPER8lJru5ZOhACBInwkK27F759ZWMqUS3HlX1ZU=; b=YbY4T22NNhSTfKQz5SfAZj3qkA4hL+9Nvby4hlSMxSywux4s02DlcwqT1Fy/yLOYhVdWV8 FGb3agzSMjQbhUu2ZxBW1kqg5CxH5lA/EmkpKlq70Nn2UPydseI3tuG2Bc56Fyn5LcZTeR 5bcX9mXynThnSFsarV2DlpxcmwMZMOME3MTiN+asZte8bTsHyvxi/NAga9DTVX004QPb6B 3X2+pwDj0KOiNWDS6FfQAoxgU8iOBIZ8ovc+kUFMs9zy/ln415x6TDV//LVAVYgRfqm8oO DfU2I+V9V3mWQhcUc47lIE70FAMonVSJTbNTC+7JZNQRhXI5zz7G+CfGctvFwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62S1zt3z19FG; Wed, 17 Apr 2024 03:33: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 43H3XqW4087170; Wed, 17 Apr 2024 03:33:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XqFQ087167; Wed, 17 Apr 2024 03:33:52 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:52 GMT Message-Id: <202404170333.43H3XqFQ087167@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: f0f7e9616da0 - main - nvmecontrol: Move intel temperature page printing to little endian orderinng List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f0f7e9616da052e3d77b6e41301ccd655ae434fa Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f0f7e9616da052e3d77b6e41301ccd655ae434fa commit f0f7e9616da052e3d77b6e41301ccd655ae434fa Author: Warner Losh AuthorDate: 2024-04-16 22:36:41 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:18 +0000 nvmecontrol: Move intel temperature page printing to little endian orderinng Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44658 --- sbin/nvmecontrol/logpage.c | 10 ---------- sbin/nvmecontrol/modules/intel/intel.c | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index ede4ff82946d..dfc35f1eb788 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -217,16 +217,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, if (ioctl(fd, NVME_PASSTHROUGH_CMD, &pt) < 0) err(EX_IOERR, "get log page request failed"); - /* Convert data to host endian */ - switch (log_page) { - case INTEL_LOG_TEMP_STATS: - intel_log_temp_stats_swapbytes( - (struct intel_log_temp_stats *)payload); - break; - default: - break; - } - if (nvme_completion_is_error(&pt.cpl)) errx(EX_IOERR, "get log page request returned error"); } diff --git a/sbin/nvmecontrol/modules/intel/intel.c b/sbin/nvmecontrol/modules/intel/intel.c index 725111cd92ab..c94fdb356608 100644 --- a/sbin/nvmecontrol/modules/intel/intel.c +++ b/sbin/nvmecontrol/modules/intel/intel.c @@ -61,18 +61,21 @@ print_intel_temp_stats(const struct nvme_controller_data *cdata __unused, void * printf("=====================\n"); printf("Current: "); - print_temp_C(temp->current); - printf("Overtemp Last Flags %#jx\n", (uintmax_t)temp->overtemp_flag_last); - printf("Overtemp Lifetime Flags %#jx\n", (uintmax_t)temp->overtemp_flag_life); + print_temp_C(letoh(temp->current)); + printf("Overtemp Last Flags %#jx\n", + (uintmax_t)letoh(temp->overtemp_flag_last)); + printf("Overtemp Lifetime Flags %#jx\n", + (uintmax_t)letoh(temp->overtemp_flag_life)); printf("Max Temperature "); - print_temp_C(temp->max_temp); + print_temp_C(letoh(temp->max_temp)); printf("Min Temperature "); - print_temp_C(temp->min_temp); + print_temp_C(letoh(temp->min_temp)); printf("Max Operating Temperature "); - print_temp_C(temp->max_oper_temp); + print_temp_C(letoh(temp->max_oper_temp)); printf("Min Operating Temperature "); - print_temp_C(temp->min_oper_temp); - printf("Estimated Temperature Offset: %ju C/K\n", (uintmax_t)temp->est_offset); + print_temp_C(letoh(temp->min_oper_temp)); + printf("Estimated Temperature Offset: %ju C/K\n", + (uintmax_t)letoh(temp->est_offset)); } /* From nobody Wed Apr 17 03:33:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62T6KwWz5HjYQ; Wed, 17 Apr 2024 03:33: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 4VK62T39ksz4Qr4; Wed, 17 Apr 2024 03:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k9/XOuuJ6oi3utSNxGYE2fZE1bcLJjEV6gw6HqvTc/A=; b=GzH/JTA7mUFJFV5faOYHkfYp16fRMR+5T0thaT7mLyMMBpevJC6ElOqUiJyQZ5+Lv0jtXp q7pQIARWdD+CW6ZdwGipSnrl3BbfTZTVrGNzyToxab+IgBj11IuCIcKXXwRowUjpsIl4y8 eDCvVVo+5/R0XlIXzi7V2+Dn8swLkZ4XuQLEzk6qlWkQuWeqoe3X1T3MKQZt3wLjx2nkx2 0tD5P23tJO1fwfDiBJcV0950XXO8W1+U5FSZtX0vaVWKNY4Q//I5abrYJ2qQJGqwpwuNrY WhpyWJuR8n3iSp0d5y+sEjGuppE4ueUOvNUV3A+kFljfK6xVduyX7wW7jAvBiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324833; a=rsa-sha256; cv=none; b=Z1jHADNhpQdtzDfpnX6X5D/njZhqxgEjVsiAW9VaCazlTV5dkmUjFMPh7FaeO/95IoOfnZ Q3KqyrbBXnHIj8wSXOwjYIynBqy6d86kN5HVuwKq2jrcQLkkOk3zZ5G5xpfqvzPAhWJpl/ fmMkadRptSClGOZUEJ3HfkpaeaHiE7OIFK5A3PKFqnLjU9hrFLvmrW4wgz/j0q5GmC91gE cuTnM/c8gV3jo8Om45DhO/+VVlosjtq4ONLtCJHwqPV4ZgDexuUbadANsSwU0aLk2/y92+ hFiOZG2YVcMAGqTcZV4rTdMkoK9JDw+DEP+yL8tQa0AY41Pnz4T187mOBow6sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k9/XOuuJ6oi3utSNxGYE2fZE1bcLJjEV6gw6HqvTc/A=; b=oawuYeVzPh9SUpc3c+tlBmh8S7qSq41N5Mpg8412YjM6xkUk9Ga/3eqNa2zSQJ6+r/anjw HA3oEC/vk/u22CmUyIANmGb6FPnwZvfVDBJ6iZH25z4C8JM5Yr7Og0MCvT8TQ6Fpn9rwJY QfTMZ3uHwARGvDzPdkYYFCkMNyIDtC9wJ0Sg9GMBxsA07O9lvE9i5UaqDv/Z7dF3QjJ/XD CDokN0Yqsnqam01P8uDT61DYjZtV7ZtVuy7nKPcbw/WgkT/0rSXDDWl1b6VR4l8W91AX+N nZGKhMCQ4aQVwwGGIHJid+MbeBUV/xXZ5Xl9GRIKxJab5vDZGQuBDUetZT8ZQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62T2nMMz19FH; Wed, 17 Apr 2024 03:33: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 43H3XrpA087209; Wed, 17 Apr 2024 03:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3Xrti087206; Wed, 17 Apr 2024 03:33:53 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:53 GMT Message-Id: <202404170333.43H3Xrti087206@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: 97b77de2d951 - main - nvme: Eliminate intel_log_temp_stats_swapbytes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 97b77de2d951b4946fb3219a99c98f2dd4c0120f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=97b77de2d951b4946fb3219a99c98f2dd4c0120f commit 97b77de2d951b4946fb3219a99c98f2dd4c0120f Author: Warner Losh AuthorDate: 2024-04-16 22:36:47 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:19 +0000 nvme: Eliminate intel_log_temp_stats_swapbytes We can't post a AER for this page, so there's no need to be able to swap it to host byte order. It's not one of the standard defined pages that can post via AER, and the vendor's public docs for this temperature page don't suggest it's possible to get over or under event changes. Since nvmecontrol no longer needsd the swap routine, remove it since it's now unused. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44659 --- sys/dev/nvme/nvme.h | 17 ----------------- sys/dev/nvme/nvme_ctrlr.c | 4 ---- 2 files changed, 21 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 706b77507b61..409d1f006cad 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -2241,23 +2241,6 @@ void nvme_sanitize_status_page_swapbytes( #endif } -static inline -void intel_log_temp_stats_swapbytes(struct intel_log_temp_stats *s __unused) -{ -#if _BYTE_ORDER != _LITTLE_ENDIAN - - s->current = le64toh(s->current); - s->overtemp_flag_last = le64toh(s->overtemp_flag_last); - s->overtemp_flag_life = le64toh(s->overtemp_flag_life); - s->max_temp = le64toh(s->max_temp); - s->min_temp = le64toh(s->min_temp); - /* omit _rsvd[] */ - s->max_oper_temp = le64toh(s->max_oper_temp); - s->min_oper_temp = le64toh(s->min_oper_temp); - s->est_offset = le64toh(s->est_offset); -#endif -} - static inline void nvme_resv_status_swapbytes(struct nvme_resv_status *s __unused, size_t size __unused) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index e41f32635346..b7b03082c54e 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -718,10 +718,6 @@ nvme_ctrlr_async_event_log_page_cb(void *arg, const struct nvme_completion *cpl) nvme_sanitize_status_page_swapbytes( (struct nvme_sanitize_status_page *)aer->log_page_buffer); break; - case INTEL_LOG_TEMP_STATS: - intel_log_temp_stats_swapbytes( - (struct intel_log_temp_stats *)aer->log_page_buffer); - break; default: break; } From nobody Wed Apr 17 03:33:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62V5tLTz5HjYR; Wed, 17 Apr 2024 03:33: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 4VK62V4NTwz4Qsx; Wed, 17 Apr 2024 03:33:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rMyp1wFwL/HckVwpzUvMSp/5Zr5IcsGxXzSgogGnu8=; b=vGYqVvCPXYuwtQSVXRLhY73IDCTLYdCIsaY3a7QAPm8u93AyzDR+c3pbIPtSIWxhjBaRqN JQfDi11d80YRudsuH7bbo8HPnlyufqedRTydEjCLKQW4dpIpnpqpML8roQjFMUQeh0DbnE zvPdCWlc7Tmco+z2P6x4MKBttqx3aPkVJDkJtbfj4juuId0FGs2rzGH4QRfow0ofIsFIQZ RkhrwVk3D9O8geYxOieWkJ9fXMDFqPJ9rAVs3pVUKZdHdf1kDuCzsonToqKbRRlJZgL1rG bmanXtQWocnHzy89APE0UBktqdLaUV0y1cbadsAKEXn4I/cXo09/V9o447dZMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324834; a=rsa-sha256; cv=none; b=CAkHE7b88cpBiWDczqlPsHhgZRNlNFxNjAk/4YeZlNrQIGaOxrJAnt8Rk2sxAO2IMzA6wc x8u0J6X4Xb71gfvaDpgdWibMT5RlAwJOkeUuE/q8/52+963x44zc9K/UbWyE5Gzo9VNRzF M/EfJLJ9zu7q74FcBDWxVF9RXOlKr1g5jflKEz4i+sdiYEDymtWQx6rDJ58yhw9BQia0i/ qseC1FyuDLbGGenJMn9PT+oMfvCxQ0Y3JkMce0aB9PzUjcb+miR7KRgD10QvtcIG20KB/X nkwp8jd00Jmo6LLTCePGHHbbyAFbkaKzV4Om8IWg9nVX4uraXQsr3cp+JFjuTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rMyp1wFwL/HckVwpzUvMSp/5Zr5IcsGxXzSgogGnu8=; b=BtoAqW8+y8nzXkkG+fV7uKJ++yon07+xl/clQaNMQnkOEKTKPa0o9F3Xb+U6RwTPKnJT1i m1nIFTKB4FdLnhSnxR1Ya6+jjAXFaKZD0jNW1uMlV+MAT0GvfIvYnZLJYisL4nU7JaHBkb BTEAHrTS5uirx1oUZ0bxYi8gJIaE8HoR7O/T57lV+ivgL72c8vY9wLKf9TxlgeO8GOeKU3 boRjCFiS82QP6LNSlD/kIfq5pJFqamDJ/bxZoy93LH4iiRCESd72z2Sfw64sioIZXvYApa pFl9apD0pszNnDM/xeVRN+WkLNCxxY+uqp0paEN7y+iVypWSEuDzE+uiK0TZAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62V3z5lz19Sq; Wed, 17 Apr 2024 03:33: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 43H3XsdS087267; Wed, 17 Apr 2024 03:33:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XsX7087264; Wed, 17 Apr 2024 03:33:54 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:54 GMT Message-Id: <202404170333.43H3XsX7087264@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: e39873820da7 - main - nvmecontrol: add newlines where needed for ns command printfs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e39873820da7ddfddb59823efc3421125b92c17a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e39873820da7ddfddb59823efc3421125b92c17a commit e39873820da7ddfddb59823efc3421125b92c17a Author: Warner Losh AuthorDate: 2024-04-16 22:36:54 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:19 +0000 nvmecontrol: add newlines where needed for ns command printfs Sponsored by: Netflix Reviewed by: chuck, jhb Differential Revision: https://reviews.freebsd.org/D44681 --- sbin/nvmecontrol/ns.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index 1f1cd6101e35..5e2a50df4ba1 100644 --- a/sbin/nvmecontrol/ns.c +++ b/sbin/nvmecontrol/ns.c @@ -646,7 +646,7 @@ nsdelete(const struct cmd *f, int argc, char *argv[]) open_dev(path, &fd, 1, 1); } else if (delete_opt.nsid == NONE - 1) { close(fd); - fprintf(stderr, "No NSID specified"); + fprintf(stderr, "No NSID specified\n"); arg_help(argc, argv, f); } if (delete_opt.nsid != NONE - 1) @@ -712,7 +712,7 @@ nsattach(const struct cmd *f, int argc, char *argv[]) open_dev(path, &fd, 1, 1); } else if (attach_opt.nsid == NONE) { close(fd); - fprintf(stderr, "No NSID specified"); + fprintf(stderr, "No NSID specified\n"); arg_help(argc, argv, f); } if (attach_opt.nsid != NONE) @@ -782,7 +782,7 @@ nsdetach(const struct cmd *f, int argc, char *argv[]) open_dev(path, &fd, 1, 1); } else if (detach_opt.nsid == NONE) { close(fd); - fprintf(stderr, "No NSID specified"); + fprintf(stderr, "No NSID specified\n"); arg_help(argc, argv, f); } if (detach_opt.nsid != NONE) @@ -859,7 +859,7 @@ nsattached(const struct cmd *f, int argc, char *argv[]) open_dev(path, &fd, 1, 1); } else if (attached_opt.nsid == NONE) { close(fd); - fprintf(stderr, "No NSID specified"); + fprintf(stderr, "No NSID specified\n"); arg_help(argc, argv, f); } if (attached_opt.nsid != NONE) @@ -912,7 +912,7 @@ nsidentify(const struct cmd *f, int argc, char *argv[]) open_dev(path, &fd, 1, 1); } else if (identify_opt.nsid == NONE) { close(fd); - fprintf(stderr, "No NSID specified"); + fprintf(stderr, "No NSID specified\n"); arg_help(argc, argv, f); } if (identify_opt.nsid != NONE) From nobody Wed Apr 17 03:33:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62W739Vz5HjYT; Wed, 17 Apr 2024 03:33: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 4VK62W5Sjhz4RCH; Wed, 17 Apr 2024 03:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KDSAKwG++PXO2FUYa5PE/6HTAdaou0LJqc+i+XOoa4=; b=cY5hxqGDite7tJtMqjnMn+uGDlc1JwE7oSHY3VLAtr0DsYrtACoxG1LJ0/qXJj8DaoMih/ 4YX+A9LYuw+MRdrJyd3m8l0FxGOZZNloHsfb4RqpRM8e05+mXPbG5iQRePe+dPd0cuU+5c vEpCExI3KiZ8reQuN0LW0ev/wTchjZkoL3MZ5h6Zzpomu/ySnmUtm5o+YGBk0h7hie1M2b LRjj7072Tng5KzgeKoR/K1xcrLQQiCCHYowEbcnr3fj8fuhQ0G8aQfiNGzEyV2peKyPLPn go2kr3Egm9P81UwXUY9zg5lyxpYNNOXl0Gfa945kTozNUA1Yi6wrC7Pkhzyeeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324835; a=rsa-sha256; cv=none; b=fMZ/87w0C1Xubpjwr4DsdJ7SkwhtVJrYHpb1GA+mRyHvVlul77Wa4QP3xdtvorCN9I5FsA dsltglAB7YY2wC32fDo6Uyqqf4EBFPU+cvsuZvHIOOiV/HGuW2zJ2YmLPKNejcUqdQpNVC NQy+lpvPZbMoIJITViN2XP45R01lRz4LtIoF4AkHt3jbtYTl2MODMyR0l7weuMVXYfPb2X gZ2KvSXw0poXcgnVy+FhjEG3k3wPrNlDgpv09Z/sXbD1bWFHYMj0OLbxxej38dBduvq/ZT Dckh2xXpcVmI96VMPgjGzqHPqnBU1LKSJToFpy+SY9+U3m3hI/5oyxZD+PV3/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KDSAKwG++PXO2FUYa5PE/6HTAdaou0LJqc+i+XOoa4=; b=KJwqnfrzrVUPxdydhneX8c2/OHcE79PZHPRy0Vd2VUPuUqBj/p2x1f4oq6ckCPxv6GLfvg KWWsIWZ0yQx4hTg01hggAMjS6nEr4OTBFR/IVSRiGiGt9Pk4t7sIRyS3bTG3qpLuQ3Bqtj TgtDT0FEfwNmhE3H10XZePHTUOlAOl1hVrlVbzEK4ZUW/C/UeRmztZuz5DnPLHn1Jar3w2 49NhDbDjQOgIvq3WQmydMrnaLzhLrGPsbNT7zHm+b+TJWoMbdMCzKHeu5Rav9xVGQ+swGt 2A4NGF+ksAd1WteFIAFzbNW9jD0EhfygWN5LrIIu4uBlDtYPqOyYXJEJc+nb0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62W54j3z19Sr; Wed, 17 Apr 2024 03:33: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 43H3XtXM087306; Wed, 17 Apr 2024 03:33:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XtVm087303; Wed, 17 Apr 2024 03:33:55 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:55 GMT Message-Id: <202404170333.43H3XtVm087303@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: 383a44fc0bcb - main - nvmecontrol: Preliminary namespace documentation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 383a44fc0bcb36bf67127856f0c5fabfea522bab Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=383a44fc0bcb36bf67127856f0c5fabfea522bab commit 383a44fc0bcb36bf67127856f0c5fabfea522bab Author: Warner Losh AuthorDate: 2024-04-16 22:37:02 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:19 +0000 nvmecontrol: Preliminary namespace documentation Provide preliminary namespace subcommand documentation, along with some basic definitions from the NVM standards relating to namespaces. Sponsored by: Netflix Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D44682 --- sbin/nvmecontrol/nvmecontrol.8 | 43 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index edeeb9afa10f..b812149b5c7d 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -33,7 +33,7 @@ .\" .\" Author: Jim Harris .\" -.Dd February 28, 2022 +.Dd April 17, 2024 .Dt NVMECONTROL 8 .Os .Sh NAME @@ -302,6 +302,47 @@ will set Retain Asynchronous Event. Various namespace management commands. If namespace management is supported by device, allow list, create and delete namespaces, list, attach and detach controllers to namespaces. +Each NVM device consists of one or more NVM subsystems. +Each NVM subsystem has one or more NVM ports. +Each NVM port is attached to one or more NVM controllers (though typically 1). +Each NVM controller is attached to one or more namespaces. +.Pp +After a namespace is created, it is considered +.Dq allocated . +All namespaces that have not been created are unallocated. +An allocated namespace may be active or inactive. +An active namespace is attached to the controller and may be interacted with. +A namespace can move from active to inactive when detached. +An allocated namespace may be deleted to become unallocated. +For more details on the nuances of NVM namespaces, please see section 2 +.Em Theory of Operation +and section 3 +.Em NVM Express Architecture +of the latest NVM standard. +.Ss ns active +Provide a list of active namespace identifiers for the givne NVM controller. +.Ss ns allocated +Provide a list of allocated namespace identifiers for the givne NVM controller. +.Ss ns attach +Attach an nsid to a controller. +The primary controller is used if one is not specified. +.Ss ns attached +Provide a list of controllers attached to a nsid. +If only a nvme controller argument is provided, a nsid must also be specified. +.Ss ns controllers +Provide a list of all controllers in the NVM subsystem. +.Ss ns create +Creates a new namespace. +.Ss ns delete +Delete a namespace. +It must be currently inactive. +.Ss ns detach +Detach a namespace from a controller. +The namespace will become inaccessible, but its contents will remain if it is +.Em activated +again. +.Ss ns identify +Print detailed information about the namespace. .Ss nsid Reports the namespace id and controller device associated with the .Aq Ar namespace-id From nobody Wed Apr 17 03:33:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62Y1dNyz5HjT2; Wed, 17 Apr 2024 03:33: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 4VK62X6hVZz4QtY; Wed, 17 Apr 2024 03:33:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/lldjRyCsMyuw4WzkE13N7UJAMWfoAabjioHUcIdN1Y=; b=YPRYBpSMP30bSAUHAZaQPcjMASs6WMhbxbkZWndE73iGXQVMrX9gL71tYAJcJoJnmpfavN 6bewgDE+0cFAa/1q5dMaTfF+wzig5ChwobZuWWfL57iRJBQUHVL4YozR17gy5YBvkc3z80 r0qFEPmLzpXND4qhm+wLvN7j9G8Oqf0P4tck6UhZKuEmuVJJ+WY7Bo9zabdhAeAbSNUsUu xvrCjjvC5RnswqC2BElzFbf42LkhiAtzzkFqB5WujflCRNj8q2ZCQ2lIWGo71tJ9ENglcn zCrmDDg3nLQZWb8kNimc3Q+EmhSy7JSTJC0BPMIKxDT3d99uilwSsPyfSpFjGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324836; a=rsa-sha256; cv=none; b=KYOdGEYFPdFWRo2PhTYcoEh93blv8Mv7TtC/jBPdeqVonCBi3Ufqncbq7LAIrVuLdlfJdS 96vXQFj1oZ7o1vOojOaGugz61oyuGvZvazw4BiOYpainJnmXewBYPIrs2skhhgwb5Idm2c Ls+Su5zqDOUOEn74mfDuL0tlpWED/OkC3/9EeSXtDrSdm5kjLGg3r9JcLnhy11PeFcT/xv VdOAEW5mx9PLPs8KRMW3OotiVX2gxXLfkuG/cl+Hre7pLZbzNmElc9pso/fjBa8sU5yzpi d1t1AlE22Kn+pfH2rgwc/k3SelcT47GqrCqJzcI7mHbgCxhVR4mC8FTHidvLqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/lldjRyCsMyuw4WzkE13N7UJAMWfoAabjioHUcIdN1Y=; b=vmpemTz7Fr6nUij9x3IEnDAzEu9dxtZtTH6dwYRLZDlrox2thJ72AxfbXSZZR5O51JB1Sc YYTHAHDoQ+WKWxjy0xncOv/RwDahY7HEBSMUWxK+UaPaupBtO+oRtCjOwTu9RBN3W9uYVS eE59z0F8l+wan8sZjAljKHUIHC8b3rNcswUT9V/BYjXRmFd/Gmw/9HLF7BbUVzEbqM1Zx9 H19eu6z9yCqZFJdUkUDkPve5nXkGTYnpK8mG7AWKjbB407vUZ3z8xuhZdqYZFFmy9JbYUI HxNP2QD3cs2U5LepZo8I4zK/4asI+XG2GXgxuogXBFuaD8Ao2oYAVqwszvRxkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62X6KCtz19Yj; Wed, 17 Apr 2024 03:33: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 43H3Xuxe087354; Wed, 17 Apr 2024 03:33:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3XuwO087351; Wed, 17 Apr 2024 03:33:56 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:56 GMT Message-Id: <202404170333.43H3XuwO087351@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: 98ab7d0a30f8 - main - nvmecontrol: Add nvme 2.0 fields to read_logpage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 98ab7d0a30f8d0fc9c51e1e97ac29f87750b526c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=98ab7d0a30f8d0fc9c51e1e97ac29f87750b526c commit 98ab7d0a30f8d0fc9c51e1e97ac29f87750b526c Author: Warner Losh AuthorDate: 2024-04-16 22:37:20 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:19 +0000 nvmecontrol: Add nvme 2.0 fields to read_logpage Add the lpo, ot, csi and uuid_index fields to read_logpage. The logpage command has not been updated to allow these to be specified. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44683 --- sbin/nvmecontrol/firmware.c | 3 ++- sbin/nvmecontrol/logpage.c | 15 ++++++++++----- sbin/nvmecontrol/nvmecontrol.h | 3 ++- sbin/nvmecontrol/sanitize.c | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c index 9ce2daf28d65..c1c26c310627 100644 --- a/sbin/nvmecontrol/firmware.c +++ b/sbin/nvmecontrol/firmware.c @@ -102,7 +102,8 @@ slot_has_valid_firmware(int fd, int slot) int has_fw = false; read_logpage(fd, NVME_LOG_FIRMWARE_SLOT, - NVME_GLOBAL_NAMESPACE_TAG, 0, 0, 0, &fw, sizeof(fw)); + NVME_GLOBAL_NAMESPACE_TAG, 0, 0, 0, 0, 0, 0, 0, + &fw, sizeof(fw)); if (fw.revision[slot-1][0] != '\0') has_fw = true; diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index dfc35f1eb788..023adf8f2d6a 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -190,7 +190,8 @@ get_log_buffer(uint32_t size) void read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, - uint16_t lsi, uint8_t rae, void *payload, uint32_t payload_size) + uint16_t lsi, uint8_t rae, uint64_t lpo, uint8_t csi, uint8_t ot, + uint16_t uuid_index, void *payload, uint32_t payload_size) { struct nvme_pt_command pt; u_int numd; @@ -207,9 +208,12 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, pt.cmd.cdw11 = htole32( ((uint32_t)lsi << 16) | /* LSI */ (numd >> 16)); /* NUMDU */ - pt.cmd.cdw12 = 0; /* LPOL */ - pt.cmd.cdw13 = 0; /* LPOU */ - pt.cmd.cdw14 = 0; /* UUID Index */ + pt.cmd.cdw12 = htole32(lpo & 0xffffffff); /* LPOL */ + pt.cmd.cdw13 = htole32(lpo >> 32); /* LPOU */ + pt.cmd.cdw14 = htole32( + (csi << 24) | /* CSI */ + (ot << 23) | /* OT */ + uuid_index); /* UUID Index */ pt.buf = payload; pt.len = payload_size; pt.is_read = 1; @@ -794,7 +798,8 @@ logpage(const struct cmd *f, int argc, char *argv[]) /* Read the log page */ buf = get_log_buffer(size); - read_logpage(fd, opt.page, nsid, opt.lsp, opt.lsi, opt.rae, buf, size); + read_logpage(fd, opt.page, nsid, opt.lsp, opt.lsi, opt.rae, + 0, 0, 0, 0, buf, size); print_fn(&cdata, buf, size); close(fd); diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h index 4187c9bee432..2ce4ad4c5c2b 100644 --- a/sbin/nvmecontrol/nvmecontrol.h +++ b/sbin/nvmecontrol/nvmecontrol.h @@ -84,7 +84,8 @@ int read_namespace_data(int fd, uint32_t nsid, struct nvme_namespace_data *nsdat void print_hex(void *data, uint32_t length); void print_namespace(struct nvme_namespace_data *nsdata); void read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, - uint16_t lsi, uint8_t rae, void *payload, uint32_t payload_size); + uint16_t lsi, uint8_t rae, uint64_t lpo, uint8_t csi, uint8_t ot, + uint16_t uuid_index, void *payload, uint32_t payload_size); void print_temp_C(uint16_t t); void print_temp_K(uint16_t t); void print_intel_add_smart(const struct nvme_controller_data *cdata __unused, void *buf, uint32_t size __unused); diff --git a/sbin/nvmecontrol/sanitize.c b/sbin/nvmecontrol/sanitize.c index ab75900d60da..ba89e138db83 100644 --- a/sbin/nvmecontrol/sanitize.c +++ b/sbin/nvmecontrol/sanitize.c @@ -182,7 +182,8 @@ sanitize(const struct cmd *f, int argc, char *argv[]) wait: read_logpage(fd, NVME_LOG_SANITIZE_STATUS, - NVME_GLOBAL_NAMESPACE_TAG, 0, 0, 0, &ss, sizeof(ss)); + NVME_GLOBAL_NAMESPACE_TAG, 0, 0, 0, + 0, 0, 0, 0, &ss, sizeof(ss)); switch (NVMEV(NVME_SS_PAGE_SSTAT_STATUS, ss.sstat)) { case NVME_SS_PAGE_SSTAT_STATUS_NEVER: printf("Never sanitized"); From nobody Wed Apr 17 03:33:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62Z1grSz5HjWr; Wed, 17 Apr 2024 03:33: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 4VK62Z0pkvz4RHp; Wed, 17 Apr 2024 03:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nxba7qkt8QFOW5x7bomeQx5jKbOhCjmcTS3g21y6pXA=; b=koe/vj12mH2INXPVJOr0KzEQcBwQrbFPqQ/hNhylh7ut3rTzsb27P7OymYnJ8xT28RAweI S4ZpGAZ+OBPksC6quVjc27OzB7lO90pSIKsDGkhWMVOw1OqqvEWoyMvdS5vB5yA8YXxtZN jLYL9N3tT5ThqlpQ35jP555Ay0fn8CbNiol45icjIxkQ4ckjTsHwCQLQ07kwjWkMCWFqpw AVj59299wqyDq4cWiyhnV+zD+Hl7TYjPKB5f7KXs13095Aus1GUTXKCRd0kHPLV6gNQJok 2/ZO+/JNbvZot4ZE3AzB4VWvUki8KUPlL8dnXEwaFDJ6hRATN7R08L1+9NQQ3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324838; a=rsa-sha256; cv=none; b=q64AZktXwLh1YrJmaULh8FPCjyumx1ALbwwPA1gswCDapw4G+M6wDE6qEdm/YcxMFsBRG7 n7pJs+CoO6gi4Hfr+Lchs6dJ+0HmGdWFNFRLQ/fRgxoIJZNmUcmOh4AGpddC33ryYyUz3g Ms1lQA/5s4bEiXQ+ySh1SiCXTEzw44VBb/VDiI63JE3GdFRx+VYNFclSV3pfFgjQB+SEMd czcQXnYLGSxLNqYRaQ1qUtfq6bKUyHx8dyOE9YkHtCRTEIB8p+MVyqQBlitKi/4KsugE5J 7Ag3l656TrqBPx/5iVcmikEaWIxtyJkD9mdjVAIWPlIq52wQQik7U9jgjpEhwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nxba7qkt8QFOW5x7bomeQx5jKbOhCjmcTS3g21y6pXA=; b=lBW4Jn6YDSOhTV8+Z5fP2QBnzEmuBaD16xuNxAYJHN/o7v1biKFZsOPGKUZqJjX53fQcRW TFut+8/cEVCj9FOscRnbTrEb70Mj0jdf54x211Bnzpna61MZeDbHFuFnBinGY5vVLz37D+ PvolHusHSmuc9TYPhHuSf5yoFCD/1TKYzputGe7HTC8aGigEAjRL6aDkF5pbR2+qtAR/pF ICtx+ENjd+MLH1LqoL2cpjMSDUdrw0GN+wtzG4hv61YxZfMUmNyfCeaaFtbfeyswRTtvc7 SIuiSd2wxsuE3ZlwGsdwThPrraYfqyvE0xYD0qmjBtZH/sv6fCo/s18CWmE/jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62Z0RJ3z19Ss; Wed, 17 Apr 2024 03:33: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 43H3Xv6H087396; Wed, 17 Apr 2024 03:33:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3Xv5B087393; Wed, 17 Apr 2024 03:33:57 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:57 GMT Message-Id: <202404170333.43H3Xv5B087393@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: 49ea0889f2cb - main - nvmecontrol: One file per line List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 49ea0889f2cb5e786e166fa9536c84f4a9994a6b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=49ea0889f2cb5e786e166fa9536c84f4a9994a6b commit 49ea0889f2cb5e786e166fa9536c84f4a9994a6b Author: Warner Losh AuthorDate: 2024-04-16 22:37:30 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:19 +0000 nvmecontrol: One file per line Move to a one file per line setup, and sort the files alphabetically. Sponsored by: Netflix Reviewed by: chuck, jhb Differential Revision: https://reviews.freebsd.org/D44684 --- sbin/nvmecontrol/Makefile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/sbin/nvmecontrol/Makefile b/sbin/nvmecontrol/Makefile index e3d363b123ed..f534093b1332 100644 --- a/sbin/nvmecontrol/Makefile +++ b/sbin/nvmecontrol/Makefile @@ -2,11 +2,24 @@ PACKAGE=nvme-tools PROG= nvmecontrol -SRCS= comnd.c nvmecontrol.c -SRCS+= devlist.c firmware.c format.c identify.c logpage.c ns.c nsid.c -SRCS+= perftest.c power.c reset.c resv.c sanitize.c +SRCS+= comnd.c +SRCS+= devlist.c +SRCS+= firmware.c +SRCS+= format.c +SRCS+= identify.c +SRCS+= identify_ext.c +SRCS+= logpage.c +SRCS+= nc_util.c +SRCS+= ns.c +SRCS+= nsid.c +SRCS+= nvme_util.c +SRCS+= nvmecontrol.c SRCS+= passthru.c -SRCS+= identify_ext.c nvme_util.c nc_util.c +SRCS+= perftest.c +SRCS+= power.c +SRCS+= reset.c +SRCS+= resv.c +SRCS+= sanitize.c SRCS+= selftest.c MAN= nvmecontrol.8 LDFLAGS+= -rdynamic From nobody Wed Apr 17 03:33:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK62b4vtKz5HjfF; Wed, 17 Apr 2024 03:33: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 4VK62b24mFz4R5C; Wed, 17 Apr 2024 03:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uhD694jjbhorcOTKqziq4DmPSeXOIbV3zFBXDbEO3mw=; b=h6KLZoT1jsAIpk8iF4tIscIik2UMTJfsCcAMJ7qEOMCVt49oqL1TL4+Gyn3nG82L+67YO3 HedDig4jJJK2xxO+RE6ei7M6DxX/xh/S9axOEpuYZYvjdcHcTqXc4h8jS5DMy7cn+FSQ+2 m4ZjwiDpwQmxxfdxKH74C4V9HkwWA/Jh5dM9srAf8Y2aWg5su/9ti9JjTEi3vi6FuXt87X 54n5EG22FuOv7gLzgxDwSPAJRGWzxa87ZPPLSTLlnkTEDLM3kFpBm38+shZEXKCX2E2T4h i1hQiPVPmPXZrD5bl4602jx90CxsK8/YAegn+27QpE3nVm2S0TYPsiuaMwOfAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324839; a=rsa-sha256; cv=none; b=rGWlpY3AKCxPc7Uy/ATiUESXovAsqwKPKndJ0JBiBLNjpCYh6vYEQ+/ui6tro/W645Q7MO oPh5jFt9BO3aMT+/omLuIA43wkzBKVSKvcrnL7tHuimPDIu1HjKMcT0Q7vtgLXULuchhdc 142XZ0Kqxju6aFznNJEDOb9lvl7AtHxVcB0Zih3QO5lJxsec0nST2rmgCeIATXV0S6p/AH GMJXISTF4n1wbWqwa05L49kVlkDTFYpwev475DWJoDLfjmAb4WDWTBvkgrP1CK+Irnd2U7 YzjTrFd4x4yBcgzYkT+E2qBOKGqQEoavgfmVlNOjbB4M/MJxj4DV5BmoxWWkBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uhD694jjbhorcOTKqziq4DmPSeXOIbV3zFBXDbEO3mw=; b=yEMO+GGHrSCWvdLBplQ2Mh/EBg9JWomViIW5snK37tK2RB4V1GdxCBm69oMmCuELIF3+SV BjSJkOnJeSbhYDFJO/7rKilufnFTYkWKPx9pKncdB5EXaVoGO0JPvARpmNSZhhkW0MwbzE ch2TuI8FOhJzkA5vJq8VTd2KDnHzMZjMeGqNbTsDz0pFE6akfAgD6ch6VTxlVLy3v+iuSR Xh/bKBd3Qxw727YFvAeuLjc0NrD3UwtqSizLelwvu0lXdImjjAwQ2FmTm2LCtxLdnbx1Qk G6bODZ/mk+XFWREbJo0a2bKXu3055LnmOM7+61gs1lg9f+CpiG8yOR7trJaeow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK62b1hqxz18Wf; Wed, 17 Apr 2024 03:33: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 43H3XxrC087440; Wed, 17 Apr 2024 03:33:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3Xxt7087437; Wed, 17 Apr 2024 03:33:59 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:59 GMT Message-Id: <202404170333.43H3Xxt7087437@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: 2fda3ab0ac19 - main - WITH_NVME: Remove from broken. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 2fda3ab0ac1903a977ef5d39d4dfb2ffe86ff1b7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2fda3ab0ac1903a977ef5d39d4dfb2ffe86ff1b7 commit 2fda3ab0ac1903a977ef5d39d4dfb2ffe86ff1b7 Author: Warner Losh AuthorDate: 2024-04-16 23:07:49 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:19 +0000 WITH_NVME: Remove from broken. NVME works everywhere, so we can eliminate this. We may remove the option altogether. Sponsored by: Netflix Discussed with: ken, jhb --- share/mk/src.opts.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index a205629fdb2c..2ea0cbf24268 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -357,12 +357,6 @@ BROKEN_OPTIONS+=MLX5TOOL BROKEN_OPTIONS+=HYPERV .endif -# NVME is only aarch64, x86 and powerpc64* -.if ${__T} != "aarch64" && ${__T} != "amd64" && ${__T} != "i386" && \ - ${__T:Mpowerpc64*} == "" -BROKEN_OPTIONS+=NVME -.endif - .if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \ ${__T:Mpowerpc64*} != "" || ${__T:Mriscv64*} != "" __DEFAULT_YES_OPTIONS+=OPENMP From nobody Wed Apr 17 04:44:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VK7cF68lcz5HpsH; Wed, 17 Apr 2024 04:44: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 4VK7cF5dj1z4d3s; Wed, 17 Apr 2024 04:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713329085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/rERu2xHCU7aWxts2xB3GwJmItTyyPghnMkIo4A1oE=; b=k4PRiMtMTNFROTnoLRqmEtZOkESr1jkk7p/44iLU8pZ4JN1GkIWAW+YVB8srUn68YDEify ow/C7aydgE5YUYMaN4wO9RUXOhE2Z8NH23TXF+JdJfB5YQbR8FwNtj1gnLUf6GNy8aVJd6 cE1jMq2hZnunGhVJkhWjCEd0uTAA8VyBDOQgpehkqsAsJsXNFoCt082qlfWADRBhozQ3Vn +NRGG8ldIqnhJEcuxNy1umFyYZYUgWyoF9kOKu3+2gjhpLmBmqW882oTn8m5Djbua0dbD4 hG3MhUO70XpcE5QTauvegrHZYPfrowRPQfQqnE3nCiL+AYKN5tsOaKb8szKyrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713329085; a=rsa-sha256; cv=none; b=xpFLQrktKFOjsKGrouSqGvsOlZhJMylb98eiMXigKNIH5aZVBH6VUhNyY3mIuzm0fJPLDf UWo747caqt10IPZooQlfsZvFhsNJFjQUpTa0iNkbFQoyVBivC7diQ0yPkm+DWsvJWY5tg4 pPMt6kpNhe4O9FK+M+eiwpkahPAkb7HPODkBUsjeYmsSW3QSq+C3d8xzP0o5n5SLJ+ae1t eY+9YucyHIbp9/C8baYj+UK68ReF4p4HpJIcSS1Mo6+LGy0ZIr0pmQGHSsWpaafkaCuqze CMZODpMb9UG4Jx1SjB3YH+iL0/biltO7hM+X5FjwF3lBK/kEwQoqqjO2F4U4uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713329085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/rERu2xHCU7aWxts2xB3GwJmItTyyPghnMkIo4A1oE=; b=VK+fzrjzgKkXIFgizjPzDLs70MlwmAE/jMZxBJMscmMchIY04ycJFt7xX4IE7jmnJ8ReXh xL+Fu8WXTZuz1T7nh0UcekFAZXkvr6cXbhIA4NBguaScqNnVjvQoKa+zcrGZ8QXxiX+r4R AUeu6TR5rDTJqDQfJpV8PmoNxCI4pYqPG+3ZACSf8k5b34vOWfLVWhYije9uV0L7qtm2HE q4X3YDQsyARaljFNxi7R5NGLq2l4kyJiCFMj89XrL/mTRT+VWypJNsWEhzv/7u6KMbmFKp DQ4/cQ0b2sj5LoO+K5koaHb0MGWyf53J67WacKZ61skmCW8g+5g1UK4NGctMmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VK7cF5FKgz1CHQ; Wed, 17 Apr 2024 04:44: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 43H4ijEf004852; Wed, 17 Apr 2024 04:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H4ij25004849; Wed, 17 Apr 2024 04:44:45 GMT (envelope-from git) Date: Wed, 17 Apr 2024 04:44:45 GMT Message-Id: <202404170444.43H4ij25004849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: b9dee1dca2d7 - main - zfs: unbreak aarch64 build with non-gcc compilers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b9dee1dca2d74e12e867fd29d2d584fc385078eb Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b9dee1dca2d74e12e867fd29d2d584fc385078eb commit b9dee1dca2d74e12e867fd29d2d584fc385078eb Author: Martin Matuska AuthorDate: 2024-04-16 23:34:25 +0000 Commit: Martin Matuska CommitDate: 2024-04-17 04:44:12 +0000 zfs: unbreak aarch64 build with non-gcc compilers Workaround until a permanent fix comes from vendor --- sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S | 4 ++-- sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S b/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S index e66bb4bc7f26..b0af629066ea 100644 --- a/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S +++ b/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S @@ -34,7 +34,7 @@ #if defined(__aarch64__) /* make gcc <= 9 happy */ -#if LD_VERSION >= 233010000 +#if !defined(LD_VERSION) || LD_VERSION >= 233010000 #define CFI_NEGATE_RA_STATE .cfi_negate_ra_state #else #define CFI_NEGATE_RA_STATE @@ -2066,4 +2066,4 @@ zfs_blake3_hash_many_sse2: .size zfs_blake3_hash_many_sse2, .Lfunc_end3-zfs_blake3_hash_many_sse2 .cfi_endproc .section ".note.GNU-stack","",@progbits -#endif \ No newline at end of file +#endif diff --git a/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S b/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S index b9fb28dfcf03..0b719761dd4c 100644 --- a/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S +++ b/sys/contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S @@ -34,7 +34,7 @@ #if defined(__aarch64__) /* make gcc <= 9 happy */ -#if LD_VERSION >= 233010000 +#if !defined(LD_VERSION) || LD_VERSION >= 233010000 #define CFI_NEGATE_RA_STATE .cfi_negate_ra_state #else #define CFI_NEGATE_RA_STATE @@ -2403,4 +2403,4 @@ zfs_blake3_hash_many_sse41: .size zfs_blake3_hash_many_sse41, .Lfunc_end3-zfs_blake3_hash_many_sse41 .cfi_endproc .section ".note.GNU-stack","",@progbits -#endif \ No newline at end of file +#endif From nobody Wed Apr 17 07:39:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKCV028XXz5J4Hh; Wed, 17 Apr 2024 07:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VKCV01BBCz44gJ; Wed, 17 Apr 2024 07:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713339576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urBiWDRVXUYfSO44AkiIGRQp224f6JV6if96EIlOQEg=; b=wX39aHY0L5iW6tMG9uO+QUD77ONHK5iF6aetd3F9+ZD1Dfc4tVaDMMOO9ew+QnBLo2gJOA Zxs5TzQtsS3MMV4cqA0yZUSpRu9bFUfHaJ8cRsIFoSzCXq1C1ktFRD7aMEtWulUITc3FxL yGmIgSoWyn1dLhJHdVgCBd0b3HFV+BsyJSmQ95AvzLZ2TCYC76olBStOB6sn/K1Oxucg9f fXE5s1qbKJjeV03Ipr3+2Y1UGaqn/wLolVjEq0VHPERz3ghp9zAsn1xhozH1PgoSSsqcN+ k7A7pY622NTH+YJyLIaBRv6xgo+wBy/H3Hu6PEQw4tT3vFXjhsjWp0Gpwe/Dxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713339576; a=rsa-sha256; cv=none; b=vHgBsQZhI70lNTCCsFCtqDLicQf5USDOo6SdoAPkjIiQVqjEHuPuZGq9FhFHI5c+soNjzX HJtkTnFgKY2uoatmJQw5Fz73RrkHMl6BQBiHiLj5YVTIVJHQNDpbdo+edng7dEi/OAzn0X 6IWejq2cparDgqWyfShOktDT/krq1qiZzNP30pmf30FTxbFbTGkAdB4x9qAv+07JYM2dyJ uUZV5z8XHi0VGJY8gmDSXUPUqkmz268kTki1sfrhQYbi5pAZBR5oVOYyrtrzoReZzNhYBR X2Q+JAXfS+eACvC8PrPm1LSPyiCuLwhbyGimteaCiN50MMQ8Gk61pdN/N4FGaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713339576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urBiWDRVXUYfSO44AkiIGRQp224f6JV6if96EIlOQEg=; b=UlxhGUtfrr69cVBEq9tMpT3VIAInvGLrbGlgBb6gaGfk+mwcRQA55WDS9M60EUrrA4vE2+ AaFH55XDmvOwRbpgQBqUzogjR3uQTXPS8fo/0VF1LkGubO+/qO1rANVaCYzMCZw+c3n/fy 2xeNiCj70LZ/SMHcOQdVEE7AUkR9IDPYlke95gY/+F526883nUrcoXxV8heUHfmamXohOl F7sWFIqwTLtbGfwlhT3psj0HjA1u65Gf/MwpfZ3FB5bZkHsA65hOBhTyoyoLO/mHB+BQrx ptOlrBRjLr61ABzzzieomn9PGOE2jorSf/1Nk7Bz4Ibz/qoAaeOXC4REis9p1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKCV00nGbzHhl; Wed, 17 Apr 2024 07:39: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 43H7da7G094912; Wed, 17 Apr 2024 07:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H7daGF094909; Wed, 17 Apr 2024 07:39:36 GMT (envelope-from git) Date: Wed, 17 Apr 2024 07:39:36 GMT Message-Id: <202404170739.43H7daGF094909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 701d0666c03d - main - libarchive: fix null format string error in tests (unbreaks gcc13 build) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 701d0666c03dacba9b73d91dff2a6140e157bdc4 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=701d0666c03dacba9b73d91dff2a6140e157bdc4 commit 701d0666c03dacba9b73d91dff2a6140e157bdc4 Author: Martin Matuska AuthorDate: 2024-04-17 07:33:13 +0000 Commit: Martin Matuska CommitDate: 2024-04-17 07:37:04 +0000 libarchive: fix null format string error in tests (unbreaks gcc13 build) Obtained from: libarchive (d43c39247) MFC after: 1 week --- contrib/libarchive/libarchive/test/test_compat_lzip.c | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/libarchive/libarchive/test/test_compat_lzip.c b/contrib/libarchive/libarchive/test/test_compat_lzip.c index d3b8b118322b..1420e5bb9ac0 100644 --- a/contrib/libarchive/libarchive/test/test_compat_lzip.c +++ b/contrib/libarchive/libarchive/test/test_compat_lzip.c @@ -195,7 +195,6 @@ compat_lzip_4(const char *name) assertEqualString("test.bin", archive_entry_pathname(ae)); /* Verify the end-of-archive. */ - archive_set_error(a, ARCHIVE_OK, NULL); assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); /* Verify that the format detection worked. */ From nobody Wed Apr 17 07:59:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKCww1CPPz5J5gy; Wed, 17 Apr 2024 07:59: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 4VKCww0Njrz46Lt; Wed, 17 Apr 2024 07:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713340768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mn5Jnp6Ez5uuZYS8+Jwp4PzKSdHUiCxzpQsIWE2fLnY=; b=JVGeEBjZ2WnOP9+BRMdk0BOxd1D9xDWRHFoBxnOuRw+PfvZNqu1pDyzeBysb2J0Fk14pVS n5ZfZSuzzk0Gths+GVcIim37NGnmEnR33M+Qtgu12IYmbL3f9nHIxfoplsfi79bzPyv4hI GYGCKaTYGCSEn+mTa5RgUlscuF5L0fz3eAiadlTYD9OEI2p7n0SFKDFPt3luK5wQs9F4AC q7YBgL2bd8u0p8xGlnOFdYG6aRAUVvb5XSUqMXkeFU+8sw8Te9SCq3BLF0rlQvMQKGfLeE jJ75llzblbqYB/9+iU3iha2PRHA4lXqE5dE3UbFm1BYSppMGKfnp6G8R3+v3cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713340768; a=rsa-sha256; cv=none; b=JhsWJHYEg8mukmgrHZAqQ7lHsAgXyG4/KtYmsjZhfMy3Q1F1+YMFAfExRn6HwucUaZy8l5 +2Pj9n/ujEWwmbrfUUyLyN31gmfM/sIu3Qp6y/Rs3PBDpt2JvaZiosJONnYUKbunnh8+E2 /QOE7m59GPaDxB8fkw3lmVXA+/h/BeDEkSTwewPw/X6uB0tNoyh31qdJI/so7s5dke0WFk isr9vg/xL+QxonoezD7r+UjNWlb4cgCWAyEE+NLsTiiNwbMDxF1g0nWVb1Z7PCS0roM+GA iEgQhKjrn5bz69xMFkgRBZ7TnlYtOSU0+NhGs+1yViuJstVLTz8+BaUAMrAFPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713340768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mn5Jnp6Ez5uuZYS8+Jwp4PzKSdHUiCxzpQsIWE2fLnY=; b=n/tRIXoSudtQ4xvLnQIzRjjTqPEKAz2yWkxnDkvjONNBKCs1AQe+YivoUHuF/U58G+x/Z7 dUbHFFKBiqf2JnUkAivvy2WYKjBC8zuTF4TfAWAonaAItMyt5bMCDGKPFR1P9anxK7SJIB G7JwdV3ERQH5cf75ssCAKfrSkKF+gZGCwBWJ8DU9W+m8aI/OvkqwvMCJXQaenJUlxpogoi MW7u7U9slaqh9aOkOZBszCnxgurRFD5cK8x3mynCj4pJ7Nnh2p+gYtuOTvhi/7xZPrFDfk pN4e7jHpoE/bp3W01A/BD93dqCVVJiTo0yqrvlyUlZguXJw3ep4O9yTxGcRrnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKCww009wzJCL; Wed, 17 Apr 2024 07:59: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 43H7xRVN028965; Wed, 17 Apr 2024 07:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H7xREm028962; Wed, 17 Apr 2024 07:59:27 GMT (envelope-from git) Date: Wed, 17 Apr 2024 07:59:27 GMT Message-Id: <202404170759.43H7xREm028962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 7d03ec330684 - main - libarchive: add two missing package files to libarchive tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7d03ec330684a4e82e6113df3f40305849e5fb6c Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7d03ec330684a4e82e6113df3f40305849e5fb6c commit 7d03ec330684a4e82e6113df3f40305849e5fb6c Author: Martin Matuska AuthorDate: 2024-04-17 07:58:32 +0000 Commit: Martin Matuska CommitDate: 2024-04-17 07:58:32 +0000 libarchive: add two missing package files to libarchive tests MFC after: 1 week --- lib/libarchive/tests/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile index 0d47e1a5ed3c..e14b37621e5c 100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@ -373,6 +373,8 @@ ${PACKAGE}FILES+= test_compat_lz4_B7.tar.lz4.uu ${PACKAGE}FILES+= test_compat_lz4_B7BD.tar.lz4.uu ${PACKAGE}FILES+= test_compat_lzip_1.tlz.uu ${PACKAGE}FILES+= test_compat_lzip_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzip_3.lz.uu +${PACKAGE}FILES+= test_compat_lzip_4.tlz.uu ${PACKAGE}FILES+= test_compat_lzma_1.tlz.uu ${PACKAGE}FILES+= test_compat_lzma_2.tlz.uu ${PACKAGE}FILES+= test_compat_lzma_3.tlz.uu From nobody Wed Apr 17 14:36:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKNkY2SdMz5H1nL; Wed, 17 Apr 2024 14:36: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 4VKNkY1qgmz4ymM; Wed, 17 Apr 2024 14:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713364565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2iUmrdc8boF1ubiOmEgv2CEO6bBK+zf8ej0CSrle5bI=; b=Rz6Kq7/35vulOG5p7EKdcIHckFYAUDClflTB/l9YRWCwN5j0J9bRZ7aXPBu+wk/KePOq+K +oz4rcdM/n6a4C1IOljIhAsVpSy8iG/eoZfFsSHL4vFxwu+/qtQ1lWxynWRg61Lgc9kDVa eFfXd1tG38JC9OEYagqiYbzg2HrE1yEk3skMbcOIX8++A6e9K+m98zKQgChNcSHUMsucZS VsA2328DqkAxgzVUziIhDwJfz26dF9/oq5Ugoysuk80hN4QjR0cb2PYptkLgaG7i0pgvPm JGasdS2X+boubNE/teIhhEWnTiPBqU5YVVg5VyHWCJgg8nunjZ8dELH+b5OTdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713364565; a=rsa-sha256; cv=none; b=nC51sSs6FtFnqmqcsZhz3YaKd4D7jTYZjRKpl5NwYG1AgNl8lM5R2B3vcdR8D5LI44iz7o NoSPbgmDyR14uknZwYL4BjqhA/2/NoY83yBDOfmgUPTltFG56IKqiNkChQchAyo2wNrho6 jUq3HvSrg1Tj5ig/ayGJ6v4DaoY9g3bUqnW0d7X0hwbVeJwK0wKs6sX3jc9qjYbHTj3ivN xuW8yhLlSO7P8ptOx1rSWgeaqUGc7Qd4lKZ821bac0naaXFFHOQp89poyzYxE+tpWBk0d7 BGk3j7NVA5PURCY/RZmVzUZvynNHUkurQzKwGpwVn3xko62vYIvzcdc9HJ+yQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713364565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2iUmrdc8boF1ubiOmEgv2CEO6bBK+zf8ej0CSrle5bI=; b=Add0tDBeEcfGdZr3YHaKyu5qxuFmaKHGRZpih+W+EIkSEEx8PuxentVUDGnahaIjJNR3bM WKqHGrLf3mAKML8pGBIKM2oMXPC0FR6lFNTq9EJE4TxqWWVaPnkpdC950wX7Wu1JOdRM5I hG9OalocFWTP82JNKoTxPM/qfc5P3uVY4YGIqDd4rz6kcegruMd9a7VLxVx7AbqGupmDUg LxUnVlshEAF+G+wfTGwB++bIHXqkrQcz55Xtv/PbYjUHNi1AzQJb/ceJTcjC+23s4ZubE6 /BLCGMlTyajo6F99aaDDERg2/HdLAMPx7wZwhPcai3a9qUP6o8GcRWSdzvmMxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKNkY1RLkzW2M; Wed, 17 Apr 2024 14:36: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 43HEa50a006830; Wed, 17 Apr 2024 14:36:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HEa5Gg006827; Wed, 17 Apr 2024 14:36:05 GMT (envelope-from git) Date: Wed, 17 Apr 2024 14:36:05 GMT Message-Id: <202404171436.43HEa5Gg006827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: b6a477600851 - main - nuageinit: start the script after zfs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6a4776008519bb4a1d5abfe63c46d5f009ce102 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b6a4776008519bb4a1d5abfe63c46d5f009ce102 commit b6a4776008519bb4a1d5abfe63c46d5f009ce102 Author: Baptiste Daroussin AuthorDate: 2024-04-17 14:25:02 +0000 Commit: Baptiste Daroussin CommitDate: 2024-04-17 14:25:02 +0000 nuageinit: start the script after zfs It prevents the home directory for the new users to be hidden by late mount of the home directory --- libexec/rc/rc.d/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/nuageinit b/libexec/rc/rc.d/nuageinit index 977b44e465fe..8da0b1aed741 100755 --- a/libexec/rc/rc.d/nuageinit +++ b/libexec/rc/rc.d/nuageinit @@ -2,7 +2,7 @@ # # PROVIDE: nuageinit -# REQUIRE: mountcritlocal +# REQUIRE: mountcritlocal zfs # BEFORE: NETWORKING # KEYWORD: firstboot From nobody Wed Apr 17 14:43:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKNtf5Zczz5H2Ws; Wed, 17 Apr 2024 14:43: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 4VKNtf3n0xz50bJ; Wed, 17 Apr 2024 14:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713364986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Km9WLeobKpRLOhy+0otnvxpue0EXxM8RJChfWT9EWQs=; b=uXM4tn7jzLRYVLEM6v4l9hmo0qLmkYHq+Ap8+UWM7upzCDaLUxaIJibIgCNAH9yPvT/msl mmBAuWnXEYbN/sCJPuBS7nqgJBhwiTws5aC+FA0o74chAjX12xN57GhtENHdi/GtCAR8ng SgU7JpXlfrJFZUr/P3EvcLg2tAHc0Q+W+pmiduonNrDY5RoYNAwGkPnX/dWVQief+6hju1 PMWU7s/jx4xuV9gdyjj8+AlFMnpxRPvgKos0vBH/gG2cwQ9DrrLRIPeLq5I7hDoDRWMwOv on2JGh4OBGfe8tz21zQT7C0KmnRaZJuYRFLI9c+smNNZJjIdlRg++jKYMDXynQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713364986; a=rsa-sha256; cv=none; b=tDMNlyf46LWD5MZZPMxJFZo+a1q/iSNSlwjlXnQN4+4LjKp5OzvbF9JxbpljLk50q10IrH 36XUSjLWT4Fwop44RiJYeLagaKiKx7VAizmhDwj1Yypy2iksLw7ZDUPKI4lmMvsLe8Zd1W Wj8iiOXtgJiJyyVOMzqvC3yPjFin28hVudypFW8c7tj6hX2j1qdGPs82PFFNm48B9b8sSm 2u36xRjtH1Mih3amZ0qoW4yyL6g7ceRFempQtZQ13fjU5BqBBUfBSAVcgt2cQMjQJoHY/b lRmsKqd3wVO3sGCCcqMVrqEeYfpOWkBlS9bCG5ti4vwJ3XrZkwMYoi1M+Edi5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713364986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Km9WLeobKpRLOhy+0otnvxpue0EXxM8RJChfWT9EWQs=; b=s2gNNuXM9jiaBVpSx6Rh6t51LBsK0/I4sIdQa8ueB0a2WP3mY8a6uCZbie10ZHxplx3oPR HqyH+A7Lu33gfW3yfi6mRRPVdely+FhdBIY+LhoNFlsZGDcC8aKVqXw06tmnDCYQKYjsL2 EqpWokgyAAr007h5QYfii7Cmx+2fyTA/v4PP+Ke9yj87j+WP3lhiAbu1O56dNKHDAHBgrL p+2cv/6J3DT/432C02aH2kX/wm9jTwX56ofomljAfK3C1ea5NgECWp9gfltITuwg+3gdJD U0XZRnKk9+4UImt0zdhWzZBf7W9x/bz3zxhh21fdrwKKz4rjGwUPM69Wm/yYYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKNtf39qWzWv3; Wed, 17 Apr 2024 14:43: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 43HEh6wJ022705; Wed, 17 Apr 2024 14:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HEh6pZ022701; Wed, 17 Apr 2024 14:43:06 GMT (envelope-from git) Date: Wed, 17 Apr 2024 14:43:06 GMT Message-Id: <202404171443.43HEh6pZ022701@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: b7e4666d7b69 - main - nfsserver: Rate-limit messages about requests from unprivileged ports List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b7e4666d7b69c22699a9299687018a892a5dad5b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b7e4666d7b69c22699a9299687018a892a5dad5b commit b7e4666d7b69c22699a9299687018a892a5dad5b Author: Mark Johnston AuthorDate: 2024-04-17 14:36:58 +0000 Commit: Mark Johnston CommitDate: 2024-04-17 14:36:58 +0000 nfsserver: Rate-limit messages about requests from unprivileged ports If access from unreserved ports is disabled, then a remote host can cause an NFS server to log a message by sending a packet. This is useful for diagnosing problems but bad for resiliency in the case where the server is being spammed with a large number of rejected requests. Limit prints to once per second (racily). Reviewed by: rmacklem, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44819 --- sys/fs/nfsserver/nfs_nfsdkrpc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index 25f9c05d6f0b..022f7403d28b 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -191,6 +191,12 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) port = ntohs(sin->sin_port); if (port >= IPPORT_RESERVED && nd.nd_procnum != NFSPROC_NULL) { + static struct timeval privport_ratecheck = { + .tv_sec = 0, .tv_usec = 0 + }; + static const struct timeval privport_ratecheck_int = { + .tv_sec = 1, .tv_usec = 0 + }; #ifdef INET6 char buf[INET6_ADDRSTRLEN]; #else @@ -208,15 +214,19 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) (buf)) #endif #endif - printf("NFS request from unprivileged port (%s:%d)\n", + if (ratecheck(&privport_ratecheck, + &privport_ratecheck_int)) { + printf( + "NFS request from unprivileged port (%s:%d)\n", #ifdef INET6 - sin->sin_family == AF_INET6 ? - ip6_sprintf(buf, &satosin6(sin)->sin6_addr) : + sin->sin_family == AF_INET6 ? + ip6_sprintf(buf, &satosin6(sin)->sin6_addr) : #if defined(KLD_MODULE) #undef ip6_sprintf #endif #endif - inet_ntoa_r(sin->sin_addr, buf), port); + inet_ntoa_r(sin->sin_addr, buf), port); + } svcerr_weakauth(rqst); svc_freereq(rqst); m_freem(nd.nd_mrep); From nobody Wed Apr 17 15:59:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKQZT3WhWz5H8Fr; Wed, 17 Apr 2024 15:59: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 4VKQZT2yM5z5572; Wed, 17 Apr 2024 15:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713369553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BoXjnGAa3uS8+6ASBu4NC7uHIUDLWLrm/asCET4bAxA=; b=Awsl3afOQ1UZko2K1JUcu8vDnpronQe/DtV3l4vmnq82ZYLYy0Dqo8fGgrqIEfPdu8IOVU 2LRuFLPSPw+0NiCg07zfRvlRVRTadsN6jenwE+nUd3ztjkFzo3fcUbBGpUdZh/b0JX/BSL eiWqFW/9Ay8Sbm2S6gIjXDh+/fJ4vsuTwJ6++y+XFvc1GGISSM/40/TbtcMAq31X/PyZyf Q3StuY2s31GKkjl244VvZKFuGhTBv2/vSAFDfqvkE00NHKu8d3gUG2pv55qNEBTIcROk9o V9rlS/cR8YhSbbOV5Xv1kL/K4dGFTs+q1Pxr86GBYbAi7NCsfPvKgXdsZU8YCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713369553; a=rsa-sha256; cv=none; b=FZ4/vq0aefK2nZxTKR30yeqFHO12h0CA3/Vl2JA0BPKboHN/IJvE8gtAVHsomHelTdNaok fKJMsPRiTEMTi2mE0KsmYczg+7z9SqTJ3QctW0MiUH9CWNzyTbqiiGaexzhzJJonF7TK7B E2r+aJPG6cOuS/QTpe9/zQjvs8JiVipksKnbAdGus0sm//heoC8yjw3KRNpMHbxncZHgeB 8LM4pIORn+kukfkz+4dsa+DocDH+pOehaARoZFgCNtQp/g5+4WPa45ZDVd0zXFUg8e4K7e V2jlxAVuGHnC30yO0iGjlzQrcEGVmxkR5EBh+Gg3KxjLFwaxWMBDOTzwPYxrzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713369553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BoXjnGAa3uS8+6ASBu4NC7uHIUDLWLrm/asCET4bAxA=; b=FWmuv6IgBGERp8azDPq/O1+7tfXVdivnzVxPXF1m7Bp/1a3pwCc15vgWa0zaMDLktJmPhP /6qc1zpKXl5iLq7Z1jJ9A9EjPkMnbAqUuVJPYoqOPqAgB9EwVZAf2dZYREqljY+H7n/dQw yMu4LseXQzIHGDejAWvUWBmsAZCZiO08ZmSI5mXSnlz54hA8dqsLp6vKEjWgWTFvvAr4eA rkWH0FP7Cz+ZVG85ovLYpt6ZBlxmGpnzkgGBYN/B2JSjOPhquDzBXiuHHes5+edAjYSiZR Qj6jWvFtG8+KNk5kCaL3kByP93/BpMc6+PkXv2ttqtCSSGQaWANhAM1Je9jGSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKQZT2RPYzXrM; Wed, 17 Apr 2024 15:59: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 43HFxDcs041306; Wed, 17 Apr 2024 15:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HFxD1p041303; Wed, 17 Apr 2024 15:59:13 GMT (envelope-from git) Date: Wed, 17 Apr 2024 15:59:13 GMT Message-Id: <202404171559.43HFxD1p041303@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: 75eda0096bf8 - main - networking.7 : create network quickstart guide List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 75eda0096bf83b9b88996d9903b5d4e504047eba Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=75eda0096bf83b9b88996d9903b5d4e504047eba commit 75eda0096bf83b9b88996d9903b5d4e504047eba Author: Alexander Ziaee AuthorDate: 2024-04-17 15:51:35 +0000 Commit: Warner Losh CommitDate: 2024-04-17 15:56:44 +0000 networking.7 : create network quickstart guide Now that the handbook has been moved to ports, I think it's very nice to have a network quickstart guide in-band, in base, in the system manual. If the user uses any of the following terms "man -k {network,networking,wifi,quickstart}" this page will come up, which is I think a very common use case for new users. Currently, this document explains connecting to a basic Ethernet network, a basic wifi network, scanning for wifi networks, and airplane mode, as well as linking to other sections, including the handbook Co-authored-by: Graham Perrin Reviewed by: imp, bcr, freebsd@igalic.co Pull Request: https://github.com/freebsd/freebsd-src/pull/833 --- share/man/man7/Makefile | 5 +++ share/man/man7/networking.7 | 101 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile index e410067a40ab..f163d4e0a0d8 100644 --- a/share/man/man7/Makefile +++ b/share/man/man7/Makefile @@ -46,6 +46,11 @@ MLINKS+= c.7 c11.7 MLINKS+= c.7 c17.7 MLINKS+= c.7 c2x.7 +.if ${MK_INET} != "no" +MAN+= networking.7 +MLINKS+= networking.7 wifi.7 +.endif + .if ${MK_TESTS} != "no" ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/doc diff --git a/share/man/man7/networking.7 b/share/man/man7/networking.7 new file mode 100644 index 000000000000..869812c05a9b --- /dev/null +++ b/share/man/man7/networking.7 @@ -0,0 +1,101 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 Alexander Ziaee +.\" +.Dd April 17, 2024 +.Dt "NETWORKING" 7 +.Os +.Sh NAME +.Nm networking , +.Nm wifi +.Nd quickstart guide to connecting to a network +.Sh DESCRIPTION +In the following examples, it is assumed that we are connecting to Ethernet +with the first interface found by the +.Xr em 4 +driver, and Wi-Fi with the first interface found by the +.Xr iwn 4 +driver, though your hardware will vary. +.Sh EXAMPLES +.Bl -tag -width 0n +.It Sy Connecting to an Ethernet network with DHCP: +.Bd -literal -offset 2n +.Ic # dhclient em0 +.Ed +.It Sy Connecting to a cellular network with USB tethering: +.Pp +Load the USB tethering driver, +.Xr urndis 4 : +.Bd -literal -offset 2n +.Ic # kldload urndis +.Ed +.Pp +Ask for a DHCP lease on the USB tethering interface: +.Bd -literal -offset 2n +.Ic # dhclient ue0 +.Ed +.It Sy Connecting to a Wi-Fi network: +.Pp +Identify your Wi-Fi hardware: +.Bd -literal -offset 2n +.Ic % sysctl net.wlan.devices +.Ed +.Pp +Configure your Wi-Fi hardware as wlan0 interface: +.Ed +.Bd -literal -offset 2n +.Ic # sysrc wlans_iwn0="wlan0" +.Ed +.Pp +Set that interface to negotiate a DHCP lease with +.Xr wpa_supplicant 8 : +.Bd -literal -offset 2n +.Ic # sysrc ifconfig_wlan0="WPA SYNCDHCP" +.Ed +.Pp +Enter the details of the Wi-Fi network: +.Bd -literal -offset 2n +.Ic # wpa_passphrase \(dqmyssid\(dq \(dqmypassphrase\(dq >> wpa_supplicant.conf +.Ed +.Pp +Restart the network interface daemon: +.Bd -literal -offset 2n +.Ic # service netif restart +.Ed +.Pp +.It Sy Scanning for Wi-Fi networks: +.Bd -literal -offset 2n +.Ic % ifconfig wlan0 scan +.Ed +.It Sy Airplane mode: +.Bd -literal -offset 2n +.Ic # service netif stop +.Ed +.El +.Sh SEE ALSO +.Xr bsdconfig 8 , +.Xr dhclient 8 , +.Xr ifconfig 8 , +.Xr wpa_passphrase 8 +.Pp +The Advanced Networking chapter of the +.Fx +Handbook. +.Sh CAVEATS +Shell Special Characters in the +.Ar SSID +or +.Ar passphrase +will need to be escaped for +.Xr wpa_passphrase 8 , +commonly using +.Ql \e , +see the manual page for your shell for more details. +.Pp +Currently +.Ql Ic service netif restart +does not restart routing. +A common workaround is to issue +.Ql Ic service netif restart && service routing restart +instead. From nobody Wed Apr 17 17:00:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKRww1VtFz5HDpy; Wed, 17 Apr 2024 17:00: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 4VKRww154Sz5995; Wed, 17 Apr 2024 17:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713373216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urNRWCto1gU8PTXsfEPQLwUuhGh/uhW2dDtefsiTJGw=; b=Jdl9U41plMgjHd1Gz8/Jde90DABBbPEXti4PDthPBPgV4a6MgsUydB6avew9VOmCAjjJ5W W70sAsCkyxYCHnD0ia8MGrzf3u/t2sexNZsQA8vgWv27QrVdlWoE39S1YYjncplIIuMA4j 4piQ3/3900wcyLZ31tHss/NruaPcVT5c4ngu9+DcpUQnIiFdXvxGqDKLfGJDkp0z30qVw+ ZcaKpaeHoXMeZl19HBGs55BIF/F16KJs2x8J/AGf1mpwpirGFtkOk/WYTqA7kCGZNdMHFX Wt1ZNWAjGw4hreT5SpcGJDuwAvvdZvDnu+gEWf09AMsVx0f8NyJM9dHGXF0Syw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713373216; a=rsa-sha256; cv=none; b=BzVuNSBWyBIzJyAbaXRfhw9OzX+IeaR2eFfnIFzczkKUoi9TdqGNyPjN+PaWpzNFW/AO20 fiJ9Wvg/o2AcvW6x18Mc+VxfFmIH+0I3NduEkNQMXKtXQQKf/NpVJy4SttIkRVzcoj86Bu qOp1OmiJXnx61UWp7yHiSvJfsV8tbDs7hjZMeyEyprTuWdGYuAiWP2JwrIoDiIBsrqMGTS DzFFnkC3f3iJllV2nROc3M1e9bNcwwnSb+JDieKcZ4Gm9AMuNL1DPHjzehTzi49nWPlBNX KyLFVLNuBKLf2Zj5a2qda9BAC2xp6QIPzpnHO4HIzjqPqrhQ3NIRpx6Vj5evdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713373216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urNRWCto1gU8PTXsfEPQLwUuhGh/uhW2dDtefsiTJGw=; b=PmL36FoGztc8m4cdSeVaEDph223ZpzzEJfsnTt/OmkdQqfvMaQkVkqB5w4HvP4zsJWzsUI PvN0sr+vm5KlOdYeTW7Decyml2+RGTwERJ+d9U8RDFPzFvA1kESO2hz6MBSXbp1TZijzHt f5Nlo8XZut6hJw3pHsA3B49/4cz/WFhnVeXke1fOUlGdQhDjNScFd+8LEJja84ualM+IH8 Zt7UpdMuQGPcGY7saWOLRTi07kzcCQJ8dgtT18bzb1B1x5zaeQ6tyrl/CIkdMjsNIFe29h hDFmDK02ojjKXo8c3jB6BAgz6K19MhhJrOe6Yr3rEj/7RxG2/+JzauemHtN7ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKRww0h2PzZrS; Wed, 17 Apr 2024 17:00: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 43HH0Gxe051484; Wed, 17 Apr 2024 17:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HH0G2H051469; Wed, 17 Apr 2024 17:00:16 GMT (envelope-from git) Date: Wed, 17 Apr 2024 17:00:16 GMT Message-Id: <202404171700.43HH0G2H051469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1b7487592987 - main - heimdal: Add 64-bit integer support to ASN.1 compiler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b7487592987c91020063a311a14dc15b6e58075 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1b7487592987c91020063a311a14dc15b6e58075 commit 1b7487592987c91020063a311a14dc15b6e58075 Author: Dimitry Andric AuthorDate: 2024-04-16 18:56:37 +0000 Commit: Dimitry Andric CommitDate: 2024-04-17 16:12:43 +0000 heimdal: Add 64-bit integer support to ASN.1 compiler Import upstream 19d378f44: ASN.1 INTEGERs will now compile to C int64_t or uint64_t, depending on whether the constraint ranges include numbers that cannot be represented in 32-bit ints and whether they include negative numbers. Template backend support included. check-template is now built with --template, so we know we're testing it. Tests included. Also adjusts the generated files: * asn1parse.c, asn1parse.h (not strictly necessary, but nice to have) * der-protos.h, which needs a bunch of new prototypes. I copied these from a der-protos.h generated by the upstream build system, which uses a perl script for this. * adjust printf format strings for int64_t. Upstream uses %lld for this, but that is not portable, and leads to lots of -Werror warnings. This should fix target-dependent differences between headers generated by asn1_compile. For example, when cross compiling world from amd64 to i386, the generated cms_asn1.h header has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..-1), iv OCTET STRING, } while a native build on i386 has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..2147483647), iv OCTET STRING, } These are _both_ wrong, since the source file, cms.asn1, has: CMSRC2CBCParameter ::= SEQUENCE { rc2ParameterVersion INTEGER (0..4294967295), iv OCTET STRING -- exactly 8 octets } PR: 276960 Reviewed by: cy, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44814 Differential Revision: https://reviews.freebsd.org/D44815 --- crypto/heimdal/lib/asn1/Makefile.am | 12 +++- crypto/heimdal/lib/asn1/asn1-template.h | 2 + crypto/heimdal/lib/asn1/asn1parse.c | 6 +- crypto/heimdal/lib/asn1/asn1parse.h | 2 +- crypto/heimdal/lib/asn1/asn1parse.y | 6 +- crypto/heimdal/lib/asn1/check-gen.c | 120 ++++++++++++++++++++++++++++++++ crypto/heimdal/lib/asn1/der-protos.h | 50 +++++++++++++ crypto/heimdal/lib/asn1/der_copy.c | 14 ++++ crypto/heimdal/lib/asn1/der_free.c | 12 ++++ crypto/heimdal/lib/asn1/der_get.c | 45 +++++++++++- crypto/heimdal/lib/asn1/der_length.c | 57 +++++++++++++++ crypto/heimdal/lib/asn1/der_put.c | 72 +++++++++++++++++++ crypto/heimdal/lib/asn1/gen.c | 20 +++--- crypto/heimdal/lib/asn1/gen_decode.c | 18 ++--- crypto/heimdal/lib/asn1/gen_encode.c | 12 ++-- crypto/heimdal/lib/asn1/gen_length.c | 12 ++-- crypto/heimdal/lib/asn1/gen_template.c | 22 +++--- crypto/heimdal/lib/asn1/lex.l | 2 +- crypto/heimdal/lib/asn1/symbol.h | 10 ++- crypto/heimdal/lib/asn1/template.c | 2 + crypto/heimdal/lib/asn1/test.asn1 | 2 + 21 files changed, 446 insertions(+), 52 deletions(-) diff --git a/crypto/heimdal/lib/asn1/Makefile.am b/crypto/heimdal/lib/asn1/Makefile.am index 47158b88aa42..608639aed276 100644 --- a/crypto/heimdal/lib/asn1/Makefile.am +++ b/crypto/heimdal/lib/asn1/Makefile.am @@ -37,6 +37,7 @@ gen_files_pkinit = asn1_pkinit_asn1.x gen_files_pkcs12 = asn1_pkcs12_asn1.x gen_files_pkcs8 = asn1_pkcs8_asn1.x gen_files_pkcs9 = asn1_pkcs9_asn1.x +gen_files_test_template = test_template_asn1-template.c gen_files_test = asn1_test_asn1.x gen_files_digest = asn1_digest_asn1.x gen_files_kx509 = asn1_kx509_asn1.x @@ -53,7 +54,7 @@ asn1_print_SOURCES = asn1_print.c check_der_SOURCES = check-der.c check-common.c check-common.h check_template_SOURCES = check-template.c check-common.c check-common.h -nodist_check_template_SOURCES = $(gen_files_test:.x=.c) +nodist_check_template_SOURCES = $(gen_files_test_template:.x=.c) dist_check_gen_SOURCES = check-gen.c check-common.c check-common.h nodist_check_gen_SOURCES = $(gen_files_test:.x=.c) @@ -134,6 +135,7 @@ CLEANFILES = \ $(gen_files_pkcs12) \ $(gen_files_digest) \ $(gen_files_kx509) \ + $(gen_files_test_template) \ $(gen_files_test) $(nodist_check_gen_SOURCES) \ asn1_err.c asn1_err.h \ rfc2459_asn1_files rfc2459_asn1*.h* \ @@ -145,6 +147,7 @@ CLEANFILES = \ pkcs12_asn1_files pkcs12_asn1*.h* \ digest_asn1_files digest_asn1*.h* \ kx509_asn1_files kx509_asn1*.h* \ + test_template_asn1_files test_template_asn1*.h* \ test_asn1_files test_asn1*.h* dist_include_HEADERS = der.h heim_asn1.h der-protos.h der-private.h @@ -170,6 +173,7 @@ priv_headers += pkcs9_asn1-priv.h priv_headers += pkcs12_asn1-priv.h priv_headers += digest_asn1-priv.h priv_headers += kx509_asn1-priv.h +priv_headers += test_template_asn1.h test_template_asn1-priv.h priv_headers += test_asn1.h test_asn1-priv.h @@ -178,7 +182,7 @@ $(asn1_compile_OBJECTS): asn1parse.h asn1parse.c $(srcdir)/der-protos.h $(srcdir $(libasn1_la_OBJECTS): $(nodist_include_HEADERS) $(priv_headers) asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(libasn1base_la_OBJECTS): asn1_err.h $(srcdir)/der-protos.h $(srcdir)/der-private.h $(check_gen_OBJECTS): test_asn1.h -$(check_template_OBJECTS): test_asn1_files +$(check_template_OBJECTS): test_template_asn1.h test_template_asn1_files $(asn1_print_OBJECTS): krb5_asn1.h asn1parse.h: asn1parse.c @@ -192,6 +196,7 @@ $(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files $(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files $(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files $(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files +$(gen_files_test_template) test_template_asn1.hx test_template_asn1-priv.hx: test_template_asn1_files $(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1 @@ -221,6 +226,9 @@ digest_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/digest.asn1 kx509_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/kx509.asn1 $(ASN1_COMPILE) --one-code-file $(srcdir)/kx509.asn1 kx509_asn1 || (rm -f kx509_asn1_files ; exit 1) +test_template_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 + $(ASN1_COMPILE) --template --sequence=TESTSeqOf $(srcdir)/test.asn1 test_template_asn1 || (rm -f test_template_asn1_files ; exit 1) + test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1 $(ASN1_COMPILE) --one-code-file --sequence=TESTSeqOf $(srcdir)/test.asn1 test_asn1 || (rm -f test_asn1_files ; exit 1) diff --git a/crypto/heimdal/lib/asn1/asn1-template.h b/crypto/heimdal/lib/asn1/asn1-template.h index 107706ce8340..5fd6b812630f 100644 --- a/crypto/heimdal/lib/asn1/asn1-template.h +++ b/crypto/heimdal/lib/asn1/asn1-template.h @@ -118,7 +118,9 @@ enum template_types { A1T_IMEMBER = 0, A1T_HEIM_INTEGER, A1T_INTEGER, + A1T_INTEGER64, A1T_UNSIGNED, + A1T_UNSIGNED64, A1T_GENERAL_STRING, A1T_OCTET_STRING, A1T_OCTET_STRING_BER, diff --git a/crypto/heimdal/lib/asn1/asn1parse.c b/crypto/heimdal/lib/asn1/asn1parse.c index 0e04fabf6296..a305f4b0267b 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.c +++ b/crypto/heimdal/lib/asn1/asn1parse.c @@ -304,7 +304,7 @@ struct string_list { typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -1874,7 +1874,7 @@ yyreduce: lex_error_message("Non-integer in first part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); (yyval.range)->min = (yyvsp[(2) - (5)].value)->u.integervalue; - (yyval.range)->max = (yyvsp[(2) - (5)].value)->u.integervalue - 1; + (yyval.range)->max = INT_MAX; } break; @@ -1884,7 +1884,7 @@ yyreduce: if((yyvsp[(4) - (5)].value)->type != integervalue) lex_error_message("Non-integer in second part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); - (yyval.range)->min = (yyvsp[(4) - (5)].value)->u.integervalue + 2; + (yyval.range)->min = INT_MIN; (yyval.range)->max = (yyvsp[(4) - (5)].value)->u.integervalue; } break; diff --git a/crypto/heimdal/lib/asn1/asn1parse.h b/crypto/heimdal/lib/asn1/asn1parse.h index 69b7d6dc1a4a..c1ced1df5a44 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.h +++ b/crypto/heimdal/lib/asn1/asn1parse.h @@ -224,7 +224,7 @@ typedef union YYSTYPE #line 71 "asn1parse.y" { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; diff --git a/crypto/heimdal/lib/asn1/asn1parse.y b/crypto/heimdal/lib/asn1/asn1parse.y index e3bea6ce0ac9..b419676d3429 100644 --- a/crypto/heimdal/lib/asn1/asn1parse.y +++ b/crypto/heimdal/lib/asn1/asn1parse.y @@ -69,7 +69,7 @@ struct string_list { %} %union { - int constant; + int64_t constant; struct value *value; struct range *range; char *name; @@ -370,14 +370,14 @@ range : '(' Value RANGE Value ')' lex_error_message("Non-integer in first part of range"); $$ = ecalloc(1, sizeof(*$$)); $$->min = $2->u.integervalue; - $$->max = $2->u.integervalue - 1; + $$->max = INT_MAX; } | '(' kw_MIN RANGE Value ')' { if($4->type != integervalue) lex_error_message("Non-integer in second part of range"); $$ = ecalloc(1, sizeof(*$$)); - $$->min = $4->u.integervalue + 2; + $$->min = INT_MIN; $$->max = $4->u.integervalue; } | '(' Value ')' diff --git a/crypto/heimdal/lib/asn1/check-gen.c b/crypto/heimdal/lib/asn1/check-gen.c index e686f166cfa0..44699cab4356 100644 --- a/crypto/heimdal/lib/asn1/check-gen.c +++ b/crypto/heimdal/lib/asn1/check-gen.c @@ -764,6 +764,124 @@ check_tag_length(void) return failed; } +static int +check_tag_length64(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\x01\xff\xff\xff\xff"}, + { 1, 7, 7, "\x02\x05\x02\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x7f\xff\xff\xff\xff\xff\xff"}, + { 1, 10, 10, "\x02\x08\x00\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x7f\xff\xff\xff\xff\xff\xff\xff"}, + { 1, 11, 11, "\x02\x09\x00\xff\xff\xff\xff\xff\xff\xff\xff"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTuint64 values[] = {0, 8589934591LL, 8589934592LL, + 36028797018963967LL, 36028797018963968LL, + 9223372036854775807LL, 18446744073709551615ULL, + 0, 127, 128, 256, 512 }; + TESTuint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTuint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + +static int +check_tag_length64s(void) +{ + struct test_data td[] = { + { 1, 3, 3, "\x02\x01\x00"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x01"}, + { 1, 7, 7, "\x02\x05\xfe\x00\x00\x00\x00"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x00"}, + { 1, 10, 10, "\x02\x08\x80\x00\x00\x00\x00\x00\x00\x01"}, + { 1, 9, 9, "\x02\x07\x80\x00\x00\x00\x00\x00\x01"}, + { 0, 3, 0, "\x02\x02\x00"}, + { 0, 3, 0, "\x02\x7f\x7f"}, + { 0, 4, 0, "\x02\x03\x00\x80"}, + { 0, 4, 0, "\x02\x7f\x01\x00"}, + { 0, 5, 0, "\x02\xff\x7f\x02\x00"} + }; + size_t sz; + TESTint64 values[] = {0, -8589934591LL, -8589934592LL, + -36028797018963967LL, -36028797018963968LL, + -9223372036854775807LL, -36028797018963967LL, + 0, 127, 128, 256, 512 }; + TESTint64 u; + int i, ret, failed = 0; + void *buf; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + struct map_page *page; + + buf = map_alloc(OVERRUN, td[i].data, td[i].len, &page); + + ret = decode_TESTint64(buf, td[i].len, &u, &sz); + if (ret) { + if (td[i].ok) { + printf("failed with tag len test %d\n", i); + printf("ret = %d\n", ret); + failed = 1; + } + } else { + if (td[i].ok == 0) { + printf("failed with success for tag len test %d\n", i); + failed = 1; + } + if (td[i].expected_len != sz) { + printf("wrong expected size for tag test %d\n", i); + printf("sz = %d\n", sz); + failed = 1; + } + if (values[i] != u) { + printf("wrong value for tag test %d\n", i); + printf("Expected value: %lld\nActual value: %lld\n", values[i], u); + failed = 1; + } + } + map_free(page, "test", "decode"); + } + return failed; +} + static int cmp_TESTChoice (void *a, void *b) { @@ -1291,6 +1409,8 @@ main(int argc, char **argv) ret += test_cert(); ret += check_tag_length(); + ret += check_tag_length64(); + ret += check_tag_length64s(); ret += test_large_tag(); ret += test_choice(); diff --git a/crypto/heimdal/lib/asn1/der-protos.h b/crypto/heimdal/lib/asn1/der-protos.h index 3b3d81d175fb..9ebc78538a9e 100644 --- a/crypto/heimdal/lib/asn1/der-protos.h +++ b/crypto/heimdal/lib/asn1/der-protos.h @@ -67,6 +67,11 @@ der_copy_integer ( const int */*from*/, int */*to*/); +int +der_copy_integer64 ( + const int64_t */*from*/, + int64_t */*to*/); + int der_copy_octet_string ( const heim_octet_string */*from*/, @@ -92,6 +97,11 @@ der_copy_unsigned ( const unsigned */*from*/, unsigned */*to*/); +int +der_copy_unsigned64 ( + const uint64_t */*from*/, + uint64_t */*to*/); + int der_copy_utctime ( const time_t */*from*/, @@ -128,6 +138,9 @@ der_free_ia5_string (heim_ia5_string */*str*/); void der_free_integer (int */*i*/); +void +der_free_integer64 (int64_t */*i*/); + void der_free_octet_string (heim_octet_string */*k*/); @@ -143,6 +156,9 @@ der_free_universal_string (heim_universal_string */*k*/); void der_free_unsigned (unsigned */*u*/); +void +der_free_unsigned64 (uint64_t */*u*/); + void der_free_utctime (time_t */*t*/); @@ -214,6 +230,13 @@ der_get_integer ( int */*ret*/, size_t */*size*/); +int +der_get_integer64 ( + const unsigned char */*p*/, + size_t /*len*/, + int64_t */*ret*/, + size_t */*size*/); + int der_get_length ( const unsigned char */*p*/, @@ -284,6 +307,13 @@ der_get_unsigned ( unsigned */*ret*/, size_t */*size*/); +int +der_get_unsigned64 ( + const unsigned char */*p*/, + size_t /*len*/, + uint64_t */*ret*/, + size_t */*size*/); + int der_get_utctime ( const unsigned char */*p*/, @@ -367,6 +397,9 @@ der_length_ia5_string (const heim_ia5_string */*data*/); size_t der_length_integer (const int */*data*/); +size_t +der_length_integer64 (const int64_t */*data*/); + size_t der_length_len (size_t /*len*/); @@ -388,6 +421,9 @@ der_length_universal_string (const heim_universal_string */*data*/); size_t der_length_unsigned (const unsigned */*data*/); +size_t +der_length_unsigned64 (const uint64_t */*data*/); + size_t der_length_utctime (const time_t */*t*/); @@ -508,6 +544,13 @@ der_put_integer ( const int */*v*/, size_t */*size*/); +int +der_put_integer64 ( + unsigned char */*p*/, + size_t /*len*/, + const int64_t */*v*/, + size_t */*size*/); + int der_put_length ( unsigned char */*p*/, @@ -569,6 +612,13 @@ der_put_unsigned ( const unsigned */*v*/, size_t */*size*/); +int +der_put_unsigned64 ( + unsigned char */*p*/, + size_t /*len*/, + const uint64_t */*v*/, + size_t */*size*/); + int der_put_utctime ( unsigned char */*p*/, diff --git a/crypto/heimdal/lib/asn1/der_copy.c b/crypto/heimdal/lib/asn1/der_copy.c index abaaf8e5d740..4faf87014280 100644 --- a/crypto/heimdal/lib/asn1/der_copy.c +++ b/crypto/heimdal/lib/asn1/der_copy.c @@ -54,6 +54,13 @@ der_copy_integer (const int *from, int *to) return 0; } +int +der_copy_integer64 (const int64_t *from, int64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_unsigned (const unsigned *from, unsigned *to) { @@ -61,6 +68,13 @@ der_copy_unsigned (const unsigned *from, unsigned *to) return 0; } +int +der_copy_unsigned64 (const uint64_t *from, uint64_t *to) +{ + *to = *from; + return 0; +} + int der_copy_generalized_time (const time_t *from, time_t *to) { diff --git a/crypto/heimdal/lib/asn1/der_free.c b/crypto/heimdal/lib/asn1/der_free.c index 4bae5fc2338f..1584cfcb299e 100644 --- a/crypto/heimdal/lib/asn1/der_free.c +++ b/crypto/heimdal/lib/asn1/der_free.c @@ -50,12 +50,24 @@ der_free_integer (int *i) *i = 0; } +void +der_free_integer64 (int64_t *i) +{ + *i = 0; +} + void der_free_unsigned (unsigned *u) { *u = 0; } +void +der_free_unsigned64 (uint64_t *u) +{ + *u = 0; +} + void der_free_generalized_time(time_t *t) { diff --git a/crypto/heimdal/lib/asn1/der_get.c b/crypto/heimdal/lib/asn1/der_get.c index 3112da86f93b..8a456d4d983d 100644 --- a/crypto/heimdal/lib/asn1/der_get.c +++ b/crypto/heimdal/lib/asn1/der_get.c @@ -48,9 +48,28 @@ der_get_unsigned (const unsigned char *p, size_t len, unsigned val = 0; size_t oldlen = len; - if (len == sizeof(unsigned) + 1 && p[0] == 0) + if (len == sizeof(val) + 1 && p[0] == 0) ; - else if (len > sizeof(unsigned)) + else if (len > sizeof(val)) + return ASN1_OVERRUN; + + while (len--) + val = val * 256 + *p++; + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_unsigned64 (const unsigned char *p, size_t len, + uint64_t *ret, size_t *size) +{ + uint64_t val = 0; + size_t oldlen = len; + + if (len == sizeof(val) + 1 && p[0] == 0) + ; + else if (len > sizeof(val)) return ASN1_OVERRUN; while (len--) @@ -67,7 +86,27 @@ der_get_integer (const unsigned char *p, size_t len, int val = 0; size_t oldlen = len; - if (len > sizeof(int)) + if (len > sizeof(val)) + return ASN1_OVERRUN; + + if (len > 0) { + val = (signed char)*p++; + while (--len) + val = val * 256 + *p++; + } + *ret = val; + if(size) *size = oldlen; + return 0; +} + +int +der_get_integer64 (const unsigned char *p, size_t len, + int64_t *ret, size_t *size) +{ + int64_t val = 0; + size_t oldlen = len; + + if (len > sizeof(val)) return ASN1_OVERRUN; if (len > 0) { diff --git a/crypto/heimdal/lib/asn1/der_length.c b/crypto/heimdal/lib/asn1/der_length.c index db82025861ea..684ba9bc6f32 100644 --- a/crypto/heimdal/lib/asn1/der_length.c +++ b/crypto/heimdal/lib/asn1/der_length.c @@ -55,6 +55,24 @@ _heim_len_unsigned (unsigned val) return ret; } +size_t +_heim_len_unsigned64 (uint64_t val) +{ + size_t ret = 0; + int last_val_gt_128; + + do { + ++ret; + last_val_gt_128 = (val >= 128); + val /= 256; + } while (val); + + if(last_val_gt_128) + ret++; + + return ret; +} + size_t _heim_len_int (int val) { @@ -82,6 +100,33 @@ _heim_len_int (int val) return ret; } +size_t +_heim_len_int64 (int64_t val) +{ + unsigned char q; + size_t ret = 0; + + if (val >= 0) { + do { + q = val % 256; + ret++; + val /= 256; + } while(val); + if(q >= 128) + ret++; + } else { + val = ~val; + do { + q = ~(val % 256); + ret++; + val /= 256; + } while(val); + if(q < 128) + ret++; + } + return ret; +} + static size_t len_oid (const heim_oid *oid) { @@ -134,12 +179,24 @@ der_length_integer (const int *data) return _heim_len_int (*data); } +size_t +der_length_integer64 (const int64_t *data) +{ + return _heim_len_int64 (*data); +} + size_t der_length_unsigned (const unsigned *data) { return _heim_len_unsigned(*data); } +size_t +der_length_unsigned64 (const uint64_t *data) +{ + return _heim_len_unsigned64(*data); +} + size_t der_length_enumerated (const unsigned *data) { diff --git a/crypto/heimdal/lib/asn1/der_put.c b/crypto/heimdal/lib/asn1/der_put.c index 0b276d1ebdce..0ccb181c0b39 100644 --- a/crypto/heimdal/lib/asn1/der_put.c +++ b/crypto/heimdal/lib/asn1/der_put.c @@ -75,6 +75,38 @@ der_put_unsigned (unsigned char *p, size_t len, const unsigned *v, size_t *size) } } +int +der_put_unsigned64 (unsigned char *p, size_t len, const uint64_t *v, size_t *size) +{ + unsigned char *base = p; + uint64_t val = *v; + + if (val) { + while (len > 0 && val) { + *p-- = val % 256; + val /= 256; + --len; + } + if (val != 0) + return ASN1_OVERFLOW; + else { + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + } + *size = base - p; + return 0; + } + } else if (len < 1) + return ASN1_OVERFLOW; + else { + *p = 0; + *size = 1; + return 0; + } +} + int der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) { @@ -115,6 +147,46 @@ der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size) return 0; } +int +der_put_integer64 (unsigned char *p, size_t len, const int64_t *v, size_t *size) +{ + unsigned char *base = p; + int64_t val = *v; + + if(val >= 0) { + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = val % 256; + len--; + val /= 256; + } while(val); + if(p[1] >= 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0; + len--; + } + } else { + val = ~val; + do { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = ~(val % 256); + len--; + val /= 256; + } while(val); + if(p[1] < 128) { + if(len < 1) + return ASN1_OVERFLOW; + *p-- = 0xff; + len--; + } + } + *size = base - p; + return 0; +} + int der_put_length (unsigned char *p, size_t len, size_t val, size_t *size) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 2194b329ce1d..76a893c5ade7 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -303,7 +303,7 @@ gen_assign_defval(const char *var, struct value *val) fprintf(codefile, "if((%s = strdup(\"%s\")) == NULL)\nreturn ENOMEM;\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "%s = %d;\n", var, val->u.integervalue); + fprintf(codefile, "%s = %" PRId64 ";\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -324,7 +324,7 @@ gen_compare_defval(const char *var, struct value *val) fprintf(codefile, "if(strcmp(%s, \"%s\") != 0)\n", var, val->u.stringvalue); break; case integervalue: - fprintf(codefile, "if(%s != %d)\n", var, val->u.integervalue); + fprintf(codefile, "if(%s != %" PRId64 ")\n", var, val->u.integervalue); break; case booleanvalue: if(val->u.booleanvalue) @@ -397,7 +397,7 @@ generate_constant (const Symbol *s) case booleanvalue: break; case integervalue: - fprintf (headerfile, "enum { %s = %d };\n\n", + fprintf (headerfile, "enum { %s = %" PRId64 " };\n\n", s->gen_name, s->value->u.integervalue); break; case nullvalue: @@ -540,7 +540,7 @@ define_asn1 (int level, Type *t) if(t->members == NULL) { fprintf (headerfile, "INTEGER"); if (t->range) - fprintf (headerfile, " (%d..%d)", + fprintf (headerfile, " (%" PRId64 "..%" PRId64 ")", t->range->min, t->range->max); } else { Member *m; @@ -723,14 +723,16 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "} %s;\n", name); } else if (t->range == NULL) { fprintf (headerfile, "heim_integer %s;\n", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + fprintf (headerfile, "int64_t %s;\n", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + fprintf (headerfile, "uint64_t %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { fprintf (headerfile, "int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - fprintf (headerfile, "unsigned int %s;\n", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_decode.c b/crypto/heimdal/lib/asn1/gen_decode.c index bf2d93b806df..c821ee1481a7 100644 --- a/crypto/heimdal/lib/asn1/gen_decode.c +++ b/crypto/heimdal/lib/asn1/gen_decode.c @@ -189,19 +189,19 @@ range_check(const char *name, { if (r->min == r->max + 2 || r->min < r->max) fprintf (codefile, - "if ((%s)->%s > %d) {\n" + "if ((%s)->%s > %" PRId64 ") {\n" "e = ASN1_MAX_CONSTRAINT; %s;\n" "}\n", name, length, r->max, forwstr); if (r->min - 1 == r->max || r->min < r->max) fprintf (codefile, - "if ((%s)->%s < %d) {\n" + "if ((%s)->%s < %" PRId64 ") {\n" "e = ASN1_MIN_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); if (r->max == r->min) fprintf (codefile, - "if ((%s)->%s != %d) {\n" + "if ((%s)->%s != %" PRId64 ") {\n" "e = ASN1_EXACT_CONSTRAINT; %s;\n" "}\n", name, length, r->min, forwstr); @@ -252,14 +252,16 @@ decode_type (const char *name, const Type *t, int optional, name); } else if (t->range == NULL) { decode_primitive ("heim_integer", name, forwstr); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + decode_primitive ("integer64", name, forwstr); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + decode_primitive ("unsigned64", name, forwstr); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { decode_primitive ("integer", name, forwstr); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - decode_primitive ("unsigned", name, forwstr); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { decode_primitive ("unsigned", name, forwstr); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; case TBoolean: diff --git a/crypto/heimdal/lib/asn1/gen_encode.c b/crypto/heimdal/lib/asn1/gen_encode.c index 1bd47484d83a..ac43b6a0d364 100644 --- a/crypto/heimdal/lib/asn1/gen_encode.c +++ b/crypto/heimdal/lib/asn1/gen_encode.c @@ -129,14 +129,16 @@ encode_type (const char *name, const Type *t, const char *tmpstr) fprintf(codefile, "}\n;"); } else if (t->range == NULL) { encode_primitive ("heim_integer", name); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + encode_primitive ("integer64", name); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + encode_primitive ("unsigned64", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { encode_primitive ("integer", name); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - encode_primitive ("unsigned", name); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { encode_primitive ("unsigned", name); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); constructed = 0; break; diff --git a/crypto/heimdal/lib/asn1/gen_length.c b/crypto/heimdal/lib/asn1/gen_length.c index 20b5adfe5d02..f12246e676ec 100644 --- a/crypto/heimdal/lib/asn1/gen_length.c +++ b/crypto/heimdal/lib/asn1/gen_length.c @@ -80,14 +80,16 @@ length_type (const char *name, const Type *t, fprintf(codefile, "}\n"); } else if (t->range == NULL) { length_primitive ("heim_integer", name, variable); - } else if (t->range->min == INT_MIN && t->range->max == INT_MAX) { + } else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) { + length_primitive ("integer64", name, variable); + } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { + length_primitive ("unsigned64", name, variable); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { length_primitive ("integer", name, variable); - } else if (t->range->min == 0 && t->range->max == UINT_MAX) { - length_primitive ("unsigned", name, variable); - } else if (t->range->min == 0 && t->range->max == INT_MAX) { + } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { length_primitive ("unsigned", name, variable); } else - errx(1, "%s: unsupported range %d -> %d", + errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64, name, t->range->min, t->range->max); break; diff --git a/crypto/heimdal/lib/asn1/gen_template.c b/crypto/heimdal/lib/asn1/gen_template.c index edd68e122380..15bf7d30c498 100644 --- a/crypto/heimdal/lib/asn1/gen_template.c +++ b/crypto/heimdal/lib/asn1/gen_template.c @@ -52,11 +52,13 @@ integer_symbol(const char *basename, const Type *t) return "int"; /* XXX enum foo */ else if (t->range == NULL) return "heim_integer"; - else if (t->range->min == INT_MIN && t->range->max == INT_MAX) + else if (t->range->min < INT_MIN && t->range->max <= INT64_MAX) + return "int64_t"; + else if (t->range->min >= 0 && t->range->max > UINT_MAX) + return "uint64_t"; + else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) *** 98 LINES SKIPPED *** From nobody Wed Apr 17 17:51:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKT4Y2Z5Zz5HK61; Wed, 17 Apr 2024 17: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 4VKT4X6rGbz45MT; Wed, 17 Apr 2024 17: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=1713376317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kqh4AAam2CYVci5C0mwjZ3FrJyDcrVIa3j7lwVxL/8M=; b=dag4lA254XagE2q4NinvYFOYfSCzuHhwj9y7KWYBMAHD3qQaJLKIKVmDaL/jq9Tk8N0uXe rYKjp32EP3+tpiQpNmDCsWCn/7rc8O+0iBtPXqPgp7skv8a6nkKdMj7exDM/pAdX0tMUNX 75p+ZodCgGImbo+vKmeIypaIF/3opMdl2cfNgVdte1MNiJdV/fAFmnG7dxx4dtbhUjFvTc VnvGkeUFsAJvgykm6o33rOCobfNO7pMnBspBd/R/HwZnBDZ6TwONfsMrqJHQ4CONLJESQC 4oxkbwNO9Q9nyzACj6rVg4JiStE6FSnt+zjna4Mkc2xxVDnemziM2Jg+NYkc5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713376317; a=rsa-sha256; cv=none; b=xZvkDigmRUVcgVmYNflI6XeqxAsU/iXjA1bobiOqJJJSg2/0KsTMlSu6S5bQYusg2hYFgH EFcR2lc5pX2Qgt+2jYO3H1QzCyxSJf3XRAllDW/9MrKdIFgdbGIafyMDMSCS1SZIfpPwgY AA5B/N107ojKlFWo40yfKxxdKw0HRfwWJzJhFnqGb57iDVDqMDJc2GSSOyeObBFNRA56Tq 8SVuWVnN2xkNBRb5++Rbi7X2IUou5Ww0De+5J3VFmqNeb9ekpIMXH6H/Aj3/SJB0naj/To Uzn12LJkk1PWcih6WjcWywGFIZHVpl3H7RrrawTvTrqT4lrOV+rF/WWc+Gdjxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713376317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kqh4AAam2CYVci5C0mwjZ3FrJyDcrVIa3j7lwVxL/8M=; b=vFOWTWJ2twDaMkwcsmg4hK2d+iDNNe6YL5OWofMPd3oBjDEoO4QcplpWRTrrlU1Xt41it8 RsxR+Syrx+hjRxkLYPySy7OiFX7arJIZRi3haCfj2YhU6RVcGZIApvVsN9lQ29yf1Rmd6e Qu8QC5XT8pfs1ChodQ/vFJfiIS8dL6ZQTFmpZuqz/mQ3ISAIwti2H2gyOyBSEehTJhM04U wJq74ySFG7epPTYjMLgBCsY7U+YTzUIRgw/vIpGU8OUmC0ud0V4h53QPUP2uGcs8qoak0N bhQoMxlg6B9CwhqvzTOs+uTIZ7tLsUmU9risNhjXQeMNcu1u3/yyGlgWPs1wLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKT4X69pPzc1M; Wed, 17 Apr 2024 17: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 43HHpuqv038008; Wed, 17 Apr 2024 17: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 43HHpu4D038005; Wed, 17 Apr 2024 17:51:56 GMT (envelope-from git) Date: Wed, 17 Apr 2024 17:51:56 GMT Message-Id: <202404171751.43HHpu4D038005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 219b6e442308 - main - heimdal: asn1: Use unsigned bitfields for named bitsets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 219b6e442308d5353b2af5f0771ce9b887b70754 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=219b6e442308d5353b2af5f0771ce9b887b70754 commit 219b6e442308d5353b2af5f0771ce9b887b70754 Author: Dimitry Andric AuthorDate: 2024-04-17 17:49:30 +0000 Commit: Dimitry Andric CommitDate: 2024-04-17 17:49:30 +0000 heimdal: asn1: Use unsigned bitfields for named bitsets Import upstream 6747e1628: asn1: Use unsigned bitfields for named bitsets Signed 1-bit bitfields are undefined in C. This should fix the following warnings, which for unknown reasons are errors in CI: /usr/src/crypto/heimdal/lib/hx509/ca.c:1020:22: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1020 | ku.digitalSignature = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1021:21: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1021 | ku.keyEncipherment = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1028:17: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1028 | ku.keyCertSign = 1; | ^ ~ /usr/src/crypto/heimdal/lib/hx509/ca.c:1029:13: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion] 1029 | ku.cRLSign = 1; | ^ ~ PR: 276960 Fixes: 1b7487592987 MFC after: 1 week --- crypto/heimdal/lib/asn1/gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/lib/asn1/gen.c b/crypto/heimdal/lib/asn1/gen.c index 76a893c5ade7..f35d41667a57 100644 --- a/crypto/heimdal/lib/asn1/gen.c +++ b/crypto/heimdal/lib/asn1/gen.c @@ -727,10 +727,10 @@ define_type (int level, const char *name, const char *basename, Type *t, int typ fprintf (headerfile, "int64_t %s;\n", name); } else if (t->range->min >= 0 && t->range->max > UINT_MAX) { fprintf (headerfile, "uint64_t %s;\n", name); - } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { - fprintf (headerfile, "int %s;\n", name); } else if (t->range->min >= 0 && t->range->max <= UINT_MAX) { fprintf (headerfile, "unsigned int %s;\n", name); + } else if (t->range->min >= INT_MIN && t->range->max <= INT_MAX) { + fprintf (headerfile, "int %s;\n", name); } else errx(1, "%s: unsupported range %" PRId64 " -> %" PRId64 "", name, t->range->min, t->range->max); From nobody Wed Apr 17 18:07:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKTQ43P6bz5HLNv; Wed, 17 Apr 2024 18:07: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 4VKTQ36Lkgz46x2; Wed, 17 Apr 2024 18:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713377227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qZWSSPAWJ4BA2wPJRfFVden78haNL3foK+NfSNEti0=; b=xCPt2gKJHuDBuYE0e0ml3kk/Euy1SFziqA1b4pdOSuEg4wFWvajtesdz4zSIqMmMhleT30 PUTyEMzKk8ftRzsqgoWqtHBM0U5yGh7vUMVjA0PCY/sN+HanTTDLZ0Z3uiuZbUI/Lfhqgl guXh034FOzGQf0CUYJ8h3K3LaXluJc9WXHP2WmewW3vuPY1CMPuw0hKLFQljaziGchkEFo wYH1xthN8OpcGVXEkWtLmzKOEAIHXOuqMM58wfWTGCbOExyLt8/aogFdmpjCAQMpi27u3E Un2H8HMAcBYpAk7MCVqCZ9F7vfQD9g7Su4Khzgm2HITcfU3eu8AtQnnOmah4VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713377227; a=rsa-sha256; cv=none; b=lzGv/H8UQSHm2N/9+aNi2zaAymdJ5y7PFbnKAR3cOfiSoZCSelsgBo8TjrkoXVsSfxrNL/ aIyoEQnnuswaZ6SzJl84qG6o/M1jDvZ5lTJmiAyu94N2UIcJ+d2qdpnSSzQ+J72TznXpv0 qMPNUG9PrwgikyiPy23peVNhRyEGvX1wVK8WDJ2z++gBUQtv/1U8Wl9XCbBO87XT/CYAaH 7xEyOdU/newsW+OuTMpRzB5gS/vqw/TNZdf5EHGb6sx5+oUZ1PfFEzaeoSNEwKZh5969Lf pO00yyxvS2yQthJhQwf/BXBoGWE0q+pg1tN1yWbtbDwUcIN6Lac98mnRilL/lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713377227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qZWSSPAWJ4BA2wPJRfFVden78haNL3foK+NfSNEti0=; b=RQO4mG4Jyh6bTnRv319T66pZ2x60Vwu7Y/4/8dbBWB85CxjUoljsqys5Vwm3MxX2zuC0ED N5iuEwnTRM8kHvz6EZPzAmEKAg3dCp2w4TYBdCyLLrGWx/tNAQuVFk9o0HDpxbLlbbTMVK BDyrSMqaq+qzIM8Zr5Y2pg7xJYYbHtyt0lvQm6IxReznriJZfXnnMNW8SguY/M/5kzw1S6 UFDH7A7Ugc3LHLpeD2BHr39oPsCQj/fiGMmCJJzEZ/gTA0OscGcQP4We7s7YvgyBFE2fUB YEblJmEQRX5bkuRHondTLF0/Oss0fJ7mTeT2BUe4s/XEvkoRWsUaKhmPHG+BSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKTQ35wX0zcHp; Wed, 17 Apr 2024 18:07: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 43HI77S1062178; Wed, 17 Apr 2024 18:07:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HI777K062175; Wed, 17 Apr 2024 18:07:07 GMT (envelope-from git) Date: Wed, 17 Apr 2024 18:07:07 GMT Message-Id: <202404171807.43HI777K062175@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: f122045e36dd - main - crunchgen: add --list option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f122045e36dd009ecdc6b69a6f4b751c4b10b443 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f122045e36dd009ecdc6b69a6f4b751c4b10b443 commit f122045e36dd009ecdc6b69a6f4b751c4b10b443 Author: Martin Tournoij AuthorDate: 2024-04-17 16:04:27 +0000 Commit: Warner Losh CommitDate: 2024-04-17 18:07:25 +0000 crunchgen: add --list option "bsdbox --list" will print all tools in the binary, one per line. The main use case for this is to make it easier to create links: for t in $(bsdbox --list); do ln -s bsdbox $t done The name --list was taken from busybox. This just adds a new "program" with the name "--list". I don't think we need to do real argument parsing here, and this is also how busybox does it. An additional minor change is that just "bsdbox" will no longer print the binary name itself ("bsdbox" in this case). Before it would do: % bsdbox usage: boxlike ..., where is one of: cp ls mv bsdbox And now just: % bsdbox usage: boxlike ..., where is one of: cp ls mv And just "bsdbox" will also exit with code 0 (and print to stdout) rather than exit with 0 and print to stderr Example output: % ./bsdbox usage: bsdbox program [args ...] bsdbox --list program [args ...] bsdbox combines several programs in one executable. Create a link to this executable with the program name to run that program, or give the program name as the first argument. Currently defined programs: true false tail head uname % ./bsdbox --list true false tail head uname % ./bsdbox uname -a FreeBSD freebsd 13.2-RELEASE-p4 FreeBSD 13.2-RELEASE-p4 GENERIC amd64 % ln -s bsdbox uname % ./uname -a FreeBSD freebsd 13.2-RELEASE-p4 FreeBSD 13.2-RELEASE-p4 GENERIC amd64 Pull Request: https://github.com/freebsd/freebsd-src/pull/894 Signed-off-by: Martin Tournoij Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/894 --- usr.sbin/crunch/crunchgen/crunched_main.c | 60 +++++++++++++++++++++---------- usr.sbin/crunch/crunchgen/crunchgen.c | 10 ++++-- 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/usr.sbin/crunch/crunchgen/crunched_main.c b/usr.sbin/crunch/crunchgen/crunched_main.c index 7de99b270ac7..a7f072378197 100644 --- a/usr.sbin/crunch/crunchgen/crunched_main.c +++ b/usr.sbin/crunch/crunchgen/crunched_main.c @@ -82,20 +82,21 @@ struct stub { extern const char *__progname; extern struct stub entry_points[]; +extern int num_entry_points; -static void crunched_usage(void); +static void crunched_usage(int); crunched_stub_t crunched_main; +crunched_stub_t crunched_list; static struct stub * find_entry_point(const char *basename) { - struct stub *ep = NULL; - - for (ep = entry_points; ep->name != NULL; ep++) + for (int i = 0; i < num_entry_points; i++) { + struct stub *ep = &entry_points[i]; if (!strcmp(basename, ep->name)) return (ep); - + } return (NULL); } @@ -159,13 +160,14 @@ main(int argc, char **argv, char **envp) } if (basename == NULL || *basename == '\0') - crunched_usage(); + crunched_usage(1); if (ep != NULL) { return ep->f(argc, argv, envp); } else { - fprintf(stderr, "%s: %s not compiled in\n", EXECNAME, basename); - crunched_usage(); + fprintf(stderr, "%s: %s not compiled in\n\n", + EXECNAME, basename); + crunched_usage(1); } } @@ -173,33 +175,53 @@ int crunched_main(int argc, char **argv, char **envp) { if (argc <= 1) - crunched_usage(); + crunched_usage(0); __progname = get_basename(argv[1]); return main(--argc, ++argv, envp); } +int +crunched_list(int argc __unused, char **argv __unused, char **envp __unused) +{ + for (int i = 0; i < num_entry_points - 2; i++) + printf("%s\n", entry_points[i].name); + return (0); +} + static void -crunched_usage(void) +crunched_usage(int code) { int columns, len; - struct stub *ep; - - fprintf(stderr, - "usage: %s ..., where is one of:\n", EXECNAME); + FILE *out = stdout; + if (code > 0) + out = stderr; + + fprintf(out, + "usage: %s program [args ...]\n" + " %s --list\n" + " program [args ...]\n" + "\n" + "%s combines several programs in one executable. Create a link to this\n" + "executable with the program name to run that program, or give the program\n" + "name as the first argument.\n" + "\n" + "Currently defined programs:\n", + EXECNAME, EXECNAME, EXECNAME); columns = 0; - for (ep = entry_points; ep->name != NULL; ep++) { + for (int i = 0; i < num_entry_points - 2; i++) { + struct stub *ep = &entry_points[i]; len = strlen(ep->name) + 1; if (columns + len < 80) columns += len; else { - fprintf(stderr, "\n"); + fprintf(out, "\n"); columns = len; } - fprintf(stderr, " %s", ep->name); + fprintf(out, " %s", ep->name); } - fprintf(stderr, "\n"); - exit(1); + fprintf(out, "\n"); + exit(code); } /* end of crunched_main.c */ diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 462a13f9c897..065619936aa0 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -924,17 +924,23 @@ gen_output_cfile(void) "extern crunched_stub_t _crunched_%s_stub;\n", p->ident); + int n = 2; /* 2 because main and --list are added manually. */ fprintf(outcf, "\nstruct stub entry_points[] = {\n"); for (p = progs; p != NULL; p = p->next) { + n++; fprintf(outcf, "\t{ \"%s\", _crunched_%s_stub },\n", p->name, p->ident); - for (s = p->links; s != NULL; s = s->next) + for (s = p->links; s != NULL; s = s->next) { + n++; fprintf(outcf, "\t{ \"%s\", _crunched_%s_stub },\n", s->str, p->ident); + } } fprintf(outcf, "\t{ EXECNAME, crunched_main },\n"); - fprintf(outcf, "\t{ NULL, NULL }\n};\n"); + fprintf(outcf, "\t{ \"--list\", crunched_list }\n"); + fprintf(outcf, "};\n\n"); + fprintf(outcf, "int num_entry_points = %d;\n", n); fclose(outcf); } From nobody Wed Apr 17 20:22:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKXPq3B9dz5H4Kj; Wed, 17 Apr 2024 20:22: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 4VKXPq0w9Tz4Pdc; Wed, 17 Apr 2024 20:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713385327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjFbycsLbtRqP0GRhNXC3pOCJ15f/emDwU2TQiiBBKg=; b=ossy46MRfvenCpJRQsDMLR/q+VBoL2ssZBXtqrcdsREc0BFOGGLqDIINlcEIGNTSFEKWV2 4Sl16BX7UDoX1XuSvOzlqzlXc4WRYG1e+KbAR26BbTAy5qdVSv5n8dOSjLS0Wn7tmqCrzr j0YtyKYx2In9YJe/JQNn+u0Xyj0LW5MULPGO39IUaRnGitXlbLBhgtEdW5pEaUfZx/zp1A uATacxI+3ZZwTasWtz8Jk7d7fQvWCnQapuIHeV7tNw7J5e5ERz/lntSExigoDNf0kZyA05 6sy++OiVZJqQxlqcqv+HxmlP2cRjnvYtKkIeu+7xQGnqZMA8rprkaoTYAHQt6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713385327; a=rsa-sha256; cv=none; b=IeRHvYu+tHjP6sdqj/kMgUca+1qKBOgjH9wHvqsHOX0e2hYB74y5/+yo+UH4uUK/s6X95G aqdfrWvTqb4roObapSQVc08Z5M21KuZQeGWJovuq8WOP4s+kqt0yzKZT7336tUvWcjupOO kyl7p6XusodJJYR8PcbM6JLtRbW7rftsEotB0EepGwNS9qp5C1emvV6kCr5LTq2OOP7H9T 21/ew/aRyfoDfpfOCiz612WkmYTFyvtnPcl36D3eydhnv05zfST+QYAmjQvMDUbj6m771/ YpZ0XHn7P6TMHv02el1xnqAr7hhTIMAIvjZF0MaSrguWVRhUiXe6rVbFtT7B5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713385327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjFbycsLbtRqP0GRhNXC3pOCJ15f/emDwU2TQiiBBKg=; b=AsK6mFgBCMy069wdYDsDf4ClMQ8PWoYsYJwVD/ltBuPSLnD5B3SIMba6qlcepf1i1cdj26 SHj+Si9Okx6XMTCWdXZ7FIfCISmZyWFLhcxkYjBIHMHPWJQHPqADQ9rZTIvOamgvKXymCm AJqH44Py/AVHczdCrWKufZzRke60MI8Cxf7D04bpVLkc3VeGZem1cmK3mNMc+uasjnWuWZ e19qlCboKpjnczLMafFJt/Pnp5dbILr74+NUzNxuhUIulKECmayyXALxojbwnhocS2NaMM l8MmEeRocCCLbVurqFo13cHTjJcflfIeVjszWyeaDwFUb/mhfHZRxpVPHgyFbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKXPq08rCzgV0; Wed, 17 Apr 2024 20:22: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 43HKM6d3094141; Wed, 17 Apr 2024 20:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HKM6r7094138; Wed, 17 Apr 2024 20:22:06 GMT (envelope-from git) Date: Wed, 17 Apr 2024 20:22:06 GMT Message-Id: <202404172022.43HKM6r7094138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: f276adc14843 - main - libcompiler_rt Makefile.inc: update _Float16/__bf16 checks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f276adc148433d009d198c2ebccdd3303377e237 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f276adc148433d009d198c2ebccdd3303377e237 commit f276adc148433d009d198c2ebccdd3303377e237 Author: Dimitry Andric AuthorDate: 2024-04-17 20:20:47 +0000 Commit: Dimitry Andric CommitDate: 2024-04-17 20:20:47 +0000 libcompiler_rt Makefile.inc: update _Float16/__bf16 checks Clang supports __bf16 for riscv from version 18.0 onwards, so update the checks for it. While here, rewrite the checks so they are hopefully more readable, and also handle gcc a little better. In addition, define COMPILER_RT_HAS_FLOAT16 and COMPILER_RT_HAS_BFLOAT16 when these features should be available, since there are some parts in compiler-rt that check for these defines. PR: 276104 MFC after: 1 month --- lib/libcompiler_rt/Makefile.inc | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index 47d87b71ea77..9aea0f2b051a 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -226,13 +226,36 @@ SRCF+= comparedf2 SRCF+= comparesf2 .endif +# Helper to reduce complexity of _Float16 and __bf16 statements below. +.if ${MACHINE_CPUARCH} == "aarch64" || \ + ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "arm" || \ + (${MACHINE_CPUARCH} == "i386" && !empty(MACHINE_CPU:Msse2)) +CRT_COMMON_F16_ARCH=t +.endif + +# +# _Float16 support, only on some architectures, and with certain compiler +# versions. +# +.if ((${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000) && \ + (defined(CRT_COMMON_F16_ARCH) || ${MACHINE_CPUARCH} == "riscv")) || \ + ((${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 120000) && \ + (defined(CRT_COMMON_F16_ARCH))) +CFLAGS+= -DCOMPILER_RT_HAS_FLOAT16 +.endif + # -# bfloat16 support, only used on some architectures. +# __bf16 support, only on some architectures, and with certain compiler +# versions. # -.if (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || (${MACHINE_CPUARCH} == "i386" && \ - !empty(MACHINE_CPU:Msse2)) || ${MACHINE_CPUARCH} == "riscv") && \ - !(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 130000) +.if ((${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000) && \ + (defined(CRT_COMMON_F16_ARCH))) || \ + ((${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 180000) && \ + ${MACHINE_CPUARCH} == "riscv") || \ + ((${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 130000) && \ + (defined(CRT_COMMON_F16_ARCH))) +CFLAGS+= -DCOMPILER_RT_HAS_BFLOAT16 SRCF+= truncdfbf2 SRCF+= truncsfbf2 .endif From nobody Thu Apr 18 13:58:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKzrs09fGz5Gvfg; Thu, 18 Apr 2024 13:58: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 4VKzrr6QZqz4PZ5; Thu, 18 Apr 2024 13:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713448716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Mrg+u767wimo0mjYnrqtFU74iwna7rmRR5utfpqUW0=; b=l+UJuwkmUyOFO5cpi3hHjhsugG8VlRjWn/y38iRW6wqcx1CCXV+RepVnl5GfOt6NGha8Hr ksbOtD4Z37gxIyWlhUjfqz2KBq5SDrC1LZ97mpsaYOb8PG6D18kPFCOYDebvAq7GM7yM7s zFVQiizCIIuKKneVat6Jx6l7cdCjHhdD5Z9xLmgd+j2Ng8EgZdGVTCJ1aOTSWPWwQoyrQp PLm3c4ErPAEeh6C1vL9VKz+A47mH8mpPm7SAlwl0N4kFUXfYa0o4/C36yUlTrKDnl+qDe3 hGzltE02J/2HWmE1AlnlKgzy098ELQPJUgpl4ZIT88QgAaKYd5dypitA0zE+kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713448716; a=rsa-sha256; cv=none; b=G1lJQsk+9NWvJGi5h/G6TdyvUPdoM2SndvsYRD3/H7fY3m2yFCi2gVndZOcHgAXDNhYwbc ko7ky6PuhOx32ia/27PAKlTnwGW7AjshZzYHElnrC427JhlI66uuUY9WzRBDbSY9L5EGXO blZtrjQURZ9Ri5XTpla2F/ZGTST9euQag2Q2v4riPkp6+cUn9HFGpJXBTAWjtjuezq922d j3d/YRjn5B+HfmdGPdDEWZensrhtYJWix4fhtar4ylFjL8XBDnRQLYKaMQMjUtEDxFuLFU XzLoGdT7hP4PTByOdN6hq5CrghEHcpPFJAj/HTkV0AbJJ4wmFEXejDoAH/snwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713448716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Mrg+u767wimo0mjYnrqtFU74iwna7rmRR5utfpqUW0=; b=dnGLNUUAj3+MwnqdIhUBFM16BowXOpXup51wA0VGCalvNBxoqyFM4dYPZaw3KzMvnNltpf 2KHNSn6s4L7YzmHCDytHy3Rr4+HNzYnIAXR0lnwoLvOtPhrIbSYwhBuvnoDFhDeQ91zVte fnEA4btxFZz0jK3vsVaV23mDrGij02OFrOJCZsibPebcBdkD/a1/nbfucw1G+DuLIHqg3r Pbq4/ogriW+B7/Ue1Ixjsf+T9lbhywFVL7tkFb3xxuYY+3ljFfXrNOMEavV5oSFXNCmp7/ l/IzjqO/VAZUuaCqihfvw59l6rgM3XoNOvqAZc3ZlVhPYBIrkqvoimtMFLpYqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKzrr5vm8z1Bq4; Thu, 18 Apr 2024 13:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IDwaGR076079; Thu, 18 Apr 2024 13:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IDwaXH076076; Thu, 18 Apr 2024 13:58:36 GMT (envelope-from git) Date: Thu, 18 Apr 2024 13:58:36 GMT Message-Id: <202404181358.43IDwaXH076076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: df1a09ba524d - main - libsys: expose a few more symbols for libc's use List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df1a09ba524d0f0927cd3e0a94fa223ae210912a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=df1a09ba524d0f0927cd3e0a94fa223ae210912a commit df1a09ba524d0f0927cd3e0a94fa223ae210912a Author: Brooks Davis AuthorDate: 2024-04-16 21:50:52 +0000 Commit: Brooks Davis CommitDate: 2024-04-17 22:39:46 +0000 libsys: expose a few more symbols for libc's use These private symbols are used by libc so expose as we do with auxargs bits rather then relying on duplicate implementations in libc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44114 --- lib/libsys/Symbol.map | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/libsys/Symbol.map b/lib/libsys/Symbol.map index 1a24998b1465..99cc171dd405 100644 --- a/lib/libsys/Symbol.map +++ b/lib/libsys/Symbol.map @@ -1,4 +1,13 @@ FBSDprivate_1.0 { __elf_aux_vector; + __getosreldate; + __realpathat; _elf_aux_info; + freebsd11_fstat; + freebsd11_fstatat; + freebsd11_getfsstat; + freebsd11_lstat; + freebsd11_stat; + freebsd11_statfs; + freebsd7___semctl; }; From nobody Thu Apr 18 13:58:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKzrt1jVxz5GvjK; Thu, 18 Apr 2024 13:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VKzrs73Xmz4PTK; Thu, 18 Apr 2024 13:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713448718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltp0oLy1Wj9v26ak64ptQVDOf9j5MvEfdz24cg8evao=; b=m5ValghbwhNbN6A+6tLpfltML6OjaA16d7kedQbia/AAFw9ZWTG9ouPysrQOr3fM8l81Cw HJGoeTZOCCJnUicVsPgP+EUnkEhz3J6XM8E3wLxAdZ0EawQef0tn6618A7uVSOKDGgH2D9 x0abtkccGtUuDlcOSmrF+YNn8LxCij52+myGXnYhQ9Zj2/D3j5SR25DZlJ8aHaJLJEVNMu Ybv/Bgl8TNjhLSxd839J8ArZ7rwXrE1KO6tcwjMvn0B9mG/Sss/382wevY5sFgbewbnXDm zQwTAZ/QEU+LBFAdrarrZ5ZAkiYGWrih44pZtyPzjcCEaWYMA91T+4Ipgmhcig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713448718; a=rsa-sha256; cv=none; b=PI/ft1i1yBIJatG+5ttEgFqkaceASZibS6uDGgo0ZoYjLkMAUUgwRK1Ols0Hkz7ErCQAZx Pgg7Yylk4l3YKMbQePwAWUftZgVPsnO2OlcKIrkABK1JcpOy+QkQ5SpHDkqImpaxmI7WnX IHyHmgIQKpvKrcwZubCAeRp5fLaOcwfnLhPLQKFc84zf770tfSfNMt8NAzPRjfqXhC2EPX KiNaqJoLDX+dt0ZMcNATAQzBu2USjALSAeig0ChtTWw71gLPWwtcIelb0Aq13HqtcnjEzN KMMgMAtWoGSG+ftQ5p9/WwVDAjgYLkJ4gUt/1TQ+FwpVbiXZIcHSsMCe98om+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713448718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltp0oLy1Wj9v26ak64ptQVDOf9j5MvEfdz24cg8evao=; b=x0rCJR6AKkLc7Shu7bdM3IEg4YQVY17LeVm8eO00EBAzST/s3zhh2eV0wBvIRJv2bEzlAM 8CZUczA0wRZje0F0eCjILUUGkn61tkT8LWp1qw7cv7U/0rF8uNn+2EYo5WW9zM6+N0XBsi QyE2R3sDX/lp3omjXtSMEoMO4UNkIPQoWNchJYktTGalGrce1InXvDJPF18IN1S5tnAKI4 9YihP60qXRSroB0PmWq9yGcp9gIp6lgKJpIY3wJKPPsDycQ4xDmPYy/7NuA4hQX7ZGyHGs zkgqCZXthkpshJi09a1tWDAe+hZWm+1+MqogRS9dYwQA7+l//M5YjnvHsJZlfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKzrs6gXgz1Bg8; Thu, 18 Apr 2024 13:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IDwbT0076132; Thu, 18 Apr 2024 13:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IDwbgd076129; Thu, 18 Apr 2024 13:58:37 GMT (envelope-from git) Date: Thu, 18 Apr 2024 13:58:37 GMT Message-Id: <202404181358.43IDwbgd076129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ee632fb9eb4a - main - lib{c,sys}: normalize export of openat, setcontext, and swapcontext List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee632fb9eb4a060a4087a7f5425bfe36e65cda61 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ee632fb9eb4a060a4087a7f5425bfe36e65cda61 commit ee632fb9eb4a060a4087a7f5425bfe36e65cda61 Author: Brooks Davis AuthorDate: 2024-04-16 22:26:29 +0000 Commit: Brooks Davis CommitDate: 2024-04-17 22:39:46 +0000 lib{c,sys}: normalize export of openat, setcontext, and swapcontext List them in the symbol map rather than using the __sym_default to expose them. This will allow later improvements in the stub implementations in libc.so. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44113 --- lib/libc/sys/openat.c | 1 - lib/libc/sys/setcontext.c | 1 - lib/libc/sys/swapcontext.c | 1 - lib/libsys/Symbol.sys.map | 4 ++++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/sys/openat.c b/lib/libc/sys/openat.c index 1cd8e7d90745..389360a5a9f5 100644 --- a/lib/libc/sys/openat.c +++ b/lib/libc/sys/openat.c @@ -37,7 +37,6 @@ __weak_reference(__sys_openat, __openat); __sym_compat(openat, __impl_openat, FBSD_1.1); __weak_reference(openat, __impl_openat); -__sym_default(openat, openat, FBSD_1.2); #pragma weak openat int diff --git a/lib/libc/sys/setcontext.c b/lib/libc/sys/setcontext.c index 96b5dc115067..301cca84c4f9 100644 --- a/lib/libc/sys/setcontext.c +++ b/lib/libc/sys/setcontext.c @@ -36,7 +36,6 @@ __weak_reference(__sys_setcontext, __setcontext); __sym_compat(setcontext, __impl_setcontext, FBSD_1.0); __weak_reference(setcontext, __impl_setcontext); -__sym_default(setcontext, setcontext, FBSD_1.2); #pragma weak setcontext int diff --git a/lib/libc/sys/swapcontext.c b/lib/libc/sys/swapcontext.c index b69a5b19e698..42793a516c70 100644 --- a/lib/libc/sys/swapcontext.c +++ b/lib/libc/sys/swapcontext.c @@ -38,7 +38,6 @@ __weak_reference(__sys_swapcontext, __swapcontext); __sym_compat(swapcontext, __impl_swapcontext, FBSD_1.0); __weak_reference(swapcontext, __impl_swapcontext); -__sym_default(swapcontext, swapcontext, FBSD_1.2); #pragma weak swapcontext int diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 822c007d32f1..359570c413a4 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -301,6 +301,8 @@ FBSD_1.2 { cap_getmode; getloginclass; getpagesizes; + openat; + pdfork; pdgetpid; pdkill; posix_fallocate; @@ -309,7 +311,9 @@ FBSD_1.2 { rctl_get_limits; rctl_add_rule; rctl_remove_rule; + setcontext; setloginclass; + swapcontext; }; FBSD_1.3 { From nobody Thu Apr 18 13:58:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VKzrv2jtDz5GvjQ; Thu, 18 Apr 2024 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VKzrv14yjz4PKM; Thu, 18 Apr 2024 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713448719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfzkiu4zdv2z87uJ0AUnApi36itbLKq4an6aMoVCtm4=; b=s29nLKcNy/cgqMBYna1DrP0m1HJGBtn1twN5yDB3ogz9g7b7zY8VORe30l58WOHt/+iuAi KdaL7YbDkpymUfomdsDXgrjeSNnLZ4GqcsUXAH7uc9I/wc0848RrI0X3S9T2lmfsNoKbGX QIHikW7aqJyK4tQPROTopDrsdAVqPHi+xQnppFAcuscGvYTxY8vKSxE1S5Z37Innmzq/f0 M2XjDfyXSEE1lHGfrLEsOdRYqgFCtfGcTKpb8bI73t+1zptan+zUiUayHRC3tp/GDDXzE0 1Gk9ohfuy5VJ/B0UyeLTMqo8T9mxcatuIdOPsoDC2kPl4vsmgbaztTI1ALtv6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713448719; a=rsa-sha256; cv=none; b=MwrysMjR2nalrd+c4bAItcBg9V8pDgIPPUVnjzfYPZ1CMXp1BtJEqpp8KwDBF3EexnOPHw Cow+iMM7vlRAVp3CvPTSr5bBHY26h3yGgu+J/yLKo5nH4dJkSaXjoP5nftoWEYAr2HBUGH +fX2PdiStECQklftcYsuR0iyZG3xwAF9PeWqt3yw1pIDbwWM6/bITfUMKbQ2mvowO8beV/ 3SBjlyoqKkI2d/0cJAE6BWUDt5xLWqOgXHgd/DybWFLFkSKVRTabOx7D/k1wUtnhHOO96v 6NQv4e/eFvsPkU9mFyualxcDT/3TacVml49gaeRKfmn0Klrv3RYfRmlDAbvsIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713448719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qfzkiu4zdv2z87uJ0AUnApi36itbLKq4an6aMoVCtm4=; b=Y+hWA/yqI/IWVB+3nNVf4fdxWhLnGK76RgWCUdKSN4ZM9DPhFRUyMO626QcyO7KVsIeTOy PQqbeNo70GwDzDihymAjhaASBxsYvo7XwN3GS7Efi1koAaXHuBiUEPs1HywR/07kuXFE1K e2waLcuPE+ddsODNJP9zkKUmfI6txD1DHelG683+XBpEsq2vjVintzE3IrIm9Pqn0/UUw2 Owts4ulF/rkYn8nDqvGLI/q+8ZOZNyulz19d9Xwiysr08RFcWa9iNJqGRLXcDRP30Iq0j9 DC66nB6rGMjm4ftCIH0QPxZhjT0CONHu78CtW3v4QG4hpw/rlu/cMz8xJpCXgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VKzrv0fGrz1Bg9; Thu, 18 Apr 2024 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IDwcqo076180; Thu, 18 Apr 2024 13:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IDwc0K076177; Thu, 18 Apr 2024 13:58:38 GMT (envelope-from git) Date: Thu, 18 Apr 2024 13:58:38 GMT Message-Id: <202404181358.43IDwc0K076177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 26a09db3add3 - main - Fix incremental build with WITH_NVME newly enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26a09db3add30238b99e3214c56a3aee63fd71d1 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=26a09db3add30238b99e3214c56a3aee63fd71d1 commit 26a09db3add30238b99e3214c56a3aee63fd71d1 Author: Brooks Davis AuthorDate: 2024-04-18 13:57:38 +0000 Commit: Brooks Davis CommitDate: 2024-04-18 13:58:17 +0000 Fix incremental build with WITH_NVME newly enabled rescue.mk doesn't get updated when options change so nvme_util.o is now missing on architectures were NVME was previously marked BROKEN. Reviewed by: imp Fixes: 2fda3ab0ac19 WITH_NVME: Remove from broken. Differential Revision: https://reviews.freebsd.org/D44826 --- tools/build/depend-cleanup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 71988e526369..a7b4f99cbc5f 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -228,3 +228,10 @@ if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depend.syscall.o ] && \ clean_dep lib/libsys syscall S clean_dep lib/libc syscall S fi + +# 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken +if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ + grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then + echo "removing rescue.mk without nvme_util.o"; then + rm -f "$OBJTOP"/rescue/rescue/rescue.mk +fi From nobody Thu Apr 18 14:17:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL0GZ6kHtz5Gxjm; Thu, 18 Apr 2024 14:17: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 4VL0GZ5qK4z4Vmw; Thu, 18 Apr 2024 14:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713449846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1ilhbWtH8Klc78mrzpTZZ0I9RjyTg3yueo491AAJb4=; b=mDkQ2U6B/r2E47vXoyPQvgrN+TUXCPIpCw4801dJ/4MMqm6ppaBZOG+lSARXCJfUXrQCYH 4/wbX+gvoFvICpblSsFJQMBwdb6AmoWUEiJdsmzY/DdYNlzPTNbfOUMWh3iqYxnEI6Ulmh Me6yRCs4LDLwQR5KBOGzHweSM6SuV0E75PbXNuGhlOryNIxwoxMijocXKTrzb4ZVjxPZKW egF9L6XKn0+QJET77A0uaB2iTNdnWk1RBKX0MGRspz+SyTthIL5KBaRpbcgonCX5rmgJ7L MMTMDYKyRCl+IblbHH/vivGU/QRzqbPvKMp+uGG5wAstShh9yWmKRajoYwof5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713449846; a=rsa-sha256; cv=none; b=Odut39k7Clw5bbO2m+UNTIANpkOWw/Rp5ynZiq833r6yYlLRP6lxO4C4FGGyexPYKaVBWb 2HV8W9SviYNoezXt9Ervd9bBHmIBxoYD+idPDeGcXw/9MrjFY/CAujBrj/bkQwdA7Eelpc raTGVtrCOidHeXrM3y3E7RdOPuXF3gMUec6/KxZ3lEe5m0/UlRS9zs2aCwDnSmXzW+OBwx hxANbPbqLfhEWvlWR6DOGzCgi4j7nlLUslMu2/x+Jc2ERfIufCMuHKvUyzj9WT6HH8dzfY Fw6r3IobP1XsxQjVpeWmhctYS+LCJI7DiKPt80736iEcnfywGbdfhujwLFV+EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713449846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1ilhbWtH8Klc78mrzpTZZ0I9RjyTg3yueo491AAJb4=; b=buqPTEF10/oakwBSkvUwLOy1mfRCEd/AoTDGtyLHJLQqh6u34TPbgaSHCG8KuQPEVs+svu BgHNqybuvO9qYez4iKINTOO698gkt12ykd1NVBxnIqOAisxfAduxW2EZm13tIbPCckPZ2e z6dhF5pXzNcRH4M4RpKWu/sbAIdB7g0hmAeb0ANe4Oii4E/H0GnCE24akhYW/BxfB0SjXD I+ShZq01nRbPv/p1xTL0cpdIELiYunEwhvOqPMQ9XEwC77/nJnSqZysXxVtO+UzAPO+yys 2Gn/VIf3kg/hyNs+6XgkoN8xTzsEQJgn2mb0qZizdbigYXicW2h8YNo9cRiPDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL0GZ56Sjz1CD7; Thu, 18 Apr 2024 14:17: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 43IEHQhK009952; Thu, 18 Apr 2024 14:17:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IEHQgJ009949; Thu, 18 Apr 2024 14:17:26 GMT (envelope-from git) Date: Thu, 18 Apr 2024 14:17:26 GMT Message-Id: <202404181417.43IEHQgJ009949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8ce3ef5f35fd - main - netpfil: Fix typos in source code comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ce3ef5f35fd4dc442b1a33605ca7d3132047faf Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8ce3ef5f35fd4dc442b1a33605ca7d3132047faf commit 8ce3ef5f35fd4dc442b1a33605ca7d3132047faf Author: Gordon Bergling AuthorDate: 2024-04-18 14:17:10 +0000 Commit: Gordon Bergling CommitDate: 2024-04-18 14:17:10 +0000 netpfil: Fix typos in source code comments - s/addres/address/ MFC after: 3 days --- sys/netpfil/ipfilter/netinet/ip_fil.h | 4 ++-- sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c | 2 +- sys/netpfil/pf/pf.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h index 909cdd8870e1..aa3d1de422db 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil.h +++ b/sys/netpfil/ipfilter/netinet/ip_fil.h @@ -591,8 +591,8 @@ typedef struct fripf { u_short fri_icmp; frtuc_t fri_tuc; - fr_atypes_t fri_satype; /* addres type */ - fr_atypes_t fri_datype; /* addres type */ + fr_atypes_t fri_satype; /* address type */ + fr_atypes_t fri_datype; /* address type */ int fri_sifpidx; /* doing dynamic addressing */ int fri_difpidx; /* index into fr_ifps[] to use when */ } fripf_t; diff --git a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c index 8f1ee3d8d05f..3bc74247251a 100644 --- a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c +++ b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c @@ -1834,7 +1834,7 @@ ipf_p_ftp_epsv(ipf_ftp_softc_t *softf, fr_info_t *fin, ip_t *ip, nat_t *nat, s++; /* - * As per RFC 2428, there are no addres components in the EPSV + * As per RFC 2428, there are no address components in the EPSV * response. So we'll go straight to getting the port. */ while (*s && ISDIGIT(*s)) { diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 4cec0936539e..cbf5ebfc0e56 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6196,7 +6196,7 @@ again: break; } - /* Only add the addres if we've actually allowed the state. */ + /* Only add the address if we've actually allowed the state. */ pf_sctp_multihome_add_addr(pd, &j->src, v_tag); if (! do_extra) { From nobody Thu Apr 18 14:18:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL0Hz3gVNz5GxgQ; Thu, 18 Apr 2024 14:18: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 4VL0Hz37qBz4WVK; Thu, 18 Apr 2024 14:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713449919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dlEpD0mAtPBq8bITio9sEVshbxM3Jo4GeEDKsv+164=; b=ENo8uhaAQ1rZQaDFCUiG/bdO1+SSnBdpgUxkejwuzIKSoCkffDAhLVD2+FbGWYN0Z6zGc8 eEUXJoWU7W66EOFODuTPSolhkS7xdbnvJckr8KeLB4OJk8dtp5rEk1NZOsEDBAjye1KaP5 KqnzOKx6xEKKsrq+vawqiR2/bNFm4+DagO2lQmQWyQJc3kWRxrv8KwcJS/VS1cKsXbJt+u BTO2AUECHntC+8EFpP9vYdNzXhPHQKZoeqlh9Dasa2QMEmWOGNIoyfpUzm9UTF3G4lTpR2 J/AZAG+J4yz+/gV5RafvUy8tfPsmwndyl0PRqIjQhI0sZwEPnl4aIhWWtW2ESg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713449919; a=rsa-sha256; cv=none; b=TZVLneS0ecSH+MBQcnf1VnCTp852pI+dEC4NIG41VQpQMgqaiedHNpIiWhe+JeQxaDnVdH KHUnujTaJ9BS6S6oArNEOslPNat9nRLTU+LwvK5UHYCQDAsugjxkpUthFAQ1OJ2OpLlmVC K6ZACq+DNOa/LJHlDyLxYbVdpxsi6I/Mm31Gx9r7jfe6OL8US4qU62fTZXUS+vmr5tceXP rIpTA3fByMt+MXRm/e0z2gd+/wrf2Gfv8GCjPI05OxGGXslTJ16dtX3cZTYbbG0c0eb0K/ f5FqDhjgeU8C278ALZ6gTtoUZKmS5ImrAs5e63YgQLalfU+D4Zl09kcfB6qOaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713449919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dlEpD0mAtPBq8bITio9sEVshbxM3Jo4GeEDKsv+164=; b=IKjYeKtiUAd1pIoGzobtHhuIoklkB7QhgS9CIhOQjQZ+b6mr7n4asi5UZ6vHJbn5BRGOwl 39XnMUI4EMAmJB4ePVnIZGL2oM5Xbr8rCRKu2buGc++M1PiqI1Q6BJpM0vi3VbXp/TL+/s uyIpt3Cg+57Xht/PdHqo/4SNE8QhvVnXAiDOyBjdmGQu4GFkGy0SWhCEQawKM8j55MEftG c9Kvw1VHhBDK9A/QKlHnwJiKrUhpQlnEqKRDONRD4KLezlgfoZcRqQW72jOFUDTbCvP3zh Qv2OxCh2g5/KtVHXoiOcMuruvXGuKQcSB3OlP/7/lAaYzRCwj44q97YJV7C1rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL0Hz2dvmz1CPK; Thu, 18 Apr 2024 14:18: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 43IEIdqG010260; Thu, 18 Apr 2024 14:18:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IEIdGo010257; Thu, 18 Apr 2024 14:18:39 GMT (envelope-from git) Date: Thu, 18 Apr 2024 14:18:39 GMT Message-Id: <202404181418.43IEIdGo010257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 046fe202e766 - main - muge(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 046fe202e76623988ac612b20047940b86dd373f Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=046fe202e76623988ac612b20047940b86dd373f commit 046fe202e76623988ac612b20047940b86dd373f Author: Gordon Bergling AuthorDate: 2024-04-18 14:18:26 +0000 Commit: Gordon Bergling CommitDate: 2024-04-18 14:18:26 +0000 muge(4): Fix a typo in a source code comment - s/addres/address/ MFC after: 3 days --- sys/dev/usb/net/if_muge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c index 0337d6ddbe18..dd4a89aa8b05 100644 --- a/sys/dev/usb/net/if_muge.c +++ b/sys/dev/usb/net/if_muge.c @@ -1811,7 +1811,7 @@ done: * muge_multicast_write * @sc: device's soft context * - * Writes perfect addres filters and hash address filters to their + * Writes perfect address filters and hash address filters to their * corresponding registers and RAMs. * */ From nobody Thu Apr 18 14:19:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL0Jx6l9sz5GxXr; Thu, 18 Apr 2024 14:19: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 4VL0Jx5z1Kz4X6D; Thu, 18 Apr 2024 14:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713449969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JlRSFKIEaXts+9u+QQIUXrcfNC4JGxYdvE9T8yXBfVY=; b=usp9elgaEkrvhjUCZzrL3qME4Yq6hU1v+Cq9kbwcKTA1FvZab55U1LC1tlMAjy5UYiTM74 +S5BHrBY+OPfU9Zpb9TBFog8N3bi4rkkEoO8dFwMUsH4HXq6oldawEiXXQ575TBrn6vxxc jkSkPQgdBmwZUhfhl1DMyEG4EbWw9zsD3ZwnTE+9e4bs6fPsUG/tw/KwO9h1fWm094OxNx ElsB6xIueZaXSf2XjmhbGedTN9bFo1r41TueJ1fvCT2C8tyAtL7yuJOJ++P6DYCwddHxHH GIevjYselt6o4f3fyb+UH5tNARxxKxqoOF6TEVORgPt9hEXxBYXPBSl3ZM5zkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713449969; a=rsa-sha256; cv=none; b=Nd1K7DzwCDVBf72LsKN2C1e0HN2M7skKbrVm9RooXV/oaQDeMVHCHK0LRWKARh2x7sShxH +eWvSgmnMC331XAmaMxFNbJ0kTrUriO0A9cPfE+1DALuvzys9OMwRSmyJGTpnwybFMF3ds jtsGsEfX5eDod9E3hWTxn9KQOyE9yh4XV3LqxTf9Pak9UKkvMWtntwjZW4lUMmWQOFrfhk tTVpITkEHnWqrknyLCUCvHEyu09sQ29bMY1byP1Lq4uvTSL3y/xpMU/2V1Te4q0YZLW6O1 3F7gtMgivYTrvh/qqCxQtOC+CXJli/g4n+TxXKDdkxkKsvG3keUX3aRdKbBr2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713449969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JlRSFKIEaXts+9u+QQIUXrcfNC4JGxYdvE9T8yXBfVY=; b=dMC/NfSntmmoiYbUoRepb9zwa3y7NEc44LSkcK5yLhu4Mzbb5MI17/Q9gUds1aAJoI24oy PW7LKEzCj9C5pHHlyobvieN3031bqgA6d8gbsempIHkY9MGWkNQVfzktwHS1hjFyCL2teC ASjIyOWBaMaJV09nNRlHEFkw+a10GJWuULuZmairCX4DJ9CQpy/acjuYwQtc1QpOVaZ46Y kteO77bjwNkL4vbj7OgfFdOED+99WXSBKNR5OTzNbZ6D4R5cQ6hlrYgG8kpaboIe0hJTWz EluHz+wNdTKwfqoqDxvMMkfd7Sa2wgjdjNj+SMOtDEmvMksROyw2ljMi91bJ/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL0Jx5TXbz1CTm; Thu, 18 Apr 2024 14:19: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 43IEJTr9010789; Thu, 18 Apr 2024 14:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IEJTRO010786; Thu, 18 Apr 2024 14:19:29 GMT (envelope-from git) Date: Thu, 18 Apr 2024 14:19:29 GMT Message-Id: <202404181419.43IEJTRO010786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: e991acd5d0f6 - main - oce(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e991acd5d0f60fe3c57acb452003c551194a758b Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e991acd5d0f60fe3c57acb452003c551194a758b commit e991acd5d0f60fe3c57acb452003c551194a758b Author: Gordon Bergling AuthorDate: 2024-04-18 14:19:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-18 14:19:18 +0000 oce(4): Fix a typo in a source code comment - s/addres/address/ MFC after: 3 days --- sys/dev/oce/oce_mbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/oce/oce_mbox.c b/sys/dev/oce/oce_mbox.c index 3717eb91d36b..a51798119761 100644 --- a/sys/dev/oce/oce_mbox.c +++ b/sys/dev/oce/oce_mbox.c @@ -471,7 +471,7 @@ oce_read_mac_addr(POCE_SOFTC sc, uint32_t if_id, goto error; } - /* copy the mac addres in the output parameter */ + /* copy the mac address in the output parameter */ mac->size_of_struct = fwcmd->params.rsp.mac.size_of_struct; bcopy(&fwcmd->params.rsp.mac.mac_addr[0], &mac->mac_addr[0], mac->size_of_struct); From nobody Thu Apr 18 14:24:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL0Qr09pqz5Gy50; Thu, 18 Apr 2024 14:24:36 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VL0Qq50VDz4ZG8; Thu, 18 Apr 2024 14:24:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id xNy9rv9W5drxExSgkrRzoY; Thu, 18 Apr 2024 14:24:34 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id xSgirgzNApsbgxSgjrjP9Q; Thu, 18 Apr 2024 14:24:33 +0000 X-Authority-Analysis: v=2.4 cv=Ff+Ux4+6 c=1 sm=1 tr=0 ts=66212d21 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=raytVjVEu-sA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=fLIEOv6QJ93joT2cqVAA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 0D0E6B76; Thu, 18 Apr 2024 07:24:32 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id D835626F; Thu, 18 Apr 2024 07:24:31 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Brooks Davis cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 26a09db3add3 - main - Fix incremental build with WITH_NVME newly enabled In-reply-to: <202404181358.43IDwc0K076177@gitrepo.freebsd.org> References: <202404181358.43IDwc0K076177@gitrepo.freebsd.org> Comments: In-reply-to Brooks Davis message dated "Thu, 18 Apr 2024 13:58:38 +0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 18 Apr 2024 07:24:31 -0700 Message-Id: <20240418142431.D835626F@slippy.cwsent.com> X-CMAE-Envelope: MS4xfEkfegDGALFcS5iIQWK+vp+eNSaJ3HAghCZp6x4YeEiwzs43tpy8s4nlgnEpuUkE2POxlkcRYQ7jOSNZ2rfbsHTy6SZ7NLHL6Q3QCI5Q2MBOsyqnaZI6 MFkAbwcPK3bXxw2j7zHs2E+Y4m/x8KvSUk2F2ZLOHy9FsuZKycDPhqqi5Sue4iIHJegADaWRujeGJlSdqQeEXncrHWxTsPDQIP7qaNm90aekiSJiu7R4ogGY YrmtvfhymH8fgXxTJWgGSy502HvuwmUx4OaBgIDRJBjOPqfdiPFg0ne2yKbpp+XCli++ymPjm0u4FjwxLPj48mf+3Ybx27TKEy6T5fuEuYw= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4VL0Qq50VDz4ZG8 In message <202404181358.43IDwc0K076177@gitrepo.freebsd.org>, Brooks Davis writ es: > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/src/commit/?id=26a09db3add30238b99e3214c56a3aee > 63fd71d1 > > commit 26a09db3add30238b99e3214c56a3aee63fd71d1 > Author: Brooks Davis > AuthorDate: 2024-04-18 13:57:38 +0000 > Commit: Brooks Davis > CommitDate: 2024-04-18 13:58:17 +0000 > > Fix incremental build with WITH_NVME newly enabled > > rescue.mk doesn't get updated when options change so nvme_util.o is now > missing on architectures were NVME was previously marked BROKEN. > > Reviewed by: imp > Fixes: 2fda3ab0ac19 WITH_NVME: Remove from broken. > Differential Revision: https://reviews.freebsd.org/D44826 > --- > tools/build/depend-cleanup.sh | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh > index 71988e526369..a7b4f99cbc5f 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -228,3 +228,10 @@ if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depe > nd.syscall.o ] && \ > clean_dep lib/libsys syscall S > clean_dep lib/libc syscall S > fi > + > +# 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken > +if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ > + grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then > + echo "removing rescue.mk without nvme_util.o"; then ^^^^ Stray "then" breaks the build. > + rm -f "$OBJTOP"/rescue/rescue/rescue.mk > +fi > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 18 14:59:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL1CZ2qVdz5H1xk; Thu, 18 Apr 2024 14:59: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 4VL1CZ2Cccz4fKx; Thu, 18 Apr 2024 14:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713452394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yHonQKysV7c25r5OVGhUtDi/6VnSQsdpG7dTk01bLRc=; b=NBb7du+QPXnzvrw25DuQCc044P13awFaReEutPZWYlsCe+P3jOHOkM0qDbOP5kAA0120qD 7FlqAFu4JS80LLgcYLI/N2POiS8HxG1nARh2pMatrCisO2tWI3MVSYRbf0GywDfDQglFKc /IJ6IpoUa9N0V4gB7GC4DTW95j/1rU11u3GTTNiV7PmmkqfTc9SJDvnAUSvfrGCP029W38 o92/p561/yBI0XaDg6txczelbdl7TAptVZxjw+e+S3KqkNqnGiBLTJdNRt9DfwttZskbGf 1rUSpWCusAm2wau4hramoKyugW6VnCHI+xGuVILtTkN/aUoYMbYHh6fINn0hYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713452394; a=rsa-sha256; cv=none; b=F985Ztnhzwxk7ujWhbC6gN+G/v+1edjnLTjEklZ9pXi9M8F64UodIVcicXVhsskAYqw49b dFxAA/i4EOpxFMyNvYot9AbD+dscHJNtHpAYWm5FXSARrqgyT+ROV0k2BPg/8IuhGtKlbW UwpgpnfkYYSddeJniXS9hXpLMNLm+EoMvlde7D68e4z+d8XD1uyBqG2AnoprIcw6SjEPoB zASwP+kGqCMXSBUqZuWleYeElyU6xHig0wMQsx6y5Pptk0Dj4IqJe66tFEKHLfi8I0FG9g 4LMScmFjWQavofPWnh1gm5FktcPuRxh+Tc3KjdMeI38LeDaodKVZYpe2TJsdmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713452394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yHonQKysV7c25r5OVGhUtDi/6VnSQsdpG7dTk01bLRc=; b=XvCqBm8EVph90NQKOs/0XPCX04LbYGslR8P9PX2M2J9V4A+CIns/qaEQikL14CPpsAqfwj Ab9VcpjKc3jsBQSZuAS9OlIKiFeGKnJmQzxoaQcQo70wuoSW6UTiaVz6XmlwVn2o+5EpT5 wVETG9oWcn5SqR3UI83XKkAn6hqvH3rSzhyaecy68cccQKvX5hv4xcCo+2HawGVIOmqcVz pXbvY0klilzDPcpovWa7M6il+IX4ymli29kb3w1kmICzTdVb11tiqVX4YOSX+ZfTzuVutx sH/H3gvRfSJOv315UMOjxgJb0Q1MWtMm4QGs0X/5DuAOUHKSlF/W9L2UlG/13w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL1CZ1pyHzDp4; Thu, 18 Apr 2024 14:59: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 43IExsdT077816; Thu, 18 Apr 2024 14:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IExsf5077813; Thu, 18 Apr 2024 14:59:54 GMT (envelope-from git) Date: Thu, 18 Apr 2024 14:59:54 GMT Message-Id: <202404181459.43IExsf5077813@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: a01c7081fef6 - main - vtnet: use CURVNET_SET() instead of CURVNET_SET_QUIET() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: a01c7081fef671bd59e9a597883e4c1cd1f16ad5 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a01c7081fef671bd59e9a597883e4c1cd1f16ad5 commit a01c7081fef671bd59e9a597883e4c1cd1f16ad5 Author: Gleb Smirnoff AuthorDate: 2024-04-18 14:58:00 +0000 Commit: Gleb Smirnoff CommitDate: 2024-04-18 14:58:00 +0000 vtnet: use CURVNET_SET() instead of CURVNET_SET_QUIET() We don't expect the VNET context to be set for virtqueue neither for taskqueue handlers. Suggested by: zec Fixes: 3f2b9607756d0f92ca29c844db0718b313a06634 --- sys/dev/virtio/network/if_vtnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 5b854ad6cbb7..9c14e688f364 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2086,7 +2086,7 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) VTNET_RXQ_LOCK_ASSERT(rxq); - CURVNET_SET_QUIET(if_getvnet(ifp)); + CURVNET_SET(if_getvnet(ifp)); while (count-- > 0) { struct mbuf *m; uint32_t len, nbufs, adjsz; From nobody Thu Apr 18 15:10:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL1Rh2by3z5H3FR; Thu, 18 Apr 2024 15:10: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 4VL1Rh1psmz4k8N; Thu, 18 Apr 2024 15:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713453024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4NjUK5ea2zQIbSINq8iotMrOFwtFBySowIWgJst1pg=; b=mf+kvwfEJys/gphGteShRrb0LmY64JwkqDxyEbL9q2EuYJ0emYQfyLSeT/Et9AEbK/vDu1 qtSMfmmmfSlSZ5IpIpaaZrS/OOnhQhyi6i1uPnjgXQJSSd67gBLqghpmivCwq6vXV0T2jf b9DoRx6DdHpuS//y0wKv4mJUEEFr7MJTUK7YNTXj2emPEvxDLDhQCA6HMycFpdwNrwUI7L ALrUJHx3EqgepIf4p9vD/dySLcR1VfKajToF2FfcfYCfihk/TZdDOYMJALraOy9neGqtV6 WVKGRFitBz3bHB1r7Z3zX2/aD9zWlLq3NOP4AYs7sxuq+AqaltxU+b7i9Cb0Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713453024; a=rsa-sha256; cv=none; b=oZsgr+bp6MhlqoZxStv6WHyExilTvzvCAfhFQaRRV/8KQu6DjTT8s7L5eua7lyC5hZEpHM 35zfb/dfxrn0C3NmQP3d6S8cI5Y4Z0vmtV5EUnwCz3nGAKj/NmO9J8JQFzPJGmB8RxC7Ao 65pioIwG4EtOE2wpzzxyk3vig6qLvSKZdye0xBxDnlrwVi1x/4zcEor2Zt+2HGzt0XjiIF +gV6+74J5RzbNli8biUBE6NDMJo+vD8nDnEenbRBQOjDDcYYDXERpXgt1R85B/MZgGVyWz 2j3V/gwG0fw/4QhyOhRLV26YzmwB5um4jmjw9bLuanM0D28qNGGirsGolFfSzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713453024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4NjUK5ea2zQIbSINq8iotMrOFwtFBySowIWgJst1pg=; b=JTFYiJ/LumbAXY0DICzVDmDiCbdtruIDtsqpiCi3MQnIw9lVXgEEVNmwLCmT6Urf5TbxrQ VR5tJUu73aog9F7+8ZbPdr1Sc8gAg3bKtw4wx/C8jnpnNf/uhBswvFxULtvUEmSwqiIrUq 3N/oSEdHSQQ0MkehrSi0czKS5uasonraZU6DTlyUOkIxS/pl2g7T7fs6WVBUfEk76CZv42 ltO4yn9MDNV7v+ldrs2ywqp/zDDUBv+Hs5SVz1DeyR9JWnz2nyqAWJGLtl422VAEHRCUs4 qpUgfFTH1mXqixcNYB3pGs4EudHQsN73zBdr/xa4gDQaQgOorvFWt9CbzgCgRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL1Rh1F8xzFTF; Thu, 18 Apr 2024 15:10: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 43IFAOSA004685; Thu, 18 Apr 2024 15:10:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IFAO0i004682; Thu, 18 Apr 2024 15:10:24 GMT (envelope-from git) Date: Thu, 18 Apr 2024 15:10:24 GMT Message-Id: <202404181510.43IFAO0i004682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: f7f570eb97c7 - main - tools: Remove stray "then" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7f570eb97c70bc7f545d79a96c3192181bb8dd1 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f7f570eb97c70bc7f545d79a96c3192181bb8dd1 commit f7f570eb97c70bc7f545d79a96c3192181bb8dd1 Author: Cy Schubert AuthorDate: 2024-04-18 14:31:13 +0000 Commit: Cy Schubert CommitDate: 2024-04-18 15:10:14 +0000 tools: Remove stray "then" Fixes: 26a09db3add3 --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index a7b4f99cbc5f..45f04c0ace73 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -232,6 +232,6 @@ fi # 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then - echo "removing rescue.mk without nvme_util.o"; then + echo "removing rescue.mk without nvme_util.o" rm -f "$OBJTOP"/rescue/rescue/rescue.mk fi From nobody Thu Apr 18 15:31:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL1vf5pVqz5H4tc; Thu, 18 Apr 2024 15:31:10 +0000 (UTC) (envelope-from brooks@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 4VL1vf5LCZz4qbV; Thu, 18 Apr 2024 15:31:10 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713454270; 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=9+dcmoWXbTb4/pnRUBaxURR9pnAsYgdSlYIJ/Nx5ifY=; b=uQwO8A1/dbxvg17OwCd+3D5kOPQbwgd6/DvJZpoB4cdpf3iR0eCUWJf2wYqgogye3uS67k dDjtS3pJtnWheicVwiNi/KCDIExLScb7qMMe/C2ESZ04SrJV8t/po/we8qvO6fXZGcyrWE yLbW2H7JZBSIByrkaXBX2WPkjM01c19CKtsGtaIquTIQZEIQlAmrwmqJoN8FvYYcyoJEhb gRfyiJOAKCmUyEu/gLmO8iivnmcOB22Pke6v4XyK5f/DvTXLOahLNmBa1ZwVZVofV9I3Ph b1mlj3u8jRY8ueA2trQQws7rd2y3X0INYyKnGL2R/0VMPUldzpz+Up47KuXZHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713454270; a=rsa-sha256; cv=none; b=QPE1rDuh6FmqYyA46Oj+OpKMuaCUu9U+ygyzH9t/KfZneSFTor34kVSJuh/dHD0fP39KWf 8OvChXWLOAhjU3/Huo1UNGhLTk3Od8PSMk4JL99K6ZWE7CyaY7MjpFgqUiZU0VkdR8YW/7 ugRYMfwuNy0bPonQbdu2vJ6gmVNRqo9SncAYD8MEpIpjP3GAKcohfj2GjWO/7ARyBJsR5p fPFobqWl7+PKyaOL81Nvt2NhIwa+YLDfa/E81j5nY4lb3mxaNkhDTwf+e7r4bu0gurCNs6 iat7M3jFA1DeEey8hSC5ZTal91S7UPRZQZroHcnGWNoYEIAGEH1zS3Sd+1iJoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713454270; 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=9+dcmoWXbTb4/pnRUBaxURR9pnAsYgdSlYIJ/Nx5ifY=; b=kk1ObHvgRz5XqfgSF7PXJB1SJQrfuagkH8viOSzKKHsLjGttmH/vqbqy+nmpZUZ2o+GfIE ndTMYJeB4sj5wf7duWo82vPW9OruOHMihyBe7vEoscrhnp64hlK1C1/L6vUCZt4nnG1v1p KIsoAVpVcdXHAMLb7mbAd7pozrEdVbH15e3V21KjIgB8plGO+57Lh1LIJx6He2wxO+rjyu djgMVC+5TXTZ+72DPMIOUejrLWeMCEJ0zCIYklaPAzexekHW2kJZNV+Xmm6Q8eOz+K7wGq ka0E0DFB0iBrmWHUenHXRnrMLEWuy/Z0oqBdIPEvaH8LFPvPGXXS8FgtZrnbdg== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VL1vf4dyGz1NJV; Thu, 18 Apr 2024 15:31:10 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id A16D13C019B; Thu, 18 Apr 2024 15:31:09 +0000 (UTC) Date: Thu, 18 Apr 2024 15:31:09 +0000 From: Brooks Davis To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f7f570eb97c7 - main - tools: Remove stray "then" Message-ID: References: <202404181510.43IFAO0i004682@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202404181510.43IFAO0i004682@gitrepo.freebsd.org> On Thu, Apr 18, 2024 at 03:10:24PM +0000, Cy Schubert wrote: > The branch main has been updated by cy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f7f570eb97c70bc7f545d79a96c3192181bb8dd1 > > commit f7f570eb97c70bc7f545d79a96c3192181bb8dd1 > Author: Cy Schubert > AuthorDate: 2024-04-18 14:31:13 +0000 > Commit: Cy Schubert > CommitDate: 2024-04-18 15:10:14 +0000 > > tools: Remove stray "then" > > Fixes: 26a09db3add3 Sorry about that. Last minute edit-o. :( Thanks, Brooks From nobody Thu Apr 18 15:35:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL20R3KLnz5H5Sv; Thu, 18 Apr 2024 15:35:19 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VL20R2FjHz4rBq; Thu, 18 Apr 2024 15:35:19 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id xSr2rn0382Ui5xTnCrNgkr; Thu, 18 Apr 2024 15:35:18 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id xTnBrhI3EpsbgxTnCrjYmU; Thu, 18 Apr 2024 15:35:18 +0000 X-Authority-Analysis: v=2.4 cv=Ff+Ux4+6 c=1 sm=1 tr=0 ts=66213db6 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=raytVjVEu-sA:10 a=y3olD_i8AAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=ESG3jicvP2s-inplwXwA:9 a=CjuIK1q_8ugA:10 a=2GdgqtpztZvaxdPX1XqS:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 2F23DCDC; Thu, 18 Apr 2024 08:35:17 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 27D73404; Thu, 18 Apr 2024 08:35:17 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Brooks Davis cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f7f570eb97c7 - main - tools: Remove stray "then" In-reply-to: References: <202404181510.43IFAO0i004682@gitrepo.freebsd.org> Comments: In-reply-to Brooks Davis message dated "Thu, 18 Apr 2024 15:31:09 -0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 18 Apr 2024 08:35:17 -0700 Message-Id: <20240418153517.27D73404@slippy.cwsent.com> X-CMAE-Envelope: MS4xfGIEd5nDlOOKCYJWfTR4GWO5A7xGClFvk7ANfG7slnuAFzRkZvGSVzGF3Da4kWLPOxD40mBUpBMHmtXP+RcCDYtCKY5EcqBVqu8DR9DafvIpAOs7pi50 zIREh9Eyo6O7hRV0xTqge6xvFSVI9cL3jUMqchdI9fuOxzrKUMCPFgOCOftybitJOv1fIjgXO5w5YkxNtHlj8bfqaCX9gHnUjasF7/7jQi/WWeOfDix1P+rh ZKezW4SIEyVyfUxbwkmmh8yRIenOBsaM6HXwYOhFjELA+hrlUTRnk9peGPM5kDgbxsc0XPcQl+Ikjm6GUPo7jXex46VEkipE+pv1vdp/QCIxMbA2JSBylvgu DNIRStos X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4VL20R2FjHz4rBq In message , Brooks Davis writes: > On Thu, Apr 18, 2024 at 03:10:24PM +0000, Cy Schubert wrote: > > The branch main has been updated by cy: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=f7f570eb97c70bc7f545d79a96c319 > 2181bb8dd1 > > > > commit f7f570eb97c70bc7f545d79a96c3192181bb8dd1 > > Author: Cy Schubert > > AuthorDate: 2024-04-18 14:31:13 +0000 > > Commit: Cy Schubert > > CommitDate: 2024-04-18 15:10:14 +0000 > > > > tools: Remove stray "then" > > > > Fixes: 26a09db3add3 > > Sorry about that. Last minute edit-o. :( > > Thanks, > Brooks NP. I do the same. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Apr 18 15:39:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL25J5wKqz5H5VX; Thu, 18 Apr 2024 15:39: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 4VL25J5MTYz4rpH; Thu, 18 Apr 2024 15:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713454772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O1XGp2D7j5VPrChUu8j+y2qhbCrnm+Opdp5/q1Mqwuc=; b=cXy8NuizQ0Vrq6SviJkV9vWXhTc6x+CsH8FfqutYblO1oUXeGeAAzDyewSw8OubvQcP6/y kj69s+FAggk9B03MXHkO3jGRbImDgsazyFIX4jl4Oae81V7iRRuHIscJbVPdLDtuTEwaUW VAsDSOg26AHp2Ghz357UM0rkYUoCayDRDJDK7qq0PUgcB1f2WO16dcs+EgueYT6a2OVpwa WzOVgYbfFkXmO3n087d24lM+DWt2SiSTbmU37tDZrARYBRYczIo/+hDVRFz2hlw5Tnmkzu jzmrTXpQCFQU7QWa5u+laZkx9lQ5KPUD7Vpxq5VOF+C8gY4mb53taXma9+Ksaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713454772; a=rsa-sha256; cv=none; b=em6N5y8BKjsjdmNgGUxcTVfnAJ0KyCRhNEolOJTE8Gh0opUe5vzqcHHFpQCVFtUsQWOS+b i6rLhw7B6DzIV9qo6eBgF8287WbTLKDCZtkf6f66AS9wsGZ16CQ7bxCzS4PBoW4m3uDzQ0 Cw6q07lHOeX0NWFzLYZaU+f6En3QuYLAwZDYU4+xIE6ec1AgpjT9UN8M6BRy7gFNCjlIKE 1oDcwKARgOSoRiA0VGOX8/NMkOpDFU3hk6ro334Fmw5TKR35gU4AuRQQh3rIVcLvm5Pjdk jvZ9JW4kkSZ3AWPpc6P0meDIJIyJKalB0hq37tj9op/fwQharbTqFDTpgTxdKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713454772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O1XGp2D7j5VPrChUu8j+y2qhbCrnm+Opdp5/q1Mqwuc=; b=VnedA0Dr8/3ZyCNJVG5TbioZWqW4ht1vYhh5H6tsuO3emF9oiMoUVlSVEidP0ccguer5tN nYezSNJdfHLU/CP7RxSMdGOXEcoji6/n1SIyv0lcJ7+U6JseQGUc5Emo5g7Ysqh3hNnYOd jM9qNkyq4ch3ozdYrdEHKendxsM2s98BsdzQIA6laEu4MDyDXzHh28XCYuVihFIOO9D2LJ evft2BSCBD2MTm4Tzw4Zh7O8Os9smxwNXBkqWSafUC5QFYiAZtCX8WaeL2gcF6ajonYaIa keraUxHcrUBmm4lRo/ptnFwBbDY8qoe+gFdkeVmBv2mW/9diH5tM1CmJXMRhHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL25J4rbwzG9D; Thu, 18 Apr 2024 15:39: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 43IFdWOY045927; Thu, 18 Apr 2024 15:39:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IFdWQo045924; Thu, 18 Apr 2024 15:39:32 GMT (envelope-from git) Date: Thu, 18 Apr 2024 15:39:32 GMT Message-Id: <202404181539.43IFdWQo045924@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: 464b1ab216d5 - main - dumpon: fix set but not used variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 464b1ab216d5f78054626524addf99f5c622da96 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=464b1ab216d5f78054626524addf99f5c622da96 commit 464b1ab216d5f78054626524addf99f5c622da96 Author: inkeliz AuthorDate: 2024-04-17 21:22:44 +0000 Commit: Mark Johnston CommitDate: 2024-04-18 15:39:16 +0000 dumpon: fix set but not used variable Signed-off-by: inkeliz Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1178 --- sbin/dumpon/dumpon.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index dd772ca75049..46652d8471eb 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -463,20 +463,23 @@ main(int argc, char *argv[]) struct diocskerneldump_arg ndconf, *kdap; struct addrinfo hints, *res; const char *dev, *pubkeyfile, *server, *client, *gateway; - int ch, error, fd, cipher; + int ch, error, fd; bool gzip, list, netdump, zstd, insert, rflag; uint8_t ins_idx; +#ifdef HAVE_CRYPTO + int cipher = KERNELDUMP_ENC_NONE; +#endif gzip = list = netdump = zstd = insert = rflag = false; kdap = NULL; pubkeyfile = NULL; server = client = gateway = NULL; ins_idx = KDA_APPEND; - cipher = KERNELDUMP_ENC_NONE; while ((ch = getopt(argc, argv, "C:c:g:i:k:lrs:vZz")) != -1) switch ((char)ch) { case 'C': +#ifdef HAVE_CRYPTO if (strcasecmp(optarg, "chacha") == 0 || strcasecmp(optarg, "chacha20") == 0) cipher = KERNELDUMP_ENC_CHACHA20; @@ -487,6 +490,11 @@ main(int argc, char *argv[]) errx(EX_USAGE, "Unrecognized cipher algorithm " "'%s'", optarg); break; +#else + errx(EX_USAGE, + "Built without crypto support, -C is unhandled."); + break; +#endif case 'c': client = optarg; break; From nobody Thu Apr 18 17:59:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL5Bv31CXz5HJBP; Thu, 18 Apr 2024 17:59: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 4VL5Bv0HVnz57ws; Thu, 18 Apr 2024 17:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713463175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StOUo7Yz3zaXRVsOieLA8kOTFhJNg4LJrWfZSiJ9Kmw=; b=h0GGPN8U8PUDWlE1FmjJBGz7KayCGNlWaOmGZZHIXrYIgwgJb4YDZXOkWoMAVFYg+gPOlS O1qokNemXg9LWAFhaTCO71hJgnlF2pWDA6kzuvezr+Lclrdo544NhZFo6Y8uv2xY3GJGhQ dpN+5Xxnr/Cqqz3B1ApnR7Vwn4Pm0qDwZUHgpRYGSVnznAl/h8nSyCT9+amdX/Xugm/ybT 5UQwunXyOKNhsZVm2XiTlU0zdrBPZFPr5X9FW9RU/Hh65N/9bogxk8ANEAhx7kJpX0sn0p ioo7NPIgQnkcuYsJPqg0ZD7vpMRsbe9f3wS/G6LkykZcVEqZ1x0gXVDWVsGDxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713463175; a=rsa-sha256; cv=none; b=aShC9Y7i9arb1jd0zbaX31gyeu5JrGXIB5F+H2R33Ossnge+wwQfUjoe/8mYtSOutYi7Vr VhU2INLQoHRR4VR4YOKPxzWYQoAzyq3QVhLvd2q7TQldOJLg4RlWEipQBhyT0roAqNGS4E T5dw+DKGR2x0FCSX1zqM5Rt95UaT8P/Azhz5gaodPnKGvLsKYKioyx/O/td8a5kSa+5M+5 ZhJqUMMMY7/9exh7hY8Js/y8FkkWewndu5nFGUWjzFV0zvE2pUg++I+jb7EcPpuSW4LzPz mm86xlmIEggAFu4mpTVIh18ZJ/m8hjTB3uC92/kyVXpBjFK7yhtvgNeWGjxNcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713463175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StOUo7Yz3zaXRVsOieLA8kOTFhJNg4LJrWfZSiJ9Kmw=; b=CFHUcQWOTv57GJ7xHczptRhjsgbNClgaPZzO3//NcNpp6e4DsxJsHSt9rHHf2/ozqTAUM7 415foryWh/OQfcfVm3pwN0y72VMhTbk2r872SEsr7AGTB5juk7AaSKsosNIQ/T+h4hC2go i4eQjSrvf81aATm6MvzjbnlOTEwcZxbHxF7etVa+PUm8uQ6iJJEsxDN2Bo81bI4UtS6zxP fmjWLcCDRKEo6v3Vxr/y/cFzH2w6puAE8Kk8NreuUzVB/2tKTdU485P5CH4RH2paoiptTc 6HPR3vu4q/6K6pNYjZuIbyTc87cJOOJ79yB7RwvSLxuWDiN8uiIi+PiWCIsDbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL5Bt70pFzKDp; Thu, 18 Apr 2024 17:59: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 43IHxYPb082041; Thu, 18 Apr 2024 17:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IHxY7g082039; Thu, 18 Apr 2024 17:59:34 GMT (envelope-from git) Date: Thu, 18 Apr 2024 17:59:34 GMT Message-Id: <202404181759.43IHxY7g082039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 9dfe484e126d - main - hier.7: polish entry to system manual List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dfe484e126d0e477a0d79b3f7a2350af9f5e025 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9dfe484e126d0e477a0d79b3f7a2350af9f5e025 commit 9dfe484e126d0e477a0d79b3f7a2350af9f5e025 Author: Alexander Ziaee AuthorDate: 2024-03-20 17:40:57 +0000 Commit: Mitchell Horne CommitDate: 2024-04-18 17:54:29 +0000 hier.7: polish entry to system manual Entries reworded to improve grammar or add keywords: - document description: substitute layout for index for first-glance - /etc/freebsd/update.conf - /usr/share/vi/ Entries that have been wordshuffled for brevity or consistency: - /{bin,libexec,nonexistent,sbin,tmp}/ - /boot/dtb/overlays/ - /boot/{defaults,efi,kernel,lua}/ - /usr/libexec/ - /var/{db,games,lib,log/{bsdisks.log,spool/,tmp/}} - /usr/share/sysroot/VERSION/MACHINE.MACHINE_ARCH/ (unfold a little) - /usr/local/share/doc/freebsd/ (unfold a little) Entries that have macro or linking adjustments: - /{boot,boot/efi,dev,etc,home,sbin,usr/bin}/ (overview or intro pages) - /media/ (bsdisks is from ports, but afaik pulled by every desktop) - /usr/share/{lib/,lib/dtrace/,libdata/games/,man/}/ (intro pages) - /var/log/messages (syslog(3) -> syslogd(8)) Entries that have been added: - /dev/{cuaU0,vmm,zvol}/ - /usr/share/{atf,bhyve}/ - /usr/share/libexec/hyperv/ (thanks @rtprio) - /local// - /var/log/debug.log (thanks @pauamma) - /var/spool/{lock,lpd} Please forgive my earlier mistakes fixed in this commit: - /{dev,/usr/share/{calendar,misc}} : accidentally reverted description - /etc/local-unbound.conf/ (wrong link) - /usr/{freebsd-dist,lib32,libdata},/var/log/{dmesg.today,lpd-errs} (typos) - /{usr/libdata/gcc/,var/log/bsdisks.log} (removed, unnecessary) PR: 261349 Reviewed by: mhorne MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1131 --- share/man/man7/hier.7 | 207 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 123 insertions(+), 84 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 8cd6ff338b5c..7d164b5683d6 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,12 +28,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 21, 2024 +.Dd April 18, 2024 .Dt HIER 7 .Os .Sh NAME .Nm hier -.Nd layout of +.Nd index of .Fx file system hierarchy .Sh DESCRIPTION @@ -44,15 +44,18 @@ root directory of the file system .Fx copyright information .It Pa /bin/ -user utilities fundamental to both single and multi-user modes +fundamental +.Bx +user utilities; see +.Xr intro 1 .It Pa /boot/ programs and configurations used during .Fx -bootstrap +.Xr boot 8 .Pp .Bl -tag -width "loader.conf.d/" -compact .It Pa defaults/ -default bootstrap configuration files; see +default boot configuration files; see .Xr loader.conf 5 .It Pa device.hints kernel variables for controlling drivers; see @@ -65,14 +68,18 @@ and .Pp .Bl -tag -width "overlays/" -compact .It Pa overlays/ -compiled flattened device tree (FDT) overlays; these can be applied using the +compiled +.Xr fdt 4 +overlays; see .Va fdt_overlays -setting in +in .Xr loader.conf 5 .El .Pp .It Pa efi/ -mount point for EFI System Partition (ESP) on UEFI systems +the +.Xr uefi 8 +EFI System Partition (ESP) mount point .It Pa firmware/ loadable binary firmware kernel modules .It Pa fonts/ @@ -84,9 +91,8 @@ and beastie boot menu images; see .Xr loader_lua 8 .It Pa kernel/ -pure kernel executable -.Pq the operating system loaded into memory at boot time -and kernel modules; see +.Fx +kernel and modules; see .Xr kldstat 8 .It Pa kernel.old/ alternative kernel and modules @@ -97,7 +103,7 @@ boot loader configuration; see .Xr loader.conf 5 configuration files .It Pa lua/ -scripts for kernel bootstrapping final stage; see +scripts for the Lua boot loader; see .Xr loader_lua 8 .It Pa modules/ third-party loadable kernel modules, such as those installed with @@ -119,7 +125,9 @@ default location for compatibility run-time .El .It Pa /dev/ -device special files managed by +device nodes and special files; see +.Xr intro 4 +and .Xr devfs 5 .Pp .Bl -tag -width "loader.conf.d" -compact @@ -129,12 +137,15 @@ first ATA storage device first partition on ada0 .It Pa cd0 first optical drive +.It Pa cuaU0 +first USB serial port; see +.Xr cu 1 .It Pa da0 first SCSI storage device .It Pa da0s1 first partition on da0 .It Pa dri/ -GPU character device node; see +GPU character device nodes; see .Xr drm 7 .It Pa drm/ GPU @@ -157,7 +168,8 @@ infinite loop that accepts anything and contains nothing .It Pa nvd0 first NVMe storage device using NVMe namespaces .It Pa pts/ -pseduo-terminals +pseduo-terminals; see +.Xr pts 4 .It Pa random source of weak randomness; see .Xr random 4 @@ -165,12 +177,20 @@ source of weak randomness; see first tape drive .It Pa usb/ USB busses +.It Pa vmm/ +active +.Xr bhyve 8 +virtual machines +.It Pa zvol/ +.Xr zfs 8 +volumes .El .It Pa /entropy provides initial state to RNG; see .Xr save-entropy 8 .It Pa /etc/ -system wide configuration files and scripts +base system configuration files and scripts; see +.Xr intro 5 .Pp .Bl -tag -width "freebsd-update.conf" -compact .It Pa auto_master @@ -197,7 +217,7 @@ boot time device configuration configuration for .Xr dma 8 .It Pa freebsd-update.conf -configuration for the base system updater +configuration for the base system updater; see .Xr freebsd-update 8 .It Pa fstab static filesystem configuration; see @@ -214,7 +234,7 @@ local timezone information; see .Xr ctime 3 .It Pa jail.conf.d/ .Xr jail 8 -startup scripts. +startup scripts .It Pa login.conf login class capability database; see .Xr login.conf 5 @@ -275,7 +295,7 @@ DNS configuration; see .It Pa resolvconf.conf DNS configuration manager configuration, often generated by local-unbound; see -.Xr local_unbound 8 +.Xr local-unbound 8 or .Xr resolvconf 8 .It Pa security/ @@ -300,11 +320,11 @@ client wifi configuration; see .El .It Pa /home/ home directories for users; the typical home for an interactive user -.Dv beastie +.Va beastie would be .Pa /home/beastie/ .It Pa /lib/ -system libraries that are critical to binaries in +system libraries critical to binaries in .Pa /bin and .Pa /sbin @@ -320,16 +340,18 @@ vendor-specific libraries to extend the utility .El .It Pa /libexec/ -system utilities that are critical to binaries in +system utilities critical to binaries in .Pa /bin and .Pa /sbin .It Pa /media/ mount points for removable storage media such as CDs, DVDs, and USB drives; see -.Xr automount 8 +.Xr automount 8 , or .Xr bsdisks 8 +if a using a desktop environment from +.Xr ports 7 .It Pa /mnt/ empty directory commonly used by system administrators as a temporary mount point @@ -338,8 +360,7 @@ automounted NFS shares; see .Xr auto_master 5 .It Pa /nonexistent/ a non-existent directory; -by convention, it serves as a home directory -for special user accounts +by convention, it serves as a home directory for user accounts that need no home directory; see also .Pa /var/empty/ .It Pa /proc/ @@ -351,33 +372,37 @@ statically linked programs for emergency recovery; see .It Pa /root/ home directory of the root user .It Pa /sbin/ -system programs and administration utilities -fundamental to both single and multi-user modes +fundamental +.Bx +system administration utilities; see +.Xr intro 8 .It Pa /tmp/ -temporary files that may be removed by -.Xr rc 8 ; -see the +temporary files commonly removed between system reboots; +see .Va clear_tmp_enable -variable of +in .Xr rc.conf 5 .It Pa /usr/ contains the majority of user utilities and applications .Pp .Bl -tag -width "freebsd-dist/" -compact .It Pa bin/ -common utilities, programming tools, and applications +common utilities, programming tools, and applications; see +.Xr intro 1 .It Pa freebsd-dist/ distribution files -.Pq like base.txz ; see +.Pq like base.txz ; +see .Xr release 7 and .Xr bsdinstall 8 .It Pa include/ standard C include header files .It Pa lib/ -shared and archive +shared and .Xr ar 1 Ns -type -libraries +libraries; see +.Xr intro 3 .Pp .Bl -tag -width Fl -compact .It Pa clang/ @@ -388,7 +413,8 @@ shared libraries for compatibility .It Pa debug/ standalone debug data for the kernel and base system libraries and binaries .It Pa dtrace/ -DTrace library scripts +.Xr dtrace 1 +library scripts .It Pa engines/ OpenSSL .Pq Cryptography/SSL toolkit @@ -401,7 +427,7 @@ shared libraries for internationalization .El .Pp .It Pa lib32/ -32-bit comparability libraries +32-bit compatibility libraries .It Pa libdata/ miscellaneous utility data files .Pp @@ -414,8 +440,9 @@ collections of compiler and linker flags for the .Xr pkgconf 1 development tool .El +.Pp .It Pa libexec/ -system daemons and utilities that are executed by other programs +system daemons and utilities executed by programs .Pp .Bl -tag -width "bsdinstall/" -compact .It Pa bsdconfig/ @@ -432,7 +459,7 @@ profiles for utilities called by .Xr fwget 8 .It Pa hyperv/ -??? +scripts for communicating with the Hyper-V hypervisor .It Pa lpr/ utilities and filters for the line printer system; see .Xr lpr 1 @@ -451,26 +478,36 @@ Z file system utilities .El .Pp .It Pa local/ -default destination for local executables, libraries, etc, installed by +local executables, libraries, etc, installed by .Xr pkg 7 or .Xr ports 7 .Pp -within -.Pa local/ , -the general layout sketched out by -.Nm -for -.Pa /usr -should be used ; exceptions are the ports documentation -.Po in -.Pa share/doc// Ns Pc , -and -.Pa /usr/local/etc -.Po mimics -.Pa /etc Ns Pc -.Pp .Bl -tag -width Fl -compact +.It Pa bin/ +local user utilities, see +.Xr intro 1 +.It Pa etc/ +local program configurations +.It Pa include/ +local library headers +.It Pa lib/ +local libraries +.It Pa lib32/ +local 32-bit compatability libraries +.It Pa libdata/ +local utility data files +.It Pa libexec/ +utilities executed by local utilities +.It Pa man/ +local manual pages; see +.Xr man 1 +.It Pa sbin/ +local administration utilities +.It Pa share/ +local architecture-independent files +.It Pa share/doc/ +local documentation .It Pa share/doc/freebsd/ articles, books, FAQ, and handbooks available from the .Fx @@ -487,13 +524,20 @@ from source; see ports collection; see .Xr ports 7 .It Pa sbin/ -system daemons and utilities meant for user execution +system daemons and utilities meant for user execution; see +.Xr intro 8 .It Pa share/ architecture-independent files .Pp .Bl -tag -width Fl -compact +.It Pa atf/ +scripts for the Automated Testing Framework; see +.Xr ATF 7 +.It Pa bhyve/ +.Xr bhyve 8 +keyboard mappings .It Pa calendar/ -a variety of pre-fab calendar files; see +system-wide calendar files; see .Xr calendar 1 .It Pa certs/ TLS certificates for @@ -522,7 +566,8 @@ firmware images loaded by userland programs .It Pa games/ ASCII text files used by .Bx -heritage games +heritage games, see +.Xr intro 6 .It Pa keys/ known trusted and revoked keys .Pp @@ -538,9 +583,10 @@ and localization files; see .Xr setlocale 3 .It Pa man/ -system manual pages +system manual pages; see +.Xr man 1 .It Pa misc/ -miscellaneous system-wide ASCII text files +miscellaneous system-wide files .Pp .Bl -tag -width Fl -compact .It Pa ascii @@ -606,7 +652,7 @@ console screen maps files necessary for the -sysroot compiler/linker argument to build non-native binaries .Pp -.Bl -tag -width Fl -compact +.Bl -tag -width "VERSION/" -compact .It Pa VERSION/ files for .Fx @@ -616,9 +662,7 @@ by convention, matches .Xr uname 1 .Fl r -.Pp -.Bl -tag -width Fl -compact -.It Pa MACHINE.MACHINE_ARCH/ +.It Pa VERSION/MACHINE.MACHINE_ARCH/ represent the binary ABI for these files; .Dq MACHINE matches @@ -629,15 +673,15 @@ matches .Xr uname 1 .Fl p .El -.El .Pp .It Pa tabset/ tab description files for a variety of terminals; used in the termcap file; see .Xr termcap 5 .It Pa vi/ -localization support and utilities for +localization support and utilities for the .Xr vi 1 +editor .It Pa vt/ files used by the system console; see .Xr vt 4 @@ -735,7 +779,7 @@ crontab files; see .El .Pp .It Pa db/ -miscellaneous automatically-generated system-specific database files +autogenerated system-specific database files .Pp .Bl -tag -width "freebsd-update/" -compact .It Pa etcupdate/ @@ -754,14 +798,14 @@ used for instance by .Xr sshd 8 for privilege separation .It Pa games/ -miscellaneous game status and score files for +status and score files for .Bx heritage games .It Pa heimdal/ Kerberos server databases; see .Xr kdc 8 .It Pa lib/ -holds state information for applications ported from linux +state information for ported Linux applications .It Pa log/ system log files .Pp @@ -770,8 +814,7 @@ system log files .Xr Xserver 1 log, if .Xr X 7 -is installed -rotates to +is installed rotates to .Pa Xorg.0.log.old .It Pa aculog serial line access log; see @@ -780,11 +823,6 @@ serial line access log; see system authentication log .It Pa bsdinstall_log system installation log -.It Pa bsdisks.log -FreeDesktop.org automounter log, if a desktop environment is using -.Xr bsdisks 8 , -from -.Xr ports 7 .It Pa cron scheduled task log; see .Xr cron 8 @@ -796,20 +834,19 @@ default log for system daemons .It Pa devd.log default log for device state change daemon .It Pa dmesg.today -system message buffer log -Rotates to +system message buffer log, rotates to .Pa dmesg.yesterday .It Pa debug.log -??? +undiscarded debug syslog messages .It Pa lpd-errs -logs for the line printer daemon; see +logs for the line printer spooler daemon; see .Xr lpd 8 .It Pa maillog .Xr sendmail 8 log, rotates and compresses to maillog.0.bz2 .It Pa messages general system log; see -.Xr syslog 3 +.Xr syslogd 8 .It Pa mount.today currently loaded .Xr fstab 5 , @@ -879,7 +916,7 @@ information about other systems on the local network; see and .Xr ruptime 1 .It Pa spool/ -miscellaneous printer and mail system spooling directories +printer and mail system spooling directories .Pp .Bl -tag -width "clientmqueue/" -compact .It Pa clientmqueue/ @@ -894,7 +931,10 @@ undelivered mail queue for Mail Agent; see .Xr dma 8 .It Pa lock/ -??? +serial device locks; see +.Xr uucplock 3 +.It Pa lpd/ +line printer spooler daemon spool .It Pa ftp/ ftp root directory; see .Xr ftpd 8 @@ -906,8 +946,7 @@ line printer spooling directories .El .Pp .It Pa tmp/ -temporary files that are not removed between system reboots by -.Xr rc 8 +temporary files not removed between system reboots .Pp .Bl -tag -width "vi.recover/" -compact .It Pa vi.recover/ From nobody Thu Apr 18 17:59:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL5Bw2x5nz5HJR1; Thu, 18 Apr 2024 17: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 4VL5Bw1HBXz57jN; Thu, 18 Apr 2024 17: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=1713463176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=75oM1RLjqecDSQ8RBFL3cyipg7CeSTVGhLDaeTTXFbE=; b=DFa54znuCsar/8FO4WE7CgzsMvkbJBMBrUiGVHOYi2B3t4+al2pkBx2yGYDgewQMBYmbPP TKNNWq9485ZCJMnKGKpsvGFnuWh8pbCQwI60xfq4fuHE74VLv74/kOlfDW1okIgvpVbEny 0393mUSpEwYk6PDhT1gnEXh6SjWPUPuWd0YcRW3YuYsvNIOuuELmNyenA0/P5dgT5APtO8 DCRd9eGAbkrSGt7CuEjvwBwmESmKx6uzh7B1PpxJm4V30WfvQQ36uVowbdtksep9VHpbvo GlMWSdDfvASaO+vCN7g2B1FRy8Mvsl9lT3MnjlznScRFZiqOq0xiNr/2XvYZaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713463176; a=rsa-sha256; cv=none; b=Sc0ILbkGpwq6XRMqBlsTjPxwkY60EFvuxl8GJoM+1zfBki0I3RHumij5F9hZOE1kQz2hJ4 ZLSwiZo7g37iUjTBvBvyVXAqr56k0qDZWrGwdhfib0esv55wWoMSFtNVJ2fXkWkZH1FCUi 0T0b+UmePYNBF8xpuIu5+Cu402jA5MYIR3wT+WGr+AS+1uJDYtLuFNrxA9YZpiYwyBSGNB 2lUd38gMY1xky0PapEitsE6Ol77k1DCL1CKAoeBnz2QFEulJV4vRZzdRTHijHBO78359K8 +QB8dpPUr/flqIsg7ef2fcinlptE7Lg7HLcKTd7Qfz7iu+JySKtYo9pB/6bsiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713463176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=75oM1RLjqecDSQ8RBFL3cyipg7CeSTVGhLDaeTTXFbE=; b=WfX+ZjwOJPRa+BPvGZO0+N+WQ4NxGd2kMWuIG3U9C9HXtRMgHxHP917lDriDzCLA5XdSGO 9VcTtLe8rw284OqfD2CTxwR8rvoLu7TRVsIsNXRu0oADi0pzAOZDYF8Sb5hNYzANFCMG+1 gXVNDdxLVI8Khxk4mT/PPO26po7o4hsy5vlgYWHLr2U4Syo7ghGoEX+C2hDaVvu03Vh3er NqEL0y1vJ/zrm6rZQlZzImdZ0TUKmiISECwUTVA9MmYvxmDY7++qT3jufAlzprhR5ffQ5I OyR/NSFKbaepNajiRQ5o7r+I+QdONjsbzGn+9qz5a/UyWEVMupzpQGAkmG09zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL5Bw0tmZzKDq; Thu, 18 Apr 2024 17: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 43IHxalQ082089; Thu, 18 Apr 2024 17: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 43IHxajn082086; Thu, 18 Apr 2024 17:59:36 GMT (envelope-from git) Date: Thu, 18 Apr 2024 17:59:36 GMT Message-Id: <202404181759.43IHxajn082086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: f115e03a47b9 - main - intro(7): add link to new networking(7) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f115e03a47b971ac639568dd5f349569527b8782 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f115e03a47b971ac639568dd5f349569527b8782 commit f115e03a47b971ac639568dd5f349569527b8782 Author: Mitchell Horne AuthorDate: 2024-04-18 17:58:33 +0000 Commit: Mitchell Horne CommitDate: 2024-04-18 17:58:33 +0000 intro(7): add link to new networking(7) It improves the discoverability of the page. Sponsored by: The FreeBSD Foundation --- share/man/man7/intro.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/intro.7 b/share/man/man7/intro.7 index 56aa2ed55f6f..a155839bde64 100644 --- a/share/man/man7/intro.7 +++ b/share/man/man7/intro.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 19, 2020 +.Dd April 18, 2024 .Dt INTRO 7 .Os .Sh NAME @@ -65,6 +65,8 @@ file system hierarchy in .Fx .It Xr hostname 7 host name resolution description +.It Xr networking 7 +network connection quickstart guide .It Xr release 7 layout of .Fx From nobody Thu Apr 18 18:02:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL5Gq0XG7z5HJPZ; Thu, 18 Apr 2024 18:02: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 4VL5Gp71Npz59PL; Thu, 18 Apr 2024 18:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713463378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ij7Og7mwnwZdEm8Ut+hSqS7/CTU5Bl1CkJdrNz1UJ6c=; b=TV+b1UsJRCC5+ncVfbLz4ij4USZH1MfnKjRGFdK6CDQcWsQJl19mxazdVZVNK24+u1rHvw b6tpa7qLgq4rnD5NuZjliCMNxbBad5CfLUufBBSN2GnzKvc8cSvYHPMCEdA68G/XsU2lpV XEVo21zyPyOgPnrwlVlIUjY4TRAbszDZGjnyMwYUTObW59bM7BQfDYOEiY1ay4gHyyPWJZ N09Thb4EMeLWdeOIzTX4cBMIzV6LQkmSqnM2+L5ZtbkRCs0oLji+RNQARdlYxBnyKn1gJS ZQ2Cod7WCLaYrNIskiKDebqeEQw+vreMG/rKplZXY+S8erOiKuUAto2AdlErjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713463378; a=rsa-sha256; cv=none; b=QNIrMHSbtDuGFXqgSm9grHyhYk6OWRcZ0xKTXSIaX37q7IqfDMGyoC9AKwwZaBc+QO7p1B ABPyr0ZpOLZNbke8NHGgqeuJn+1ihv+Ps/VA85TSTOrXu+v351O82VJvCE2MfDAWfLOZU2 cUyHyOHkYQohq/4S3JJokbg3OCabHhhcn13PQQhdPM6A11cD+72PQbPo6Y3hlJbwRZZJuB 08y9GPPAQ+WnIVDNXvEiBPLdPi0iRWIsPmm9ad2QTXlDtu2kP+ercHBF5F0jxYOeHEpyjN pwuxWtH1nyr43eG0zFPHI4kJwRqKhyVCvSHq+H23KOznjmGUzbwgwj/fHOf9uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713463378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ij7Og7mwnwZdEm8Ut+hSqS7/CTU5Bl1CkJdrNz1UJ6c=; b=SSktwr+qnK8+8TCqIfPRa3P37Br+nCcBeEvrOhocnWdYjFdTd1Ymc7kFHlHL1Qe5pAmMRC 92RmKtqeiyLm6F1DvlJFr/fSXJ411e/AOBp2JkdLYJHa3ih61dzHFDUX+Cuh7fIpzZRpNt e1gTpemKIQTT4xMoKOM7S39BsI64ukMPBoDvI865WkZ9GeeNjeWs/1F+1T5KFZjTRvL8uH KXpHWzXkBTQf9a3P9/1yHQ6jK/FcdcS6cJiO/OrHNJKjqUVqeTKdl9tMKyALl/4rzLLvik TrYwwjBYQgAs4DEmM/EUBU5BxwCXLDGc/K+hsViSLkCyt3obHp5pZ/i9BooFZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL5Gp6ckqzKFj; Thu, 18 Apr 2024 18:02: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 43II2wbI099567; Thu, 18 Apr 2024 18:02:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43II2w5Y099564; Thu, 18 Apr 2024 18:02:58 GMT (envelope-from git) Date: Thu, 18 Apr 2024 18:02:58 GMT Message-Id: <202404181802.43II2w5Y099564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: cb9d4bb1fbb9 - main - Add preliminary in-tree CI infrastructure for developers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb9d4bb1fbb9ac0eb9f211656e91f9d5254c166c Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=cb9d4bb1fbb9ac0eb9f211656e91f9d5254c166c commit cb9d4bb1fbb9ac0eb9f211656e91f9d5254c166c Author: Muhammad Moinur Rahman AuthorDate: 2024-04-18 17:57:38 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-04-18 18:02:24 +0000 Add preliminary in-tree CI infrastructure for developers The goal of this project is to integrate the relevant scripts from the FreeBSD-CI project (https://github.com/freebsd/freebsd-ci) into the src repository. This allows developers to run the test suite similar to how it is executed on ci.freebsd.org, and eventually, have it directly used by our CI system. This effort is also part of the workflow improvement project, aiming to incorporate pre-merge testing. Current Features: * Does smoke tests using either bhyve(amd64 only) or qemu(Non x86_64 or when defined USE_QEMU=1). Currently defined CITYPE=smoke. Once we have added full tests we can also utilize something like CITYPE=full * Most of the resources are dynamically allocated based on available resources in the host * If CPU supports POPCNT or vmm can be loaded then bhyve is used for amd64 otherwise automatically installs and uses qemu@nox11 * When required third party applications or packages for booting non-x86 images are automatically installed Current Limitation: * Does not support full tests like the one in our Jenkins * At this moment this is also not suitable to be used in our Jenkins platform as the jobs are divided in multiple smaller tasks and artifacts are moved here and there which are not exactly the scenario for individual developers. Future Works: * Add full tests like the one in ci.freebsd.org * Add different tests or options to disable some tests * Add test profiles full * Possibly add test through Cloud Providers like AWS/GCP/Azure or Cirrus or Github Actions * Update documentation Test Plan: cd /usr/src/tests/ci make ci make TARGET=amd64 TARGET_ARCH=amd64 ci make TARGET=amd64 TARGET_ARCH=amd64 USE_QEMU=1 ci make TARGET=arm64 TARGET_ARCH=aarch64 ci make TARGET=powerpc TARGET_ARCH=powerpc64 ci make TARGET=powerpc TARGET_ARCH=powerpc64le ci make TARGET=riscv TARGET_ARCH=riscv64 ci Reviewed by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43786 --- tests/ci/Makefile | 210 ++++++++++++++++++++++++++++++++++++++++++ tests/ci/Makefile.aarch64 | 29 ++++++ tests/ci/Makefile.amd64 | 26 ++++++ tests/ci/Makefile.armv7 | 29 ++++++ tests/ci/Makefile.powerpc64 | 28 ++++++ tests/ci/Makefile.powerpc64le | 28 ++++++ tests/ci/Makefile.riscv64 | 32 +++++++ tests/ci/tools/ci.conf | 96 +++++++++++++++++++ tests/ci/tools/freebsdci | 90 ++++++++++++++++++ 9 files changed, 568 insertions(+) diff --git a/tests/ci/Makefile b/tests/ci/Makefile new file mode 100644 index 000000000000..8892b0860260 --- /dev/null +++ b/tests/ci/Makefile @@ -0,0 +1,210 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# Makefile for CI testing. +# +# User-driven targets: +# ci: Run CI tests. Currently only smoke tests are supported. +# ci-smokeit: Currently same as ci. +# +# Variables affecting the build process: +# TARGET/TARGET_ARCH: architecture of built release (default: same as build host) +# KERNELCONF: kernel configuration to use +# USE_QEMU: Use QEMU for testing rather than bhyve +# + +WORLDDIR?= ${.CURDIR}/../.. +RELEASEDIR= ${WORLDDIR}/release +MAKECONF?= /dev/null +SRCCONF?= /dev/null +_MEMORY!=sysctl -n hw.physmem 2>/dev/null +PARALLEL_JOBS!=sysctl -n hw.ncpu 2>/dev/null || nproc 2>/dev/null +TOTAL_MEMORY!=expr ${_MEMORY} / 1073741824 +KERNCONF?= GENERIC +LOCALBASE?= /usr/local + +.if !defined(TARGET) || empty(TARGET) +TARGET= ${MACHINE} +.endif +.if !defined(TARGET_ARCH) || empty(TARGET_ARCH) +.if ${TARGET} == ${MACHINE} +TARGET_ARCH= ${MACHINE_ARCH} +.else +TARGET_ARCH= ${TARGET} +.endif +.endif +IMAKE= ${MAKE} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} + +.if defined(CROSS_TOOLCHAIN) || !empty(CROSS_TOOLCHAIN) +CROSS_TOOLCHAIN_PARAM= "CROSS_TOOLCHAIN=${CROSS_TOOLCHAIN}" +.endif + +# Define OSRELEASE by using newvers.sh +.if !defined(OSRELEASE) || empty(OSRELEASE) +.for _V in TYPE BRANCH REVISION +. if !defined(${_V}) || empty(${_V}) +${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../../sys/conf/newvers.sh); echo $$${_V} +. endif +.endfor +.for _V in ${TARGET_ARCH} +.if !empty(TARGET:M${_V}) +OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET} +VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET} +.else +OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH} +VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH} +.endif +.endfor +.endif + +.if exists(${.CURDIR}/tools/ci.conf) && !defined(CICONF) +CICONF?= ${.CURDIR}/tools/ci.conf +.endif +SWAPSIZE?= 1g +VMFS?= ufs +FORMAT= raw +CIIMAGE= ci-${OSRELEASE}-${GITREV}-${KERNCONF}.${FORMAT} +VMSIZE?= 6g +CITYPE?= +TEST_VM_NAME= ci-${OSRELEASE}-${GITREV}-${KERNCONF} +.if ${TOTAL_MEMORY} >= 16 +VM_MEM!=expr ${TOTAL_MEMORY} / 2 +.elif ${TOTAL_MEMORY} >=4 +VM_MEM=${TOTAL_MEMORY} +.else +echo "Please increase the memory to at least 4GB" +exit 0 +.endif +VM_MEM_SIZE?=${VM_MEM}g +TIMEOUT_MS?=5400000 +TIMEOUT=$$((${TIMEOUT_MS} / 1000)) +TIMEOUT_EXPECT=$$((${TIMEOUT} - 60)) +TIMEOUT_VM=$$((${TIMEOUT_EXPECT} - 120)) +.if exists(${.CURDIR}/Makefile.${TARGET_ARCH}) +. include "${.CURDIR}/Makefile.${TARGET_ARCH}" +.endif +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) +QEMUSTATIC=/usr/local/bin/qemu-${QEMU_ARCH}-static +QEMUTGT=portinstall-qemu +.endif +.endif +QEMUTGT?= +QEMU_DEVICES?=-device virtio-blk,drive=hd0 +QEMU_EXTRA_PARAM?= +QEMU_MACHINE?=virt +QEMUBIN=/usr/local/bin/qemu-system-${QEMU_ARCH} +.if ${PARALLEL_JOBS} >= ${QEMU_MAX_CPU_COUNT} +QEMU_CPU_COUNT=${QEMU_MAX_CPU_COUNT} +.else +QEMU_CPU_COUNT=${PARALLEL_JOBS} +.endif +.if ${VM_MEM} >= ${QEMU_MAX_MEM_SIZE} +VM_MEM_SIZE=${QEMU_MAX_MEM_SIZE}g +.else +VM_MEM_SIZE=${VM_MEM}g +.endif +KLDVMMISLOADED!=kldload -q -n vmm 2>/dev/null && echo "1" || echo "0" +.if ${KLDVMMISLOADED} == "0" +USE_QEMU?=1 +.endif +KLDFILEMONISLOADED!=kldload -q -n filemon 2>/dev/null && echo "1" || echo "0" +.if ${KLDFILEMONISLOADED} == "1" +METAMODE?=-DWITH_META_MODE +.endif + +CLEANFILES= ${CIIMAGE} ci.img +CLEANDIRS= ci-buildimage + +portinstall: portinstall-pkg portinstall-qemu portinstall-expect portinstall-${TARGET_ARCH:tl} .PHONY + +portinstall-pkg: .PHONY +.if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap +.endif + +portinstall-qemu: portinstall-pkg .PHONY +.if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) + env ASSUME_ALWAYS_YES=yes pkg install emulators/qemu-user-static +.endif +.if !exists(/usr/local/bin/qemu-system-${QEMU_ARCH}) + env ASSUME_ALWAYS_YES=yes pkg install emulators/qemu@nox11 +.endif + +portinstall-expect: portinstall-pkg .PHONY +.if !exists(/usr/local/bin/expect) + env ASSUME_ALWAYS_YES=yes pkg install lang/expect +.endif + +beforeclean: .PHONY + chflags -R noschg . + +.include +clean: beforeclean .PHONY + +ci-buildworld: .PHONY + ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} buildworld + +ci-buildkernel: ci-buildworld-${TARGET_ARCH:tl} .PHONY + ${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} buildkernel + +ci-buildimage: ${QEMUTGT} ci-buildkernel-${TARGET_ARCH:tl} .PHONY + mkdir -p ${.OBJDIR}/${.TARGET} + env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ + QEMUSTATIC=${QEMUSTATIC} CITYPE=${CITYPE} \ + ${RELEASEDIR}/scripts/mk-vmimage.sh \ + -C ${RELEASEDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${VMFS} \ + -i ${.OBJDIR}/ci.img -s ${VMSIZE} -f ${FORMAT} \ + -S ${WORLDDIR} -o ${.OBJDIR}/${CIIMAGE} -c ${CICONF} + touch ${.TARGET} + +ci-setsmokevar: .PHONY +CITYPE=smoke + +ci-runtest: ci-buildimage-${TARGET_ARCH:tl} portinstall .PHONY +.if ${MACHINE} == "amd64" && ( ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" ) && ( !defined(USE_QEMU) || empty(USE_QEMU) ) + /usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy || true + /usr/sbin/bhyveload -c stdio -m ${VM_MEM_SIZE} -d ${CIIMAGE} ${TEST_VM_NAME} + expect -c "set timeout ${TIMEOUT_EXPECT}; \ + spawn /usr/bin/timeout -k 60 ${TIMEOUT_VM} /usr/sbin/bhyve \ + -c ${PARALLEL_JOBS} -m ${VM_MEM_SIZE} -A -H -P \ + -s 0:0,hostbridge \ + -s 1:0,lpc \ + -s 2:0,virtio-blk,${CIIMAGE} \ + -l com1,stdio \ + ${TEST_VM_NAME}; \ + expect { eof }" + /usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy +.else + timeout -k 60 ${TIMEOUT_VM} ${QEMUBIN} \ + -machine ${QEMU_MACHINE} \ + -smp ${QEMU_CPU_COUNT} \ + -m ${VM_MEM_SIZE} \ + -nographic \ + -no-reboot \ + ${QEMU_EXTRA_PARAM} \ + -drive if=none,file=${CIIMAGE},format=raw,id=hd0 \ + ${QEMU_DEVICES} +.endif + +ci-checktarget: .PHONY +.if ${TARGET_ARCH} != "aarch64" && \ + ${TARGET_ARCH} != "amd64" && \ + ${TARGET_ARCH} != "armv7" && \ + ${TARGET_ARCH} != "powerpc64" && \ + ${TARGET_ARCH} != "powerpc64le" && \ + ${TARGET_ARCH} != "riscv64" + @false +.ERROR: + @echo "Error: ${TARGET_ARCH} is not supported on ${TYPE} ${REVISION} ${BRANCH}" +.endif + +ci-smokeit: ci-setsmokevar ci-checktarget .WAIT ci-runtest-${TARGET_ARCH:tl} .PHONY + +ci: ci-smokeit .PHONY + +.include "${RELEASEDIR}/Makefile.inc1" diff --git a/tests/ci/Makefile.aarch64 b/tests/ci/Makefile.aarch64 new file mode 100644 index 000000000000..9cbec6010a36 --- /dev/null +++ b/tests/ci/Makefile.aarch64 @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# CI Makefile for aarch64. +# +QEMU_ARCH=aarch64 +QEMU_DEVICES=-device virtio-blk,drive=hd0 -device ahci,id=ahci +QEMU_EXTRA_PARAM=-bios /usr/local/share/u-boot/u-boot-qemu-arm64/u-boot.bin -cpu cortex-a57 +QEMU_MAX_CPU_COUNT=64 +QEMU_MAX_MEM_SIZE=64 + +portinstall-aarch64: portinstall-pkg .PHONY +.if !exists(/usr/local/share/u-boot/u-boot-qemu-arm64/u-boot.bin) + env ASSUME_ALWAYS_YES=yes pkg install sysutils/u-boot-qemu-arm64 +.endif + +# NOTE: Nothing should be changed below this line unless explicitly required. + +ci-buildworld-aarch64: ci-buildworld .PHONY + +ci-buildkernel-aarch64: ci-buildkernel .PHONY + +ci-buildimage-aarch64: ci-buildimage .PHONY + +ci-runtest-aarch64: ci-runtest .PHONY diff --git a/tests/ci/Makefile.amd64 b/tests/ci/Makefile.amd64 new file mode 100644 index 000000000000..2f71f3f8c371 --- /dev/null +++ b/tests/ci/Makefile.amd64 @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# CI Makefile for amd64. +# +QEMU_ARCH=x86_64 +QEMU_MACHINE=q35 +QEMU_MAX_CPU_COUNT=256 +QEMU_MAX_MEM_SIZE=128 + +portinstall-amd64: portinstall-pkg .PHONY + @true + +# NOTE: Nothing should be changed below this line unless explicitly required. + +ci-buildworld-amd64: ci-buildworld .PHONY + +ci-buildkernel-amd64: ci-buildkernel .PHONY + +ci-buildimage-amd64: ci-buildimage .PHONY + +ci-runtest-amd64: ci-runtest .PHONY diff --git a/tests/ci/Makefile.armv7 b/tests/ci/Makefile.armv7 new file mode 100644 index 000000000000..21ee6b387b05 --- /dev/null +++ b/tests/ci/Makefile.armv7 @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# CI Makefile for armv7. +# +QEMU_ARCH=arm +QEMU_DEVICES=-device virtio-blk,drive=hd0 -device ahci,id=ahci +QEMU_EXTRA_PARAM=-bios /usr/local/share/u-boot/u-boot-qemu-arm/u-boot.bin +QEMU_MAX_CPU_COUNT=1 +QEMU_MAX_MEM_SIZE=3 + +portinstall-armv7: portinstall-pkg .PHONY +.if !exists(/usr/local/share/u-boot/u-boot-qemu-arm/u-boot.bin) + env ASSUME_ALWAYS_YES=yes pkg install sysutils/u-boot-qemu-arm +.endif + +# NOTE: Nothing should be changed below this line unless explicitly required. + +ci-buildworld-armv7: ci-buildworld .PHONY + +ci-buildkernel-armv7: ci-buildkernel .PHONY + +ci-buildimage-armv7: ci-buildimage .PHONY + +ci-runtest-armv7: ci-runtest .PHONY diff --git a/tests/ci/Makefile.powerpc64 b/tests/ci/Makefile.powerpc64 new file mode 100644 index 000000000000..26712b45f30b --- /dev/null +++ b/tests/ci/Makefile.powerpc64 @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# CI Makefile for powerpc64. +# +QEMU_ARCH=ppc64 +QEMU_DEVICES=-device virtio-blk,drive=hd0 +QEMU_EXTRA_PARAM=-vga none -accel tcg,thread=multi +QEMU_MACHINE=pseries,cap-hpt-max-page-size=16M +QEMU_MAX_CPU_COUNT=1 +QEMU_MAX_MEM_SIZE=64 + +portinstall-powerpc64: portinstall-pkg .PHONY + @true + +# NOTE: Nothing should be changed below this line unless explicitly required. + +ci-buildworld-powerpc64: ci-buildworld .PHONY + +ci-buildkernel-powerpc64: ci-buildkernel .PHONY + +ci-buildimage-powerpc64: ci-buildimage .PHONY + +ci-runtest-powerpc64: ci-runtest .PHONY diff --git a/tests/ci/Makefile.powerpc64le b/tests/ci/Makefile.powerpc64le new file mode 100644 index 000000000000..974ab04b8eed --- /dev/null +++ b/tests/ci/Makefile.powerpc64le @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# CI Makefile for powerpc64le. +# +QEMU_ARCH=ppc64 +QEMU_DEVICES=-device virtio-blk,drive=hd0 +QEMU_EXTRA_PARAM=-vga none -accel tcg,thread=multi +QEMU_MACHINE=pseries,cap-hpt-max-page-size=16M +QEMU_MAX_CPU_COUNT=1 +QEMU_MAX_MEM_SIZE=64 + +portinstall-powerpc64le: portinstall-pkg .PHONY + @true + +# NOTE: Nothing should be changed below this line unless explicitly required. + +ci-buildworld-powerpc64le: ci-buildworld .PHONY + +ci-buildkernel-powerpc64le: ci-buildkernel .PHONY + +ci-buildimage-powerpc64le: ci-buildimage .PHONY + +ci-runtest-powerpc64le: ci-runtest .PHONY diff --git a/tests/ci/Makefile.riscv64 b/tests/ci/Makefile.riscv64 new file mode 100644 index 000000000000..749df3f0b369 --- /dev/null +++ b/tests/ci/Makefile.riscv64 @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# CI Makefile for riscv64. +# +QEMU_ARCH=riscv64 +QEMU_DEVICES=-device virtio-blk-device,drive=hd0 +QEMU_EXTRA_PARAM=-bios /usr/local/share/opensbi/lp64/generic/firmware/fw_jump.elf -kernel /usr/local/share/u-boot/u-boot-qemu-riscv64/u-boot.bin +QEMU_MAX_CPU_COUNT=16 +QEMU_MAX_MEM_SIZE=64 + +portinstall-riscv64: portinstall-pkg .PHONY +.if !exists(/usr/local/share/opensbi/lp64/generic/firmware/fw_jump.elf) + env ASSUME_ALWAYS_YES=yes pkg install sysutils/opensbi +.endif +.if !exists(/usr/local/share/u-boot/u-boot-qemu-riscv64/u-boot.bin) + env ASSUME_ALWAYS_YES=yes pkg install sysutils/u-boot-qemu-riscv64 +.endif + +# NOTE: Nothing should be changed below this line unless explicitly required. + +ci-buildworld-riscv64: ci-buildworld .PHONY + +ci-buildkernel-riscv64: ci-buildkernel .PHONY + +ci-buildimage-riscv64: ci-buildimage .PHONY + +ci-runtest-riscv64: ci-runtest .PHONY diff --git a/tests/ci/tools/ci.conf b/tests/ci/tools/ci.conf new file mode 100644 index 000000000000..47001d6248c6 --- /dev/null +++ b/tests/ci/tools/ci.conf @@ -0,0 +1,96 @@ +#!/bin/sh +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# Set to a list of third-party software to enable in rc.conf(5). +export VM_RC_LIST="auditd freebsdci" + +if [ "${CITYPE}" != "smoke" ]; then +export VM_EXTRA_PACKAGES="coreutils devel/py-pytest gdb jq ksh93 net/py-dpkt net/scapy nist-kat nmap perl5 python python3 sudo tcptestsuite" + + if [ "${TARGET}" = "amd64" ]; then + export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} linux-c7-ltp" + fi +fi + +vm_extra_pre_umount() { +cat << EOF >> ${DESTDIR}/boot/loader.conf +autoboot_delay=1 +beastie_disable="YES" +loader_logo="none" +console="comconsole,vidconsole" +net.fibs=3 +net.inet.ip.fw.default_to_accept=1 +mac_bsdextended_load="YES" +vfs.zfs.arc_max=4294967296 +kern.vty=sc +EOF +cat << EOF >> ${DESTDIR}/etc/kyua/kyua.conf +test_suites.FreeBSD.ci = 'true' +test_suites.FreeBSD.fibs = '1 2' +test_suites.FreeBSD.allow_sysctl_side_effects = '1' +test_suites.FreeBSD.cam_test_device = '/dev/ada0' +test_suites.FreeBSD.disks = '/dev/vtbd2 /dev/vtbd3 /dev/vtbd4 /dev/vtbd5 /dev/vtbd6' +EOF +cat << EOF >> ${DESTDIR}/etc/rc.conf +kld_list="" # Load modules needed by tests +kld_list="${kld_list} blake2" # sys/opencrypto +kld_list="${kld_list} cryptodev" # sys/opencrypto +kld_list="${kld_list} fusefs" # sys/fs/fusefs +kld_list="${kld_list} ipsec" # sys/netipsec +kld_list="${kld_list} mac_portacl" # sys/mac/portacl +kld_list="${kld_list} mqueuefs" # sys/kern/mqueue_test +kld_list="${kld_list} pfsync" # sys/netpfil/pf (loads pf) +kld_list="${kld_list} pflog" # sys/netpfil/pf +kld_list="${kld_list} ipl" # sys/sbin/ipf (loads ipfilter) +kld_list="${kld_list} ipfw" # sys/netpfil/ipfw (loads ipfw) +kld_list="${kld_list} ipfw_nat" # sys/netpfil/ipfw (loads ipfw_nat) +kld_list="${kld_list} ipdivert" # sys/netinet (loads ipdivert) +kld_list="${kld_list} dummynet" # sys/netpfil/common +kld_list="${kld_list} carp" # sys/netinet/carp +kld_list="${kld_list} if_stf" # sys/net/if_stf +background_fsck="NO" +sendmail_enable="NONE" +cron_enable="NO" +syslogd_enable="NO" +newsyslog_enable="NO" +EOF +if [ "${CITYPE}" = "smoke" ]; then +cat << EOF >> ${DESTDIR}/etc/rc.conf +freebsdci_type="smoke" +EOF +fi +cat << EOF >> ${DESTDIR}/etc/sysctl.conf +kern.cryptodevallowsoft=1 +kern.ipc.tls.enable=1 +net.add_addr_allfibs=0 +security.mac.bsdextended.enabled=0 +vfs.aio.enable_unsafe=1 +vfs.usermount=1 +EOF +cat << EOF >> ${DESTDIR}/etc/fstab +fdesc /dev/fd fdescfs rw 0 0 +EOF + mkdir -p ${DESTDIR}/usr/local/etc/rc.d + echo $scriptdir + cp -p ${scriptdir}/../../tests/ci/tools/freebsdci ${DESTDIR}/usr/local/etc/rc.d/ + touch ${DESTDIR}/firstboot + + return 0 +} + +vm_extra_pkg_rmcache() { + if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then + mount -t devfs devfs ${DESTDIR}/dev + chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ + /usr/local/sbin/pkg clean -a + umount_loop ${DESTDIR}/dev + fi + + return 0 +} diff --git a/tests/ci/tools/freebsdci b/tests/ci/tools/freebsdci new file mode 100755 index 000000000000..c77216c9fd4d --- /dev/null +++ b/tests/ci/tools/freebsdci @@ -0,0 +1,90 @@ +#!/bin/sh +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 The FreeBSD Foundation +# +# This software was developed by Cybermancer Infosec +# under sponsorship from the FreeBSD Foundation. +# +# PROVIDE: freebsdci +# REQUIRE: LOGIN FILESYSTEMS +# KEYWORD: firstboot + +# This script is used to run the firstboot CI tests on the first boot of a +# FreeBSD image. It is automatically disabled after the first boot. +# +# The script will run the firstboot CI tests and then shut down the system. +# The tests are run in the foreground so that the system can shut down +# immediately after the tests are finished. +# +# Default test types are full and smoke. To run only the smoke tests, set +# freebsdci_type="smoke" in /etc/rc.conf.local or /etc/rc.conf. +# To run only the full tests, set freebsdci_type="full" in +# /etc/rc.conf.local or /etc/rc.conf. + +. /etc/rc.subr + +: ${freebsdci_enable:="NO"} + +name="freebsdci" +desc="Run FreeBSD CI" +rcvar=freebsdci_enable +start_cmd="firstboot_ci_run" +stop_cmd=":" +os_arch=$(uname -p) + +auto_shutdown() +{ + # XXX: Currently RISC-V kernels lack the ability to + # make qemu exit on shutdown. Reboot instead; + # it makes qemu exit too. + case "$os_arch" in + riscv64) + shutdown -r now + ;; + *) + shutdown -p now + ;; + esac +} + +smoke_tests() +{ + echo + echo "--------------------------------------------------------------" + echo "BUILD sequence COMPLETED" + echo "IMAGE sequence COMPLETED" + echo "BOOT sequence COMPLETED" + echo "INITIATING system SHUTDOWN" + echo "--------------------------------------------------------------" +} + +full_tests() +{ + # Currently this is a placeholder. + # This will be used to add the full tests scenario those are run in + # the CI system + echo + echo "--------------------------------------------------------------" + echo "BUILD sequence COMPLETED" + echo "IMAGE sequence COMPLETED" + echo "BOOT sequence COMPLETED" + echo "TEST sequence STARTED" + echo "TEST sequence COMPLETED" + echo "INITIATING system SHUTDOWN" + echo "--------------------------------------------------------------" +} + +firstboot_ci_run() +{ + if [ "$freebsdci_type" = "smoke" ]; then + smoke_tests + elif [ "$freebsdci_type" = "full" ]; then + full_tests + fi + auto_shutdown +} + +load_rc_config $name +run_rc_command "$1" From nobody Thu Apr 18 18:42:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL68z0B33z5HMZW; Thu, 18 Apr 2024 18:42: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 4VL68y6f4Yz46SX; Thu, 18 Apr 2024 18:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713465778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9li3NcZl8MAsDFkK5XUoiSiR961jaIEgwHgzOj1VJZs=; b=lpIIBetM+E0Av6Qm7Vs20SDKCOdmP7Jl6z46TaqeTJhI84sbFgOWX32wb4EnxcyM0H0ecK uCY3SWmiiFZgxIwiGOoBBrW9fif86IwOF9kt4onuo68iJWapTzOL9f8hoObHEESqpo+PAl fFQ789DkesiHMADq7IMLsjdExLxWrtpa6H1J2S08qCsT+51uimmcZ0fCKm5+Ogq6XmMwvV LGRO7erTEOR3FesIZan2BST49PgqqntpwZgdA80Ht3vMOetqRyfpFOqm9IXF7tz0DbMF// RnBT/r1EI5tVl1X2Cw7V5+Euth7P2Bmn3mCXwSNw5JswW2giKzEOEfu+TLRILw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713465778; a=rsa-sha256; cv=none; b=rxPzBKVHZYhx01ABIXpPhPiGqJxEYfnHRXgCOuUmK6KiD+TTVrfwXwj9kN52xl+PW0zYUL zjQpsGyJsnakcu92jKaEbyoso7vfJJ2+2kfgbtpjDkcCyRnAZcJBMnIJ7tFYg/K0ogMrpO mCzNDsGS/ZIVMh1OtqqlBAnQ0vSE4qRYlL2FvEEHdB83V6YJu/7j+kncNBZKg2hBW6iBE+ 4UHk9XJNUuy+2W5VZbNTVOC8A7tptxgVz+hxsp/hGzbjQdE2fr4z/TyI8VsUPzodxlU6S3 roAdlD6aXXoP4bOhOpcNqQ/nWr6g5uwCPl3Y47d+JlC5GrNV5IBbb91ZwjjfKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713465778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9li3NcZl8MAsDFkK5XUoiSiR961jaIEgwHgzOj1VJZs=; b=v7WeTiedhceyVzlvgcR+tIfwqLkilZ5XVA3qZG/+S8mKeE6VbduaEtT1uqTDYuVNxx2gyP GR6rYUL8jxqjRiuy2oz1AZ1ekvMOlblgeCyrUd9eq6lInOh9xVWakzDRhuSxL6Ob6hHmlw 0h0KGo6rRqdaClL5w++eOiOVp8CLqkV2eDjFyPy2AyAQKNxtnQMqEgyAYiLGdu2gO8p5TF WliVa9uJ4yUu0JCZVEVcw0Q1E6tPuKj++BOmW/HTG36XoIeqbX9tKQwDbA7FjC0e0lJazB 7Mhxu1a59fehgP7RDO8mUX37HESRY9HkBQsOExECsJC7g2CuCSoHK7HMOBWw1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL68y6DyYzLhB; Thu, 18 Apr 2024 18:42: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 43IIgwPq067429; Thu, 18 Apr 2024 18:42:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IIgwE7067426; Thu, 18 Apr 2024 18:42:58 GMT (envelope-from git) Date: Thu, 18 Apr 2024 18:42:58 GMT Message-Id: <202404181842.43IIgwE7067426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 2fd73b7126d7 - main - share/mk/bsd.cpu.mk: add F16C feature for i386 and amd64 architectures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fd73b7126d7d7e5701e001af929411ce7a0c5f1 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2fd73b7126d7d7e5701e001af929411ce7a0c5f1 commit 2fd73b7126d7d7e5701e001af929411ce7a0c5f1 Author: Dimitry Andric AuthorDate: 2024-04-18 17:46:57 +0000 Commit: Dimitry Andric CommitDate: 2024-04-18 18:42:21 +0000 share/mk/bsd.cpu.mk: add F16C feature for i386 and amd64 architectures As discussed in bug 278417, some ports require the F16C instruction set to compile, but there is no way yet to detect whether the currently chosen CPUTYPE supports this feature. Add the feature to the MACHINE_CPU variable, for each processor that supports it. The list of processors was extracted from clang 18's -dM output, filtered on the __F16C__ define. PR: 278417 Reviewed by: brooks, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44848 --- share/mk/bsd.cpu.mk | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 3fee105e901d..730e4b4aa152 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -149,17 +149,18 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} ########## i386 . if ${MACHINE_CPUARCH} == "i386" . if ${CPUTYPE} == "znver4" -MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 +MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 f16c . elif ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ ${CPUTYPE} == "znver1" -MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 +MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 f16c . elif ${CPUTYPE} == "bdver4" -MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 -. elif ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" || \ - ${CPUTYPE} == "bdver1" +MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 f16c +. elif ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" +MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 f16c +. elif ${CPUTYPE} == "bdver1" MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 . elif ${CPUTYPE} == "btver2" -MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 +MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 f16c . elif ${CPUTYPE} == "btver1" MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 . elif ${CPUTYPE} == "amdfam10" @@ -186,12 +187,14 @@ MACHINE_CPU = k5 i586 ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \ ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl" || \ ${CPUTYPE} == "x86-64-v4" -MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 +MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 f16c . elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "skylake" || \ ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell" || \ ${CPUTYPE} == "x86-64-v3" -MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 -. elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge" +MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 f16c +. elif ${CPUTYPE} == "ivybridge" +MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 f16c +. elif ${CPUTYPE} == "sandybridge" MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 . elif ${CPUTYPE} == "tremont" || ${CPUTYPE} == "goldmont-plus" || \ ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \ @@ -232,17 +235,18 @@ MACHINE_CPU += i486 ########## amd64 . elif ${MACHINE_CPUARCH} == "amd64" . if ${CPUTYPE} == "znver4" -MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse4a sse3 +MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse4a sse3 f16c . elif ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ ${CPUTYPE} == "znver1" -MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 +MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 f16c . elif ${CPUTYPE} == "bdver4" -MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 -. elif ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" || \ - ${CPUTYPE} == "bdver1" +MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 f16c +. elif ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" +MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 f16c +. elif ${CPUTYPE} == "bdver1" MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 . elif ${CPUTYPE} == "btver2" -MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3 +MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3 f16c . elif ${CPUTYPE} == "btver1" MACHINE_CPU = ssse3 sse4a sse3 . elif ${CPUTYPE} == "amdfam10" @@ -259,12 +263,14 @@ MACHINE_CPU = k8 3dnow ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \ ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl" || \ ${CPUTYPE} == "x86-64-v4" -MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 +MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 f16c . elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "skylake" || \ ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell" || \ ${CPUTYPE} == "x86-64-v3" -MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 -. elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge" +MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 f16c +. elif ${CPUTYPE} == "ivybridge" +MACHINE_CPU = avx sse42 sse41 ssse3 sse3 f16c +. elif ${CPUTYPE} == "sandybridge" MACHINE_CPU = avx sse42 sse41 ssse3 sse3 . elif ${CPUTYPE} == "tremont" || ${CPUTYPE} == "goldmont-plus" || \ ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \ From nobody Thu Apr 18 18:57:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL6V06J0Mz5HP1L; Thu, 18 Apr 2024 18:57: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 4VL6V05nshz47FC; Thu, 18 Apr 2024 18:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713466664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+os9fffPEg4qLZ5LGQPFhWiU/LeSzEJkabvWUSQjTzA=; b=chb/rG3+qEfwzD+yyPyNAxOctNonZ5IVr8Ah81YQ1FXtrmDzAUKVyO3SiGQgaa6qpSc0tZ LbFhXH4sTlY4ZW6Cp/eU1MdJJhD3+TyxaC0KIXvWtp847OjqQgCMC8Sf+kXu+gywiOkmYs NTq085BHu2sdofgujYJdjroddDpTxrGNGYUJEEnlIKgDArt+XCz1hxBox7eAwqpo8bK1FH SsuGJhjF6qgTbAPKf5CwKBiM2ZsaCmVsatfkUhcDOAv9CEd26umQ2BxN9dSyxYQvl50nlB dDr1rUcbp4DNuKSorCAIWCxShlGwZBm2cdFJnI0Mx14KxYE9Zve1MG0UMmoeXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713466664; a=rsa-sha256; cv=none; b=tUmoRACRB8Jp1mPOR37lwbVS9JMVyKEXDhff25pPI6MIfnKjgVg+vREuDoQUl4xe0HDkCq ee32ukV4bGFN2SxeSfy+62yQR89pySUfwWD4tvEv2c+u3r4XB82KP8daQIQVASvycFPyVS pzTE4pd/FDxfIrU0oUP+Mbv71AANE27GyNuMxqaaprD8ksKhW5+ZhY3zlq0e7uDI3RUOk8 25EktWJBHknJcWmlf7aGPZEy1SDf6swcahOTgXr0IM4OjPYy/z7XzFq+Tv74ysLwGPtPTj MBq3pJYcW8yorm34hR9YCV4BHTnj1D/157h5D+0bFEByq38CRNHE3V/u3sjNzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713466664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+os9fffPEg4qLZ5LGQPFhWiU/LeSzEJkabvWUSQjTzA=; b=EA5EUMbuYDfynGlH/u9fHd05DCR5Oe3Kb753kwZ6oibVN9CsapuZzhlH2EYh/rYP59X1E5 hKdI09ZjUk+7f2GOb72DwYnW9DWncPhb484VKKUWKgKSn4YMwAu1pvzEqtUo01IVZfwX2k sOBHXjQnP+0Ie1udjTGjeE/9RQX2M+q/vDoi5r4Xz5z0vCUyq7Y2Hn5uV69nRg46HJggKP b4Eb14YbVTMDNygj/jpo6poK3iwZ1jZ6SruNoyxvTPzaGBinD1Uhz83ozbxjt1UxbHhBwL yy8y6K2JgXHFCjon15TRJP2FLtnUKig3B4+476zYZvy0pVIu3jScxpmGw6RFOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL6V05PkwzMCv; Thu, 18 Apr 2024 18:57: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 43IIvi0C084765; Thu, 18 Apr 2024 18:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IIviHV084762; Thu, 18 Apr 2024 18:57:44 GMT (envelope-from git) Date: Thu, 18 Apr 2024 18:57:44 GMT Message-Id: <202404181857.43IIviHV084762@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: ede456359e55 - main - CONTRIBUTING: mention sys/crypto as another "contrib" directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ede456359e55958ab17ac665e5867674a0c0e81b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ede456359e55958ab17ac665e5867674a0c0e81b commit ede456359e55958ab17ac665e5867674a0c0e81b Author: Ed Maste AuthorDate: 2024-04-18 18:44:30 +0000 Commit: Ed Maste CommitDate: 2024-04-18 18:57:19 +0000 CONTRIBUTING: mention sys/crypto as another "contrib" directory Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44857 --- CONTRIBUTING.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c3028b7a764f..7dcdc1b49685 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -145,11 +145,11 @@ class work. It also helps us keep track. ## FreeBSD's Upstreams -Anything that's in the directory `contrib`, `crypto`, `sys/contrib` or -`sys/cddl` likely has an upstream we pull from. Please do a git log --merges in -any subdirectory of these you are submitting patches for to find out the last -time we merged from upstream. If it is in the last 5 years, upstream is "active" -and you should submit your patches there and let the last few people to commit -to this file (especially merge commits) know. If it's been more than 5 years, -upstream is likely inactive so please submit the patch. We can sort out if it -should go into FreeBSD or upstream. +Anything that's in the directory `contrib`, `crypto`, `sys/contrib`, +`sys/crypto/` or `sys/cddl` likely has an upstream we pull from. Please do a +`git log --merges` in any subdirectory of these you are submitting patches for +to find out the last time we merged from upstream. If it is in the last 5 years, +upstream is "active" and you should submit your patches there and let the last +few people to commit to this file (especially merge commits) know. If it's been +more than 5 years, upstream is likely inactive so please submit the patch. We +can sort out if it should go into FreeBSD or upstream. From nobody Thu Apr 18 19:10:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL6mf0zCDz5HPqR; Thu, 18 Apr 2024 19:10:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VL6mf07bLz4B6w; Thu, 18 Apr 2024 19:10:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713467426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Obzpc5iu976lzwfU3TXyUMX1PxTfXcQCwAcoVhjvgxM=; b=bRlEa68mmMXY2jnzycc2XxxyMU116OX/LhgAXK6zTX+0rQPH0dNRjKHSUE+Mz5c9B40Ruu KXl4wOutccMZnsmIhDJTzfpKNoQC+oNO2Wjps2ALO72kaR4v5eu/wFVo7ZP3ndUSbbn0z+ ZdUxhMf8Bb2lQvtCW//0leTlVojBNXYXS62JANBEmcUgcyeFljCxFRFsTCTVWFCcoY8sZE ryVrF1n4LOY3sgZR7pTe9LQTP8o4tvyJIEQ5xwna9pmkh4g7kwMAC/kEw5uyl7fH5KutrZ yg6rJadWEyPGjB7vU/+3LtiHk5DOgVz0tmz/90gM9bPlx6Mt9yny+YczOQ1L+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713467426; a=rsa-sha256; cv=none; b=rEeCs1cxncW8InqO/ZVRJZvzgee7t0LxNMnTK7CgmCOsEEfybsQb51lPpY9bj2kZlRvrNo OZizjylWCpG3QBOmVbJCBO6xNSiP1T7JoWOOCZPnMOcJMTJ6tV78Hw0zJl/QupznU1CCm0 xjEEHR90/yfVhFZWdn2wjedi0Cx5/wi+jEvT/sj0dBjL/rg1PEpBa1iEBvcr/frs8BEFjf YvB1St+4APwos4hNZ5FUkMq0PjlKpLiy8tJpG7PlUgHk19iKT8jK/2vZz82jRMDHiwQPQN DaJ0aznTTYh0ZvhsRdfTEvn9r8X36GGILt6r0amGVAetWguy8EhyrLxg/bVMXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713467426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Obzpc5iu976lzwfU3TXyUMX1PxTfXcQCwAcoVhjvgxM=; b=VRo327CJ43buhaMyBjVWpLFIaykBvK3drS09L/xtVmtQVmYd36QQEDXxW/j05YhmNGA6zg q9e5VKRqblKJwk5AqQY4eIvqyigyCKcBIYh1glIRRuHnb4jIqumkcqn5QfOuwGtjkIqSfc cJLGyFovs3ao3u44760N3b6Eh+P6+nZBBlHVT9KxS+/SLtCaJGreFLBPecO9yJkTiYh3XH hdqvHhMw47su7VrL6XpxJKB17MLStJtp8ER+VUCpUZUkMS1UvlFTvAvMEYh3cnZgTKRLgc oC1JksxbYhC7miiAu+xutej6CmdzymSkXAv7iDrdiwEzqoC9H2GFekQV80unuQ== Received: from [IPV6:2601:644:937f:4c50:1913:73cc:327c:6ad4] (unknown [IPv6:2601:644:937f:4c50:1913:73cc:327c:6ad4]) (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 4VL6md3cS4zDk9; Thu, 18 Apr 2024 19:10:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Thu, 18 Apr 2024 12:10:24 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: ede456359e55 - main - CONTRIBUTING: mention sys/crypto as another "contrib" directory Content-Language: en-US To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202404181857.43IIviHV084762@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202404181857.43IIviHV084762@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/18/24 11:57 AM, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ede456359e55958ab17ac665e5867674a0c0e81b > > commit ede456359e55958ab17ac665e5867674a0c0e81b > Author: Ed Maste > AuthorDate: 2024-04-18 18:44:30 +0000 > Commit: Ed Maste > CommitDate: 2024-04-18 18:57:19 +0000 > > CONTRIBUTING: mention sys/crypto as another "contrib" directory > > Reviewed by: imp > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D44857 Hmm, sys/crypto is a bit of a mixed bag there. openssl is a mix of upstream and local bits. libsodium is an upstream. chacha20 and blake2 I think are upstreams. rijndael did come from an upstream but I don't think it's alive. I'd actually prefer if we moved a lot of sys/crypto over to sys/dev, e.g. actual device drivers (as opposed to software crypto implementations) like aesni, armv8, via, should definitely move to sys/dev. For sys/openssl it might be nicer then to have the home-grown bits of ossl(4) that aren't from upstream in a sys/dev/ossl leaving the stock openssl bits in sys/crypto/openssl. -- John Baldwin From nobody Thu Apr 18 19:15:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL6tC0Kv8z5HQb7; Thu, 18 Apr 2024 19:15: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 4VL6tB6xHGz4CZj; Thu, 18 Apr 2024 19:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713467715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LIEc8SOTvOe836IbkYgKJMfmDBw7vmLuu7fZk35de5g=; b=sF9McMgl0Bjj2CxHRho64TsBxrtrO5K5Y8unBjWuGg4riVlXRPi4D3n3ExBm+o7NQCoPjJ j/hOGMzlFogwr+zLpUhziGJu1ieKKiR6Op29H2aNeCb86beBFkqkY1pWfAD89IEoRZLJei Ovlb4UGOhMgg0I9J7Ihyg3CAC23q13526u5B8tl4DnhCQr7k7vkqId4TPMi/kmaA3HXa9J SvHJU1Ki3RtQwS4ARDhEv3tU2D00gj2/by6QU4ti7b299S35cxosnvoPN/P/YpdD3jRmiK +HL/HlUx1EJpqIVYzLP7JVSUzIURJcUNnBJIm0RE//lu5nzIHtfum+4d+UMxCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713467715; a=rsa-sha256; cv=none; b=aLGAfm+wjvkek3vAnW5KmVUBIXSLPxjN3VdNYdGDxyAn1xG56gzNeb1G73V8rUxw/VnpkB XxR/xp2b8s/NaUvHSTkjTbIFX6zlqCjWjcJV8ItuNkIM3TXyJ6IBiNZvPbloL76up7Si2u giymtIJxh3T0ZbP7d0yiu16e27sYhUuOD4/XFabIm7tlU+lXEdlr+1gFEZl1v3cOt4GHxR Pl3rW5KoiW4r1cjKCKMAs/jcrvDMMo5X/MfrnF9IGEBIKQ8xcdetq08bKkYIhxsXqrGv8i Ovh9pD9ajpgX+2NKtnNBJ4H8cheqyb8SUyoIf6jXQkFMM8ycz4cjKL5ztmwdUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713467715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LIEc8SOTvOe836IbkYgKJMfmDBw7vmLuu7fZk35de5g=; b=DZ2WMmSFtpASpQgiCZ7Sv2qvhviWG3DB5fSyT5vNZNgnuqM5J1EuFaW1oewXCgBJ7c+cDK f57YA6qCGdjScf7TXlbdx4kbESKez3hsGbmXAFqAP75B9SOCNZCE2crx3oR3rH9K5Fm07h 10oXtFpUI5EHQT1t7tlXd9AKewGrGSihHr5P9a81uRdpoA6uUuVxL33oUrzweHWW+I5aYu 7Wer6lJjvJphJIiXyAOt/agPAXURg0ptQogyt+3RNAjIvUzFFDgJyK4FSpKYYVez732jwB 85L2ohriozmHmstasscNgvQmek7u/LIdVrzptbiz79VV/xmLj6pLNFW/plg0UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL6tB6XXvzM48; Thu, 18 Apr 2024 19:15: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 43IJFEuQ020483; Thu, 18 Apr 2024 19:15:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IJFEoG020480; Thu, 18 Apr 2024 19:15:14 GMT (envelope-from git) Date: Thu, 18 Apr 2024 19:15:14 GMT Message-Id: <202404181915.43IJFEoG020480@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: 67783db661f8 - main - CONTRIBUTING: request only one submission type per change List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 67783db661f88cf5259c19bb59ddee9e076007ac Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=67783db661f88cf5259c19bb59ddee9e076007ac commit 67783db661f88cf5259c19bb59ddee9e076007ac Author: Ed Maste AuthorDate: 2024-04-18 18:38:54 +0000 Commit: Ed Maste CommitDate: 2024-04-18 19:13:15 +0000 CONTRIBUTING: request only one submission type per change We have some instances of contributors opening a GitHub pull request and a Phabricator review for the same change, which divides or duplicates review effort. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44856 --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7dcdc1b49685..c26b1d335c5f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,6 +18,10 @@ The preferred method depends on a few factors including the size or scope of the change. GitHub pull requests are preferred for relatively straightforward changes where the contributor already has a GitHub account. +A change should be submitted by only one method. For example, please do not +open a GitHub pull request and create a Phabricator review for the same change +(unless explicitly requested to do so by a FreeBSD committer). + ## GitHub Pull Requests Presently, GitHub 'freebsd-src' repository is one of the publish-only services From nobody Thu Apr 18 19:27:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL78x1Dr6z5HRF4; Thu, 18 Apr 2024 19:28:01 +0000 (UTC) (envelope-from lexi@le-fay.org) Received: from fuchsia.eden.le-Fay.ORG (fuchsia.eden.le-fay.org [81.187.47.195]) by mx1.freebsd.org (Postfix) with ESMTP id 4VL78w66bfz4Dlp; Thu, 18 Apr 2024 19:28:00 +0000 (UTC) (envelope-from lexi@le-fay.org) Authentication-Results: mx1.freebsd.org; none Received: from iris.eden.le-Fay.ORG (iris.eden.le-fay.org [IPv6:2001:8b0:aab5:106:3::6]) by fuchsia.eden.le-Fay.ORG (Postfix) with ESMTP id E2EAF920C; Thu, 18 Apr 2024 19:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=le-fay.org; s=fuchsia; t=1713468478; bh=YkZgyz5DpIWeHoK7YpgyJqOkyWF+hwq+S+DAgplVS3Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=fBWjIBZoQTl02DxmpitZH37acw/dIf/x3NvS7tGzyU4ExpbqfK1qT0pnB3VhcJEnN vyCxUh/0bg7SCVxgcQlB/5JHjwJ16VMJXbF1kB63lK9yetsMr1qw0zrmtqBAoc4t7e 4KuQ04bQGVeZaXwZbR7Qp7zsKA7jIY3f/3xEJSO0= Received: from ilythia.eden.le-fay.org (ilythia.eden.le-fay.org [IPv6:2001:8b0:aab5:106:3::10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by iris.eden.le-Fay.ORG (Postfix) with ESMTPSA id A4D4E2C0419; Thu, 18 Apr 2024 20:27:58 +0100 (BST) Date: Thu, 18 Apr 2024 20:27:56 +0100 From: Lexi Winter To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, imp@freebsd.org Subject: Re: git: 67783db661f8 - main - CONTRIBUTING: request only one submission type per change Message-ID: References: <202404181915.43IJFEoG020480@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="00cepVzMNjNz7xrS" Content-Disposition: inline In-Reply-To: <202404181915.43IJFEoG020480@gitrepo.freebsd.org> 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:20712, ipnet:81.187.0.0/16, country:GB] X-Rspamd-Queue-Id: 4VL78w66bfz4Dlp --00cepVzMNjNz7xrS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Ed Maste: > +A change should be submitted by only one method. For example, please do not > +open a GitHub pull request and create a Phabricator review for the same change > +(unless explicitly requested to do so by a FreeBSD committer). as a non-committer src contributor, i've discussed this with imp@ quite a bit and i think this should be phrased more strongly in favour of using GitHub for commits. the current situation is that Phabricator is useless for non-committers because 1) you have to know who can review your commit, and 2) once your commit is reviewed, someone has to commit it, and Phabricator doesn't address this. i think it might make more sense to suggest that people submit all patches via either GitHub or Bugzilla, and only use Phabricator if specifically asked to. --00cepVzMNjNz7xrS Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEuwt6MaPcv/+Mo+ftDHqbqZ41x5kFAmYhdDkACgkQDHqbqZ41 x5lMdwv+IBJxb0k6wAMipS1AfREWSu5GL3cI6TgN1DkbILPkZlh06tILslrYpFD6 hwZ7JopCFD2ZTqnIAZ/W/iESES+dMz/nMjKX3bcuFB+Q4qaYDMPrRFm4JBgyoh4d Ci5GVqq8RoM5G8VCONQWRtgXJI3iyjghRIuHxFbHLIcm+7uopgSIuhs2zsHv9it8 caVBlMS/McHbVcJkw1aK4bo/ZZPkkMi3E3pAVJQC6XcsCMjczgh4hAANq3ix60PD RTrMtVY+tUVa7G6h/1OvL/4qD7RRXBZ63qLxCDunz5zXcDTk8O7Ndz0OHAPR1E9X /gmvyyUtc4Q3tiTgzxTkx3MPcOsZeGXgHWm6kLendSVxCLQZ8wTPB72Bk3Kw799K Yo9gA1d51b9EvdzKzQ6/sfooJLiX0OfUqL2v2HU9nVHKATeF/AeSpExgpvxYLE5I pmVUKA2HJix8yGCkG5NRK6z80LNvtqg/9RNRA5S2PiP+n0LI1uUv22C932OLIx1Z g3ZRjmP/ =zl0N -----END PGP SIGNATURE----- --00cepVzMNjNz7xrS-- From nobody Thu Apr 18 19:54:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL7m118BMz5HT0v for ; Thu, 18 Apr 2024 19:54:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (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 4VL7m05nRpz4J1p for ; Thu, 18 Apr 2024 19:54:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a5568bef315so237992666b.1 for ; Thu, 18 Apr 2024 12:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1713470094; x=1714074894; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Q6Rt0NQ/Os3OQZu5y59Bm86y+3VzxYmneeUfMl87wtw=; b=zuyDZt4x6Nc+ExgJV+TrL/n/3WnaZWjs6eWINQlHa4M6v6WQ1pop82bcoNvsTTHXVC PsWpf3mxFAd78mdPojio/jNQ3euIBKI7Ku8H4HR983xBY+xyMS4h+ldthZJpgop/8Okg vVU1MOAqpD8WnjG2iixEHWn67MoDZMCNjZzQpSAqgjAQhTpt21XYu5LKqu9PcWZ3qJa2 /Jis2B7lUqhAE8DUp3+Wd5rDDu6Nu9BUe8fJ5gPac54Lu/2LEOy7W4u5xCft5s+aohji M7ap2VLOWwsXvhxtVLLVukh3vntQraUEKVPRNajXvRJfti38ZL3vl3zC7+ywe0l/PTVK wgUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713470094; x=1714074894; 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=Q6Rt0NQ/Os3OQZu5y59Bm86y+3VzxYmneeUfMl87wtw=; b=Rv3cMGVyZLTLqA/JYPN0Q2wqCnI9oRy1LQ5OALluzNmEJLLRFMRx5k8oOPVZ/l9kdV kl78TTBq2AmlPmFzfX7Pg7lxy65X5Clm3qxk0PZkwlZ3dkLzLnQQadFeYrS17kaOKnEz bgJQtlVAavafXW7UbBi4LfM5WA9mYaQ/JfcJ8VoORGBLBcEfgR7Oqq71HvWKchnivsvT vD2w6MhasgYcxXwcXcDQcA53e8P1iLG+E6luGJtAov3ldYnEY6Kp8X32GTyrvZjzQ6+R PpWuSGAlIdnOSzAPUrCFive5NYlMpUijcnmQHyd7h2JU8qjGktMfWG4i1pLLKTZlXpWO MfmA== X-Forwarded-Encrypted: i=1; AJvYcCX6qOW4gMiQvvFg9d3V81PtZHeO4TU4sabL01bg3E/Zc5OP7FELVA2Nfb2wLCBpzKz3uM9M1LmdiC7bxKjP4l3wS6lzYVC685eCC+Yy7KfyGA== X-Gm-Message-State: AOJu0YxE+Kz8JZ46vxcAUeWoEjkcBDrYgTv3HKOvmaYjnsD15KUaGunZ UMqeq35xaOqvq/fm/NpndOeOxdtT5Q8Mq5aNbhcCQ9kz4YYQ/1qhkEcidYFmH/bxr6h3Z4BhlD5 U5KOTRe/QH1xhXN2f0a8DoWvzlhzFv85kpas4BQ== X-Google-Smtp-Source: AGHT+IFoHiuwJcC9Q4AIuhkzn1EPOLFDR8yHL/Xn7YGjhmfoZJSWdgA3iSmc3k1VNHC/Qua4lKfTA0hK0vGf/79kicU= X-Received: by 2002:a17:906:c34c:b0:a55:6d17:6fbf with SMTP id ci12-20020a170906c34c00b00a556d176fbfmr196198ejb.5.1713470094124; Thu, 18 Apr 2024 12:54:54 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202404181857.43IIviHV084762@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 18 Apr 2024 13:54:41 -0600 Message-ID: Subject: Re: git: ede456359e55 - main - CONTRIBUTING: mention sys/crypto as another "contrib" directory To: John Baldwin Cc: Ed Maste , src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000004b42250616645837" 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] X-Rspamd-Queue-Id: 4VL7m05nRpz4J1p --0000000000004b42250616645837 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Apr 18, 2024, 1:10=E2=80=AFPM John Baldwin wrote: > On 4/18/24 11:57 AM, Ed Maste wrote: > > The branch main has been updated by emaste: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dede456359e55958ab17ac665e586767= 4a0c0e81b > > > > commit ede456359e55958ab17ac665e5867674a0c0e81b > > Author: Ed Maste > > AuthorDate: 2024-04-18 18:44:30 +0000 > > Commit: Ed Maste > > CommitDate: 2024-04-18 18:57:19 +0000 > > > > CONTRIBUTING: mention sys/crypto as another "contrib" directory > > > > Reviewed by: imp > > Sponsored by: The FreeBSD Foundation > > Differential Revision: https://reviews.freebsd.org/D44857 > > Hmm, sys/crypto is a bit of a mixed bag there. openssl is a mix of > upstream > and local bits. libsodium is an upstream. chacha20 and blake2 I think a= re > upstreams. rijndael did come from an upstream but I don't think it's > alive. > > I'd actually prefer if we moved a lot of sys/crypto over to sys/dev, e.g. > actual device drivers (as opposed to software crypto implementations) lik= e > aesni, armv8, via, should definitely move to sys/dev. For sys/openssl it > might be nicer then to have the home-grown bits of ossl(4) that aren't fr= om > upstream in a sys/dev/ossl leaving the stock openssl bits in > sys/crypto/openssl. > I like this idea... git makes it easier... this area has historical been a hodgepodge.. Warner > --0000000000004b42250616645837 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Apr 18, 2024, 1:10=E2=80=AFPM John Baldwin <= ;jhb@freebsd.org> wrote:
On 4/18/24 11:57 AM, Ed Maste wrote:
> The branch main has been updated by emaste:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dede456359e55958ab17ac665e58676= 74a0c0e81b
>
> commit ede456359e55958ab17ac665e5867674a0c0e81b
> Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
> AuthorDate: 2024-04-18 18:44:30 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
> CommitDate: 2024-04-18 18:57:19 +0000
>
>=C2=A0 =C2=A0 =C2=A0 CONTRIBUTING: mention sys/crypto as another "= contrib" directory
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 imp
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation >=C2=A0 =C2=A0 =C2=A0 Differential Revision: https:/= /reviews.freebsd.org/D44857

Hmm, sys/crypto is a bit of a mixed bag there.=C2=A0 openssl is a mix of up= stream
and local bits.=C2=A0 libsodium is an upstream.=C2=A0 chacha20 and blake2 I= think are
upstreams.=C2=A0 rijndael did come from an upstream but I don't think i= t's alive.

I'd actually prefer if we moved a lot of sys/crypto over to sys/dev, e.= g.
actual device drivers (as opposed to software crypto implementations) like<= br> aesni, armv8, via, should definitely move to sys/dev.=C2=A0 For sys/openssl= it
might be nicer then to have the home-grown bits of ossl(4) that aren't = from
upstream in a sys/dev/ossl leaving the stock openssl bits in sys/crypto/ope= nssl.

I like this idea... git makes it easier... this area has historical be= en a hodgepodge..

Warner= =C2=A0
--0000000000004b42250616645837-- From nobody Thu Apr 18 20:03:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL7y34ShRz5HTx8; Thu, 18 Apr 2024 20:03: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 4VL7y33qCdz4Jmh; Thu, 18 Apr 2024 20:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713470619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ostPrmso3dwRbm9ghgpvU2EiBuS7rYyAwcLG2zWqrRE=; b=rdbe24Q4vqOBDndqG4yj5Uc9IB2pUucyzPCVjHcQcwuKVnbDIQtbpjJXM5w/6lR/8kYzan 5rmAMqYStFhuEYPMC7oJH7/fIEU38tOxj36qPdfvfvh9AGGsKjQ7tS3p52sC0cT+yaBD9J hj91AUaPbXaLFHKAz94ixHJ8jAsAfsA4SMMXw1Bg7YXMmz5vV01Iwpc1GW85P3WtgmQt+h oYUpWgzcG1uIz7PkYnhACjwexumO2vCgf9b8epchytuLfBGuOzJZU5qz9VE6ppsSbO7SVN kb7njG7+MnEeDnAObTE7XZyMS/cZ9RQX4pxK1ZecPKaZJpbHMJ8zkp9jKh/acg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713470619; a=rsa-sha256; cv=none; b=R4n5nfkU1ggC/+KtreWajjRuAXQBguRic24Ds1EjtwwOEx/Uv7IL1Ghs8yIJPGjY6k+SYd aw7uDU05HutgeLBZN16RGAhVrci0z+LfwN0ek2GgUGNZ//YnE/D4AYeizF9XlunFRXxlzn ZOHJTShuyupC1tdNv7HF16kNS1FuXzorSoH8B316a95TUtE78CJxTfZX4B3E5XbD/2mXZw 5slZjYIv03cEgo/DV+jSxbCdYrY0E++DlKw5zMQArQ8auBPEN8GDfm6BH26s1o4WH/2qVG BvC/7bv3cTVId7SlSrD58fy9Q4dV57iiloOOUH/A8595YYPqW/iNogtiJeaoDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713470619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ostPrmso3dwRbm9ghgpvU2EiBuS7rYyAwcLG2zWqrRE=; b=qam7pfO4eNrv0bC0lgxfbG1kVrLvQfzjUgSc74oe6I3k51+h2UZyBiDrEkbJ73ltYksZbS aSmz6OJNtz7S7bi3MjIm4IWQH/GXHDhOGTS3NVncchRohcXo5ydgfVS8thrldhY0HD8Vw5 +tgOMdASeOVpWl85nC1gOxUUSVf3pZJllw5p4UAQqHQvKOkWrdbTHkziJoGnjGOn8no7hi i7p0fCO0WUfD+mIvqWQ2j5HVvE1kXro2W6IuJ1BfQz9PjYZ7/Pfa6t/rDDAYr9tUmRV+gl EO/uFNPSNcxAR9IK/GvjZi2//uvWpcT5N1qutOGEfYS6Vs1C+t0vKfUsNb+gYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL7y33PmbzP5p; Thu, 18 Apr 2024 20:03: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 43IK3dU1005429; Thu, 18 Apr 2024 20:03:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IK3dxw005426; Thu, 18 Apr 2024 20:03:39 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:03:39 GMT Message-Id: <202404182003.43IK3dxw005426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 806bd5e00658 - main - organization.dot: Fix typos List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 806bd5e00658e66a5625397335cafa4748112f14 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=806bd5e00658e66a5625397335cafa4748112f14 commit 806bd5e00658e66a5625397335cafa4748112f14 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-18 19:59:49 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-18 20:02:55 +0000 organization.dot: Fix typos MFC after: 3 days --- share/misc/organization.dot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/misc/organization.dot b/share/misc/organization.dot index 1552da1f646e..f33ea0f0dbd0 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -30,9 +30,9 @@ doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nbcr, gabor, gjb, hrs,\nblackend, ryusuke, wblock"] pkgmgr [label="Package Management Team\npkgmgr@FreeBSD.org\nantoine, bdrewery"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat\npizzamig, rene, tcberner"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat,\npizzamig, rene, tcberner"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"] -re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib\n, blackend, delphij, cperciva"] +re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib,\nblackend, delphij, cperciva"] secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, markj,\nemaste,\ngjb, gordon,\noshogbo, philip"] portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, jgh, rea, riggs, sbz, simon, zi"] secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"] From nobody Thu Apr 18 20:21:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8Ll6WWpz5HWFK; Thu, 18 Apr 2024 20:21: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 4VL8Ll64Wkz4LCl; Thu, 18 Apr 2024 20:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713471695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r02uUHZ4A5VME4uB+dORiuoiYrRptM4sanTtLN8cWNM=; b=XDfgCw69ipPqt4yipnFzzJO4Mp5RmJkHIBrabSodhqch00dX0mtk9oKuXqYd7BM4/bcZUU bpCIuuusCfIyZU6k7UkqIIgbb72D6i+ng5Sewu9pZj1cDvSx/eBKYBob/baJcgUbsKVXZs iHRp0BIxgSH3RgcfITkB1er4GAmNSr9RE//hdvpXDMEIpT1LBgnmD53/JoCG7gbELJsrak cjJUYevYgu7+/OINb3RWYkFppeXjVpD9Q6KvoCFWHT53oH+AkzHcsIC6GI6J/7RxLY9J8x WVaR/Y7GGdtZMB3lNmjL8rxU0xuihQsnHQPmUHAGFiX+j5RzvzdgmSZMOYYTLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713471695; a=rsa-sha256; cv=none; b=bjhOU6CBohHdrPgxt5ioCpavXwCXHi7wNsy3oaaaAuxnC5qDyYur2AfONMouhRsC9rrrL9 Da+28L0QWPGzAvlDxHdAs91jSdYRGMbRalKamLsfTnKdW7O5VJ0TQRWwQF7pqsyIKkU0Lq C8zHX+zEtA7OHPW6RzDVPXEw1yHeb95H/pVcgSH2GBle988AXhG2ybUoU8CTP0fI8wc3ZA izICsHJBV9np2u9RBeXiCbOHJIicDsR9x/b5H+DW3iaIMU9M5ZSiQh3rnqdFUSQacmFZTA ETxEZ+yMMydnxdUtxLRQW2BN8EXaKZg4Z7X6UsM3TpMahUBukdeDlY6CgiP8ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713471695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r02uUHZ4A5VME4uB+dORiuoiYrRptM4sanTtLN8cWNM=; b=Em7ZQFy6uVSD2XRGj0EaG3J46Qz6svKN/BSmigNLkRcdNSEIuP0yNSiXrbScVTB4OLErim QC1X87YpSKlTuUVkRN8b8pMvU/6oE/Vws3GXe8/CD6vdURlvbLiecIbBsbg1LljScdTh63 B0GxqdvaNUA+WqqTBdVteK7Qg2UiMaEVyMiYPpLdkkJiupBu7X1a1ZAbdkJwMrqzPUHtqQ PWmEyPetkPLZL1IhAtm0X/CdW7YoHfVXyBiWaSau8bzUmYUiB0yTXFYLcQkHwB517ahsl3 xPEaoste0C/td58UFy7NDAr1zk22ObyhX/MjUVp8iIFsUT2AFJvelbVSTpHpew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8Ll5gvfzP2V; Thu, 18 Apr 2024 20:21: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 43IKLZGi036791; Thu, 18 Apr 2024 20:21:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKLZeT036788; Thu, 18 Apr 2024 20:21:35 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:21:35 GMT Message-Id: <202404182021.43IKLZeT036788@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: c9cd686bd4a0 - main - tcp: drop data received after a FIN has been processed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: c9cd686bd4a039c652ed5d11019bae10828329df Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c9cd686bd4a039c652ed5d11019bae10828329df commit c9cd686bd4a039c652ed5d11019bae10828329df Author: Michael Tuexen AuthorDate: 2024-04-18 19:50:31 +0000 Commit: Michael Tuexen CommitDate: 2024-04-18 19:54:42 +0000 tcp: drop data received after a FIN has been processed RFC 9293 describes the handling of data in the CLOSE-WAIT, CLOSING, LAST-ACK, and TIME-WAIT states: This should not occur since a FIN has been received from the remote side. Ignore the segment text. Therefore, implement this handling. Reviewed by: rrs, rscheff MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44746 --- sys/netinet/tcp_input.c | 6 ++++-- sys/netinet/tcp_stacks/bbr.c | 18 ------------------ sys/netinet/tcp_stacks/rack.c | 14 -------------- 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 1c6bdedc9368..3fda6e903738 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2337,9 +2337,11 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, /* * If new data are received on a connection after the - * user processes are gone, then RST the other end. + * user processes are gone, then RST the other end if + * no FIN has been processed. */ - if ((tp->t_flags & TF_CLOSED) && tlen) { + if ((tp->t_flags & TF_CLOSED) && tlen > 0 && + TCPS_HAVERCVDFIN(tp->t_state) == 0) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) { log(LOG_DEBUG, "%s; %s: %s: Received %d bytes of data " "after socket was closed, " diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 06e80db4a0eb..946b65cda6a5 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -9555,15 +9555,6 @@ bbr_do_closing(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_drop_checks(to, m, th, tp, &tlen, &thflags, &drop_hdrlen, &ret_val)) { return (ret_val); } - /* - * If new data are received on a connection after the user processes - * are gone, then RST the other end. - * We call a new function now so we might continue and setup - * to reset at all data being ack'd. - */ - if ((tp->t_flags & TF_CLOSED) && tlen && - bbr_check_data_after_close(m, bbr, tp, &tlen, th, so)) - return (1); /* * If last ACK falls within this segment's sequence numbers, record * its timestamp. NOTE: 1) That the test incorporates suggestions @@ -9666,15 +9657,6 @@ bbr_do_lastack(struct mbuf *m, struct tcphdr *th, struct socket *so, if (ctf_drop_checks(to, m, th, tp, &tlen, &thflags, &drop_hdrlen, &ret_val)) { return (ret_val); } - /* - * If new data are received on a connection after the user processes - * are gone, then RST the other end. - * We call a new function now so we might continue and setup - * to reset at all data being ack'd. - */ - if ((tp->t_flags & TF_CLOSED) && tlen && - bbr_check_data_after_close(m, bbr, tp, &tlen, th, so)) - return (1); /* * If last ACK falls within this segment's sequence numbers, record * its timestamp. NOTE: 1) That the test incorporates suggestions diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 5b76480ee55d..409402adb907 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -14997,13 +14997,6 @@ rack_do_closing(struct mbuf *m, struct tcphdr *th, struct socket *so, &rack->r_ctl.challenge_ack_cnt)) { return (ret_val); } - /* - * If new data are received on a connection after the user processes - * are gone, then RST the other end. - */ - if ((tp->t_flags & TF_CLOSED) && tlen && - rack_check_data_after_close(m, tp, &tlen, th, so)) - return (1); /* * If last ACK falls within this segment's sequence numbers, record * its timestamp. NOTE: 1) That the test incorporates suggestions @@ -15112,13 +15105,6 @@ rack_do_lastack(struct mbuf *m, struct tcphdr *th, struct socket *so, &rack->r_ctl.challenge_ack_cnt)) { return (ret_val); } - /* - * If new data are received on a connection after the user processes - * are gone, then RST the other end. - */ - if ((tp->t_flags & TF_CLOSED) && tlen && - rack_check_data_after_close(m, tp, &tlen, th, so)) - return (1); /* * If last ACK falls within this segment's sequence numbers, record * its timestamp. NOTE: 1) That the test incorporates suggestions From nobody Thu Apr 18 20:27:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8Th374Pz5HWmD; Thu, 18 Apr 2024 20:27: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 4VL8Th2FMYz4LvJ; Thu, 18 Apr 2024 20:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=twE6txNcm3pajodqnzin66K2Z1hDBHd7eLaeyNXHOhs=; b=n/JN+UJYfs0oyyGkqEKRyTfOPGwgOwccODciGBkOTovJpO8EB08CaJWWF3kB+Cu+S3hoHJ bEqA4ha3vM+nznyXeDOSnXNsqlqPtcJ+QiWx43K6oMMHKl5nNOuAo5Fc6A6IccI5ZQ6Jl3 dKDumPukXaVfRiHndL08qjLf/ZqxYJAz6grv5kmdsw3l+XAAtdV9XJUG/nzanZfH3FJyKw +vwYyb54m/4/CGMqZXFxfldpZNU3K4ZvWXBTINH45KyqIuoX6UAE+4lCVekoKeVO0ufg1N RIiAh2hBvxGIXHOWbvY/P0gS48httRJiMcldAkYFXyg8Dzg0GF4OjCrxCeV+cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472056; a=rsa-sha256; cv=none; b=AWoEcb2JUZFx3ub8bDvh8Mc8JMuGRRqF1yB9OdVczHB55AV1r1+V+GwmDQUBw4VgOeaKeR IHnkkIqsddc9lXWtTZmRqUSh3wW4a9KntTAFPv8r5hXSkYUtHeH81taInhW+DNzpYG0ttU zv6CSlsLmkJfv9PzJxADI5uSyxiw0PN8tlevaqT+4de3mSww0VkkmUGQsmr6eWP9edIrLk q/h2/+QLemwnpxovKT3eVpJVdyVa++RC3OEe6TKnsPqlW8J/ySBoHQsC9qHGRJ+sXT7A4z Fz+1uq5KIocV6e402B6wJzfsZakAoP49/LjUnexf7DU0ruNQxYdyEasZflQKpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=twE6txNcm3pajodqnzin66K2Z1hDBHd7eLaeyNXHOhs=; b=KntInN4OEjCfDaOkaq1GXPj1R8Tsha0P7EE0vYnulsDLUByFwYUWaJl7jkbSHuqTH2xFh3 Q9byKpmCrvbDmAxEmFgJNWNo2vQucMeXv4twQEXwlCpB000ymO54zBmlI0tvDRQ5X88k+A qVhNEWV2zOtm0rGAOxQ1Gb3OFvIiaM64Rhm9K3kjzyWvHzNoxkpgUyQY/fv8paOwaxwGBB d8oRIIWb4ZIa3GrjmsdvILxN745dqlBpC/DfCbZ1k1twnntsy0le2Woxra7wlx+8MYieUo VKD1NWGEMmW79acusBFpKhY+1J26LfQdo8gsNCLwnET9MvO4LfXNfndC/PzVaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8Th1rtczP5G; Thu, 18 Apr 2024 20:27: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 43IKRaPq039875; Thu, 18 Apr 2024 20:27:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKRaNH039872; Thu, 18 Apr 2024 20:27:36 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:27:36 GMT Message-Id: <202404182027.43IKRaNH039872@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: 1941914d3bb4 - main - tcp rack: improve BBR_LOG_CWND event List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1941914d3bb41b9e29a250d876ed8814b7b91f96 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1941914d3bb41b9e29a250d876ed8814b7b91f96 commit 1941914d3bb41b9e29a250d876ed8814b7b91f96 Author: Michael Tuexen AuthorDate: 2024-04-18 19:57:44 +0000 Commit: Michael Tuexen CommitDate: 2024-04-18 19:57:44 +0000 tcp rack: improve BBR_LOG_CWND event Fix a typo, which resulted in missing r_ctl.gate_to_fs in the BBLog event. Reported by: Coverity Scan CID: 1540024 Reviewed by: rrs, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44648 --- sys/netinet/tcp_stacks/rack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 409402adb907..669d213e58fb 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -17026,7 +17026,7 @@ rack_new_round_setup(struct tcpcb *tp, struct tcp_rack *rack, uint32_t high_seq) log.u_bbr.flex1 = rack->r_ctl.current_round; log.u_bbr.flex2 = rack->r_ctl.last_rnd_of_gp_rise; log.u_bbr.flex3 = rack->r_ctl.gp_rnd_thresh; - log.u_bbr.flex5 = rack->r_ctl.gate_to_fs; + log.u_bbr.flex4 = rack->r_ctl.gate_to_fs; log.u_bbr.flex5 = rack->r_ctl.ss_hi_fs; log.u_bbr.flex8 = 40; (void)tcp_log_event(tp, NULL, NULL, NULL, BBR_LOG_CWND, 0, From nobody Thu Apr 18 20:35:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8g74x36z5HX46; Thu, 18 Apr 2024 20:35: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 4VL8g74RdDz4MmS; Thu, 18 Apr 2024 20:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VKUo9hbfezSIA2U5T3pieM1/XkM73mA0eVDZfNucKoQ=; b=n7KMHgl/LtFvsiAy8kKgnba5eU646ldFMSI5Jzb9D01yRnxonoArq9F7bRFguUg8b8xlPg r5Fbz1Vj5sJohnCopaImuQenzW0mTEBGkFudvkL65Vf4sIueuOmKvFxEmiT+F/TL+oMNSx xYiBh3rRPbKA3ILBiODYY2wIOPNw5SVAzcegy7iH5pll3Xoh9AhS6DYOdgVtt4qeKcy2bv exi+BAHpK1I6C6MTQfIfz8euIOuYhnw3JPamLfb8wYdrtf1dl3pJ5XaCD93k3Kv0c6NeZU 61AXADvVz5orKZFX7+A7EbmFXe+aLq1fjg/NQ34HEtw8gK5ChikH8v7Re4gOlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472547; a=rsa-sha256; cv=none; b=VibGBVIsPx4O/W3c51IDjfBgKXoXtyaE4ZnuC3EBgIKJe/Gcfx1gs83uCEP71cwKV4sua/ K36LpraYeBlpwkKxFab+ovQdhk0G9w8LPVoDYOPtPSy+qv51+OcoY3G4mTRJS4wGwtFWKO zFcOGruJMNs3h1Oeav19BQuBv5w0dEydYHcF8feas9ehLKmcW6/cUpCo9sVQEcZMU6Lqi1 PQ7NAGyrTYRWmtOuD86rFTLAAJqtL3q556ekuzxeKPms9ibC0XsTz/ARpnYF8BDCUiGJco UmHnbgGKnUjWbVVdDJlcEmif3akDYV87elIlirP8kFRZHZbqhTkf6h1ph0e9LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VKUo9hbfezSIA2U5T3pieM1/XkM73mA0eVDZfNucKoQ=; b=Lg91UQJfVSALWd5Am+eMUngjYqrEPreWFjbFz68SKwY6WI/A6Q3fBED6G2ibStrz1CFFG8 pQpy5W+UAxAhYFEvZ76JTpO4N1WMWjw7Zjh3mVdneP8OSUaOLzLs9UCtpsOMflpafxERjl olM9uHhMQEjAlanC5jfuDd9rgEHGfYPM6uLDPiukm8Pgeg+9oQ+O1LZwv/d5Yc/AcvW2R0 ysVii0XrceWFL1RHZOj2p5aI1DrAlbgdfkEx0cC7+nDth/lEexlGBk98mComCmewFQ5CtV /Q7HehA/3WME/nkeDmv83jDCFtkP6In2GaeeuHR5H1lqhvMVqz5d1byejGlEnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8g74311zPHG; Thu, 18 Apr 2024 20:35: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 43IKZlbI056583; Thu, 18 Apr 2024 20:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZlfv056580; Thu, 18 Apr 2024 20:35:47 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:47 GMT Message-Id: <202404182035.43IKZlfv056580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d0032e6a9e65 - main - sound: Be more verbose with virtual channel descriptions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0032e6a9e6596302bf129d7f68a627a02c6cd0a Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d0032e6a9e6596302bf129d7f68a627a02c6cd0a commit d0032e6a9e6596302bf129d7f68a627a02c6cd0a Author: Christos Margiolis AuthorDate: 2024-04-18 20:34:45 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:36 +0000 sound: Be more verbose with virtual channel descriptions Non-virtual channel description denote "play" or "record", so do the same for virtual ones as well. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44839 --- sys/dev/sound/pcm/sound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 52ead91853e9..4b5c2573239c 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -461,7 +461,7 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c max = SND_MAXHWCHAN; break; case PCMDIR_PLAY_VIRTUAL: - dirs = "virtual"; + dirs = "virtual_play"; direction = PCMDIR_PLAY; pnum = &d->pvchancount; device = SND_DEV_DSPHW_VPLAY; @@ -475,7 +475,7 @@ pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t c max = SND_MAXHWCHAN; break; case PCMDIR_REC_VIRTUAL: - dirs = "virtual"; + dirs = "virtual_record"; direction = PCMDIR_REC; pnum = &d->rvchancount; device = SND_DEV_DSPHW_VREC; From nobody Thu Apr 18 20:35:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8g860cYz5HX47; Thu, 18 Apr 2024 20:35: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 4VL8g85SQqz4Mpb; Thu, 18 Apr 2024 20:35:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YmAsloaA/vPID1p/m6SpmwZKPI69ND771MUBqYy+sUA=; b=krBk1cojzwdrcLZWf1977NRyeYdR6QieQvgwhqlxVILH5W/hOrKrkbvf6wjPqc7aGJHMW9 Sy0m8Bi439AcvKUwwRZZiqDOrn19JIPG3LXPJJxiW+95kX3f4zw9Xr8638BBeq/j802DfR h+qVlqR/wWX96mZxnjpkFF7adJ8zMvUrouDsoJK7jfQDlniboAldvgLEmWwI79TrM9EZFK S9u0ew9gTTxUZtxbFF9X+uXUgogucDBwl41WiO7iRuyMuJ7yBHjz0T0bWGWgpzjR0i02eF 9e9G7u5FJIKqedsHpVN2bsmFLHsg9WnH1IuMld4krk6qjZz/z8Vh9hGxunmDqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472548; a=rsa-sha256; cv=none; b=twMcf0BJmwmhOQ1dd6jbqu9qfOTE9e2gpRvDvqWjQM8GcHnxOBSV4Sn6ihKv65W2lFretI phqLTBplWOXc6YkugmwY0DhfJLzY1Chxayyg7sXGJq/Cryn0rlGag9bDH22yam+J9/x9j4 +1IWpcDFg14jjise3TK5pgJlggafO2LXIbIy5AOlH98W1lBm6rFVrCtoBiEHN4L8t+nV4D c13EosFnOl5Nj7lzYi0rjO3wurpqc5UhbPV6GF7Uui5XNvp9rPQ30TlzM2ArqmJPN58541 Zx/tORucjxQbWxMFA4XNKautkm9R7h7tCCc3eKfjTWBm2UGkPadgKw6MiBDFxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YmAsloaA/vPID1p/m6SpmwZKPI69ND771MUBqYy+sUA=; b=VC5QtDdhcytplSWSpjjj4Ey8WsSc4qiAaeIH+6CNMyppS+zE8mP4qmBrR+Ye0s+w7LOiOC ulYJQ2+WMTC5xexCKyuVDtbymeaLQDSU6jOjKn5VbbIuWdyBg4Xt/hZcpqPk10YXN0jA55 QjTgBv2idkdob66Gpbiwg2T57oo/UnjbReoe5lyV3wufvMjpztUyku/Mhhb3tfluIqgT8D bk4EyzOTA+wnHNIxMvumPsrvuDoZ46Iiptjp0gUou7wAFQzqH2ZFXuxzUEnEpKX7cNTdVe FmdjsIfI6LpjBrEUvqPAVG2g0c0X/NUe8S1xDoQcpS8XzLUvQb3cSKQcQrf2Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8g8548szPZx; Thu, 18 Apr 2024 20:35: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 43IKZmcx056637; Thu, 18 Apr 2024 20:35:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZmYB056634; Thu, 18 Apr 2024 20:35:48 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:48 GMT Message-Id: <202404182035.43IKZmYB056634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 41ab202ff74e - main - sound: Call device_get_name() and device_get_unit() only once in mixer_init() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41ab202ff74ea6af7e9125c9dfb430c729380f41 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=41ab202ff74ea6af7e9125c9dfb430c729380f41 commit 41ab202ff74ea6af7e9125c9dfb430c729380f41 Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:01 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:40 +0000 sound: Call device_get_name() and device_get_unit() only once in mixer_init() No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44840 --- sys/dev/sound/pcm/mixer.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index cc8cf5b1ceea..9a83fc305bc7 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -726,14 +726,17 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) struct snd_mixer *m; u_int16_t v; struct cdev *pdev; + const char *name; int i, unit, devunit, val; snddev = device_get_softc(dev); if (snddev == NULL) return (-1); - if (resource_int_value(device_get_name(dev), - device_get_unit(dev), "eq", &val) == 0 && val != 0) { + name = device_get_name(dev); + unit = device_get_unit(dev); + if (resource_int_value(name, unit, "eq", &val) == 0 && + val != 0) { snddev->flags |= SD_F_EQ; if ((val & SD_F_EQ_MASK) == val) snddev->flags |= val; @@ -749,8 +752,8 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { v = snd_mixerdefaults[i]; - if (resource_int_value(device_get_name(dev), - device_get_unit(dev), snd_mixernames[i], &val) == 0) { + if (resource_int_value(name, unit, snd_mixernames[i], + &val) == 0) { if (val >= 0 && val <= 100) { v = (u_int16_t) val; } @@ -761,7 +764,6 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) mixer_setrecsrc(m, 0); /* Set default input. */ - unit = device_get_unit(dev); devunit = snd_mkunit(unit, SND_DEV_CTL, 0); pdev = make_dev(&mixer_cdevsw, PCMMINOR(devunit), UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); From nobody Thu Apr 18 20:35:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8gB2Bp9z5HXRw; Thu, 18 Apr 2024 20:35: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 4VL8g96lSlz4My3; Thu, 18 Apr 2024 20:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xq8eq9nL8hJ+j9IJrH8k8RiGAimrd8fuhVDhr4hW5pg=; b=mkynAUdD1tn+mvr5zxHsyKGetn+IIu33WqGYyW7Ya1NHTN5d1vZ/lGWvBRxI4OPCVeBmLV HOBQCZ9sjnA4a/C/zcq8LH4CV0+1w5iltv+WYUj8IIHvYj0cS58bCW1lS6SidYJECtoeEm JwGnqQts1wTwihx6gnZnEgCXqz6dXxuwgc8EhEjVWrpc3djRAK0/2Vugtp8R45v0nRENyh WeG1mS9a9Mye/4kNOg3/c3Osi0sX9ufChJLubuKEl0aBjoawadQmqjE3/VTjukyfJUpwKd 6ZHJHAdIUhla51uJrA3P//hKYREGQD5CaU2qbIB0YUbn8Sv4vTvwM6mqlduCMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472549; a=rsa-sha256; cv=none; b=oUwZcmoZqZQM9Lla3eMtUctMctfCXtI8A6vlWo/I3v6hUoW5TlPmBJ8OPPLe8AChODuy7m NBLVoAilUmA6RdYpK/A3p5uDRJA522zSt16OXjA0ibKaizLbigp+aiMSeujLoQNvWgQFY6 x5iEXM14qxoWEM9shSWdX+da/coaFbuV25Jy8z4UccAwZ3/qqQMPmCqd/uozD7srWb9USs SkUhRND4Q5rnG0goocscVMKOuQ8gXsqjcDokQUrfx4in4tr1rkAS4C/TVWQtqLslGDRYzz bftV7wrHbq0mkU8vqFGVSwJdqPrkjdz1m/YeVtfq7APi3PmzBp2zcV24zhtpnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xq8eq9nL8hJ+j9IJrH8k8RiGAimrd8fuhVDhr4hW5pg=; b=WP+Ras5DA4+fqeBq7z4c34j7YJOMWIuntAFTAKQLQhST5Sxl9ACAB44BpvPvaA2dEeLviD 2ZRslRqWX53XYW5+dqOi8fB5UAz1L6CwtepP7IfDfipEumI7fPuQ0i2I5Hy7Xa9StHk/s3 uaf9p46zE01IO1OiyJ+a3EhuAYtY+rYdU2FtdWBITrl3UmzHMItHirdHgwvEsI2C30Vlhi vawoQxu8At9HPw5HOZAL+VtwqsOE0/sqwVR82wzeAM/6wITwo13AAS6mxRW+BAC9mdRQZI z8Mo1QUOYv99s00aeKXofkaAu8CuKXcn6pKvJ5Pa4HMiFYZPA27kP/y2YSAi/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8g9648lzPXr; Thu, 18 Apr 2024 20:35: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 43IKZndT056679; Thu, 18 Apr 2024 20:35:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZnKG056676; Thu, 18 Apr 2024 20:35:49 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:49 GMT Message-Id: <202404182035.43IKZnKG056676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4d2be7be3837 - main - sound: Get rid of snddev_info->devcount List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d2be7be3837d66ba242a0a7fd51632c3f89285d Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4d2be7be3837d66ba242a0a7fd51632c3f89285d commit 4d2be7be3837d66ba242a0a7fd51632c3f89285d Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:06 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:41 +0000 sound: Get rid of snddev_info->devcount snddev_info->devcount keeps track of the total number of channels for a given device. However, it is redundant to have it, since it is only used in sound_oss_sysinfo() to populate the "numaudios" field, and we also keep track of the channel counts in the playcount, pvchancount, reccount and rvchancount fields anyway. We can simply sum those fields together instead of updating a separate variable upon every channel addition/deletion. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44852 --- sys/dev/sound/pcm/sound.c | 7 +------ sys/dev/sound/pcm/sound.h | 5 ++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 4b5c2573239c..e88ccb1f25a6 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -602,8 +602,6 @@ pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch) break; } - d->devcount++; - return (0); } @@ -644,8 +642,6 @@ pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch) break; } - d->devcount--; - return (0); } @@ -947,7 +943,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) d->flags |= SD_F_BITPERFECT; d->devinfo = devinfo; - d->devcount = 0; d->reccount = 0; d->playcount = 0; d->pvchancount = 0; @@ -1116,7 +1111,7 @@ sound_oss_sysinfo(oss_sysinfo *si) PCM_UNLOCKASSERT(d); PCM_LOCK(d); - si->numaudios += d->devcount; + si->numaudios += PCM_CHANCOUNT(d); ++ncards; CHN_FOREACH(c, d, channels.pcm) { diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index b48aed7c2d6e..3b725603ee2b 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -175,6 +175,9 @@ struct snd_mixer; #define PCM_DETACHING(x) ((x)->flags & SD_F_DETACHING) +#define PCM_CHANCOUNT(d) \ + (d->playcount + d->pvchancount + d->reccount + d->rvchancount) + /* many variables should be reduced to a range. Here define a macro */ #define RANGE(var, low, high) (var) = \ (((var)<(low))? (low) : ((var)>(high))? (high) : (var)) @@ -367,7 +370,7 @@ struct snddev_info { } opened; } pcm; } channels; - unsigned devcount, playcount, reccount, pvchancount, rvchancount ; + unsigned playcount, reccount, pvchancount, rvchancount; unsigned flags; unsigned int bufsz; void *devinfo; From nobody Thu Apr 18 20:35:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8gC1gmtz5HXW2; Thu, 18 Apr 2024 20:35: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 4VL8gC04qxz4N1S; Thu, 18 Apr 2024 20:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wL79WdXG2ZuMvMZaeHyaLCstKYk5OrkcQwBjnRoP/Y=; b=s13Cu14Cqg9uHJiqnRrvwQJagNlqolH+ciIkZjOSHaGSdNVG3ZgErAg5Ry6qX4UNX0QBiL U/kLjJ+mthipQWszD2OSeTkgUHWE6f4wixVtvP17Jv7OTrFEyMP8yo5BuAZyE7fbRPWppI GCMBNDFhWf6ox2jybGDNY4YqlRHISsHRtTQYQdiJihCcSqio9La7fvfjaofC3x7PWhsB+s vXoeh/TsViQWFSfItNpAhqVmcFXDG8O+vTpFhVvL7CXA6LOVJpqIoYO/fei+x/rbXzajwF Ez5EqvnE6/M/8wxjQ6xSm6tDrcT4cbKL303+g6reWT1gx48ZuvtTmLiz9ptglA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472551; a=rsa-sha256; cv=none; b=fBRq3uzLT/9P1xclMEydZkBkkVyC1ecHrnsuJWGUVsks32FUM/c90qY1wPIPli8BRe1F9Z L5SESXPmqmPlGJDCQujaIm9VSGTaYuGbINOcKR5AWdJiKAugZ7Sf4iQPsK72jeNZEcdWmy bNgn9/7XgU81qUfAmr4SzNtJhMN59mJaFaOrq28i9V3GRrvOc8L6ZKFF7nec4vV+yhq+aF AntlXUUujcA2p4UAB2PEGaRUNQ8yJGSe0XclPgWdpHQzqnLMEz/hS8fQDRCQO72qf+3hEA 037QgAR1mXGsdMPrm6/o9rUQCT344mtQQmz2KqN7t8IPtCM0Uqljz7/Fv+9PbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wL79WdXG2ZuMvMZaeHyaLCstKYk5OrkcQwBjnRoP/Y=; b=By9sP2SxVJsR7QN4E94cK+gzHRMTmqKXQpnDORgaD2f6FsMTykY/Ke6qm0PXuVFhjJziwH Jgqpn0MRvF6AoZP/I6aRZe88NhQGDWPmUBQb+rM+K6K7drg8rfJojzipwl27agzg81P4+R cIODMZa/9vIUvqp1j5XdU0cEtSvDL2/j2dRqFmyy5hB/LN4wn6tIaxZRcO8tVpoVfuHqsh 4R8Nqd6sA9/lLUwCLqTlm3+fCBSgm2Xc/c2CA5IicLRVSYbvr7cZJAN9RHeoV2G+GVIQD1 nT531VV5xxLKKpNkIPkC/Oh9ezX4MYb9hnJxQzTg/mlA6RZiN6YqLC/TMYEmcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8gB6pWkzPmG; Thu, 18 Apr 2024 20:35: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 43IKZoa1056719; Thu, 18 Apr 2024 20:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZowi056716; Thu, 18 Apr 2024 20:35:50 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:50 GMT Message-Id: <202404182035.43IKZowi056716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 17969e696325 - main - sound: Remove obsolete chn_setvolume() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17969e696325273e250a1dc73f43de76c0836aae Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=17969e696325273e250a1dc73f43de76c0836aae commit 17969e696325273e250a1dc73f43de76c0836aae Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:11 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:41 +0000 sound: Remove obsolete chn_setvolume() It is marked as obsolete and there are no consumers of it anymore. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44853 --- sys/dev/sound/pcm/channel.c | 13 ------------- sys/dev/sound/pcm/channel.h | 1 - 2 files changed, 14 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 4cb2b2a92b44..b4872fdb8037 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1301,19 +1301,6 @@ chn_kill(struct pcm_channel *c) return (0); } -/* XXX Obsolete. Use *_matrix() variant instead. */ -int -chn_setvolume(struct pcm_channel *c, int left, int right) -{ - int ret; - - ret = chn_setvolume_matrix(c, SND_VOL_C_MASTER, SND_CHN_T_FL, left); - ret |= chn_setvolume_matrix(c, SND_VOL_C_MASTER, SND_CHN_T_FR, - right) << 8; - - return (ret); -} - int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 4199dc282f06..21007454584e 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -265,7 +265,6 @@ int chn_poll(struct pcm_channel *c, int ev, struct thread *td); int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction); int chn_kill(struct pcm_channel *c); int chn_reset(struct pcm_channel *c, u_int32_t fmt, u_int32_t spd); -int chn_setvolume(struct pcm_channel *c, int left, int right); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, int center); int chn_setvolume_matrix(struct pcm_channel *c, int vc, int vt, int val); From nobody Thu Apr 18 20:35:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8gD2LPCz5HX85; Thu, 18 Apr 2024 20:35: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 4VL8gD1RJCz4N69; Thu, 18 Apr 2024 20:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GCVOZIQrRfMXwi/E2ullAixUIcrj0jUIcPe43zLMrmA=; b=xVFMhkhc0HXfdsj555k1Uqw1lD/iNupDFpjfuOUQ/NO/jSxUebITqycsDKro4dIytANg4o NNLhWFBTcz1hj2T8MZc3Rtsild02jR3pPeKs890rqjEwtVglVX9yo508YwOTKfLon11WQU WI//VM7ubELB60Ah9UF1IK1sSmj0cDIMh9XusDu5XR2n/SJTpl+bdQT1c6qMYDZoTBKwtx VSV3RhDrY4N4eZuxV3o70uyf2kcTw8ivXtNZ29Fv3wrF2w7kb2/TxhSYm3rbNx6IzmKK0d yET58FyxSTsLXdVMo5hGPhPhK0WJXi8H8xNMVwHCC4w3WEWhL3rmjspPl/TFow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472552; a=rsa-sha256; cv=none; b=ToNrdH20SVJ7aJFmhS2Act4zJy/Y72ZiAosjAnnWhLHMsLaUC6sgV+IOC1DBsGRdfPLC1B UEaxW0nxUcXOQZ4ofxv2p3yC54BuOW1d7S1uEy+tNl7D3s859qTsPKMeFvCbbdHX5sJZok 5v6taDIKmXMUiGbzW6yaS0BWRAx5Xn0XCDjD4CgTQI+4zNZ4dBFVS/N+EBkvCJNJJCL2Yu xEOK+FUU2NGO907a7IpuMXtV5y1aZ7wn+XMK50V8vSk19Sar4JO6Cmk7xgbfckJFwKqhGS +ricPIWdxmaXwZM8NjtAAc8ufml85j5V+930IBT6IO3/Ap2J5bBMUnS0T76kaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GCVOZIQrRfMXwi/E2ullAixUIcrj0jUIcPe43zLMrmA=; b=aXupRAGU7KjXmyZzDCSnuXmF3we6Ry7TROqjsgRiyQALTLKsQdPJUm5baoZth/HTMSdws6 /QXk2Ud0IFnfPy/BigF4UM3Hmt2iMhKihtmpXiFxgbDuYLJstNMR1bx41Rg+PMz83bXOXE 5pnyE+R67ub3Rt7iCUmM4d3NVeT1o+uGRIia0GOBeQoK7iaw9GrL/Mqqee0RaIKD0EncIB EYpuoXbEstjKkyM+hWOSdsfpNp5b4W8pkKEfnhMoSBkAAeRscVHkmWqSk8aq2rvHab1ZPU WjUY7HN/FtYfIhaNgF+Kw5LstOOCnEMdVNI1VqQq6m6aAYkWwNhkR9Zb5M14xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8gD10vTzPXs; Thu, 18 Apr 2024 20:35: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 43IKZqsI056762; Thu, 18 Apr 2024 20:35:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZq4H056759; Thu, 18 Apr 2024 20:35:52 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:52 GMT Message-Id: <202404182035.43IKZq4H056759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 8b97dce6973c - main - sound: Remove PCMMINOR() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b97dce6973ca1b6c3407c34c76d459f43ca1061 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8b97dce6973ca1b6c3407c34c76d459f43ca1061 commit 8b97dce6973ca1b6c3407c34c76d459f43ca1061 Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:15 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:41 +0000 sound: Remove PCMMINOR() It's a NO-OP. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44854 --- sys/dev/sound/pci/emu10kx.c | 2 +- sys/dev/sound/pcm/mixer.c | 4 ++-- sys/dev/sound/pcm/sound.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index 6bbbfcc1df0e..d17f5fb16d34 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -2313,7 +2313,7 @@ emu10kx_dev_init(struct emu_sc_info *sc) mtx_init(&sc->emu10kx_lock, device_get_nameunit(sc->dev), "kxdevlock", 0); unit = device_get_unit(sc->dev); - sc->cdev = make_dev(&emu10kx_cdevsw, PCMMINOR(unit), UID_ROOT, GID_WHEEL, 0640, "emu10kx%d", unit); + sc->cdev = make_dev(&emu10kx_cdevsw, unit, UID_ROOT, GID_WHEEL, 0640, "emu10kx%d", unit); if (sc->cdev != NULL) { sc->cdev->si_drv1 = sc; return (0); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 9a83fc305bc7..0178e1ae8c3e 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -765,8 +765,8 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) mixer_setrecsrc(m, 0); /* Set default input. */ devunit = snd_mkunit(unit, SND_DEV_CTL, 0); - pdev = make_dev(&mixer_cdevsw, PCMMINOR(devunit), - UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit); + pdev = make_dev(&mixer_cdevsw, devunit, UID_ROOT, GID_WHEEL, 0666, + "mixer%d", unit); pdev->si_drv1 = m; snddev->mixer_dev = pdev; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 3b725603ee2b..b72348ccf486 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -115,9 +115,6 @@ struct snd_mixer; #define PCMDEV(x) (snd_unit2d(dev2unit(x))) #define PCMCHAN(x) (snd_unit2c(dev2unit(x))) -/* XXX unit2minor compat */ -#define PCMMINOR(x) (x) - /* * By design, limit possible channels for each direction. */ From nobody Thu Apr 18 20:35:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8gF5PvNz5HX88; Thu, 18 Apr 2024 20:35: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 4VL8gF2ZK4z4N41; Thu, 18 Apr 2024 20:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zc32XBdt1Jn1EJ5ENJwzEvjvfbY3qc4HIypkQqlDUdI=; b=K1PjzMjH+/J+jTxa2WA1pQLyy1mAGYVX23xHVes+wF57cA3T0141AkFy8PH5y9aV2K5KTY Q6DUhbQV5P81uETF5rpDWMjOJ8G0ISKwle8OnjprdhJTd6BI71oz853dQBXFASFzG8S7Up pIW1mz21LGJ4AqNl6RAB3My6imFB/KNk6rHf9f4wioRpfCX2JJQpYCLeYts1ldyL47so5v vNQXyv9RvJZwOhgLfV/wUjlCpyK9rht8ax4CrUUazxctMkxOXVRnysknrsyzu/JDdQirNp ISaGvIldmPLDHP+17efKz6ogFahLKDzgtEDTw6SlbDlIrNdll0OvvY3iMFKk1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472553; a=rsa-sha256; cv=none; b=UAKOqJJLE/8UcqQil3jVY6yyRp9n6yNiEN41oXX7iZlEn/hMkh6F/788PpJe1bjJ9QIDl4 +bkQlnLHOIhXiRXD6swaSeNcfqry8DigG1QQRKQ/Q75C+7wy/uVdxRO550wXvoNtv3gND6 ZxyYpoh5yO1J/sG4CCewWT1K444J08qTXE1+h9rB2wNQGavnLnSo8Z0kOPffBgbaZC70/Q BxX22TF8U/2aHGAwixVY0LyE3ge+G1D+walxMZ915r7O3o1gpSUfCYF/YhMYQ+COhGzj1l UZ5XcCJLxbFuUOROHNzqf02qd9Bz8XvodJUUAzpzrkfAPOoaHGSZMeVN3jBQBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zc32XBdt1Jn1EJ5ENJwzEvjvfbY3qc4HIypkQqlDUdI=; b=aHwhiM78a6P7+drZfm8JrnnzmAmVtTIN8n5aL+Cd70qiV74Zu+W+ePQLSGI1Hdpky+TI5L wyquB1jkPfhB+A1BM+xZTXU3DLrqiy7LOgM8QzB/19gW2M/7D4UNv3ubnyug5vcEF6rEhX 8Dz8bewXwgZQadq6LT7Mg1VECQCHeJ6B2LDicr6/RX+nTOsPxCX8U23o+Gad+l/fejmJlJ uz2q1I3f2Uf3TnYe5/wtkmJa3d0l1pVXyXwVjRXZC8rj/AlnawVjQnxLZgRW/hgRZajDUW F1P+3wGtmeyV43xXAU40oTseGZApyuSCZ5qlZjJY9pxvm278mchYWq8KXOLx6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8gF21XnzPHH; Thu, 18 Apr 2024 20:35: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 43IKZrLl056807; Thu, 18 Apr 2024 20:35:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZrTU056804; Thu, 18 Apr 2024 20:35:53 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:53 GMT Message-Id: <202404182035.43IKZrTU056804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a44c45c7f597 - main - sound: Simplify unit fetching in dsp_oss_audioinfo() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a44c45c7f597d67d37e09396b0778a2847a30981 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a44c45c7f597d67d37e09396b0778a2847a30981 commit a44c45c7f597d67d37e09396b0778a2847a30981 Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:20 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:41 +0000 sound: Simplify unit fetching in dsp_oss_audioinfo() "i" keeps the value of the current unit, so we do not have to call PCMUNIT() and device_get_unit() to fetch it. In the mixer case, I think it is more correct to do it like this, since mixer and DSP device units have a 1-1 relationship (i.e the mixer unit is always the same as the corresponding DSP device one) and that way we can make it more clear. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44855 --- sys/dev/sound/pcm/dsp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f685d7e38f6d..1c020ba22611 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2177,7 +2177,7 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) struct pcm_channel *ch; struct snddev_info *d; uint32_t fmts; - int i, nchan, *rates, minch, maxch; + int i, nchan, *rates, minch, maxch, unit; char *devname, buf[CHN_NAMELEN]; /* @@ -2197,9 +2197,9 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) * Search for the requested audio device (channel). Start by * iterating over pcm devices. */ - for (i = 0; pcm_devclass != NULL && - i < devclass_get_maxunit(pcm_devclass); i++) { - d = devclass_get_softc(pcm_devclass, i); + for (unit = 0; pcm_devclass != NULL && + unit < devclass_get_maxunit(pcm_devclass); unit++) { + d = devclass_get_softc(pcm_devclass, unit); if (!PCM_REGISTERED(d)) continue; @@ -2324,14 +2324,13 @@ dsp_oss_audioinfo(struct cdev *i_dev, oss_audioinfo *ai) * @todo @c port_number - routing information? */ ai->port_number = -1; - ai->mixer_dev = (d->mixer_dev != NULL) ? PCMUNIT(d->mixer_dev) : -1; + ai->mixer_dev = (d->mixer_dev != NULL) ? unit : -1; /** * @note * @c real_device - OSSv4 docs: "Obsolete." */ ai->real_device = -1; - snprintf(ai->devnode, sizeof(ai->devnode), - "/dev/dsp%d", device_get_unit(d->dev)); + snprintf(ai->devnode, sizeof(ai->devnode), "/dev/dsp%d", unit); ai->enabled = device_is_attached(d->dev) ? 1 : 0; /** * @note From nobody Thu Apr 18 20:35:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL8gG4js2z5HXY2; Thu, 18 Apr 2024 20:35: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 4VL8gG3Rdbz4NFC; Thu, 18 Apr 2024 20:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkH101Ux2t2uWVJeipJYrZAP4A17himF9L3fQhssEP4=; b=LWxzBXA6YilV+fI80DDzecn/iN7RkDJrQGP+aciCPlHEfyOUXDaYIzBR84RGBdRqdUO1WH QRt/7c6Ot6kPTuE8suRdox/S1H4VMdZ1A6Uhr3G/ZZ4vWOYrNms0tHPjBPyKiy2qrN/Sst Hu+3tHqoS8ddV4JmJlXM74WSN6yPB6st+qcfDijAgknY2ao9R1a6Nz5BYREKPZl5jQbBbh W4wIW0Q4S4BQZ5dVdKnsbVuiTlALOwiXEnGwEsydJe7BqsbMSQBqPl+H+/b/ff+IWeUWqh WQA00X7ISfC8hH/YeDNXgLANvMPsgwifMOsrlagqvlYWCmhyuAV8KKlcxfSo0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713472554; a=rsa-sha256; cv=none; b=wtUlnmkR9wBDk43eciy4PlS3dUZGCWhBoFNEEZ84Vr0g1gnsawedE9LtjA71dlv6NIEJUQ xUnJ8AOmrqcphXo6oz6txdnn5jZYbRxBY9uD67GIPKqPCbixZH972IIDkzlJotUcdwxy0a 2jSlyrbFV0nWYCWqZMzRiTQm3rsLzXK7lXI368dNOQSDot2QXdoo1Ew6OJwHbmFYgxgl7i wRajYZ1JFMEgdMhpsFwi8zhi/E8T3JCAoJF68ufws8VrcQjFPmAcpzxhb4KyAqLSZvBPzW 2WyL7GMj4/R6WIMcEynVScYOqzvBw7rh+AIdNvwNiVYDOY0qLghciCNSItGkfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713472554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkH101Ux2t2uWVJeipJYrZAP4A17himF9L3fQhssEP4=; b=iJ2z1MGP0M/l3qXJ11YcOoooFpThyphFfns660TS/QETixbHKdE2hddxpQBPi2WvH6wyxR lIVWncKhQxPX6hPnk1DDNh+Y3yzdkHCH3rl3T+fVNkAMYZITuo+N9wEeLNPJf+yK0yGEmZ kV/crNYhZil7dCpivt6QZF6ecuPx8t+TqLi09gBiBobwr19vAT0w4i+8neddGoltmqb3/A TwGvHWQsqh98KFS04D242uP6fDejJ8m0d73sS94kettpvjAYxK58H0ET4PDLi+wD4I1OzK MiLguItjxdrwU11uUKFB6cLPOMEPi7w4Rti+RnVEdDGIB7fj8gBocpQU23deVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL8gG33TvzPmw; Thu, 18 Apr 2024 20:35: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 43IKZsIc056849; Thu, 18 Apr 2024 20:35:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IKZsa8056846; Thu, 18 Apr 2024 20:35:54 GMT (envelope-from git) Date: Thu, 18 Apr 2024 20:35:54 GMT Message-Id: <202404182035.43IKZsa8056846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 1b82d425ec0a - main - sound: Remove obsolete DV_F_* flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b82d425ec0ac155765bcdf706040534309e9c94 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1b82d425ec0ac155765bcdf706040534309e9c94 commit 1b82d425ec0ac155765bcdf706040534309e9c94 Author: Christos Margiolis AuthorDate: 2024-04-18 20:35:26 +0000 Commit: Christos Margiolis CommitDate: 2024-04-18 20:35:41 +0000 sound: Remove obsolete DV_F_* flags The ISA sound drivers that used them are retired. Last reference of DV_F_DRQ_MASK and DV_F_DUAL_DMA: 716924cb4832ea0a440daf09913a06f3166f243e ("Retire snd_sbc ISA sound card driver") Last reference of DV_F_DEV_MASK and DV_F_DEV_SHIFT: 5126e5eeeb5e07ceef3c809452a8c9f508b2d4d1 ("Retire snd_mss ISA sound card driver") Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D44858 --- sys/dev/sound/pcm/sound.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index b72348ccf486..fe310a3be3d6 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -341,14 +341,6 @@ void snd_mtxassert(void *m); int sndstat_register(device_t dev, char *str); int sndstat_unregister(device_t dev); -/* usage of flags in device config entry (config file) */ -#define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */ -#define DV_F_DUAL_DMA 0x00000010 /* set to use secondary dma channel */ - -/* ought to be made obsolete but still used by mss */ -#define DV_F_DEV_MASK 0x0000ff00 /* force device type/class */ -#define DV_F_DEV_SHIFT 8 /* force device type/class */ - /* * this is rather kludgey- we need to duplicate these struct def'ns from sound.c * so that the macro versions of pcm_{,un}lock can dereference them. From nobody Thu Apr 18 21:07:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VL9Mm5Xr6z5HZvl; Thu, 18 Apr 2024 21:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VL9Mm2zjcz4TK9; Thu, 18 Apr 2024 21:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713474452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=76zXZsk28L098Utptg/z4+Dv6z+vt6J7grpYb6rQbPc=; b=kivY/KUF0ca/BSHEIbLmVf/QfyrOMLLjfIrt+7IHSJlqUy/cfR+MpUVsuwZr0bUE/KRnf6 lamaOwZUVlKV4NQWx9MOyreUhZhyDvbPq8OzVJW5vGCSvpmKJ4IQbXh0iYfb2Y9LyJXB3R gHCuI7eLSA6dttlCTrDehSyEGqnDfU4PXY+TnmKhRf6Kzj5F/jQE7cMXN6JgMLanadUlu2 HzZKIg0WNTUSDPXKz/V7vwPpPvvu/Da2AJVY94JE2JLcBefdgT1n7x8GxWeg101jgcc1Je U1ufbg/lwrl13oNHvEo79wboeqi3EfeFHNelwqMzhuy8i5rxLsbr00b2/7TJAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713474452; a=rsa-sha256; cv=none; b=pDwokYPRzWjEzspMkwv1oM3y5a44kzpNNU4v4vMGksL27kJRoJNJnVrNC3fjjMmn6RM0eO 2gbpUpF1dUGQ89QGGjKZ9zFKXLJf7Ohd9d9/uTfS3KoodV3u8QxXp8VWdZjL47nOlRC6hh NFAiATrObUMM+uzEPT1IZddN+VQStV5NC1n0bYtVgiNLN/VXtOP8JuDG9yQnHkUZjjQL0u Cth4F8FNSjNriGbi4elY7ykSjiiLUEH2pbU4yyxzW21cHppp5ekI3Tj7UKMiu5gPIySl7V 8x8ODkZnVaj9O614VSDXDPfsUjDNXI6NU9hucz/hSdJYowL4Vey+b8DdeVqWlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713474452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=76zXZsk28L098Utptg/z4+Dv6z+vt6J7grpYb6rQbPc=; b=c+6vFf9Mcv3ftSwc03/TV0NSOOGqrXvLM9Z3VIpaJ1ZeDLsJKi+y7697/a40DgChynmphJ q+BOsws9R4r96q0HOlWb8Qhv4Slv7ZgGfl+xun17mZQlzwE5j136W3yP0kfk4BxLuag0dL egEnWzKx6MDwsCtGYjLXuiD7SjfuCHkIVtMeWrtv4E0FEs0eIMlJ5xZpCCQ/kUGIXJH1vC 7eJaFYJOCbLuXmNzz20dX/VUFrvpwKn0SApar7Qqvup56C3U+1HYE+EG+ktM8bhdx5OCTt Tnw5xQ3hkWfZ4oFlBgLdSvMecxQ52TFSypwRT//ZldwLBAgd6HbtE/AuLanXIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VL9Mm2ZFGzQ22; Thu, 18 Apr 2024 21:07: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 43IL7WYQ008677; Thu, 18 Apr 2024 21:07:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IL7W3D008674; Thu, 18 Apr 2024 21:07:32 GMT (envelope-from git) Date: Thu, 18 Apr 2024 21:07:32 GMT Message-Id: <202404182107.43IL7W3D008674@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: f697b9d03d99 - main - Update sys.dirdeps.mk set default DEP_* List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f697b9d03d998da8ec69f2028dd7702a42adc3fc Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f697b9d03d998da8ec69f2028dd7702a42adc3fc commit f697b9d03d998da8ec69f2028dd7702a42adc3fc Author: Simon J. Gerraty AuthorDate: 2024-04-18 21:07:24 +0000 Commit: Simon J. Gerraty CommitDate: 2024-04-18 21:07:24 +0000 Update sys.dirdeps.mk set default DEP_* Even at level 0 it is handy to default DEP_* used by Makefile.depend* to aid the first include if in a leaf dir. Reviewed by: stevek --- share/mk/sys.dirdeps.mk | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/share/mk/sys.dirdeps.mk b/share/mk/sys.dirdeps.mk index 1e3363c22339..4d2dfa8416fa 100644 --- a/share/mk/sys.dirdeps.mk +++ b/share/mk/sys.dirdeps.mk @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-2-Clause # -# $Id: sys.dirdeps.mk,v 1.14 2024/02/25 19:12:13 sjg Exp $ +# $Id: sys.dirdeps.mk,v 1.15 2024/04/18 17:18:31 sjg Exp $ # # @(#) Copyright (c) 2012-2023, Simon J. Gerraty # @@ -196,11 +196,10 @@ RELSRCTOP?= ${RELTOP} # just in case .MAKE.DEPENDFILE ?= Makefile.depend -.if ${.MAKE.LEVEL} > 0 -# Makefile.depend* also get read at level 1+ -# and often refer to DEP_MACHINE etc, -# so ensure DEP_* (for TARGET_SPEC_VARS anyway) are set -.for V in ${TARGET_SPEC_VARS} -DEP_$V = ${$V} +# Makefile.depend* often refer to DEP_MACHINE etc, +# we need defaults for both first include in a leaf dir +# and when level > 0 +# so ensure DEP_* for TARGET_SPEC_VARS and RELDIR are set +.for V in ${TARGET_SPEC_VARS} RELDIR +DEP_$V ?= ${$V} .endfor -.endif From nobody Thu Apr 18 23:23:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLDNP5vJnz5HJ98; Thu, 18 Apr 2024 23:23: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 4VLDNP5Fv5z4kGv; Thu, 18 Apr 2024 23:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713482597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1lRQpwMReINw9QnX8oR8pqBtnlYhdD7WHcwNxfOoctk=; b=AfK39SHC5nPXX6rg0CMICPFPPAARZlJ7AiysXcu0lA89XexTQkCnZIgrwE6c9hWUjkdicC 2KzY8J5eog8nIPi81JqXg8RrPnEBNuVZ3wo1GQ6DLBDTI4SLWcjfsFOFLyHF7RRxKKUv4P F0V8YAdzw7yzUVOGuTPQZZDc9e+7O+gsVaofdqa3OVMM9OS9VkY1gOA4KkTzKj1jGM++7W odFMDJReLE69Em4QFSZYRyJCeP679j5fxw5DCURcJ52tfVrFwhPGrgna39S4sIGmB1xYWC z2J/YahGMKR98kwAxWnPLGnolq9/Omv6Zp1jtBYc0DprX+6Crn2+Ig3+iTNiKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713482597; a=rsa-sha256; cv=none; b=vZyFRYP81Dhh07LwjfBWh1yzSonPFcYRW7F3YkU4qjp6yuKdGSVPeiTaPZL7Z0w/3Jbplp 40U7474mpl1PlpsrNGCNyrrgXkvMuMN7kLH60pAxA2X3T5U+BBa3MJtPzbsiYaC4VaDaNH PSM3mYnWlI+SCFVkt5x2W1aCs5toQzYtlJlNdGYGVByZtv3I4q+Sjqfsd1zRfJLWBfzRWv Viar7t1cKzlYXLfOB5tfFYdl6mO8iKEV1gku3LG4WbDqCeU2YclV5TQuFVyRBCm8scRGQh WECfljyXtH37aU1adbfHvYZl8cGkhUBo9L+UB5kP33mrjdPr8EtIbhDOHzXlMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713482597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1lRQpwMReINw9QnX8oR8pqBtnlYhdD7WHcwNxfOoctk=; b=IkauPCoZAmCmj41oeIxSq6JOmWwRwlWVvfZFLeEvoFZsw2NzzIVi8OedfiNpx1CT0MTAMS AvbbvSdvh4Z2TdwtTBy/Xgrhj9Gtwk/1tDL4q9CrZhWarcXNZI0Zw8rs3X9XHTOBB/lqQk SiwlOv4PFKIpPO6nrwuplelHQAeSXTqTudwVtW7Iqtbj0VnUuoFnu/vXsfqsnKmkefm9sC 8bWpiXcGSUvDpJ/pnaIkrM2RlNe3tHL3NWmELXm/IXn0Z5nwDuTBMmN3bm443Cp/U6quZU xDAhiNzrAycHc1nC92xWdWdzg5+OUHltI6ejQAMtQzEJ8Gc0Yy65VCzZJLk0Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLDNP4r1RzVc7; Thu, 18 Apr 2024 23:23: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 43INNH21045545; Thu, 18 Apr 2024 23:23:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43INNH1u045542; Thu, 18 Apr 2024 23:23:17 GMT (envelope-from git) Date: Thu, 18 Apr 2024 23:23:17 GMT Message-Id: <202404182323.43INNH1u045542@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: 3c7da27a473e - main - iflib: Add sysctl to request extra MSIX vectors on driver load List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 3c7da27a473e339392121404e06c506df040c16f Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=3c7da27a473e339392121404e06c506df040c16f commit 3c7da27a473e339392121404e06c506df040c16f Author: Eric Joyner AuthorDate: 2023-03-22 19:18:44 +0000 Commit: Eric Joyner CommitDate: 2024-04-18 23:13:47 +0000 iflib: Add sysctl to request extra MSIX vectors on driver load Intended to be used with upcoming feature to add sub-interfaces, since those new interfaces will be dynamically created and will need to have spare MSI-X interrupts already allocated for them on driver load. This sysctl is marked as a tunable since it will need to be set before the driver is loaded since MSI-X interrupt allocation and setup is done during the attach process. Signed-off-by: Eric Joyner MFC after: 3 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41326 --- sys/net/iflib.c | 14 ++++++++++++++ sys/net/iflib.h | 1 + 2 files changed, 15 insertions(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 5e1f71f6f9c2..9be99df08a81 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -194,6 +194,7 @@ struct iflib_ctx { #define CORE_OFFSET_UNSPECIFIED 0xffff uint8_t ifc_sysctl_separate_txrx; uint8_t ifc_sysctl_use_logical_cores; + uint16_t ifc_sysctl_extra_msix_vectors; bool ifc_cpus_are_physical_cores; qidx_t ifc_sysctl_ntxds[8]; @@ -264,6 +265,13 @@ iflib_get_sctx(if_ctx_t ctx) return (ctx->ifc_sctx); } +uint16_t +iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx) +{ + + return (ctx->ifc_sysctl_extra_msix_vectors); +} + #define IP_ALIGNED(m) ((((uintptr_t)(m)->m_data) & 0x3) == 0x2) #define CACHE_PTR_INCREMENT (CACHE_LINE_SIZE/sizeof(void*)) #define CACHE_PTR_NEXT(ptr) ((void *)(((uintptr_t)(ptr)+CACHE_LINE_SIZE-1) & (CACHE_LINE_SIZE-1))) @@ -6803,6 +6811,12 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) 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"); + SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "use_extra_msix_vectors", + CTLFLAG_RDTUN, &ctx->ifc_sysctl_extra_msix_vectors, 0, + "attempt to reserve the given number of extra MSI-X vectors during driver load for the creation of additional interfaces later"); + SYSCTL_ADD_INT(ctx_list, oid_list, OID_AUTO, "allocated_msix_vectors", + CTLFLAG_RDTUN, &ctx->ifc_softc_ctx.isc_vectors, 0, + "total # of MSI-X vectors allocated by driver"); /* XXX change for per-queue sizes */ SYSCTL_ADD_PROC(ctx_list, oid_list, OID_AUTO, "override_ntxds", diff --git a/sys/net/iflib.h b/sys/net/iflib.h index b16e2805aab6..5e1adccf202c 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -489,5 +489,6 @@ void iflib_led_create(if_ctx_t ctx); void iflib_add_int_delay_sysctl(if_ctx_t, const char *, const char *, if_int_delay_info_t, int, int); +uint16_t iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx); #endif /* __IFLIB_H_ */ From nobody Thu Apr 18 23:23:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLDNR096Dz5HJSl; Thu, 18 Apr 2024 23:23: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 4VLDNQ6HVjz4kJh; Thu, 18 Apr 2024 23:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713482598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cBFtPmWDO3LPEreB2wB0bLF8klADIwn/3M77/G3kfk=; b=rJV3rFH5PphmNnGjZbyFUfZVhq02TNLRQHSsBtd4aavx8BOisk/9u84PEK7g2b4uw3hmDB nFeEatEIBmj6Zu2NuTrHOF/T3pYW13KZ4AM0mOS98MVL4iiwzZu92ryWKRlra+sjy3wN1R 8DI8ePntd4hnbRMiJXFYQR2HWD97Coo+3h3AzYVA+QHmge86xN0yiTfW20E9odFGvpHSEn VJCY1yX7LZ5rSAnfflm2d9vUeBFXJcb76es2n1+cLDgKyYv2R7ccFmRWOJDoS40eWZDTxA zSUhiYcDtylQ/uPXZizH+W1/td7tg/aM2hb9XoAgJwdCaqPIZzvFTdv5X0qCmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713482598; a=rsa-sha256; cv=none; b=YkK8oWQ4MELaUreJh2LUXhZR5Vob3Agnlcxv6N9BoAPnua2IcsTMgI9/QmfKWeROFTOme+ V0O5Ntp6O/M6IL/43pi8TnG5bOzyj9u1sJvURWwBcDQSoxsauVpMgg8Fai6rUWH4KubHJW c8y30/V7RmVBlrLnCheUTQQlBc21wC4Tc6PUdmnGQSz9pZjM1VzOQh1Go8ITjamVod4E1V 4i/0a4TF/CIAq3g4HJdpkJebZ1T94AURKusOBpfIkc7orC0xLzLHoksQ4KyA8CuztijXSD KuWzup9jonb0+zTiztBBB8hAKlnfstkDuFu7TAKomgBz9YnTXmIDIyT31IueQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713482598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cBFtPmWDO3LPEreB2wB0bLF8klADIwn/3M77/G3kfk=; b=m5jRaI57nKGicse8+jGZ8RnEDwvB5i98R0QtAo7EifMrxrf6Z2UF3ciMS/5Foaxrv07pPS u0nzWKl9FfKE9bCBmCvBhNQYSofvCsCf9aIeXON+JAmWro+4epVJUIfsGkoM9YmvvusvpK LtisrtpjAPjRa8CNGJ99DIUvgSmbmrUT5DCUPZTlWPunGm0n6F4kt4tvCgDlVI6/Aa4pBc J02bJsGhS+mKQ/INxY+SxaSp0Z7V8i7LQv4UCQTm42W9gFERDcdcB4bxP2kXv+F9PAfH9a 5R5yRESRMpQDGWOa9KYxsx1SQav4wieY0cjh+gsZcbJDt1fY2CYfDVX/OoH/CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLDNQ5sfdzVMR; Thu, 18 Apr 2024 23:23: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 43INNIg0045590; Thu, 18 Apr 2024 23:23:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43INNI0Z045587; Thu, 18 Apr 2024 23:23:18 GMT (envelope-from git) Date: Thu, 18 Apr 2024 23:23:18 GMT Message-Id: <202404182323.43INNI0Z045587@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: ed34a6b6eab9 - main - iflib: Add subinterface interrupt allocation function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ed34a6b6eab9ea39759ccd3f12876a815d271929 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=ed34a6b6eab9ea39759ccd3f12876a815d271929 commit ed34a6b6eab9ea39759ccd3f12876a815d271929 Author: Eric Joyner AuthorDate: 2023-01-18 00:46:39 +0000 Commit: Eric Joyner CommitDate: 2024-04-18 23:14:02 +0000 iflib: Add subinterface interrupt allocation function The ice(4) driver will add the ability to create extra interfaces that hang off of the base interface; to do that the driver requires a method for the subinterface to request hardware interrupt resources from the base interface. Signed-off-by: Eric Joyner MFC after: 3 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D39930 --- sys/net/iflib.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- sys/net/iflib.h | 12 +++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 9be99df08a81..8129fb3f2f0b 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1469,8 +1469,8 @@ iflib_dma_alloc_align(if_ctx_t ctx, int size, int align, iflib_dma_info_t dma, i &dma->idi_tag); if (err) { device_printf(dev, - "%s: bus_dma_tag_create failed: %d\n", - __func__, err); + "%s: bus_dma_tag_create failed: %d (size=%d, align=%d)\n", + __func__, err, size, align); goto fail_0; } @@ -6199,6 +6199,81 @@ iflib_irq_set_affinity(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, return (0); } +/* + * Allocate a hardware interrupt for subctx using the parent (ctx)'s hardware + * resources. + * + * Similar to iflib_irq_alloc_generic(), but for interrupt type IFLIB_INTR_RXTX + * only. + * + * XXX: Could be removed if subctx's dev has its intr resource allocation + * methods replaced with custom ones? + */ +int +iflib_irq_alloc_generic_subctx(if_ctx_t ctx, if_ctx_t subctx, if_irq_t irq, + int rid, iflib_intr_type_t type, + driver_filter_t *filter, void *filter_arg, + int qid, const char *name) +{ + device_t dev, subdev; + struct grouptask *gtask; + struct taskqgroup *tqg; + iflib_filter_info_t info; + gtask_fn_t *fn; + int tqrid, err; + driver_filter_t *intr_fast; + void *q; + + MPASS(ctx != NULL); + MPASS(subctx != NULL); + + tqrid = rid; + dev = ctx->ifc_dev; + subdev = subctx->ifc_dev; + + switch (type) { + case IFLIB_INTR_RXTX: + q = &subctx->ifc_rxqs[qid]; + info = &subctx->ifc_rxqs[qid].ifr_filter_info; + gtask = &subctx->ifc_rxqs[qid].ifr_task; + tqg = qgroup_if_io_tqg; + fn = _task_fn_rx; + intr_fast = iflib_fast_intr_rxtx; + NET_GROUPTASK_INIT(gtask, 0, fn, q); + break; + default: + device_printf(dev, "%s: unknown net intr type for subctx %s (%d)\n", + __func__, device_get_nameunit(subdev), type); + return (EINVAL); + } + + info->ifi_filter = filter; + info->ifi_filter_arg = filter_arg; + info->ifi_task = gtask; + info->ifi_ctx = q; + + NET_GROUPTASK_INIT(gtask, 0, fn, q); + + /* Allocate interrupts from hardware using parent context */ + err = _iflib_irq_alloc(ctx, irq, rid, intr_fast, NULL, info, name); + if (err != 0) { + device_printf(dev, "_iflib_irq_alloc failed for subctx %s: %d\n", + device_get_nameunit(subdev), err); + return (err); + } + + if (tqrid != -1) { + err = iflib_irq_set_affinity(ctx, irq, type, qid, gtask, tqg, q, + name); + if (err) + return (err); + } else { + taskqgroup_attach(tqg, gtask, q, dev, irq->ii_res, name); + } + + return (0); +} + int iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, iflib_intr_type_t type, driver_filter_t *filter, diff --git a/sys/net/iflib.h b/sys/net/iflib.h index 5e1adccf202c..bf40c7429fb8 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -393,6 +393,11 @@ typedef enum { * function. */ #define IFLIB_FEATURE_QUEUE_SELECT_V2 1400073 +/* + * Driver can create subinterfaces with their own Tx/Rx queues + * that all share a single device (or commonly, port) + */ +#define IFLIB_FEATURE_SUB_INTERFACES 1500014 /* * These enum values are used in iflib_needs_restart to indicate to iflib @@ -491,4 +496,11 @@ void iflib_add_int_delay_sysctl(if_ctx_t, const char *, const char *, if_int_delay_info_t, int, int); uint16_t iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx); +/* + * Sub-interface support + */ +int iflib_irq_alloc_generic_subctx(if_ctx_t ctx, if_ctx_t subctx, if_irq_t irq, + int rid, iflib_intr_type_t type, + driver_filter_t *filter, void *filter_arg, + int qid, const char *name); #endif /* __IFLIB_H_ */ From nobody Thu Apr 18 23:23:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLDNS1yXtz5HJ9H; Thu, 18 Apr 2024 23:23: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 4VLDNS05bjz4kBB; Thu, 18 Apr 2024 23:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713482600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywrQP88lFASeq+73hzz6vGNsocNXH2C4S1iC2vKQuto=; b=BiLlaeLnt9qLlO/rVmsBXPWexdyI4DRH2XIyy42siXtiaPqWY2R8Cp2CQLlZyWF6sF3Bt6 pG5fwqSXts+W52IK9QiixPS7HMKImVZramcLROtulfyvxXcJYdXqAAHduTRZyDBJAjMTya jVE4ojB7ArcR17Sp5tpirwm/dSHaToOskoHQF2e+X3Vqok1haxQzHz5J0/AHTxpd2MW0IQ 6vtMeR4iZgMlKkV6GVPhdpemmxca7nHLhVM9+Umt+LZilOtixcDu5heXrirt/f8Grg3FVI 13y9TdmgPbmza3FbBvyY5caUmUtLz+oprN5AtFdbMaFw9zNI2zgwl5HXvg76Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713482600; a=rsa-sha256; cv=none; b=gDnXhQa1OS3DTshfoqDVL+lrCMy6P8SXNI2II2P0xNiXX6p94pj8Pzrgb5zvsXFW5Y28R9 hWI+YVSA8qOQ+g8x5t9gte9rvAXjSmqAoO7tlY5utC40BHdlDbG3v3vXSZaQgTrAAAlYiQ 2JPUoqtI6lK93rAiZs328fiOIlgaH8h5i0ht9e33ZeKe/dXiXlz7R3GJ4H7IhZf+PX/lbL b8JzKbJKeX0OC/ispgZ1OCQCB/b50NRwxBDv8dreSe5uUvGnhrVL2NCEhsca+u/zcUJXc4 VAbh+/nCjAQWGJdoDg6DFO1E2VUkmfK0P1pc9NwE0+jDBtzSJmqN0JAGv9DTqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713482600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywrQP88lFASeq+73hzz6vGNsocNXH2C4S1iC2vKQuto=; b=DMjYrsOGd0bDOtSzJIPM5cuVw0b39B3mFg6SG5TAxHOg+48sR0vwmVuuRZgMio/N9r5gNF 7MSV1yeZHgsIdUqm4nackMANxYlvqvve86CTxsFFvM4cN1Nwp1P/zMwcY0gri8he7ciA2x 54+CsK7DGwjUKTav4qNa/0R9vHVF0AAzOyeUUS4qNV4dDf1fXjuFBww7DQQmOkQaVYlY7z zX3RibuiyLGflBarefE8nUiuyjDr9DzQh6smvfQBjR17dHE0RTfE9vDaWTwFTyfFXR7db3 VnZPBa5ClC3SV5EPcdfEZbKpnJE0uVcm0PAYnveujfwPr4FhfCI4NiS9SOp3HA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLDNR6ctjzV9M; Thu, 18 Apr 2024 23:23: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 43INNJpu045636; Thu, 18 Apr 2024 23:23:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43INNJwf045633; Thu, 18 Apr 2024 23:23:19 GMT (envelope-from git) Date: Thu, 18 Apr 2024 23:23:19 GMT Message-Id: <202404182323.43INNJwf045633@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: 015f8cc5b0c1 - main - ice(4): Update copyright year to 2024 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 015f8cc5b0c10336a048f37a7071ea03516de242 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=015f8cc5b0c10336a048f37a7071ea03516de242 commit 015f8cc5b0c10336a048f37a7071ea03516de242 Author: Eric Joyner AuthorDate: 2024-02-13 06:25:47 +0000 Commit: Eric Joyner CommitDate: 2024-04-18 23:14:03 +0000 ice(4): Update copyright year to 2024 Signed-off-by: Eric Joyner MFC after: 3 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D44003 --- sys/dev/ice/ice_adminq_cmd.h | 2 +- sys/dev/ice/ice_alloc.h | 2 +- sys/dev/ice/ice_bitops.h | 2 +- sys/dev/ice/ice_common.c | 2 +- sys/dev/ice/ice_common.h | 2 +- sys/dev/ice/ice_common_sysctls.h | 2 +- sys/dev/ice/ice_common_txrx.h | 2 +- sys/dev/ice/ice_controlq.c | 2 +- sys/dev/ice/ice_controlq.h | 2 +- sys/dev/ice/ice_dcb.c | 2 +- sys/dev/ice/ice_dcb.h | 2 +- sys/dev/ice/ice_ddp_common.c | 2 +- sys/dev/ice/ice_ddp_common.h | 2 +- sys/dev/ice/ice_defs.h | 2 +- sys/dev/ice/ice_drv_info.h | 2 +- sys/dev/ice/ice_features.h | 2 +- sys/dev/ice/ice_flex_pipe.c | 2 +- sys/dev/ice/ice_flex_pipe.h | 2 +- sys/dev/ice/ice_flex_type.h | 2 +- sys/dev/ice/ice_flow.c | 2 +- sys/dev/ice/ice_flow.h | 2 +- sys/dev/ice/ice_fw_logging.c | 2 +- sys/dev/ice/ice_fwlog.c | 2 +- sys/dev/ice/ice_fwlog.h | 2 +- sys/dev/ice/ice_hw_autogen.h | 2 +- sys/dev/ice/ice_iflib.h | 2 +- sys/dev/ice/ice_iflib_recovery_txrx.c | 2 +- sys/dev/ice/ice_iflib_sysctls.h | 2 +- sys/dev/ice/ice_iflib_txrx.c | 2 +- sys/dev/ice/ice_lan_tx_rx.h | 2 +- sys/dev/ice/ice_lib.c | 2 +- sys/dev/ice/ice_lib.h | 2 +- sys/dev/ice/ice_nvm.c | 2 +- sys/dev/ice/ice_nvm.h | 2 +- sys/dev/ice/ice_opts.h | 2 +- sys/dev/ice/ice_osdep.c | 2 +- sys/dev/ice/ice_osdep.h | 2 +- sys/dev/ice/ice_protocol_type.h | 2 +- sys/dev/ice/ice_rdma.c | 2 +- sys/dev/ice/ice_rdma.h | 2 +- sys/dev/ice/ice_rdma_internal.h | 2 +- sys/dev/ice/ice_resmgr.c | 2 +- sys/dev/ice/ice_resmgr.h | 2 +- sys/dev/ice/ice_rss.h | 2 +- sys/dev/ice/ice_sched.c | 2 +- sys/dev/ice/ice_sched.h | 2 +- sys/dev/ice/ice_status.h | 2 +- sys/dev/ice/ice_strings.c | 2 +- sys/dev/ice/ice_switch.c | 2 +- sys/dev/ice/ice_switch.h | 2 +- sys/dev/ice/ice_type.h | 2 +- sys/dev/ice/ice_vlan_mode.c | 2 +- sys/dev/ice/ice_vlan_mode.h | 2 +- sys/dev/ice/if_ice_iflib.c | 2 +- sys/dev/ice/irdma_di_if.m | 2 +- sys/dev/ice/irdma_if.m | 2 +- sys/dev/ice/virtchnl.h | 2 +- sys/dev/ice/virtchnl_inline_ipsec.h | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index e4dc14b0162c..31e9583494fc 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_alloc.h b/sys/dev/ice/ice_alloc.h index 4970fae3bcf7..90946143091a 100644 --- a/sys/dev/ice/ice_alloc.h +++ b/sys/dev/ice/ice_alloc.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index 9c20106b994a..c7bf3384675e 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index 0df73583e137..73249cb7add4 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common.h b/sys/dev/ice/ice_common.h index 3d96792cf56f..024f6f4cdb01 100644 --- a/sys/dev/ice/ice_common.h +++ b/sys/dev/ice/ice_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common_sysctls.h b/sys/dev/ice/ice_common_sysctls.h index 3ff004152784..37a50296ea81 100644 --- a/sys/dev/ice/ice_common_sysctls.h +++ b/sys/dev/ice/ice_common_sysctls.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_common_txrx.h b/sys/dev/ice/ice_common_txrx.h index 4a4d2fc948ed..865c1d27da44 100644 --- a/sys/dev/ice/ice_common_txrx.h +++ b/sys/dev/ice/ice_common_txrx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_controlq.c b/sys/dev/ice/ice_controlq.c index 6568be2d9748..09816d4a812a 100644 --- a/sys/dev/ice/ice_controlq.c +++ b/sys/dev/ice/ice_controlq.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_controlq.h b/sys/dev/ice/ice_controlq.h index b32c753d14c5..047dd1beaf60 100644 --- a/sys/dev/ice/ice_controlq.h +++ b/sys/dev/ice/ice_controlq.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_dcb.c b/sys/dev/ice/ice_dcb.c index deb1505fa01c..a06117f90aad 100644 --- a/sys/dev/ice/ice_dcb.c +++ b/sys/dev/ice/ice_dcb.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_dcb.h b/sys/dev/ice/ice_dcb.h index 10c8c3cda9e9..ec2200afe200 100644 --- a/sys/dev/ice/ice_dcb.h +++ b/sys/dev/ice/ice_dcb.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_ddp_common.c b/sys/dev/ice/ice_ddp_common.c index 95e65317a4f2..a1573f5ea998 100644 --- a/sys/dev/ice/ice_ddp_common.c +++ b/sys/dev/ice/ice_ddp_common.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_ddp_common.h b/sys/dev/ice/ice_ddp_common.h index 10f6665d2b12..9305dc83520d 100644 --- a/sys/dev/ice/ice_ddp_common.h +++ b/sys/dev/ice/ice_ddp_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_defs.h b/sys/dev/ice/ice_defs.h index 3b96f9e0bf7c..e9f5192bed9f 100644 --- a/sys/dev/ice/ice_defs.h +++ b/sys/dev/ice/ice_defs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index 41598923dc94..ff13fe99ee27 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_features.h b/sys/dev/ice/ice_features.h index c259684df4fc..b58af574976d 100644 --- a/sys/dev/ice/ice_features.h +++ b/sys/dev/ice/ice_features.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_pipe.c b/sys/dev/ice/ice_flex_pipe.c index fc31afab9e79..943b37746f9d 100644 --- a/sys/dev/ice/ice_flex_pipe.c +++ b/sys/dev/ice/ice_flex_pipe.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_pipe.h b/sys/dev/ice/ice_flex_pipe.h index 16f9334daa83..559905e7fb59 100644 --- a/sys/dev/ice/ice_flex_pipe.h +++ b/sys/dev/ice/ice_flex_pipe.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flex_type.h b/sys/dev/ice/ice_flex_type.h index 5baa694ebda7..9c8f7b462677 100644 --- a/sys/dev/ice/ice_flex_type.h +++ b/sys/dev/ice/ice_flex_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flow.c b/sys/dev/ice/ice_flow.c index a45bb0408b9d..0cf37159b251 100644 --- a/sys/dev/ice/ice_flow.c +++ b/sys/dev/ice/ice_flow.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_flow.h b/sys/dev/ice/ice_flow.h index c6e272b4dd6b..0857b325ca7c 100644 --- a/sys/dev/ice/ice_flow.h +++ b/sys/dev/ice/ice_flow.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fw_logging.c b/sys/dev/ice/ice_fw_logging.c index 57445cc89056..a8caf65aca6d 100644 --- a/sys/dev/ice/ice_fw_logging.c +++ b/sys/dev/ice/ice_fw_logging.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fwlog.c b/sys/dev/ice/ice_fwlog.c index b66860f67cf5..c3c6d9101627 100644 --- a/sys/dev/ice/ice_fwlog.c +++ b/sys/dev/ice/ice_fwlog.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_fwlog.h b/sys/dev/ice/ice_fwlog.h index 0aa7db9a8339..41e41de1e670 100644 --- a/sys/dev/ice/ice_fwlog.h +++ b/sys/dev/ice/ice_fwlog.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_hw_autogen.h b/sys/dev/ice/ice_hw_autogen.h index 36d13eb22f52..6b04bff4b722 100644 --- a/sys/dev/ice/ice_hw_autogen.h +++ b/sys/dev/ice/ice_hw_autogen.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib.h b/sys/dev/ice/ice_iflib.h index d89d04985429..e9e09851b82c 100644 --- a/sys/dev/ice/ice_iflib.h +++ b/sys/dev/ice/ice_iflib.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_recovery_txrx.c b/sys/dev/ice/ice_iflib_recovery_txrx.c index 69ee98b46d35..dd90ffb8f21a 100644 --- a/sys/dev/ice/ice_iflib_recovery_txrx.c +++ b/sys/dev/ice/ice_iflib_recovery_txrx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_sysctls.h b/sys/dev/ice/ice_iflib_sysctls.h index 1eac7249447e..a718f5d12943 100644 --- a/sys/dev/ice/ice_iflib_sysctls.h +++ b/sys/dev/ice/ice_iflib_sysctls.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index b74ab610327e..f3087c09702a 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lan_tx_rx.h b/sys/dev/ice/ice_lan_tx_rx.h index 415565b4e99d..860958bffbaf 100644 --- a/sys/dev/ice/ice_lan_tx_rx.h +++ b/sys/dev/ice/ice_lan_tx_rx.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 7dcce35b072b..114d2a319669 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_lib.h b/sys/dev/ice/ice_lib.h index c07b9458db1f..fd8c8881cdbd 100644 --- a/sys/dev/ice/ice_lib.h +++ b/sys/dev/ice/ice_lib.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_nvm.c b/sys/dev/ice/ice_nvm.c index 42a60e0df1c8..91393c1fc8b3 100644 --- a/sys/dev/ice/ice_nvm.c +++ b/sys/dev/ice/ice_nvm.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_nvm.h b/sys/dev/ice/ice_nvm.h index d359a9ea4e4e..32f791f63102 100644 --- a/sys/dev/ice/ice_nvm.h +++ b/sys/dev/ice/ice_nvm.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_opts.h b/sys/dev/ice/ice_opts.h index 4b11f277debe..479ead0dc41e 100644 --- a/sys/dev/ice/ice_opts.h +++ b/sys/dev/ice/ice_opts.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_osdep.c b/sys/dev/ice/ice_osdep.c index c9ac8e9f97c9..88b4984c290f 100644 --- a/sys/dev/ice/ice_osdep.c +++ b/sys/dev/ice/ice_osdep.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_osdep.h b/sys/dev/ice/ice_osdep.h index c6774588bdaa..ea355ddb31f4 100644 --- a/sys/dev/ice/ice_osdep.h +++ b/sys/dev/ice/ice_osdep.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_protocol_type.h b/sys/dev/ice/ice_protocol_type.h index 0793eb005eca..ced1bc5037dd 100644 --- a/sys/dev/ice/ice_protocol_type.h +++ b/sys/dev/ice/ice_protocol_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma.c b/sys/dev/ice/ice_rdma.c index a614ee500c10..3fe12cec7adc 100644 --- a/sys/dev/ice/ice_rdma.c +++ b/sys/dev/ice/ice_rdma.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma.h b/sys/dev/ice/ice_rdma.h index 6d818f84b6cf..68aa2f2099e7 100644 --- a/sys/dev/ice/ice_rdma.h +++ b/sys/dev/ice/ice_rdma.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rdma_internal.h b/sys/dev/ice/ice_rdma_internal.h index 20718973af5d..c2ff8757c8c2 100644 --- a/sys/dev/ice/ice_rdma_internal.h +++ b/sys/dev/ice/ice_rdma_internal.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_resmgr.c b/sys/dev/ice/ice_resmgr.c index 547d6035e2bb..824b986fff57 100644 --- a/sys/dev/ice/ice_resmgr.c +++ b/sys/dev/ice/ice_resmgr.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_resmgr.h b/sys/dev/ice/ice_resmgr.h index eef028df4700..0869f5c5654c 100644 --- a/sys/dev/ice/ice_resmgr.h +++ b/sys/dev/ice/ice_resmgr.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_rss.h b/sys/dev/ice/ice_rss.h index 0b79bea6f30b..ede1fad5abe7 100644 --- a/sys/dev/ice/ice_rss.h +++ b/sys/dev/ice/ice_rss.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_sched.c b/sys/dev/ice/ice_sched.c index 49a8415132cb..ed9432292c0c 100644 --- a/sys/dev/ice/ice_sched.c +++ b/sys/dev/ice/ice_sched.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_sched.h b/sys/dev/ice/ice_sched.h index 4d9a4480fe58..490a7719a960 100644 --- a/sys/dev/ice/ice_sched.h +++ b/sys/dev/ice/ice_sched.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_status.h b/sys/dev/ice/ice_status.h index 48c8264c4bc5..016d987bac36 100644 --- a/sys/dev/ice/ice_status.h +++ b/sys/dev/ice/ice_status.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_strings.c b/sys/dev/ice/ice_strings.c index 16a1f9a34d56..7feaef163ef6 100644 --- a/sys/dev/ice/ice_strings.c +++ b/sys/dev/ice/ice_strings.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_switch.c b/sys/dev/ice/ice_switch.c index dfa2368e2bee..44be3999d3de 100644 --- a/sys/dev/ice/ice_switch.c +++ b/sys/dev/ice/ice_switch.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_switch.h b/sys/dev/ice/ice_switch.h index e5b0239d491b..70b5df769175 100644 --- a/sys/dev/ice/ice_switch.h +++ b/sys/dev/ice/ice_switch.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_type.h b/sys/dev/ice/ice_type.h index b7bab6a21a20..e153a772f746 100644 --- a/sys/dev/ice/ice_type.h +++ b/sys/dev/ice/ice_type.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_vlan_mode.c b/sys/dev/ice/ice_vlan_mode.c index 9b298a6ad71a..e0c6d7897607 100644 --- a/sys/dev/ice/ice_vlan_mode.c +++ b/sys/dev/ice/ice_vlan_mode.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/ice_vlan_mode.h b/sys/dev/ice/ice_vlan_mode.h index 1cf4ebb68798..8b1a56c98a3d 100644 --- a/sys/dev/ice/ice_vlan_mode.h +++ b/sys/dev/ice/ice_vlan_mode.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index e43c05081098..fb710d078b42 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/irdma_di_if.m b/sys/dev/ice/irdma_di_if.m index 55564d554c12..61a1817925a2 100644 --- a/sys/dev/ice/irdma_di_if.m +++ b/sys/dev/ice/irdma_di_if.m @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2023, Intel Corporation +# Copyright (c) 2024, Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/irdma_if.m b/sys/dev/ice/irdma_if.m index a78a4b05f7d2..d3aa68bcdf46 100644 --- a/sys/dev/ice/irdma_if.m +++ b/sys/dev/ice/irdma_if.m @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2023, Intel Corporation +# Copyright (c) 2024, Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/virtchnl.h b/sys/dev/ice/virtchnl.h index da281bfa366b..d7a1d3f254bf 100644 --- a/sys/dev/ice/virtchnl.h +++ b/sys/dev/ice/virtchnl.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/ice/virtchnl_inline_ipsec.h b/sys/dev/ice/virtchnl_inline_ipsec.h index ad8cfc1dcebb..adcd9f34c00f 100644 --- a/sys/dev/ice/virtchnl_inline_ipsec.h +++ b/sys/dev/ice/virtchnl_inline_ipsec.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause */ -/* Copyright (c) 2023, Intel Corporation +/* Copyright (c) 2024, Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without From nobody Thu Apr 18 23:23:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLDNT3S5yz5HJTf; Thu, 18 Apr 2024 23:23: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 4VLDNT1Nh9z4kBV; Thu, 18 Apr 2024 23:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713482601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=30TTNj9GO9G1C4ki2KLRI4R04hc5RTfHBnu4Vj4eM6c=; b=FqQFtmWDvCcM4Mp+5qbIasezy2Xp/5amkGOLuMknl24sxQKKlXTTIir164WXzxzcoMQQLd Zeoc5AAQIotW+S14DnS+XwknFphE6gRkzdvIrVPiEE4wG3P84TbHbm0o0Z63c9OaIr0quL iaKIrVaKdQdvplB9I7Z1t+1/0aKvWzc2ujQ8F3hI6IH8n2MezPFlCmmswV5Pt48rOOPn39 GWepecCWlST+tTsSODrkFWAZ90WcOfRcW6CMhUxCKRayQpYx2BkTYMrhkRglBozPZhq/YA ICWbS3+G+xXq5fM0bi5u/wV8c5FKxqO+Krg6adA6q8RfXSNSEUEk836gx/41eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713482601; a=rsa-sha256; cv=none; b=WBj282ntlxphp+49s0p6C/pNlejpzUuBKF8D2wk0Fw+6K+2WZUdSKidBXycSjq1n0irChP wGUciMBh5jaoP6QuiK+5DaHBocyK/l1j7iDLPH1VYnebIgVQ2lYFGHi35n2xxKqnZwQGDt vPEiQGFqkstS5nWvrgWfuWKYIP4QCa8Vq9gyPIQTlPRhZ3mXG+12OMPaTqx2GF2YFP6M5N A2xLleAXuK6zWMkQQ+X2f9QB0XBr7rSaWcuzQ1a4Boj3m7vMrCB8ws+H5xL3hZt0rxbZiY b2HZskJX5i/rm89uQInOwIE4xMj6WdqqCCf6+8YBCx6hB9vEo8zYhhwJ0CRe0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713482601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=30TTNj9GO9G1C4ki2KLRI4R04hc5RTfHBnu4Vj4eM6c=; b=QICGs3Dl9AjIiNMyJWosRCot6VFMLN5Oz8vBOxBhZLw1h4oUqT9Yly8VxeAXdJlFc7U5m3 ZcjPZBZi2CUwiJJOGDAuf4z/Q5ftu4jb0GpD/cWtIyjgBYUlvBGXCztPcKdrkHVcjNSy6g +FS6JCflSJG77MvmtFiM/QrRqJ5C2dVzancYJJ65l41Q87YVGfXKRRJJN8x3gvr1xiXNnj B3J6NVkzL4gKxNkRtNCRvLCTsTDfqCSjFtOfnsh7VAhJvmGRqKy678B4eLDoPhb+tc2fRr rWFw0/jYUFXUBBM/RVHStHL/AlinyKvcjuAVrPqxaDJ4wvPIMnI73/YZ0+pqDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLDNT0ttqzVdw; Thu, 18 Apr 2024 23:23: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 43INNLBm045680; Thu, 18 Apr 2024 23:23:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43INNLn0045676; Thu, 18 Apr 2024 23:23:21 GMT (envelope-from git) Date: Thu, 18 Apr 2024 23:23:21 GMT Message-Id: <202404182323.43INNLn0045676@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: 9e54973fc33a - main - ice(4): Update to 1.39.13-k List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9e54973fc33aa44b77d1c851cb36fcd82dc44cda Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=9e54973fc33aa44b77d1c851cb36fcd82dc44cda commit 9e54973fc33aa44b77d1c851cb36fcd82dc44cda Author: Eric Joyner AuthorDate: 2024-02-13 06:26:26 +0000 Commit: Eric Joyner CommitDate: 2024-04-18 23:21:22 +0000 ice(4): Update to 1.39.13-k - Adds mirror interface functionality - Remove unused virtchnl headers Signed-off-by: Eric Joyner MFC-with: 768329961dc0c041f7647f1c4549944a2ca168aa MFC after: 3 days Sponsored by: Intel Corporation Tested by: jeffrey.e.pieper@intel.com Differential Revision: https://reviews.freebsd.org/D44004 --- sys/dev/ice/ice_adminq_cmd.h | 21 +- sys/dev/ice/ice_bitops.h | 4 +- sys/dev/ice/ice_common.c | 43 +- sys/dev/ice/ice_common.h | 8 +- sys/dev/ice/ice_controlq.c | 10 +- sys/dev/ice/ice_controlq.h | 3 +- sys/dev/ice/ice_drv_info.h | 10 +- sys/dev/ice/ice_features.h | 1 - sys/dev/ice/ice_flex_pipe.c | 1 + sys/dev/ice/ice_flow.c | 71 +- sys/dev/ice/ice_flow.h | 8 +- sys/dev/ice/ice_hw_autogen.h | 1 + sys/dev/ice/ice_iflib.h | 32 +- sys/dev/ice/ice_iflib_txrx.c | 352 +++++++++- sys/dev/ice/ice_lib.c | 360 ++++++++-- sys/dev/ice/ice_lib.h | 30 +- sys/dev/ice/ice_nvm.c | 33 +- sys/dev/ice/ice_nvm.h | 1 + sys/dev/ice/ice_protocol_type.h | 1 + sys/dev/ice/ice_sched.c | 7 +- sys/dev/ice/ice_strings.c | 6 + sys/dev/ice/ice_switch.c | 31 +- sys/dev/ice/ice_switch.h | 9 +- sys/dev/ice/ice_type.h | 15 +- sys/dev/ice/if_ice_iflib.c | 1266 ++++++++++++++++++++++++++++++++++- sys/dev/ice/virtchnl_inline_ipsec.h | 594 ---------------- sys/dev/ice/virtchnl_lan_desc.h | 0 27 files changed, 2134 insertions(+), 784 deletions(-) diff --git a/sys/dev/ice/ice_adminq_cmd.h b/sys/dev/ice/ice_adminq_cmd.h index 31e9583494fc..70b56144faf2 100644 --- a/sys/dev/ice/ice_adminq_cmd.h +++ b/sys/dev/ice/ice_adminq_cmd.h @@ -152,6 +152,7 @@ struct ice_aqc_list_caps_elem { #define ICE_AQC_CAPS_WOL_PROXY 0x0008 #define ICE_AQC_CAPS_SRIOV 0x0012 #define ICE_AQC_CAPS_VF 0x0013 +#define ICE_AQC_CAPS_VMDQ 0x0014 #define ICE_AQC_CAPS_802_1QBG 0x0015 #define ICE_AQC_CAPS_802_1BR 0x0016 #define ICE_AQC_CAPS_VSI 0x0017 @@ -184,6 +185,8 @@ struct ice_aqc_list_caps_elem { #define ICE_AQC_CAPS_DYN_FLATTENING 0x008A #define ICE_AQC_CAPS_OROM_RECOVERY_UPDATE 0x0090 #define ICE_AQC_CAPS_ROCEV2_LAG 0x0092 +#define ICE_AQC_BIT_ROCEV2_LAG 0x01 +#define ICE_AQC_BIT_SRIOV_LAG 0x02 u8 major_ver; u8 minor_ver; @@ -358,6 +361,8 @@ struct ice_aqc_set_port_params { #define ICE_AQC_RES_TYPE_FLAG_SHARED BIT(7) #define ICE_AQC_RES_TYPE_FLAG_SCAN_BOTTOM BIT(12) #define ICE_AQC_RES_TYPE_FLAG_IGNORE_INDEX BIT(13) +#define ICE_AQC_RES_TYPE_FLAG_SUBSCRIBE_SHARED BIT(14) +#define ICE_AQC_RES_TYPE_FLAG_SUBSCRIBE_CTL BIT(15) #define ICE_AQC_RES_TYPE_FLAG_DEDICATED 0x00 @@ -2198,6 +2203,14 @@ struct ice_aqc_nvm { #define ICE_AQC_NVM_MINSREV_MOD_ID 0x130 #define ICE_AQC_NVM_TX_TOPO_MOD_ID 0x14B +#define ICE_AQC_NVM_CMPO_MOD_ID 0x153 + +/* Cage Max Power override NVM module */ +struct ice_aqc_nvm_cmpo { + __le16 length; +#define ICE_AQC_NVM_CMPO_ENABLE BIT(8) + __le16 cages_cfg[8]; +}; /* Used for reading and writing MinSRev using 0x0701 and 0x0703. Note that the * type field is excluded from the section when reading and writing from @@ -2509,11 +2522,13 @@ enum ice_lut_type { ICE_LUT_VSI = 0, ICE_LUT_PF = 1, ICE_LUT_GLOBAL = 2, - ICE_LUT_TYPE_MASK = 3 + ICE_LUT_TYPE_MASK = 3, + ICE_LUT_PF_SMALL = 5, /* yields ICE_LUT_PF when &= ICE_LUT_TYPE_MASK */ }; enum ice_lut_size { ICE_LUT_VSI_SIZE = 64, + ICE_LUT_PF_SMALL_SIZE = 128, ICE_LUT_GLOBAL_SIZE = 512, ICE_LUT_PF_SIZE = 2048, }; @@ -2796,7 +2811,7 @@ struct ice_aqc_event_lan_overflow { /* Debug Dump Internal Data (indirect 0xFF08) */ struct ice_aqc_debug_dump_internals { - u8 cluster_id; + __le16 cluster_id; /* Expresses next cluster ID in response */ #define ICE_AQC_DBG_DUMP_CLUSTER_ID_SW 0 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_TXSCHED 2 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_PROFILES 3 @@ -2809,7 +2824,7 @@ struct ice_aqc_debug_dump_internals { #define ICE_AQC_DBG_DUMP_CLUSTER_ID_L2P 8 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_QUEUE_MNG 9 #define ICE_AQC_DBG_DUMP_CLUSTER_ID_FULL_CSR_SPACE 21 - u8 reserved; +#define ICE_AQC_DBG_DUMP_CLUSTER_ID_MNG_TRANSACTIONS 22 __le16 table_id; /* Used only for non-memory clusters */ __le32 idx; /* In table entries for tables, in bytes for memory */ __le32 addr_high; diff --git a/sys/dev/ice/ice_bitops.h b/sys/dev/ice/ice_bitops.h index c7bf3384675e..499ee41228c3 100644 --- a/sys/dev/ice/ice_bitops.h +++ b/sys/dev/ice/ice_bitops.h @@ -402,7 +402,7 @@ static inline bool ice_is_any_bit_set(ice_bitmap_t *bitmap, u16 size) } /** - * ice_cp_bitmap - copy bitmaps. + * ice_cp_bitmap - copy bitmaps * @dst: bitmap destination * @src: bitmap to copy from * @size: Size of the bitmaps in bits @@ -460,7 +460,7 @@ ice_bitmap_hweight(ice_bitmap_t *bm, u16 size) } /** - * ice_cmp_bitmap - compares two bitmaps. + * ice_cmp_bitmap - compares two bitmaps * @bmp1: the bitmap to compare * @bmp2: the bitmap to compare with bmp1 * @size: Size of the bitmaps in bits diff --git a/sys/dev/ice/ice_common.c b/sys/dev/ice/ice_common.c index 73249cb7add4..ef487bcfd0f4 100644 --- a/sys/dev/ice/ice_common.c +++ b/sys/dev/ice/ice_common.c @@ -2319,6 +2319,10 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, ice_debug(hw, ICE_DBG_INIT, "%s: sr_iov_1_1 = %d\n", prefix, caps->sr_iov_1_1); break; + case ICE_AQC_CAPS_VMDQ: + caps->vmdq = (number == 1); + ice_debug(hw, ICE_DBG_INIT, "%s: vmdq = %d\n", prefix, caps->vmdq); + break; case ICE_AQC_CAPS_802_1QBG: caps->evb_802_1_qbg = (number == 1); ice_debug(hw, ICE_DBG_INIT, "%s: evb_802_1_qbg = %d\n", prefix, number); @@ -2404,7 +2408,7 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, ice_debug(hw, ICE_DBG_INIT, "%s: iwarp = %d\n", prefix, caps->iwarp); break; case ICE_AQC_CAPS_ROCEV2_LAG: - caps->roce_lag = (number == 1); + caps->roce_lag = !!(number & ICE_AQC_BIT_ROCEV2_LAG); ice_debug(hw, ICE_DBG_INIT, "%s: roce_lag = %d\n", prefix, caps->roce_lag); break; @@ -2726,6 +2730,10 @@ ice_parse_nac_topo_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, dev_p->nac_topo.mode = LE32_TO_CPU(cap->number); dev_p->nac_topo.id = LE32_TO_CPU(cap->phys_id) & ICE_NAC_TOPO_ID_M; + ice_info(hw, "PF is configured in %s mode with IP instance ID %d\n", + (dev_p->nac_topo.mode == 0) ? "primary" : "secondary", + dev_p->nac_topo.id); + ice_debug(hw, ICE_DBG_INIT, "dev caps: nac topology is_primary = %d\n", !!(dev_p->nac_topo.mode & ICE_NAC_TOPO_PRIMARY_M)); ice_debug(hw, ICE_DBG_INIT, "dev caps: nac topology is_dual = %d\n", @@ -3060,7 +3068,7 @@ void ice_clear_pxe_mode(struct ice_hw *hw) } /** - * ice_aq_set_port_params - set physical port parameters. + * ice_aq_set_port_params - set physical port parameters * @pi: pointer to the port info struct * @bad_frame_vsi: defines the VSI to which bad frames are forwarded * @save_bad_pac: if set packets with errors are forwarded to the bad frames VSI @@ -4058,6 +4066,8 @@ static u16 ice_lut_type_to_size(u16 lut_type) return ICE_LUT_GLOBAL_SIZE; case ICE_LUT_PF: return ICE_LUT_PF_SIZE; + case ICE_LUT_PF_SMALL: + return ICE_LUT_PF_SMALL_SIZE; default: return 0; } @@ -4089,6 +4099,8 @@ int ice_lut_size_to_type(int lut_size) return ICE_LUT_GLOBAL; case ICE_LUT_PF_SIZE: return ICE_LUT_PF; + case ICE_LUT_PF_SMALL_SIZE: + return ICE_LUT_PF_SMALL; default: return -1; } @@ -4116,8 +4128,8 @@ __ice_aq_get_set_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params vsi_handle = params->vsi_handle; lut = params->lut; - lut_type = params->lut_type; - lut_size = ice_lut_type_to_size(lut_type); + lut_size = ice_lut_type_to_size(params->lut_type); + lut_type = params->lut_type & ICE_LUT_TYPE_MASK; cmd_resp = &desc.params.get_set_rss_lut; if (lut_type == ICE_LUT_GLOBAL) glob_lut_idx = params->global_lut_id; @@ -4773,6 +4785,7 @@ ice_set_ctx(struct ice_hw *hw, u8 *src_ctx, u8 *dest_ctx, * @buf: dump buffer * @buf_size: dump buffer size * @ret_buf_size: return buffer size (returned by FW) + * @ret_next_cluster: next cluster to read (returned by FW) * @ret_next_table: next block to read (returned by FW) * @ret_next_index: next index to read (returned by FW) * @cd: pointer to command details structure @@ -4780,10 +4793,10 @@ ice_set_ctx(struct ice_hw *hw, u8 *src_ctx, u8 *dest_ctx, * Get internal FW/HW data (0xFF08) for debug purposes. */ enum ice_status -ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, +ice_aq_get_internal_data(struct ice_hw *hw, u16 cluster_id, u16 table_id, u32 start, void *buf, u16 buf_size, u16 *ret_buf_size, - u16 *ret_next_table, u32 *ret_next_index, - struct ice_sq_cd *cd) + u16 *ret_next_cluster, u16 *ret_next_table, + u32 *ret_next_index, struct ice_sq_cd *cd) { struct ice_aqc_debug_dump_internals *cmd; struct ice_aq_desc desc; @@ -4796,7 +4809,7 @@ ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_debug_dump_internals); - cmd->cluster_id = cluster_id; + cmd->cluster_id = CPU_TO_LE16(cluster_id); cmd->table_id = CPU_TO_LE16(table_id); cmd->idx = CPU_TO_LE32(start); @@ -4805,6 +4818,8 @@ ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, if (!status) { if (ret_buf_size) *ret_buf_size = LE16_TO_CPU(desc.datalen); + if (ret_next_cluster) + *ret_next_cluster = LE16_TO_CPU(cmd->cluster_id); if (ret_next_table) *ret_next_table = LE16_TO_CPU(cmd->table_id); if (ret_next_index) @@ -6051,7 +6066,7 @@ ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, */ enum ice_status ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, - u16 bus_addr, __le16 addr, u8 params, u8 *data, + u16 bus_addr, __le16 addr, u8 params, const u8 *data, struct ice_sq_cd *cd) { struct ice_aq_desc desc = { 0 }; @@ -6183,8 +6198,6 @@ static bool ice_is_fw_min_ver(struct ice_hw *hw, u8 branch, u8 maj, u8 min, if (hw->fw_min_ver == min && hw->fw_patch >= patch) return true; } - } else if (hw->fw_branch > branch) { - return true; } return false; @@ -6591,10 +6604,14 @@ u32 ice_get_link_speed(u16 index) */ bool ice_fw_supports_fec_dis_auto(struct ice_hw *hw) { - return ice_is_fw_min_ver(hw, ICE_FW_FEC_DIS_AUTO_BRANCH, + return ice_is_fw_min_ver(hw, ICE_FW_VER_BRANCH_E810, ICE_FW_FEC_DIS_AUTO_MAJ, ICE_FW_FEC_DIS_AUTO_MIN, - ICE_FW_FEC_DIS_AUTO_PATCH); + ICE_FW_FEC_DIS_AUTO_PATCH) || + ice_is_fw_min_ver(hw, ICE_FW_VER_BRANCH_E82X, + ICE_FW_FEC_DIS_AUTO_MAJ_E82X, + ICE_FW_FEC_DIS_AUTO_MIN_E82X, + ICE_FW_FEC_DIS_AUTO_PATCH_E82X); } /** diff --git a/sys/dev/ice/ice_common.h b/sys/dev/ice/ice_common.h index 024f6f4cdb01..3abfba874b9c 100644 --- a/sys/dev/ice/ice_common.h +++ b/sys/dev/ice/ice_common.h @@ -88,10 +88,10 @@ enum ice_status ice_get_caps(struct ice_hw *hw); void ice_set_safe_mode_caps(struct ice_hw *hw); enum ice_status -ice_aq_get_internal_data(struct ice_hw *hw, u8 cluster_id, u16 table_id, +ice_aq_get_internal_data(struct ice_hw *hw, u16 cluster_id, u16 table_id, u32 start, void *buf, u16 buf_size, u16 *ret_buf_size, - u16 *ret_next_table, u32 *ret_next_index, - struct ice_sq_cd *cd); + u16 *ret_next_cluster, u16 *ret_next_table, + u32 *ret_next_index, struct ice_sq_cd *cd); enum ice_status ice_set_mac_type(struct ice_hw *hw); @@ -352,7 +352,7 @@ ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, struct ice_sq_cd *cd); enum ice_status ice_aq_write_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr, - u16 bus_addr, __le16 addr, u8 params, u8 *data, + u16 bus_addr, __le16 addr, u8 params, const u8 *data, struct ice_sq_cd *cd); enum ice_status ice_aq_set_health_status_config(struct ice_hw *hw, u8 event_source, diff --git a/sys/dev/ice/ice_controlq.c b/sys/dev/ice/ice_controlq.c index 09816d4a812a..8aa2a7f765a2 100644 --- a/sys/dev/ice/ice_controlq.c +++ b/sys/dev/ice/ice_controlq.c @@ -482,7 +482,7 @@ shutdown_sq_out: } /** - * ice_aq_ver_check - Check the reported AQ API version. + * ice_aq_ver_check - Check the reported AQ API version * @hw: pointer to the hardware structure * * Checks if the driver should load on a given AQ API version. @@ -1037,12 +1037,18 @@ ice_sq_send_cmd_nolock(struct ice_hw *hw, struct ice_ctl_q_info *cq, if (cq->sq.next_to_use == cq->sq.count) cq->sq.next_to_use = 0; wr32(hw, cq->sq.tail, cq->sq.next_to_use); + ice_flush(hw); + + /* Wait a short time before initial ice_sq_done() check, to allow + * hardware time for completion. + */ + ice_usec_delay(5, false); do { if (ice_sq_done(hw, cq)) break; - ice_usec_delay(ICE_CTL_Q_SQ_CMD_USEC, false); + ice_usec_delay(10, false); total_delay++; } while (total_delay < cq->sq_cmd_timeout); diff --git a/sys/dev/ice/ice_controlq.h b/sys/dev/ice/ice_controlq.h index 047dd1beaf60..d48d53a37161 100644 --- a/sys/dev/ice/ice_controlq.h +++ b/sys/dev/ice/ice_controlq.h @@ -60,8 +60,7 @@ enum ice_ctl_q { }; /* Control Queue timeout settings - max delay 1s */ -#define ICE_CTL_Q_SQ_CMD_TIMEOUT 10000 /* Count 10000 times */ -#define ICE_CTL_Q_SQ_CMD_USEC 100 /* Check every 100usec */ +#define ICE_CTL_Q_SQ_CMD_TIMEOUT 100000 /* Count 100000 times */ #define ICE_CTL_Q_ADMIN_INIT_TIMEOUT 10 /* Count 10 times */ #define ICE_CTL_Q_ADMIN_INIT_MSEC 100 /* Check every 100msec */ diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index ff13fe99ee27..8e1200e08a64 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -62,16 +62,16 @@ * @var ice_rc_version * @brief driver release candidate version number */ -const char ice_driver_version[] = "1.37.11-k"; +const char ice_driver_version[] = "1.39.13-k"; const uint8_t ice_major_version = 1; -const uint8_t ice_minor_version = 37; -const uint8_t ice_patch_version = 11; +const uint8_t ice_minor_version = 39; +const uint8_t ice_patch_version = 13; const uint8_t ice_rc_version = 0; #define PVIDV(vendor, devid, name) \ - PVID(vendor, devid, name " - 1.37.11-k") + PVID(vendor, devid, name " - 1.39.13-k") #define PVIDV_OEM(vendor, devid, svid, sdevid, revid, name) \ - PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.37.11-k") + PVID_OEM(vendor, devid, svid, sdevid, revid, name " - 1.39.13-k") /** * @var ice_vendor_info_array diff --git a/sys/dev/ice/ice_features.h b/sys/dev/ice/ice_features.h index b58af574976d..03b8c63af291 100644 --- a/sys/dev/ice/ice_features.h +++ b/sys/dev/ice/ice_features.h @@ -89,7 +89,6 @@ enum feat_list { static inline void ice_disable_unsupported_features(ice_bitmap_t __unused *bitmap) { - ice_clear_bit(ICE_FEATURE_SRIOV, bitmap); #ifndef DEV_NETMAP ice_clear_bit(ICE_FEATURE_NETMAP, bitmap); #endif diff --git a/sys/dev/ice/ice_flex_pipe.c b/sys/dev/ice/ice_flex_pipe.c index 943b37746f9d..f103e2aa6e71 100644 --- a/sys/dev/ice/ice_flex_pipe.c +++ b/sys/dev/ice/ice_flex_pipe.c @@ -672,6 +672,7 @@ enum ice_status ice_replay_tunnels(struct ice_hw *hw) if (status) { ice_debug(hw, ICE_DBG_PKG, "ERR: 0x%x - destroy tunnel port 0x%x\n", status, port); + hw->tnl.tbl[i].ref = refs; break; } diff --git a/sys/dev/ice/ice_flow.c b/sys/dev/ice/ice_flow.c index 0cf37159b251..c04f86445767 100644 --- a/sys/dev/ice/ice_flow.c +++ b/sys/dev/ice/ice_flow.c @@ -404,12 +404,11 @@ struct ice_flow_prof_params { }; #define ICE_FLOW_SEG_HDRS_L3_MASK \ - (ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV6 | \ - ICE_FLOW_SEG_HDR_ARP) + (ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_ARP) #define ICE_FLOW_SEG_HDRS_L4_MASK \ (ICE_FLOW_SEG_HDR_ICMP | ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_UDP | \ ICE_FLOW_SEG_HDR_SCTP) -/* mask for L4 protocols that are NOT part of IPV4/6 OTHER PTYPE groups */ +/* mask for L4 protocols that are NOT part of IPv4/6 OTHER PTYPE groups */ #define ICE_FLOW_SEG_HDRS_L4_MASK_NO_OTHER \ (ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_SCTP) @@ -483,15 +482,13 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params) if ((hdrs & ICE_FLOW_SEG_HDR_IPV4) && (hdrs & ICE_FLOW_SEG_HDR_IPV_OTHER)) { - src = i ? - (const ice_bitmap_t *)ice_ptypes_ipv4_il : + src = i ? (const ice_bitmap_t *)ice_ptypes_ipv4_il : (const ice_bitmap_t *)ice_ptypes_ipv4_ofos_all; ice_and_bitmap(params->ptypes, params->ptypes, src, ICE_FLOW_PTYPE_MAX); } else if ((hdrs & ICE_FLOW_SEG_HDR_IPV6) && (hdrs & ICE_FLOW_SEG_HDR_IPV_OTHER)) { - src = i ? - (const ice_bitmap_t *)ice_ptypes_ipv6_il : + src = i ? (const ice_bitmap_t *)ice_ptypes_ipv6_il : (const ice_bitmap_t *)ice_ptypes_ipv6_ofos_all; ice_and_bitmap(params->ptypes, params->ptypes, src, ICE_FLOW_PTYPE_MAX); @@ -645,8 +642,7 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params, case ICE_FLOW_FIELD_IDX_ICMP_TYPE: case ICE_FLOW_FIELD_IDX_ICMP_CODE: /* ICMP type and code share the same extraction seq. entry */ - prot_id = (params->prof->segs[seg].hdrs & - ICE_FLOW_SEG_HDR_IPV4) ? + prot_id = (params->prof->segs[seg].hdrs & ICE_FLOW_SEG_HDR_IPV4) ? ICE_PROT_ICMP_IL : ICE_PROT_ICMPV6_IL; sib = fld == ICE_FLOW_FIELD_IDX_ICMP_TYPE ? ICE_FLOW_FIELD_IDX_ICMP_CODE : @@ -1301,20 +1297,20 @@ ice_flow_set_rss_seg_info(struct ice_flow_seg_info *segs, u8 seg_cnt, /* set outer most header */ if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV4) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV4 | - ICE_FLOW_SEG_HDR_IPV_FRAG | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_IPV_FRAG | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV6) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 | - ICE_FLOW_SEG_HDR_IPV_FRAG | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_IPV_FRAG | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV4_GRE) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV4 | - ICE_FLOW_SEG_HDR_GRE | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_GRE | + ICE_FLOW_SEG_HDR_IPV_OTHER; else if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV6_GRE) segs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 | - ICE_FLOW_SEG_HDR_GRE | - ICE_FLOW_SEG_HDR_IPV_OTHER; + ICE_FLOW_SEG_HDR_GRE | + ICE_FLOW_SEG_HDR_IPV_OTHER; if (seg->hdrs & ~ICE_FLOW_RSS_SEG_HDR_VAL_MASKS) return ICE_ERR_PARAM; @@ -1418,11 +1414,14 @@ ice_get_rss_hdr_type(struct ice_flow_prof *prof) if (prof->segs_cnt == ICE_FLOW_SEG_SINGLE) { hdr_type = ICE_RSS_OUTER_HEADERS; } else if (prof->segs_cnt == ICE_FLOW_SEG_MAX) { - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs == ICE_FLOW_SEG_HDR_NONE) + const struct ice_flow_seg_info *s; + + s = &prof->segs[ICE_RSS_OUTER_HEADERS]; + if (s->hdrs == ICE_FLOW_SEG_HDR_NONE) hdr_type = ICE_RSS_INNER_HEADERS; - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs & ICE_FLOW_SEG_HDR_IPV4) + if (s->hdrs & ICE_FLOW_SEG_HDR_IPV4) hdr_type = ICE_RSS_INNER_HEADERS_W_OUTER_IPV4; - if (prof->segs[ICE_RSS_OUTER_HEADERS].hdrs & ICE_FLOW_SEG_HDR_IPV6) + if (s->hdrs & ICE_FLOW_SEG_HDR_IPV6) hdr_type = ICE_RSS_INNER_HEADERS_W_OUTER_IPV6; } @@ -1529,13 +1528,14 @@ ice_add_rss_list(struct ice_hw *hw, u16 vsi_handle, struct ice_flow_prof *prof) * [62:63] - Encapsulation flag: * 0 if non-tunneled * 1 if tunneled - * 2 for tunneled with outer ipv4 - * 3 for tunneled with outer ipv6 + * 2 for tunneled with outer IPv4 + * 3 for tunneled with outer IPv6 */ -#define ICE_FLOW_GEN_PROFID(hash, hdr, encap) \ - ((u64)(((u64)(hash) & ICE_FLOW_PROF_HASH_M) | \ +#define ICE_FLOW_GEN_PROFID(hash, hdr, encap) \ + ((u64)(((u64)(hash) & ICE_FLOW_PROF_HASH_M) | \ (((u64)(hdr) << ICE_FLOW_PROF_HDR_S) & ICE_FLOW_PROF_HDR_M) | \ - (((u64)(encap) << ICE_FLOW_PROF_ENCAP_S) & ICE_FLOW_PROF_ENCAP_M))) + (((u64)(encap) << ICE_FLOW_PROF_ENCAP_S) & \ + ICE_FLOW_PROF_ENCAP_M))) /** * ice_add_rss_cfg_sync - add an RSS configuration @@ -1559,7 +1559,8 @@ ice_add_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, return ICE_ERR_PARAM; segs_cnt = (cfg->hdr_type == ICE_RSS_OUTER_HEADERS) ? - ICE_FLOW_SEG_SINGLE : ICE_FLOW_SEG_MAX; + ICE_FLOW_SEG_SINGLE : + ICE_FLOW_SEG_MAX; segs = (struct ice_flow_seg_info *)ice_calloc(hw, segs_cnt, sizeof(*segs)); @@ -1663,18 +1664,16 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, struct ice_rss_hash_cfg local_cfg; enum ice_status status; - if (!ice_is_vsi_valid(hw, vsi_handle) || - !cfg || cfg->hdr_type > ICE_RSS_ANY_HEADERS || + if (!ice_is_vsi_valid(hw, vsi_handle) || !cfg || + cfg->hdr_type > ICE_RSS_ANY_HEADERS || cfg->hash_flds == ICE_HASH_INVALID) return ICE_ERR_PARAM; + ice_acquire_lock(&hw->rss_locks); local_cfg = *cfg; if (cfg->hdr_type < ICE_RSS_ANY_HEADERS) { - ice_acquire_lock(&hw->rss_locks); status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); - ice_release_lock(&hw->rss_locks); } else { - ice_acquire_lock(&hw->rss_locks); local_cfg.hdr_type = ICE_RSS_OUTER_HEADERS; status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); if (!status) { @@ -1682,8 +1681,8 @@ ice_add_rss_cfg(struct ice_hw *hw, u16 vsi_handle, status = ice_add_rss_cfg_sync(hw, vsi_handle, &local_cfg); } - ice_release_lock(&hw->rss_locks); } + ice_release_lock(&hw->rss_locks); return status; } @@ -1707,7 +1706,8 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u8 segs_cnt; segs_cnt = (cfg->hdr_type == ICE_RSS_OUTER_HEADERS) ? - ICE_FLOW_SEG_SINGLE : ICE_FLOW_SEG_MAX; + ICE_FLOW_SEG_SINGLE : + ICE_FLOW_SEG_MAX; segs = (struct ice_flow_seg_info *)ice_calloc(hw, segs_cnt, sizeof(*segs)); if (!segs) @@ -1762,8 +1762,8 @@ ice_rem_rss_cfg(struct ice_hw *hw, u16 vsi_handle, struct ice_rss_hash_cfg local_cfg; enum ice_status status; - if (!ice_is_vsi_valid(hw, vsi_handle) || - !cfg || cfg->hdr_type > ICE_RSS_ANY_HEADERS || + if (!ice_is_vsi_valid(hw, vsi_handle) || !cfg || + cfg->hdr_type > ICE_RSS_ANY_HEADERS || cfg->hash_flds == ICE_HASH_INVALID) return ICE_ERR_PARAM; @@ -1774,7 +1774,6 @@ ice_rem_rss_cfg(struct ice_hw *hw, u16 vsi_handle, } else { local_cfg.hdr_type = ICE_RSS_OUTER_HEADERS; status = ice_rem_rss_cfg_sync(hw, vsi_handle, &local_cfg); - if (!status) { local_cfg.hdr_type = ICE_RSS_INNER_HEADERS; status = ice_rem_rss_cfg_sync(hw, vsi_handle, diff --git a/sys/dev/ice/ice_flow.h b/sys/dev/ice/ice_flow.h index 0857b325ca7c..31c369c144e0 100644 --- a/sys/dev/ice/ice_flow.h +++ b/sys/dev/ice/ice_flow.h @@ -188,14 +188,14 @@ enum ice_flow_avf_hdr_field { enum ice_rss_cfg_hdr_type { ICE_RSS_OUTER_HEADERS, /* take outer headers as inputset. */ ICE_RSS_INNER_HEADERS, /* take inner headers as inputset. */ - /* take inner headers as inputset for packet with outer ipv4. */ + /* take inner headers as inputset for packet with outer IPv4. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV4, - /* take inner headers as inputset for packet with outer ipv6. */ + /* take inner headers as inputset for packet with outer IPv6. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV6, /* take outer headers first then inner headers as inputset */ - /* take inner as inputset for GTPoGRE with outer ipv4 + gre. */ + /* take inner as inputset for GTPoGRE with outer IPv4 + GRE. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV4_GRE, - /* take inner as inputset for GTPoGRE with outer ipv6 + gre. */ + /* take inner as inputset for GTPoGRE with outer IPv6 + GRE. */ ICE_RSS_INNER_HEADERS_W_OUTER_IPV6_GRE, ICE_RSS_ANY_HEADERS }; diff --git a/sys/dev/ice/ice_hw_autogen.h b/sys/dev/ice/ice_hw_autogen.h index 6b04bff4b722..8e59ebc76835 100644 --- a/sys/dev/ice/ice_hw_autogen.h +++ b/sys/dev/ice/ice_hw_autogen.h @@ -5476,6 +5476,7 @@ #define GL_MNG_FW_RAM_STAT_MNG_MEM_ECC_ERR_S 1 #define GL_MNG_FW_RAM_STAT_MNG_MEM_ECC_ERR_M BIT(1) #define GL_MNG_FWSM 0x000B6134 /* Reset Source: POR */ +#define GL_MNG_FWSM_FW_LOADING_M BIT(30) #define GL_MNG_FWSM_FW_MODES_S 0 #define GL_MNG_FWSM_FW_MODES_M MAKEMASK(0x7, 0) #define GL_MNG_FWSM_RSV0_S 3 diff --git a/sys/dev/ice/ice_iflib.h b/sys/dev/ice/ice_iflib.h index e9e09851b82c..4ac5fffe5b7e 100644 --- a/sys/dev/ice/ice_iflib.h +++ b/sys/dev/ice/ice_iflib.h @@ -192,6 +192,29 @@ struct ice_rx_queue { struct if_irq que_irq; }; +/** + * @struct ice_mirr_if + * @brief structure representing a mirroring interface + */ +struct ice_mirr_if { + struct ice_softc *back; + struct ifnet *ifp; + struct ice_vsi *vsi; + + device_t subdev; + if_ctx_t subctx; + if_softc_ctx_t subscctx; + + u16 num_irq_vectors; + u16 *if_imap; + u16 *os_imap; + struct ice_irq_vector *rx_irqvs; + + u32 state; + + bool if_attached; +}; + /** * @struct ice_softc * @brief main structure representing one device @@ -262,7 +285,7 @@ struct ice_softc { struct ice_resmgr rx_qmgr; /* Interrupt allocation manager */ - struct ice_resmgr imgr; + struct ice_resmgr dev_imgr; u16 *pf_imap; int lan_vectors; @@ -302,7 +325,7 @@ struct ice_softc { /* NVM link override settings */ struct ice_link_default_override_tlv ldo_tlv; - u16 fw_debug_dump_cluster_mask; + u32 fw_debug_dump_cluster_mask; struct sx *iflib_ctx_lock; @@ -310,6 +333,11 @@ struct ice_softc { ice_declare_bitmap(feat_cap, ICE_FEATURE_COUNT); ice_declare_bitmap(feat_en, ICE_FEATURE_COUNT); + struct ice_resmgr os_imgr; + /* For mirror interface */ + struct ice_mirr_if *mirr_if; + int extra_vectors; + int last_rid; }; #endif /* _ICE_IFLIB_H_ */ diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index f3087c09702a..a090717e7c5e 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -44,6 +44,18 @@ /* Tx/Rx hotpath utility functions */ #include "ice_common_txrx.h" +/* + * Driver private implementations + */ +static int _ice_ift_txd_encap(struct ice_tx_queue *txq, if_pkt_info_t pi); +static int _ice_ift_txd_credits_update(struct ice_softc *sc, struct ice_tx_queue *txq, bool clear); +static int _ice_ift_rxd_available(struct ice_rx_queue *rxq, qidx_t pidx, qidx_t budget); +static int _ice_ift_rxd_pkt_get(struct ice_rx_queue *rxq, if_rxd_info_t ri); +static void _ice_ift_rxd_refill(struct ice_rx_queue *rxq, uint32_t pidx, + uint64_t *paddrs, uint16_t count); +static void _ice_ift_rxd_flush(struct ice_softc *sc, struct ice_rx_queue *rxq, + uint32_t pidx); + /* * iflib txrx method declarations */ @@ -55,6 +67,13 @@ static int ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t static void ice_ift_rxd_flush(void *arg, uint16_t rxqid, uint8_t flidx, qidx_t pidx); static void ice_ift_rxd_refill(void *arg, if_rxd_update_t iru); static qidx_t ice_ift_queue_select(void *arg, struct mbuf *m, if_pkt_info_t pi); +static int ice_ift_txd_credits_update_subif(void *arg, uint16_t txqid, bool clear); +static int ice_ift_txd_encap_subif(void *arg, if_pkt_info_t pi); +static void ice_ift_txd_flush_subif(void *arg, uint16_t txqid, qidx_t pidx); +static int ice_ift_rxd_available_subif(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget); +static int ice_ift_rxd_pkt_get_subif(void *arg, if_rxd_info_t ri); +static void ice_ift_rxd_refill_subif(void *arg, if_rxd_update_t iru); +static void ice_ift_rxd_flush_subif(void *arg, uint16_t rxqid, uint8_t flidx, qidx_t pidx); /* Macro to help extract the NIC mode flexible Rx descriptor fields from the * advanced 32byte Rx descriptors. @@ -82,8 +101,27 @@ struct if_txrx ice_txrx = { }; /** - * ice_ift_txd_encap - prepare Tx descriptors for a packet - * @arg: the iflib softc structure pointer + * @var ice_subif_txrx + * @brief Tx/Rx operations for the iflib stack, for subinterfaces + * + * Structure defining the Tx and Rx related operations that iflib can request + * the subinterface driver to perform. These are the main entry points for the + * hot path of the transmit and receive paths in the iflib driver. + */ +struct if_txrx ice_subif_txrx = { + .ift_txd_credits_update = ice_ift_txd_credits_update_subif, + .ift_txd_encap = ice_ift_txd_encap_subif, + .ift_txd_flush = ice_ift_txd_flush_subif, + .ift_rxd_available = ice_ift_rxd_available_subif, + .ift_rxd_pkt_get = ice_ift_rxd_pkt_get_subif, + .ift_rxd_refill = ice_ift_rxd_refill_subif, + .ift_rxd_flush = ice_ift_rxd_flush_subif, + .ift_txq_select_v2 = NULL, +}; + +/** + * _ice_ift_txd_encap - prepare Tx descriptors for a packet + * @txq: driver's TX queue context * @pi: packet info * * Prepares and encapsulates the given packet into into Tx descriptors, in @@ -94,10 +132,8 @@ struct if_txrx ice_txrx = { * Return 0 on success, non-zero error code on failure. */ static int -ice_ift_txd_encap(void *arg, if_pkt_info_t pi) +_ice_ift_txd_encap(struct ice_tx_queue *txq, if_pkt_info_t pi) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[pi->ipi_qsidx]; int nsegs = pi->ipi_nsegs; bus_dma_segment_t *segs = pi->ipi_segs; struct ice_tx_desc *txd = NULL; @@ -156,6 +192,27 @@ ice_ift_txd_encap(void *arg, if_pkt_info_t pi) return (0); } +/** + * ice_ift_txd_encap - prepare Tx descriptors for a packet + * @arg: the iflib softc structure pointer + * @pi: packet info + * + * Prepares and encapsulates the given packet into Tx descriptors, in + * preparation for sending to the transmit engine. Sets the necessary context + * descriptors for TSO and other offloads, and prepares the last descriptor + * for the writeback status. + * + * Return 0 on success, non-zero error code on failure. + */ +static int +ice_ift_txd_encap(void *arg, if_pkt_info_t pi) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[pi->ipi_qsidx]; + + return _ice_ift_txd_encap(txq, pi); +} + /** * ice_ift_txd_flush - Flush Tx descriptors to hardware * @arg: device specific softc pointer @@ -176,9 +233,9 @@ ice_ift_txd_flush(void *arg, uint16_t txqid, qidx_t pidx) } /** - * ice_ift_txd_credits_update - cleanup Tx descriptors - * @arg: device private softc - * @txqid: the Tx queue to update + * _ice_ift_txd_credits_update - cleanup Tx descriptors + * @sc: device private softc + * @txq: the Tx queue to update * @clear: if false, only report, do not actually clean * * If clear is false, iflib is asking if we *could* clean up any Tx @@ -186,13 +243,12 @@ ice_ift_txd_flush(void *arg, uint16_t txqid, qidx_t pidx) * * If clear is true, iflib is requesting to cleanup and reclaim used Tx * descriptors. + * + * Called by other txd_credits_update functions passed to iflib. */ static int -ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) +_ice_ift_txd_credits_update(struct ice_softc *sc __unused, struct ice_tx_queue *txq, bool clear) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[txqid]; - qidx_t processed = 0; qidx_t cur, prev, ntxd, rs_cidx; int32_t delta; @@ -235,9 +291,28 @@ ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) } /** - * ice_ift_rxd_available - Return number of available Rx packets + * ice_ift_txd_credits_update - cleanup PF VSI Tx descriptors * @arg: device private softc - * @rxqid: the Rx queue id + * @txqid: the Tx queue to update + * @clear: if false, only report, do not actually clean + * + * Wrapper for _ice_ift_txd_credits_update() meant for TX queues that + * belong to the PF VSI. + * + * @see _ice_ift_txd_credits_update() + */ +static int +ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_tx_queue *txq = &sc->pf_vsi.tx_queues[txqid]; + + return _ice_ift_txd_credits_update(sc, txq, clear); +} + +/** + * _ice_ift_rxd_available - Return number of available Rx packets + * @rxq: RX queue driver structure * @pidx: descriptor start point * @budget: maximum Rx budget * @@ -245,10 +320,8 @@ ice_ift_txd_credits_update(void *arg, uint16_t txqid, bool clear) * of the given budget. */ static int -ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) +_ice_ift_rxd_available(struct ice_rx_queue *rxq, qidx_t pidx, qidx_t budget) { - struct ice_softc *sc = (struct ice_softc *)arg; - struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[rxqid]; union ice_32b_rx_flex_desc *rxd; uint16_t status0; int cnt, i, nrxd; @@ -270,21 +343,54 @@ ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) return (cnt); } +/** + * ice_ift_rxd_available - Return number of available Rx packets + * @arg: device private softc + * @rxqid: the Rx queue id + * @pidx: descriptor start point + * @budget: maximum Rx budget + * + * Wrapper for _ice_ift_rxd_available() that provides a function pointer + * that iflib requires for RX processing. + */ +static int +ice_ift_rxd_available(void *arg, uint16_t rxqid, qidx_t pidx, qidx_t budget) +{ + struct ice_softc *sc = (struct ice_softc *)arg; + struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[rxqid]; + + return _ice_ift_rxd_available(rxq, pidx, budget); +} + /** * ice_ift_rxd_pkt_get - Called by iflib to send data to upper layer * @arg: device specific softc * @ri: receive packet info * - * This function is called by iflib, and executes in ithread context. It is - * called by iflib to obtain data which has been DMA'ed into host memory. - * Returns zero on success, and EBADMSG on failure. + * Wrapper function for _ice_ift_rxd_pkt_get() that provides a function pointer + * used by iflib for RX packet processing. */ static int ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) { struct ice_softc *sc = (struct ice_softc *)arg; - if_softc_ctx_t scctx = sc->scctx; struct ice_rx_queue *rxq = &sc->pf_vsi.rx_queues[ri->iri_qsidx]; + + return _ice_ift_rxd_pkt_get(rxq, ri); +} + +/** + * _ice_ift_rxd_pkt_get - Called by iflib to send data to upper layer + * @rxq: RX queue driver structure + * @ri: receive packet info + * + * This function is called by iflib, and executes in ithread context. It is + * called by iflib to obtain data which has been DMA'ed into host memory. + * Returns zero on success, and EBADMSG on failure. + */ +static int +_ice_ift_rxd_pkt_get(struct ice_rx_queue *rxq, if_rxd_info_t ri) +{ union ice_32b_rx_flex_desc *cur; u16 status0, plen, ptype; bool eop; @@ -341,7 +447,7 @@ ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) /* Get packet type and set checksum flags */ ptype = le16toh(cur->wb.ptype_flex_flags0) & ICE_RX_FLEX_DESC_PTYPE_M; - if ((scctx->isc_capenable & IFCAP_RXCSUM) != 0) + if ((if_getcapenable(ri->iri_ifp) & IFCAP_RXCSUM) != 0) ice_rx_checksum(rxq, &ri->iri_csum_flags, &ri->iri_csum_data, status0, ptype); @@ -357,16 +463,14 @@ ice_ift_rxd_pkt_get(void *arg, if_rxd_info_t ri) * @arg: device specific softc structure * @iru: the Rx descriptor update structure * - * Update the Rx descriptor indices for a given queue, assigning new physical - * addresses to the descriptors, preparing them for re-use by the hardware. + * Wrapper function for _ice_ift_rxd_refill() that provides a function pointer + * used by iflib for RX packet processing. */ static void ice_ift_rxd_refill(void *arg, if_rxd_update_t iru) { struct ice_softc *sc = (struct ice_softc *)arg; struct ice_rx_queue *rxq; - uint32_t next_pidx; - int i; uint64_t *paddrs; uint32_t pidx; uint16_t qsidx, count; @@ -378,6 +482,26 @@ ice_ift_rxd_refill(void *arg, if_rxd_update_t iru) rxq = &(sc->pf_vsi.rx_queues[qsidx]); + _ice_ift_rxd_refill(rxq, pidx, paddrs, count); +} + +/** + * _ice_ift_rxd_refill - Prepare Rx descriptors for re-use by hardware + * @rxq: RX queue driver structure + * @pidx: first index to refill + * @paddrs: physical addresses to use *** 3364 LINES SKIPPED *** From nobody Fri Apr 19 00:18:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLFcZ3LP2z5HP2l; Fri, 19 Apr 2024 00:18: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 4VLFcZ2P5wz4rJr; Fri, 19 Apr 2024 00:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713485934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MeLSs6F1FkYYBlzBLJLGzXjUKVh/WvVXSCczIoxlBBU=; b=PwIUP/d6STR1KJ45//+Do6thbAZatP2W5bA4lhgU/8Ju+WRdFp1pfVgc41O4Knbia/X4yk lMxxFD0BLTPhdI+eajwKyQn7eL+tlucElxI9nUD3LbPfUsw/FeJEQ8g+riNpabAwE3X4/b jCWXi6eM5Qek3bsddmHe2j3Vca7Zu+9CvWqYPmcXxHiCdHkZSX1d20IFCBwTArpmS8ypT6 DjlHDGcuBLUygTIwchba8PegZSeR2hvEfLnituXUP9DmUkoGYH+cGGWR/+XlBcqSRHLgZg dAwAOJ349DTQ11NpTBJFrxpyMZ4OUy9f/OuDSUUtDOwKEQ4yWtP/HwTXBHUOlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713485934; a=rsa-sha256; cv=none; b=D3UykJuOI2c3GQLK2NFOBwObVNJ2U3hzPpcbQKtWuxfYtxemhEJJwb2Qf8H0lIa4+vBnnG ZQwwAwsWEKrjQRPRu4YeHnrpKxQpgA8QwrIj1Z2ECm+zr5S3wihAs3pLBPM3LayHebzquc nSSYg4omKsz9jsrVvvvYM9ULdbrUkkJqYFVu7IYbljJtFLfxTd9tMuaZIqr5Q08zBKg8CM 7xqWeThglddlU5OrlrrDIWCr0UWC77F9w8i0YvfKye7mvhp5RKY/snzbP2Arn84KbjqXvK rq/RTiNY7TzXytNuaWVfuwdYY+lCeS8QsrKsdTnmtONIjJdju9jCtwz6ddTJKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713485934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MeLSs6F1FkYYBlzBLJLGzXjUKVh/WvVXSCczIoxlBBU=; b=Sd9tJAkvjdFybnIf3eAl5/DeGlOHokw9mrZlVdM8YTM4BCBj0VzKuDgH2676GU2eYC1ZYd czxyLn1MrX4rdfqyJZQYULPeU2ZXo5TRgnn3ezpD3nCbQ/l9DOcQ58q6R2a03v/6Dj4JuL 9SHEYjc9oNzpdOpHqDBBt2982ljRDMzyBKol/rLOpVFjpcxGshtcxq/n446EZE5XD66Bvj oqMhAbuqjiDhbr8rhGRTjU7qryb7hQbGozhd3WAppsFgxf6UscMkjljQOmh4OC4+1UYRcf FswzUUH+yogacEtbSfvEUCeXHrzLjL87I8OBmBc2klAxEMN+aOqgK+eyrgv33g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLFcZ202qzXKd; Fri, 19 Apr 2024 00:18: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 43J0Ish5031400; Fri, 19 Apr 2024 00:18:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43J0IsdK031398; Fri, 19 Apr 2024 00:18:54 GMT (envelope-from git) Date: Fri, 19 Apr 2024 00:18:54 GMT Message-Id: <202404190018.43J0IsdK031398@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: e411b2273603 - main - uipc_shm: Fix a free() of an uninitialized variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e411b2273603267dbc51c7839879e765b573c1c5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e411b2273603267dbc51c7839879e765b573c1c5 commit e411b2273603267dbc51c7839879e765b573c1c5 Author: Mark Johnston AuthorDate: 2024-04-19 00:15:51 +0000 Commit: Mark Johnston CommitDate: 2024-04-19 00:18:29 +0000 uipc_shm: Fix a free() of an uninitialized variable Reported by: Coverity CID: 1544043 Fixes: b112232e4fb9 ("uipc_shm: Copyin userpath for ktrace(2)") --- sys/kern/uipc_shm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 14fe43524935..1136f34a6f85 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1215,6 +1215,8 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, #endif AUDIT_ARG_UPATH1_CANON(path); + } else { + path = NULL; } pdp = td->td_proc->p_pd; From nobody Fri Apr 19 04:27:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLMKh2jrXz5HnW0 for ; Fri, 19 Apr 2024 04:36:24 +0000 (UTC) (envelope-from celina.jones@excitereturns.info) Received: from server.excitereturns.info (server.excitereturns.info [103.117.180.104]) (using TLSv1.3 with cipher TLS_AES_256_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 4VLMKg34D1z4HbR for ; Fri, 19 Apr 2024 04:36:23 +0000 (UTC) (envelope-from celina.jones@excitereturns.info) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=excitereturns.info header.s=default header.b=pXj5v9l+; dmarc=pass (policy=none) header.from=excitereturns.info; spf=pass (mx1.freebsd.org: domain of celina.jones@excitereturns.info designates 103.117.180.104 as permitted sender) smtp.mailfrom=celina.jones@excitereturns.info Received: by server.excitereturns.info (Postfix, from userid 1000) id C2E7BC1655BB; Fri, 19 Apr 2024 00:27:06 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.11.0 server.excitereturns.info C2E7BC1655BB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=excitereturns.info; s=default; t=1713500827; bh=+sj8XuY1LWHUGlBI3d4cJbDznSXFtvOKdKMM4hJc29E=; h=To:Subject:Date:From:Reply-To:List-Unsubscribe:From; b=pXj5v9l+X0VcRO459mvWhxAT2l37zgwziy4aKKVMwjHev8L+wE9BoEavnqdtav3uE 8n0QSiqXuA13nlk3DUGCPZ+YmBVE8gq7GkHgc9+w++hGo62nOUrXMXRxpRANNMMryr yQVFcKILI2mBUBUux2hFTVW5XWNoznaBEewCsMQtUISEHa4av0rdpjxVDKABOcrZzs hgUbXRkdHYtOfx06Y4M2OvRegza7hu20FTlZ/u1nEbefTw2bxwLUDH+GyQF8286RxG k3PFKMqj6Nnffk+XhzN45yxLrVCEvstVTHnniearG3C8OaUi885Mx5B0Jh9baBZ5k6 hVXd/WzZVGdqA== To: dev-commits-src-main@freebsd.org Subject: =?us-ascii?Q?Audio_Transcription_/_Translation_Service_-_USD?= =?us-ascii?Q?_0.70_Per_Audio_Minute?= Date: Fri, 19 Apr 2024 04:27:06 +0000 From: Celina Jones Reply-To: celina.jones@crabtreesolutions.org Message-ID: Precedence: bulk X-Newsletter-Email-Id: 20 X-Auto-Response-Suppress: OOF, AutoReply List-Unsubscribe: =?us-ascii?Q??= List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="b1=_mGivh34Tz2OcnFKIYx2CvDnt6lWDzIJlhqniBfWQU" Content-Transfer-Encoding: 8bit X-Spamd-Bar: +++ X-Spamd-Result: default: False [3.79 / 15.00]; RSPAMD_URIBL(4.50)[excitereturns.info:dkim]; SUBJ_EXCESS_QP(1.20)[]; URI_COUNT_ODD(1.00)[1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; ONCE_RECEIVED(0.10)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; BAD_REP_POLICIES(0.10)[]; HAS_LIST_UNSUB(-0.01)[]; DKIM_TRACE(0.00)[excitereturns.info:+]; DMARC_POLICY_ALLOW(0.00)[excitereturns.info,none]; RCPT_COUNT_ONE(0.00)[1]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; GREYLIST(0.00)[pass,body]; RCVD_TLS_LAST(0.00)[]; R_DKIM_ALLOW(0.00)[excitereturns.info:s=default]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_DN_NONE(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; PRECEDENCE_BULK(0.00)[]; MISSING_XM_UA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; R_SPF_ALLOW(0.00)[+a:c]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:133643, ipnet:103.117.180.0/24, country:IN]; HAS_REPLYTO(0.00)[celina.jones@crabtreesolutions.org] X-Rspamd-Queue-Id: 4VLMKg34D1z4HbR --b1=_mGivh34Tz2OcnFKIYx2CvDnt6lWDzIJlhqniBfWQU Content-Type: text/plain; charset=us-ascii Hello, We have over 10 years of transcription / translation experience and have been supporting several clients with their transcription requirements. We assure you of quality work and most importantly confidentiality of all the proprietary information / materials. All the work is deleted from our systems as soon as the transcription is completed to the satisfaction of our client. We work for several Universities & businesses offering a very low rate of USD 0.70 per audio / video minute and can also do a free sample transcription of any audio clip of your choice. Looking forward to hearing from you soon and working for you. I assure you of quality work and confidentiality of information. In addition, we also do logo / graphic designing, website designing and development, website content writing tasks as well Please do write back for the portfolio or a free quote. Regards, Celina Jones --b1=_mGivh34Tz2OcnFKIYx2CvDnt6lWDzIJlhqniBfWQU Content-Type: text/html; charset=us-ascii Audio Transcription / Translation Service - USD 0.70 Per Audio Minute

Hello,

We have over 10 years of transcription / translation experience and have been supporting several clients with their transcription requirements.

We assure you of quality work and most importantly confidentiality of all the proprietary information / materials.

All the work is deleted from our systems as soon as the transcription is completed to the satisfaction of our client.

We work for several Universities & businesses offering a very low rate of USD 0.70 per audio / video minute and can also do a free sample transcription of any audio clip of your choice.

Looking forward to hearing from you soon and working for you.

I assure you of quality work and confidentiality of information. In addition, we also do logo / graphic designing, website designing and development, website content writing tasks as well

Please do write back for the portfolio or a free quote.

Regards,

Celina Jones
--b1=_mGivh34Tz2OcnFKIYx2CvDnt6lWDzIJlhqniBfWQU-- From nobody Fri Apr 19 06:54:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLQPT6pXLz5Hycf; Fri, 19 Apr 2024 06: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 4VLQPT6BBzz4SyQ; Fri, 19 Apr 2024 06: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=1713509693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/thbUIgZbytWqWMA40fwuu6MEzbsiPWRM03zqJV04DE=; b=DXcgVUTfRm5WHwGqkwSsez41XKiLmWlu/wKguztpxrgxgeQ4C2+oR077YCWbl+qR13Xt0X /3pv0klGTDKkhaI0Wd1661qwtqbpV0reZdsd/Qe/RtEn+dNAeWwRBrZ7HmGDxO0D0HEOgq uMSDYCfg4Fv+gXf+c3HcHLnAEKOzRq1LhWR/siZ+7zftrP25iZ965ZPAzRghLHtTHoQWl+ N2mAbNLk7X2YMtPGgFKKZCxJyjyBNW0O4bdrQIevuhc1qNRDO+gaEZj8BeiJoCnZvwGKWJ GvhKbs/wXzPxoZf3skYb2xJbZC8gGjUHHSvXS26b+mXPjeklOvfHUVEB7HqJuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713509693; a=rsa-sha256; cv=none; b=ZAXxCFqChFduYPJA2oAbqpBE532nvTn1Lo9a6yh76VtrKmKTBJYOq01sWlXStvufbxvCM1 HVWAk0UChp5d6p/n1BsiJTTiZdboUSnIIxfREZTPn8heSlFv7z5kAlZWz0q/rHCOT4Yl+S 6qoza8uFAODo5QrCiLlUarRMV9M23h0a0iPYvWuNmnWHQrAIxGytQvyxVKBjAQ7qiRXKfb jGIz4ktECefsEtJ+Z8ned4Hhh6/6AoOaWq7T95yDlzt8W40S3cxSJYK+XK51/3fQkTNIgB xT5Rf4P9+VEH3OqkV60E7YRAuImvkaH0iKNzdDouUCWDMaibrcffAe5ARN1PBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713509693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/thbUIgZbytWqWMA40fwuu6MEzbsiPWRM03zqJV04DE=; b=u/9S7qyL6LjyZgDqiFio1DFmLoXNi8A5mlEVbGtOoU4kpnb+HbIyxfplL+dbOzTqrhRAJp hLO1JBY/qbJDkB9i4KLLIL6v5JPbW07RY3/k+rZirtfadr24cZasBfr+trqttY8caUq5xo ByNNIT6A4p4vCe5aamakMuI/YsP8x+VqFbiCsJmJfnqTO52EyKgtwUzJogXf/xILZU8mwU ztWQvSrqR61RayWLOcypD7UrGPTgwaPpnZldvn2KSJWpG5up77jaBKAavGCDxEBgoVgu0Y Dyv8/vs9JThooZfhXI3qetb9Hwpu37NAAMsBnHYwh2AmBeuk9RX4Joyom3TVPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLQPT5gG9zk0J; Fri, 19 Apr 2024 06: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 43J6srfA005202; Fri, 19 Apr 2024 06:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43J6srDi005199; Fri, 19 Apr 2024 06:54:53 GMT (envelope-from git) Date: Fri, 19 Apr 2024 06:54:53 GMT Message-Id: <202404190654.43J6srDi005199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 178cf4b9db4b - main - arm: Fix a typo in a KASSERT message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 178cf4b9db4bb6726e845b10923788cf4e7a5ef0 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=178cf4b9db4bb6726e845b10923788cf4e7a5ef0 commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0 Author: Gordon Bergling AuthorDate: 2024-04-19 06:54:39 +0000 Commit: Gordon Bergling CommitDate: 2024-04-19 06:54:39 +0000 arm: Fix a typo in a KASSERT message - s/resoure/resource/ MFC after: 5 days --- sys/arm/arm/gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index cb1419c42569..7fbf7e7fd827 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -444,7 +444,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int type, int *rid, struct resource_list *rl; int j; - KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type)); + KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type)); sc = device_get_softc(bus); From nobody Fri Apr 19 14:55:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLd4K3MsVz5HC76; Fri, 19 Apr 2024 14:55: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 4VLd4K1894z4MTS; Fri, 19 Apr 2024 14:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713538545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5L1RpnsYN4bMhRCCArVxAckGt6IuBhl//+fTZflG/U=; b=p+Ux2OFAmhNioZ0vLwJWudC/LGd1AJ5TY3m8tszk3SmMTzPxycg2hBc2Rb9MsLCfubaPsl z2+m6a52qXPbmAG4WDNZd4vOjQitsyaIFuR6vROa0itN7T3SjaAdgZ4QR5F2mS5i8EJkGN jnC3aVmsGha7w1VMh7L0UTAESCIAdvzbxywAr3x0ObojGdiyHhq7rpzNSP5sCSY06Gw0G2 g0fImcoqq9OxaFsLgbbr96LSq6ZnU/LGyWajYABJLqNSYApA9VV/cWpuCELj4N73XdG+pY eDL3ZmrVtS4AD8rhiJezL1lED8CbGONTpaDUbg5joaEBkFhs5SQL6UznGlIk5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713538545; a=rsa-sha256; cv=none; b=jVe2gAcQVkYQQmS/JPMYgVWq41X3BOjmp32IegRy7kwq4akV/po7zk/B9Tz8qHp/jyu1WE mXa8y5pzFcokg85gMR8rEnYCUsZqOL/iOMM0ECdzCCKI8yQGBkbQxbAsej6trPxV9W6nyX FMWbHvPMoeaMeagvf/NPhAuIurWsyA0ftP9HGxQ31UbtAJ2sAJZ7xvNSPJnvmNhmlVtS7l 3fR29Oit2KW6c+Cx1h+LnTNP0cyzdg25PJZ2aKHRUt2eWHFgCYUEIfncVMVGxpVy0fa/za k9PkRlqHkmwWMhwGKMuO+ZbiFg5v4Yv+RjQGZwPv40+N2j7Wkikq+/J8d5cxdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713538545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5L1RpnsYN4bMhRCCArVxAckGt6IuBhl//+fTZflG/U=; b=Azu0oxt28akOJrysCphTDmFzI6GakVNRyrsC+mfYXp4hQxtP7+aGNUq/72f1zIYbYNPgOH at8pyiD0a0cV6iiDZNhOIiP+tl6tvFQE/VdsobxBOlHGiCpuSjT8nF6PcZz454ZU9H7t/n 6DMnl/dtqX+VM9ArWNE6HFEhVXJvR6xOXBy1lZlVDkWkg3EYZ2xnLugnj0lz0gM44Iy9f/ sMNumouIpKDNnzwkcESNH2Xc74/wfljKP0G3sDEVJYmz7Zimp8WbcE7Ht4MMiNvLjtu4Pz +za7HCHXil3XeNbT4Hb4bCnB7eN0ieKjKiimVz2emxfUPXu9RbHmoWs+pKZ5sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLd4K0kxpzxSx; Fri, 19 Apr 2024 14:55: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 43JEtjFT014184; Fri, 19 Apr 2024 14:55:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JEtipf014181; Fri, 19 Apr 2024 14:55:44 GMT (envelope-from git) Date: Fri, 19 Apr 2024 14:55:44 GMT Message-Id: <202404191455.43JEtipf014181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 6b13e4cb3da2 - main - ldconfig: small optimization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b13e4cb3da28be82f9d3b8bd98e229ae107c73a Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=6b13e4cb3da28be82f9d3b8bd98e229ae107c73a commit 6b13e4cb3da28be82f9d3b8bd98e229ae107c73a Author: Stefan Eßer AuthorDate: 2024-04-19 14:29:12 +0000 Commit: Stefan Eßer CommitDate: 2024-04-19 14:47:19 +0000 ldconfig: small optimization Swap which side of a comparison is byte-swapped by be32toh() on little-endian architectures. The be32toh() macro just returns the operand and big-endian architectures and returns it byte-swapped on little-endian architectures. When operating on a constant argument, the compiler can perform the swap operation at build time instead of swapping the data read from the hints file at run time. Reviewed by: kib Tested by: tuexen MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44734 --- sbin/ldconfig/elfhints.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c index d6ee5e0918d6..64b3f916ba8d 100644 --- a/sbin/ldconfig/elfhints.c +++ b/sbin/ldconfig/elfhints.c @@ -220,7 +220,7 @@ read_elf_hints(const char *hintsfile, bool must_exist, bool force_be) close(fd); hdr = (struct elfhints_hdr *)mapbase; - is_be = be32toh(hdr->magic) == ELFHINTS_MAGIC; + is_be = hdr->magic == htobe32(ELFHINTS_MAGIC); if (COND_SWAP(hdr->magic) != ELFHINTS_MAGIC) errx(1, "\"%s\": invalid file format", hintsfile); if (force_be && !is_be) From nobody Fri Apr 19 14:55:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLd4L6CKQz5HBZB; Fri, 19 Apr 2024 14:55: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 4VLd4L41pbz4MRy; Fri, 19 Apr 2024 14:55:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713538546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icy7b2wQFEo2MVT8VUl0OCISeiWgHia/LQYtiaiFKpo=; b=kjgU1F0JaeJNq0eYBP9SszvwFtVLnIHfndoLK75ndS6LlR+DF1zz0LRMKpEQ0lOCiMAQuV CFbw2R3ny4G8f5MQIDSCPV0X74vKfhdNHudaNQ/qRqHziZL5igsYOuoqWUi/Sax/hV3Jtv Flb1NH79Qpti3pSplXYp3YlZwFZs0kAjIfX2LJ1dUoDl5PKE92VNpBB3yKfYRO4POHR4HR R0OfhWT8/lT9ccIz63Gv2QJOmC2tMdsJTjjAB5lK4hKTmN/EThDiEpO+JtNPDt7QcUnvR9 UL40ibwli169aFk8LI5X9VC0Xclfc0wdrwYpoLzL2uaHtnBEiJ5sCtvTAZyggQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713538546; a=rsa-sha256; cv=none; b=Sy8hZPK9Z7+dR1XrJJfr/BAthg8o/BiGGSf2ZZBuJH7M0PwWHka6FdTQdqDB5kDQg6hDuP femSuJMNUUUGADZT/U7XOSpLLHSj0ih4tjAelPjUWWW4Z4EPIzbAn29Pey4UyU3bbtHDWw +ru8V8NMEV0uwruxViZ+vD1HXFju7HYez9iXjd/kVuzgOwW7WZ1nUN0W9zPjxC0G1MR6ML zx+hUIbT03+1MOTtgxnf1y6J5pd8H9HHNR+kNWk5p2BUEVHJMotQ8nWbLdZ6q7mVXriz5g js25iWmn/Is0PULJtGyszcqo0w2qLqV/hRid6u0BeupGuMSMU34SNhu37bPdsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713538546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icy7b2wQFEo2MVT8VUl0OCISeiWgHia/LQYtiaiFKpo=; b=rP7OSEyr+tCwG0b2dtzLgEYuAhV2ZlkdHtnFqqvlOeE6Ciklzmy7GxDfr487Xl7FR6Kt67 dwOHFG8+D2Gf4CwZwShWrf97Ji1imNJm0KHT4euJke5KE8TLlhwOev339UoQSKsIPl/XsK FS+ZIatOlOfgJRI4D0QVL5uT3sspHVAB3dYWm2wrvpXB9zuRz6K6P89uvzICs3pXunEYJ9 gu0R8rhMYSLCsrcTuh7YPFWD6iKQnI2rPyilVi3vdhgk6FneRQSdsXzKdfkDuimGUNraPX xvZN+HbMNDtcfE2UGFijgMuVUb5bgHkRyYbAn1JITiqCnWElkAXFhQWUDZz1LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLd4L1lZSzy2V; Fri, 19 Apr 2024 14:55: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 43JEtkrP014238; Fri, 19 Apr 2024 14:55:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JEtkqT014235; Fri, 19 Apr 2024 14:55:46 GMT (envelope-from git) Date: Fri, 19 Apr 2024 14:55:46 GMT Message-Id: <202404191455.43JEtkqT014235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: f221df6597df - main - ldconfig: use little-endian hints file on all architectures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f221df6597df6b606102b329f36e20e0257308de Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=f221df6597df6b606102b329f36e20e0257308de commit f221df6597df6b606102b329f36e20e0257308de Author: Stefan Eßer AuthorDate: 2024-04-19 14:49:57 +0000 Commit: Stefan Eßer CommitDate: 2024-04-19 14:49:57 +0000 ldconfig: use little-endian hints file on all architectures Remove the test for building on a big-endian architecture, which preserved the previous default of creating the ELF hints file in native byte-order of the respective architecture. Support for little-endian hints files has been added to the run-time linker and the pkg command. This is a step towards architecture independent little-endian hints files, but support for big-endian hints files shall only be removed from the run-time linker (and ldconfig and pkg) when the last release that defaulted to hints files in host-byte has been declared EOL. Reviewed by: kib Tested by: tuexen MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44734 --- sbin/ldconfig/elfhints.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/ldconfig/elfhints.c b/sbin/ldconfig/elfhints.c index 64b3f916ba8d..97499e398c9d 100644 --- a/sbin/ldconfig/elfhints.c +++ b/sbin/ldconfig/elfhints.c @@ -246,10 +246,10 @@ update_elf_hints(const char *hintsfile, int argc, char **argv, bool merge, int i; /* - * Remove "be32toh(1) == 1" from this condition to create - * little-endian hints files on all architectures by default. + * Create little-endian hints files on all architectures unless + * ldconfig has been invoked with the -B option. */ - is_be = be32toh(1) == 1 || force_be; + is_be = force_be; if (merge) read_elf_hints(hintsfile, false, force_be); for (i = 0; i < argc; i++) { From nobody Fri Apr 19 15:13:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLdT24zy8z5HDJ0; Fri, 19 Apr 2024 15:13: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 4VLdT24fNbz4QmN; Fri, 19 Apr 2024 15:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713539622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYc7Awye7/qif1+lrnjyHRsjxC5DA4Z6iBSh9wcxprY=; b=FtUzM5pJCHWCfubo9Qmha7WmVb7vagFCmRkNUPjV6WyyQh3KMFDN0ceYCT2aDimApsozg+ qBhVH45Bt8HVVp1ojmT6qKbJK64xi9IX/i1kd6LS0hEzM6F8sYBROp9A2k3bla4uj39RLn RboXhCwkHPFKzDj4eoR5Iaed+vVRCVh7Wp6OKoLQnhQ6Xh6iOUCF8PZn0TJT6I1DF7kUO+ mNQ3NHAciL+yLLFWvkO/kRe7wprIe2k90eeZLLlApSkwKUOoRb/6hRarxg2i9j/euZpTB5 oexzZbFNRE8eM+hhb5VSCbVdxTEWj/n24L5clyI4tHaD3+mGB/3oS8pKb+O7uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713539622; a=rsa-sha256; cv=none; b=g2lDw7xcI/uI64SZva8pJQcKc+aTIQLiUSqssAxbC5+8fAomW8037i1OWZ2vUrbdQeeWJz 7279D2rbO2eXTL0VHhLlDtFx7ZDG+u3zyRAHxzbnARt5BOF+RUMJkQHeaJtH/42L9fmv9z pdoSZkZzJ+f4CiD9AGPUg6pFEyTFaNcz3gTPUMXHtzzJapuZyjYp4GmEZtv9LkaBZOWjk0 REKiWw8pT6D5Fa8yJIIjYUb09x8kCrUoSoktFOf3/Gr4WUFv8RWhalDaawUN6OnpZ2DJke 5Bj8EeldLZ/BbmKnQmrUtLH/G/a6tCS1Le5l09xPZzlSGd9JInVPFMZjCAxhZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713539622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYc7Awye7/qif1+lrnjyHRsjxC5DA4Z6iBSh9wcxprY=; b=Vz5k+QSeqPgnYFcFoYDXBnFn78wk3i1kRaVq83ouC978XctvX2t1XJQqZKatjW9IkMqkCD 3XPV+vMIXMbP29zlxHIYlB7J7y+iFMSfJFHkp7NDCYdLkcYB/DXp9zjgIRW/tMs7q9fyD5 zX9fxk4EkO7rnkIpjUFYGzreppVixHUfQfHiJ5qnHQBFLSbbXDJQS9U7XCx34369f//Dwr 7nSrmpCqaiCg4UE00AX70Ho3swHb3wlg3QyfCmCnOgnuBfVFvKMl6Gbk1r+vcb8ZDIJl9n zK4qPlCVtdM8dtuzi9IQrsx6+scLP1PHqA8vBSH+wDbZpkjlqtHvjbahTZEK+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLdT24DlzzyS6; Fri, 19 Apr 2024 15:13: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 43JFDgTV047867; Fri, 19 Apr 2024 15:13:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JFDgLi047864; Fri, 19 Apr 2024 15:13:42 GMT (envelope-from git) Date: Fri, 19 Apr 2024 15:13:42 GMT Message-Id: <202404191513.43JFDgLi047864@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: 170d0882903e - main - adduser: Overhaul. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 170d0882903eb75b92cd10e9a1bcbe57a647ae7d Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=170d0882903eb75b92cd10e9a1bcbe57a647ae7d commit 170d0882903eb75b92cd10e9a1bcbe57a647ae7d Author: Dag-Erling Smørgrav AuthorDate: 2024-04-19 15:11:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-19 15:13:30 +0000 adduser: Overhaul. Most importantly: * Make local variables local. * Use `$()` instead of backticks. * Avoid unsafe use of `-a` and `-o` operators in `test` expressions. * Remove a hack intended to ease the transition from Perl 22 years ago. MFC after: 1 week Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44863 --- usr.sbin/adduser/adduser.sh | 225 ++++++++++++++++++-------------------------- 1 file changed, 93 insertions(+), 132 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 0d5a628f8f33..692b54bebf78 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -53,11 +53,10 @@ info() { # by pw(8). # get_nextuid () { - _uid=$1 - _nextuid= + local _uid=$1 _nextuid if [ -z "$_uid" ]; then - _nextuid="`${PWCMD} usernext | cut -f1 -d:`" + _nextuid="$(${PWCMD} usernext | cut -f1 -d:)" else while : ; do ${PWCMD} usershow $_uid > /dev/null 2>&1 @@ -103,17 +102,12 @@ show_usage() { # basename of the shell is output. # valid_shells() { - _prefix= - cat ${ETCSHELLS} | + local _prefix + + ${GREPCMD} '^[^#]' ${ETCSHELLS} | while read _path _junk ; do - case $_path in - \#*|'') - ;; - *) - echo -n "${_prefix}`basename $_path`" - _prefix=' ' - ;; - esac + echo -n "${_prefix}${_path##*/}" + _prefix=' ' done # /usr/sbin/nologin is a special case @@ -126,36 +120,31 @@ valid_shells() { # full path to the shell from the /etc/shells file. # fullpath_from_shell() { - _shell=$1 - [ -z "$_shell" ] && return 1 + local _shell=$1 _fullpath + + if [ -z "$_shell" ]; then + return + fi # /usr/sbin/nologin is a special case; it needs to be handled - # before the cat | while loop, since a 'return' from within + # before the grep | while loop, since a 'return' from within # a subshell will not terminate the function's execution, and # the path to the nologin shell might be printed out twice. # - if [ "$_shell" = "${NOLOGIN}" -o \ - "$_shell" = "${NOLOGIN_PATH}" ]; then + if [ "$_shell" = "${NOLOGIN}" ] || + [ "$_shell" = "${NOLOGIN_PATH}" ]; then echo ${NOLOGIN_PATH} - return 0; + return fi - cat ${ETCSHELLS} | + ${GREPCMD} '^[^#]' ${ETCSHELLS} | while read _path _junk ; do - case "$_path" in - \#*|'') - ;; - *) - if [ "$_path" = "$_shell" -o \ - "`basename $_path`" = "$_shell" ]; then - echo $_path - return 0 - fi - ;; - esac + if [ "$_path" = "$_shell" ] || + [ "${_path##*/}" = "$_shell" ]; then + echo "$_path" + break + fi done - - return 1 } # shell_exists shell @@ -166,19 +155,14 @@ fullpath_from_shell() { # will emit an informational message saying so. # shell_exists() { - _sh="$1" - _shellchk="${GREPCMD} '^$_sh$' ${ETCSHELLS} > /dev/null 2>&1" + local _sh="$1" - if ! eval $_shellchk; then - # The nologin shell is not listed in /etc/shells. - if [ "$_sh" != "${NOLOGIN_PATH}" ]; then - err "Invalid shell ($_sh) for user $username." - return 1 - fi + if [ -z "$(fullpath_from_shell "$_sh")" ] ; then + err "Invalid shell ($_sh) for user $username." + return 1 fi - ! [ -x "$_sh" ] && + [ -x "$_sh" ] || info "The shell ($_sh) does not exist or is not executable." - return 0 } @@ -190,7 +174,7 @@ shell_exists() { save_config() { echo "# Configuration file for adduser(8)." > ${ADDUSERCONF} echo "# NOTE: only *some* variables are saved." >> ${ADDUSERCONF} - echo "# Last Modified on `${DATECMD}`." >> ${ADDUSERCONF} + echo "# Last Modified on $(${DATECMD})." >> ${ADDUSERCONF} echo '' >> ${ADDUSERCONF} echo "defaultHomePerm=$uhomeperm" >> ${ADDUSERCONF} echo "defaultLgroup=$ulogingroup" >> ${ADDUSERCONF} @@ -210,6 +194,8 @@ save_config() { # message or lock the account, do so. # add_user() { + local _uid _name _comment _gecos _home _group _grouplist _shell _class + local _dotdir _expire _pwexpire _passwd _upasswd _passwdmethod # Is this a configuration run? If so, don't modify user database. # @@ -218,22 +204,6 @@ add_user() { return fi - _uid= - _name= - _comment= - _gecos= - _home= - _group= - _grouplist= - _shell= - _class= - _dotdir= - _expire= - _pwexpire= - _passwd= - _upasswd= - _passwdmethod= - _name="-n '$username'" [ -n "$uuid" ] && _uid='-u "$uuid"' [ -n "$ulogingroup" ] && _group='-g "$ulogingroup"' @@ -244,7 +214,7 @@ add_user() { [ -n "$udotdir" ] && _dotdir='-k "$udotdir"' [ -n "$uexpire" ] && _expire='-e "$uexpire"' [ -n "$upwexpire" ] && _pwexpire='-p "$upwexpire"' - if [ -z "$Dflag" -a -n "$uhome" ]; then + if [ -z "$Dflag" ] && [ -n "$uhome" ]; then # The /nonexistent home directory is special. It # means the user has no home directory. if [ "$uhome" = "$NOHOME" ]; then @@ -257,7 +227,7 @@ add_user() { _home='-m -d "$uhome"' fi fi - elif [ -n "$Dflag" -a -n "$uhome" ]; then + elif [ -n "$Dflag" ] && [ -n "$uhome" ]; then _home='-d "$uhome"' fi case $passwdtype in @@ -304,7 +274,7 @@ add_user() { _pwcmd="$_pwcmd $_shell $_class $_home $_dotdir $_passwdmethod $_passwd" _pwcmd="$_pwcmd $_expire $_pwexpire" - if ! _output=`eval $_pwcmd` ; then + if ! _output=$(eval $_pwcmd) ; then err "There was an error adding user ($username)." return 1 else @@ -331,30 +301,27 @@ add_user() { fi fi - _line= - _owner= - _perms= + local _line _owner _perms _file _dir if [ -n "$msgflag" ]; then - [ -r "$msgfile" ] && { + if [ -r "$msgfile" ]; then # We're evaluating the contents of an external file. # Let's not open ourselves up for attack. _perms will # be empty if it's writeable only by the owner. _owner # will *NOT* be empty if the file is owned by root. # - _dir="`dirname $msgfile`" - _file="`basename $msgfile`" - _perms=`/usr/bin/find $_dir -name $_file -perm +07022 -prune` - _owner=`/usr/bin/find $_dir -name $_file -user 0 -prune` - if [ -z "$_owner" -o -n "$_perms" ]; then + _dir="$(dirname "$msgfile")" + _file="$(basename "$msgfile")" + _perms=$(/usr/bin/find "$_dir" -name "$_file" -perm +07022 -prune) + _owner=$(/usr/bin/find "$_dir" -name "$_file" -user 0 -prune) + if [ -z "$_owner" ] || [ -n "$_perms" ]; then err "The message file ($msgfile) may be writeable only by root." return 1 fi - cat "$msgfile" | while read _line ; do eval echo "$_line" - done | ${MAILCMD} -s"Welcome" ${username} + done <"$msgfile" | ${MAILCMD} -s"Welcome" ${username} info "Sent welcome message to ($username)." - } + fi fi } @@ -366,7 +333,7 @@ add_user() { # a file it will output an error message and return to the caller. # get_user() { - _input= + local _input # No need to take down user names if this is a configuration saving run. [ -n "$configflag" ] && return @@ -376,7 +343,7 @@ get_user() { echo -n "Username: " read _input else - _input="`echo "$fileline" | cut -f1 -d:`" + _input="$(echo "$fileline" | cut -f1 -d:)" fi # There *must* be a username, and it must not exist. If @@ -387,7 +354,7 @@ get_user() { err "You must enter a username!" [ -z "$fflag" ] && continue fi - ${PWCMD} usershow $_input > /dev/null 2>&1 + ${PWCMD} usershow "$_input" > /dev/null 2>&1 if [ "$?" -eq 0 ]; then err "User exists!" [ -z "$fflag" ] && continue @@ -402,7 +369,7 @@ get_user() { # and batch (from file) mode. # get_gecos() { - _input= + local _input # No need to take down additional user information for a configuration run. [ -n "$configflag" ] && return @@ -411,7 +378,7 @@ get_gecos() { echo -n "Full name: " read _input else - _input="`echo "$fileline" | cut -f7 -d:`" + _input="$(echo "$fileline" | cut -f7 -d:)" fi ugecos="$_input" } @@ -422,8 +389,7 @@ get_gecos() { # If an invalid shell is entered it will simply use the default shell. # get_shell() { - _input= - _fullpath= + local _input _fullpath ushell="$defaultshell" # Make sure the current value of the shell is a valid one @@ -435,16 +401,16 @@ get_shell() { fi if [ -z "$fflag" ]; then - echo -n "Shell ($shells) [`basename $ushell`]: " + echo -n "Shell ($shells) [${ushell##*/}]: " read _input else - _input="`echo "$fileline" | cut -f9 -d:`" + _input="$(echo "$fileline" | cut -f9 -d:)" fi if [ -n "$_input" ]; then if [ -n "$Sflag" ]; then ushell="$_input" else - _fullpath=`fullpath_from_shell $_input` + _fullpath=$(fullpath_from_shell "$_input") if [ -n "$_fullpath" ]; then ushell="$_fullpath" else @@ -466,7 +432,7 @@ get_homedir() { echo -n "Home directory [${homeprefix}/${username}]: " read _input else - _input="`echo "$fileline" | cut -f8 -d:`" + _input="$(echo "$fileline" | cut -f8 -d:)" fi if [ -n "$_input" ]; then @@ -475,7 +441,9 @@ get_homedir() { # directory prefix. Otherwise it is understood to # be $prefix/$user # - [ -z "$configflag" ] && homeprefix="`dirname $uhome`" || homeprefix="$uhome" + [ -z "$configflag" ] && + homeprefix="$(dirname "$uhome")" || + homeprefix="$uhome" else uhome="${homeprefix}/${username}" fi @@ -485,9 +453,8 @@ get_homedir() { # Reads the account's home directory permissions. # get_homeperm() { + local _input _prompt uhomeperm=$defaultHomePerm - _input= - _prompt= if [ -n "$uhomeperm" ]; then _prompt="Home directory permissions [${uhomeperm}]: " @@ -515,7 +482,7 @@ get_zfs_home() { Zcreate="no" return fi - zfs_homeprefix=`${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null` + zfs_homeprefix=$(${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null) if [ "$?" -ne 0 ]; then Zcreate="no" elif [ -z "${zfs_homeprefix}" ]; then @@ -529,12 +496,11 @@ get_zfs_home() { # allocates one if it is not specified. # get_uid() { + local _input _prompt uuid=${uidstart} - _input= - _prompt= if [ -n "$uuid" ]; then - uuid=`get_nextuid $uuid` + uuid=$(get_nextuid "$uuid") _prompt="Uid [$uuid]: " else _prompt="Uid (Leave empty for default): " @@ -543,11 +509,11 @@ get_uid() { echo -n "$_prompt" read _input else - _input="`echo "$fileline" | cut -f2 -d:`" + _input="$(echo "$fileline" | cut -f2 -d:)" fi [ -n "$_input" ] && uuid=$_input - uuid=`get_nextuid $uuid` + uuid=$(get_nextuid "$uuid") uidstart=$uuid } @@ -555,15 +521,15 @@ get_uid() { # Reads login class of account. Can be used in interactive or batch mode. # get_class() { + local _input _uclass uclass="$defaultclass" - _input= _class=${uclass:-"default"} if [ -z "$fflag" ]; then echo -n "Login class [$_class]: " read _input else - _input="`echo "$fileline" | cut -f4 -d:`" + _input="$(echo "$fileline" | cut -f4 -d:)" fi [ -n "$_input" ] && uclass="$_input" @@ -577,14 +543,14 @@ get_class() { # will then provide a login group with the same name as the username. # get_logingroup() { + local _input ulogingroup="$defaultLgroup" - _input= if [ -z "$fflag" ]; then echo -n "Login group [${ulogingroup:-$username}]: " read _input else - _input="`echo "$fileline" | cut -f3 -d:`" + _input="$(echo "$fileline" | cut -f3 -d:)" fi # Pw(8) will use the username as login group if it's left empty @@ -596,8 +562,8 @@ get_logingroup() { # and batch modes. # get_groups() { + local _input _group ugroups="$defaultgroups" - _input= _group=${ulogingroup:-"${username}"} if [ -z "$configflag" ]; then @@ -616,8 +582,8 @@ get_groups() { # routine is used only from batch processing mode. # get_expire_dates() { - upwexpire="`echo "$fileline" | cut -f5 -d:`" - uexpire="`echo "$fileline" | cut -f6 -d:`" + upwexpire="$(echo "$fileline" | cut -f5 -d:)" + uexpire="$(echo "$fileline" | cut -f6 -d:)" } # get_password @@ -632,10 +598,10 @@ get_password() { # We may temporarily change a password type. Make sure it's changed # back to whatever it was before we process the next account. # - [ -n "$savedpwtype" ] && { + if [ -n "$savedpwtype" ]; then passwdtype=$savedpwtype savedpwtype= - } + fi # There may be a ':' in the password upass=${fileline#*:*:*:*:*:*:*:*:*:} @@ -662,7 +628,7 @@ get_password() { # Ask user if they want to enable encryption on their ZFS home dataset. # get_zfs_encryption() { - _input= + local _input _prompt _prompt="Enable ZFS encryption? (yes/no) [${Zencrypt}]: " while : ; do echo -n "$_prompt" @@ -738,7 +704,7 @@ set_zfs_perms() { # adds it to the user database. # input_from_file() { - _field= + local _field while read -r fileline ; do case "$fileline" in @@ -769,16 +735,14 @@ input_from_file() { # the user database. # input_interactive() { - _disable= - _pass= - _passconfirm= - _random="no" - _emptypass="no" - _usepass="yes" - _logingroup_ok="no" - _groups_ok="no" - _all_ok="yes" - _another_user="no" + local _disable _pass _passconfirm _input + local _random="no" + local _emptypass="no" + local _usepass="yes" + local _logingroup_ok="no" + local _groups_ok="no" + local _all_ok="yes" + local _another_user="no" case $passwdtype in none) _emptypass="yes" @@ -801,7 +765,7 @@ input_interactive() { until [ "$_logingroup_ok" = yes ]; do get_logingroup _logingroup_ok=yes - if [ -n "$ulogingroup" -a "$username" != "$ulogingroup" ]; then + if [ -n "$ulogingroup" ] && [ "$username" != "$ulogingroup" ]; then if ! ${PWCMD} show group $ulogingroup > /dev/null 2>&1; then echo "Group $ulogingroup does not exist!" _logingroup_ok=no @@ -865,8 +829,7 @@ input_interactive() { stty echo # if user entered a blank password # explicitly ask again. - [ -z "$upass" -a -z "$_passconfirm" ] \ - && continue + [ -z "$upass$_passconfirm" ] && continue ;; [Yy][Ee][Ss]|[Yy][Ee]|[Yy]) passwdtype="none" @@ -934,8 +897,10 @@ input_interactive() { [ -n "$configflag" ] && printf "%-11s : %s\n" "Pass Type" "$passwdtype" [ -z "$configflag" ] && printf "%-11s : %s\n" "Full Name" "$ugecos" [ -z "$configflag" ] && printf "%-11s : %s\n" "Uid" "$uuid" - [ "$Zcreate" = "yes" -a -z "$configflag" ] && printf "%-11s : %s\n" "ZFS dataset" "${zhome}" - [ "$Zencrypt" = "yes" -a -z "$configflag" ] && printf "%-11s : %s\n" "Encrypted" "${Zencrypt}" + [ "$Zcreate" = "yes" ] && [ -z "$configflag" ] && + printf "%-11s : %s\n" "ZFS dataset" "${zhome}" + [ "$Zencrypt" = "yes" ] && [ -z "$configflag" ] && + printf "%-11s : %s\n" "Encrypted" "${Zencrypt}" printf "%-11s : %s\n" "Class" "$uclass" printf "%-11s : %s %s\n" "Groups" "${ulogingroup:-$username}" "$ugroups" printf "%-11s : %s\n" "Home" "$uhome" @@ -966,7 +931,7 @@ input_interactive() { #### END SUBROUTINE DEFINITION #### -THISCMD=`/usr/bin/basename $0` +THISCMD=${0##*/} DEFAULTSHELL=/bin/sh ADDUSERCONF="${ADDUSERCONF:-/etc/adduser.conf}" PWCMD="${PWCMD:-/usr/sbin/pw}" @@ -999,7 +964,7 @@ udotdir=/usr/share/skel ugroups= uexpire= upwexpire= -shells="`valid_shells`" +shells="$(valid_shells)" passwdtype="yes" msgfile=/etc/adduser.msg msgflag= @@ -1028,7 +993,7 @@ Zencrypt="no" # measure as much as it is a useful method of reminding the user to # 'su -' before he/she wastes time entering data that won't be saved. # -procowner=${procowner:-`/usr/bin/id -u`} +procowner=${procowner:-$(/usr/bin/id -u)} if [ "$procowner" != "0" ]; then err 'you must be the super-user (uid 0) to use this utility.' exit 1 @@ -1046,12 +1011,8 @@ for _i in $* ; do break; fi done -if [ -n "$readconfig" ]; then - # On a long-lived system, the first time this script is run it - # will barf upon reading the configuration file for its perl predecessor. - if ( . ${ADDUSERCONF} > /dev/null 2>&1 ); then - [ -r ${ADDUSERCONF} ] && . ${ADDUSERCONF} > /dev/null 2>&1 - fi +if [ -n "$readconfig" ] && [ -r "${ADDUSERCONF}" ]; then + . "${ADDUSERCONF}" fi # Process command-line options @@ -1136,7 +1097,7 @@ for _switch ; do shift ;; -s) - defaultshell="`fullpath_from_shell $2`" + defaultshell="$(fullpath_from_shell $2)" shift; shift ;; -S) @@ -1181,7 +1142,7 @@ else fi case $_input in [Yy][Ee][Ss]|[Yy][Ee]|[Yy]) - uidstart=`get_nextuid $uidstart` + uidstart=$(get_nextuid $uidstart) input_interactive continue ;; From nobody Fri Apr 19 15:40:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLf3d1srmz5HFmR; Fri, 19 Apr 2024 15:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLf3d1MVkz4SnN; Fri, 19 Apr 2024 15:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713541213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rKNzpkEdYzE7p7G+BQqAzGmGXLe11/nESGKbggA4UvU=; b=tMg60WqZkqTXoDJPnO42JH73Q526QAbzQM9Is0dA3SPWLMnWjX7O4B/X2NYk9IC7IEHHzI 3TjGXMqK7iXeBOS2BWoDHaJUp9uhSbQiSFlMQxb8GmrGiyhTwkBmMG3ThV/X5gQmJHey7t IyFGm4twuX11RAZ/zQ43nbWDiVUgzEkFXUolYtUlwM0xzzDPaopQsUQr4K1C/2+xkSTGCq L9Z7Clb7CmMiWjZxPOWhzUSCdGcgjI2AGMEtNneIvcn6d5TeoFnAtLcN2uMbV8EpITaeaW O5/GCHV5iHyX5YoxB8zWDKTXxQfvQTDDGI3FpYa7BVWEOhS0ns1mSpBt+WtdWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713541213; a=rsa-sha256; cv=none; b=a+BvPusBbmKRt3P8dh1l38tlSR99HbxiRS9yOMCFZ/dNWyNsO4pf1j4tRlAsvjleXPZ42F zQtgtyI7IKdC6XffRqx9fRO32x+QaSYJDAb3s21Eouz7MB1d0M1ExA71/7p18XvMJ+5QKM Ls7WJ1YqtEZx1Cw1UBzQW9gST+aJrh6x6+CQtQiERmKSHdrAYcDvumh8FUA+fDwLBz5+62 23dWsPB4QIyDOxqYx2UQJya3o6MxwJFltLpfRMm5y6WtDbZ9sgcsX7CQebPFaYGNjCvnyF eephXf4EG7IFW+TM7PXahqZww/BE/44zA5g8AQApYCVoKs7k1inJrGqGwW2jyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713541213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rKNzpkEdYzE7p7G+BQqAzGmGXLe11/nESGKbggA4UvU=; b=R1x62ygAWN3GCZXiMJPQBj+LDtmdeqnSJyMs/GboPztvPo6Nr1qi6yzHM8kxgEKU232py6 tBDFFxGnfuqeeBSHS6kRS4qJCQPe00REE3yj6OG7Dpmi/g1ld2gYftZRGbwloS8YtZZw+b AohOcVGK3fWDt/DOiUhTgfMvNtOKBTAG0aCIOmZEeoSnRfNQ40KFDpKNvJ0xaK/bH806AO hELCIWkTPpk8eqhmL7w41CAWzfyI+BdQfeLZgZ3fIoR6v5I86h/hLeU7asK3d8pt+RxAfH fjq1Or7Vu1YuTDE98dZvO9uqU49y4LKIdwX5qstsyDGr/1kKzkujxDeKi2AwQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLf3d0z5pzxyn; Fri, 19 Apr 2024 15:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43JFeD8F088449; Fri, 19 Apr 2024 15:40:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JFeDXd088443; Fri, 19 Apr 2024 15:40:13 GMT (envelope-from git) Date: Fri, 19 Apr 2024 15:40:13 GMT Message-Id: <202404191540.43JFeDXd088443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8993d785a261 - main - expand.1: Fix markup for the '-t' option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8993d785a261ee92528b44dae5a629ce389de412 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8993d785a261ee92528b44dae5a629ce389de412 commit 8993d785a261ee92528b44dae5a629ce389de412 Author: Gordon Bergling AuthorDate: 2024-04-19 15:39:37 +0000 Commit: Gordon Bergling CommitDate: 2024-04-19 15:39:37 +0000 expand.1: Fix markup for the '-t' option When viewing the manpage the '-t' option is shown as follows -t -Sm tab1, tab2, ..., tabn Sm with the markup '\&Sm' included within '.It Fl t', which doesn't makes any sense. So just remove it. PR: 274897 MFC after: 3 days --- usr.bin/expand/expand.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1 index 06a2ad2e6132..e63d9d7c1e03 100644 --- a/usr.bin/expand/expand.1 +++ b/usr.bin/expand/expand.1 @@ -78,7 +78,7 @@ If the .Fl a option is given, then tabs are inserted whenever they would compress the resultant file by replacing two or more characters. -.It Fl t \&Sm Ar tab1 , tab2 , ... , tabn \&Sm +.It Fl t Ar tab1 , tab2 , ... , tabn Set tab stops at column positions .Ar tab1 , tab2 , ... , tabn . If only a single number is given, tab stops are set that number of From nobody Fri Apr 19 16:57:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLgmy364vz5HNZF; Fri, 19 Apr 2024 16:57: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 4VLgmy2PQGz4f8n; Fri, 19 Apr 2024 16:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713545858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flf0fd1j2zWJOE64YkJ88clxMTr6MRa+vb35h9metYg=; b=f4nfGj0XUNEmuTE/3MpXs0NpDBLc7GPw2h5AeIXJrlqEXMH6WzgNWugm6Qt59qFE+6XIoU KHTJplrAf5Mh1ah9Dv7gMY0+uB6fJuSNOslOrl0SiklGxDFYJBSSmTH+ZJYjtlF2k656Ep KG9bFTIE8zDrTKjnBN+4f+v3jdpQfFczpEeaxqpeKoAjkY1zFIfbCbFMM8ACysFVgKHREp V+ECWuja0BFDD/T8lhWqYC7gBhOzu0ihAqAT5uBkIqIws9dbRFRTHr7ndR0u2j4TZ6hF/7 RhYM8pRgQCN3z36kjxg9z1NEbfxkAjB8h6RYuL+8+U0PugD59ehhpDrUeU7eFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713545858; a=rsa-sha256; cv=none; b=t+7VnlXt8k535EchHIhDcsnYDmQ7iY9XNn16TtVG63ie7l/fpe9VfenZ/qJTHmAwV7Khq1 B442ViH1anqbKimPxV4JTrzqbi5tmsjWgIPWs34uh1jMWMiwJmvZGuyyO83n3FZHjA7VB8 XJBmAqdViKr8tzc5vZLUH5w1UaStLjGQmpZeqFj2mLZriQDIn2Y4Vo/0PeUYQJrha+/cAo Ccuu3lpNwc0uOYTwyLp3LyqCdFlxoI6aSUJWvMLSehKQvN+3xq6nAlyRKHWXkC+tCH4wmj tCbD0XpUbCAvFIj4+6RVPRH9KIR836CUmbbOZHOvksGzkM2awKMkxTya08m47w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713545858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=flf0fd1j2zWJOE64YkJ88clxMTr6MRa+vb35h9metYg=; b=lo0EMA/H4cfIeueuvBCq+uxcOJhf0tXrLeuFIDaC/JLMWXFkCHyjMZ4GtFwDl11AuLeDde +IAuXDE7ZI28cTy1JFqKZG9XUqmLp6H9Zxj6bWPct4gSN0DbBoiXD2HNCK6i3/ekVYJDZB Ex5lWmCaTFG809UTn8UMGHSH+LNA7R6anUIMUxzkUVCUlpAwO0PbGBLxBctATYL9wsRzru /5Y8wpfd0dd5IS+uT+3f+387TH2pKuSfBy4XJX6mWRVlNaEKUxXBlXNmJFDZAyBvSfAcH/ TKpO0tmh1ijlBrjhVZ96VrjJjDU1GojHy8GBV/MTDc3S4T3bXfwDWNCAf3ObAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLgmy20J0z11GY; Fri, 19 Apr 2024 16:57: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 43JGvcSD017413; Fri, 19 Apr 2024 16:57:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JGvcSf017410; Fri, 19 Apr 2024 16:57:38 GMT (envelope-from git) Date: Fri, 19 Apr 2024 16:57:38 GMT Message-Id: <202404191657.43JGvcSf017410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: d3b6d70e0dfa - main - freebsd-update(8): Use kern.module_path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3b6d70e0dfaa4e9496bddcbc212d7d3ea392800 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=d3b6d70e0dfaa4e9496bddcbc212d7d3ea392800 commit d3b6d70e0dfaa4e9496bddcbc212d7d3ea392800 Author: Fernando Apesteguía AuthorDate: 2024-04-15 12:18:06 +0000 Commit: Fernando Apesteguía CommitDate: 2024-04-19 16:57:11 +0000 freebsd-update(8): Use kern.module_path Instead of tailored configuration files to look for module_path entries. Reported by: kevans@ Reviewed by: kevans, imp, zlei Approved by: kevans,zlei Differential Revision: https://reviews.freebsd.org/D44797 --- usr.sbin/freebsd-update/freebsd-update.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index d1cd46963a6c..9f5eaebfd64a 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -673,17 +673,13 @@ upgrade_check_kmod_ports() { fi # Most modules are in /boot/modules but we should actually look - # in every path configured in module_path - search_files="/boot/defaults/loader.conf /boot/loader.conf" - pattern=$(grep -shE '^module_path=' ${search_files} | - tail -1 | - cut -f2 -d\" | - tr ";" "|") + # in every module_path passed to the kernel: + pattern=$(sysctl -n kern.module_path | tr ";" "|") if [ -z "${pattern}" ]; then - # Not having module_path in loader.conf is probably an error. - # Check at least the most common path - pattern="/boot/modules" + echo "Empty kern.module_path sysctl. This should not happen." + echo "Aborting check of kernel modules installed from ports." + return fi # Check the pkg database for modules installed in those directories From nobody Fri Apr 19 18:25:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLjkj0gF2z5HW7g; Fri, 19 Apr 2024 18:25: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 4VLjkj02gkz4ljS; Fri, 19 Apr 2024 18:25:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713551149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wupCnbFDrGY3J1ydYrSOkICGhPo3Eyb2dZe2NRU2qrs=; b=nE2XNrspCM6Z+J23QIiPXf9uRntp/n6P7fabDNykEFu/jGj8ZZSUCTMYT1Esmhlwt4k6b0 02jnPqelZtMRxhV8AEbOaF2I5+psRi7vTS44cxzMyUxUjkWldqst5fz3oia29BqS6EZoiv q7tDWe6X+sVsogjW44CY5MtkG3WLwHUEui9jbjJhbzpfanoi9kePJXBcYiQwW6OXvtH9s1 7HNciWJq85Z00IzPcL6T+ch+OlnkWYwMcUCg2uVMyHCPdecL+Nn0bn8ThpO7zg1+MuVIyL 4pDqNkFaET/5v+/aZH+5FCXo59UzmPqDHlvowJFXk46pzCFbgJPjzDcrqWFmLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713551149; a=rsa-sha256; cv=none; b=xkXdZGDkOUe2A+Wd4EfrpGERV7bu9D7S6YBHXnpgRO3mEnJulL0nb1T0E466HIL6/1fTW4 4lQWqmSP9Argo4DKDWjHB2AtKgiUxgh9/x5pQGNVBIOFvfxtKthLVLFZh7w7QgBrjoIm7S xFJcz5p0sod2hkQl3883FIohp9bfJJ8Z/rZOLfV5HxgAnOAXcgeVW2OzX919+8QO2vo3He Falfji5oTDdjOhjVq+52lXdkryUPJrTjDyj3a6n3AvquDctUZOzIhSWbPc6SGa/rlETO1b u+lhOjKHhxGCwAW8J+W1lfqXpOwj8Bk8anvo63IvbxVwbVjCCyQtmYSh/AavDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713551149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wupCnbFDrGY3J1ydYrSOkICGhPo3Eyb2dZe2NRU2qrs=; b=FLwfIV+EVp8h4NNIDgWzpxZicSADfKHpUNqA4SiQQB2/VoY1y//T8yR3xO319K3PuHwHu8 wAWFRPUFnqFpDog8KOeBRdxAwihK4zzb8VwmAxND1OIqY/3gV4elX5aPGJIN0oVQHGouYS dSibZJg/0rl66SGkSgCTDGI26NPP0fZu1VW5m78RnIadopx0ZaeI4EbVJFO5kKxxgNFSrr X+SFzOn1zD/SULgUrm4Ean2O7FWa6XoOfB4ARfiC7TQa2HGLbi9VvglMUcmQ2ZiWJz0DAt kqhiZsli2XoDFwHoD2KjseJ55e/ZyGNYpDXUTRYX0aR2AR4RUrjMiphWdRBCRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLjkh6d6qz13Tl; Fri, 19 Apr 2024 18:25: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 43JIPmYr069233; Fri, 19 Apr 2024 18:25:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JIPmue069230; Fri, 19 Apr 2024 18:25:48 GMT (envelope-from git) Date: Fri, 19 Apr 2024 18:25:48 GMT Message-Id: <202404191825.43JIPmue069230@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: 563c72e2137c - main - LinuxKPI: utsname.h add missing SPDX-License-Identifier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 563c72e2137cb8cb9eb0eabf78319e8fe9c8aedd Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=563c72e2137cb8cb9eb0eabf78319e8fe9c8aedd commit 563c72e2137cb8cb9eb0eabf78319e8fe9c8aedd Author: Bjoern A. Zeeb AuthorDate: 2024-04-19 18:23:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-19 18:23:12 +0000 LinuxKPI: utsname.h add missing SPDX-License-Identifier Reported by: markj (2023-05-24; sorry took me a while) MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/utsname.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/utsname.h b/sys/compat/linuxkpi/common/include/linux/utsname.h index e6c52f8a5020..3239801ca17b 100644 --- a/sys/compat/linuxkpi/common/include/linux/utsname.h +++ b/sys/compat/linuxkpi/common/include/linux/utsname.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2023 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without From nobody Fri Apr 19 18:48:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLkFJ5SxRz5HY2X; Fri, 19 Apr 2024 18:48: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 4VLkFJ4rqKz4nb4; Fri, 19 Apr 2024 18:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713552532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNQFdDvlUORLd5dj9T7DmrzfpsSuKjBI47I6Fybs3L8=; b=O2+xc8lTu2FXWT9GCW0/9uy8IbKjRyI6sVHDwM52E/M0SmtD6ILRUM/qAceLGMyGlgmeff 37BON4RYh1zO1uNCqKVqMNqfMPsLQvm4kkXSo8vvIZMNVX+SdMq3x+hjd7M6mVlfFDWx4U IgCd09FqFiU6Ih5d4QIijmumTQiVvHkhcUH9wkt5nfQw++mO2EWKmT4Y+p3es+2Y635jAB ITpHnXaLPrMlMdrWS9oRoqFuHtrG/qCF9Pf7BaY1s/ROHYlwTfC5bcii7PcnbZ29cKZMOG 1X/ZmYSAAdWqR/FMZ3cqhDsEsPTXaTrJf29Qv1EWx4GdVNYbZ9GtCQAutK8JYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713552532; a=rsa-sha256; cv=none; b=kCB2iy8CF1opCcxzp+W+2dpLn+lvb9WDauzkYYlbHHLW5Gpuqj41FlNvr8NfIzk2eNXbK0 5/nO7NJWTLZdpibtmtcQgFPJloSDgj4D9DN5Bq943RbAJjYuRbWP9Ag0eg85dw2GTYWeiW CNNbgEiXX61L8Crhzklv4nNWIgRB0q6v+rJjUYgA/SktWgFsu+ro70QeXbAZDMOmsOjyP+ mpEkhR6u1gymXgOp/9jKx7S+xryASWCzX/sly7weE7ledmAGwlvEyzUp5/9T0fwyVh+yhb eUlJCJWR3r3a4oFZgazaslrTkY5GQVTB8JBSAZAYXfQFLREeg5hUzk/l8UyM2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713552532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNQFdDvlUORLd5dj9T7DmrzfpsSuKjBI47I6Fybs3L8=; b=abvRaD2EHaTaJaPpCIfiiV1WboyMBBpd+6Cps8k8J/LFkFoITE/veZUISBfpiImJib3gW1 laxU6HCUgxFlcS514KQi32SghnFyq/NbkyYnNPL+h97FBA7OVXQ5/chOKnbNRzTK6ccXT+ NJrKob1mA69VCq2pAy5d6j3LfzGXituqs5bd7z/SA1a6yynXGBelW0yX22qqwQpeQwwgxm XJWBdo84z1JiDkLNI08dXMagt55u8rJqJWpi7/xvdL+EHTWjbbv/MPYLKu+ByZfQ3RfUky 62dqxJlQas7YwxdtKRhC+LBSqo/nfbOt1187mxwJryyOhyzMHiPIvXRpUtzNkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLkFJ4Rw8z14bZ; Fri, 19 Apr 2024 18:48: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 43JImqGh003351; Fri, 19 Apr 2024 18:48:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JImqO3003348; Fri, 19 Apr 2024 18:48:52 GMT (envelope-from git) Date: Fri, 19 Apr 2024 18:48:52 GMT Message-Id: <202404191848.43JImqO3003348@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: 2f44f86575f9 - main - install: Fix a compiler warning when bootstrapping List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 2f44f86575f9cba5da28b762c359f7a806400744 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2f44f86575f9cba5da28b762c359f7a806400744 commit 2f44f86575f9cba5da28b762c359f7a806400744 Author: Mark Johnston AuthorDate: 2024-04-19 18:22:00 +0000 Commit: Mark Johnston CommitDate: 2024-04-19 18:48:37 +0000 install: Fix a compiler warning when bootstrapping Fixes: 4336161cc9c6 ("install: Don't skip syncing in the common case.") Reviewed by: imp, des Differential Revision: https://reviews.freebsd.org/D44866 --- usr.bin/xinstall/xinstall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index e25ccf5c6eb1..2823a9040b7a 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1250,7 +1250,9 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, errno = serrno; err(EX_OSERR, "%s", from_name); } +#ifndef BOOTSTRAP_XINSTALL done: +#endif if (safecopy && fsync(to_fd) == -1) { serrno = errno; (void)unlink(to_name); From nobody Fri Apr 19 18:48:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLkFL0hGBz5HY0B; Fri, 19 Apr 2024 18:48: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 4VLkFK6CDnz4nrK; Fri, 19 Apr 2024 18:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713552533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ib8oPirvJAYCJYhmoNZ/MeiUuxVu68ltyPwYfmz88ao=; b=YNnPD8Ec0pVvhvpJWws0j0CpcOYG2dW1pZHixKG7mIA6LM0pQK/NpGUtveDauAE1GRffpN HJ3SJuOgU4EVF5Hgad1x3BUMwVkTmL/vAATC4v2iw9mt8bIePRF/NBONAi9ZZZH+awsBHM hlgWnW5PjEPno6MQ5TXSwJs4KhtENAeWQDgbUjlO1sWKtPbPf5WJ6mJhm284oweel+Hd/n 3Wj4KGdZ5Y7iV3kCovO9h7ME6CHxL0bprPwJPujpzzmBha47eTYbj7j87mFKTNJoQ3KPvM bW9KAARdwYGVwEDx6kIeIYkCiJnhQBCTFDS2vqnWexuqu2xsJ+ezI15d7eLxBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713552533; a=rsa-sha256; cv=none; b=RKhUsWxWkK0EIoChE0RtwMu00GUhRTjTzLVDT7COTuF+Wn5S2H0tn7CA7CNo/clq5s88FR PWENC+ZzaH7kb32t2vWAyrw2SBIazVchRkHSI+NXLvcAuhS1XsyRZscKruh1a4gX1ESFAE CyEgUKOozkDLkhGgZXMqg2ckh2hcxCRp4Ab+pTZsZbue+CWy5jkHPMcM0ZT2kEAl3DgTJN lkrlI+jue6iyOfACpwOkhSCyPWY/cUH+UfUtoEKmFqNAfOk3BzPGo04RMg/7kCeVdYGB3m bwaxnV3lUziDAtI5Dr+11y+LBWKikWRCnfPPMCP03WDitE86LBzUJvGe+Vg8NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713552533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ib8oPirvJAYCJYhmoNZ/MeiUuxVu68ltyPwYfmz88ao=; b=wFYuAQE7t52ZBBvcZcJbI/b9nK0/ZrObCiOPU5lJ584t4sc/gunevlKlJbUCc+f0PlX7qB Yhng5GLB00J6U24+0v7l4PkRisbpOPDjxedJWqqB73f5gjrbMr4SFEQk5TmomQXnqTML0I VWRMvvlc/UZt759HRR33NgaRxCX9uPNXtmejC/A2+qO/OZ3eE9Z0rcj4Hcc7isCG/hMaeT 0XDISTHkP4pnVCjLQj9PZdF6vYcrpUUhYJ7XHwxhMfCxIHjiw1jhdLATlO48t4mdpCgFAA Y5v6NAA8cz1Y2SuHsdnPukt6NSHivvk1aRjxoZlX78F0vnJmfAR3+tvNaoRrrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLkFK5pcsz14L1; Fri, 19 Apr 2024 18:48: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 43JImr5P003399; Fri, 19 Apr 2024 18:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JImrV8003396; Fri, 19 Apr 2024 18:48:53 GMT (envelope-from git) Date: Fri, 19 Apr 2024 18:48:53 GMT Message-Id: <202404191848.43JImrV8003396@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: 2cb0fce24d64 - main - bpf: Make BPF interop consistent with if_loop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 2cb0fce24d64039090dc9243cdf0715ee80c91b1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2cb0fce24d64039090dc9243cdf0715ee80c91b1 commit 2cb0fce24d64039090dc9243cdf0715ee80c91b1 Author: Seth Hoffert AuthorDate: 2023-10-22 14:12:45 +0000 Commit: Mark Johnston CommitDate: 2024-04-19 18:48:37 +0000 bpf: Make BPF interop consistent with if_loop The pseudo_AF_HDRCMPLT check is already being done in if_loop and just needed to be ported over to if_ic, if_wg, if_disc, if_gif, if_gre, if_me, if_tuntap and ng_iface. This is needed in order to allow these interfaces to work properly with e.g., tcpreplay. PR: 256587 Reviewed by: markj MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/876 --- sys/dev/iicbus/if_ic.c | 4 ++-- sys/dev/wg/if_wg.c | 3 ++- sys/net/if_disc.c | 2 +- sys/net/if_gif.c | 3 ++- sys/net/if_gre.c | 3 ++- sys/net/if_me.c | 3 ++- sys/net/if_tuntap.c | 2 +- sys/netgraph/ng_iface.c | 2 +- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c index 4ca8f3960298..52ab5afb9c4e 100644 --- a/sys/dev/iicbus/if_ic.c +++ b/sys/dev/iicbus/if_ic.c @@ -363,8 +363,8 @@ icoutput(if_t ifp, struct mbuf *m, const struct sockaddr *dst, u_char *cp; u_int32_t hdr; - /* BPF writes need to be handled specially. */ - if (dst->sa_family == AF_UNSPEC) + /* BPF writes need to be handled specially. */ + if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) bcopy(dst->sa_data, &hdr, sizeof(hdr)); else hdr = RO_GET_FAMILY(ro, dst); diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index bb61917ee4fc..d3a5a29e4c08 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2196,7 +2196,8 @@ wg_output(if_t ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro int ret; struct mbuf *defragged; - if (dst->sa_family == AF_UNSPEC) + /* BPF writes need to be handled specially. */ + if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) memcpy(&af, dst->sa_data, sizeof(af)); else af = dst->sa_family; diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c index f4b51b799d73..9740a25f35c6 100644 --- a/sys/net/if_disc.c +++ b/sys/net/if_disc.c @@ -180,7 +180,7 @@ discoutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, M_ASSERTPKTHDR(m); /* BPF writes need to be handled specially. */ - if (dst->sa_family == AF_UNSPEC) + if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) bcopy(dst->sa_data, &af, sizeof(af)); else af = RO_GET_FAMILY(ro, dst); diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index e5065889d732..ef64c15074ed 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -408,7 +408,8 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, KASSERT(ifp->if_bridge == NULL, ("%s: unexpectedly called with bridge attached", __func__)); - if (dst->sa_family == AF_UNSPEC) + /* BPF writes need to be handled specially. */ + if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) memcpy(&af, dst->sa_data, sizeof(af)); else af = RO_GET_FAMILY(ro, dst); diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 55163416f807..ca9c4835daf6 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -609,7 +609,8 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, { uint32_t af; - if (dst->sa_family == AF_UNSPEC) + /* BPF writes need to be handled specially. */ + if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) bcopy(dst->sa_data, &af, sizeof(af)); else af = RO_GET_FAMILY(ro, dst); diff --git a/sys/net/if_me.c b/sys/net/if_me.c index 126fe680e65f..b839730d2e37 100644 --- a/sys/net/if_me.c +++ b/sys/net/if_me.c @@ -538,7 +538,8 @@ me_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, { uint32_t af; - if (dst->sa_family == AF_UNSPEC) + /* BPF writes need to be handled specially. */ + if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) bcopy(dst->sa_data, &af, sizeof(af)); else af = RO_GET_FAMILY(ro, dst); diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index 1009dc7b3806..a70efe79cbb5 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1410,7 +1410,7 @@ tunoutput(struct ifnet *ifp, struct mbuf *m0, const struct sockaddr *dst, } /* BPF writes need to be handled specially. */ - if (dst->sa_family == AF_UNSPEC) + if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) bcopy(dst->sa_data, &af, sizeof(af)); else af = RO_GET_FAMILY(ro, dst); diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index 8ae4707b7abd..e9f97ff0fdec 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -367,7 +367,7 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m, } /* BPF writes need to be handled specially. */ - if (dst->sa_family == AF_UNSPEC) + if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) bcopy(dst->sa_data, &af, sizeof(af)); else af = RO_GET_FAMILY(ro, dst); From nobody Fri Apr 19 18:48:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLkFM1fC5z5HXx6; Fri, 19 Apr 2024 18:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLkFL6sb0z4nbB; Fri, 19 Apr 2024 18:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713552535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oMiChvFNlblPtNFShra1YHaOpI8eQH8MEJ+L9AjvKKI=; b=Jnx4LzV5ApMYTiwIxjlQKvz7pG9HQfEYUA/KbeOHK0d44TqHW2VwxhAylTE0f7+bWqrZW8 SZ3eOg/sUNiSB5W6qfp7QCrKcXIFE/VQEDabV1zZHt30ozxOMXbELGxqIdfq5eu/PjSerO v5E/q5I32gre7hf/ig1QuHRxlgzjLuuwPgOU71KUwDwMB1Yk1A1hgaez7vm+WSpgNx+NCO iJnwy1Aqb5IGd+Nys+zI9CjwKfM8yblXuBb7x10oG0ZGydCgA8lk7P0l+iv2Y8AHh3pxr9 hdbHxThCP2M8rdsi6dteze4QQvAirmsWBOgjgOOUtVzDQfCxJQUPaQg8YuHmhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713552535; a=rsa-sha256; cv=none; b=g3kLBrXzOoU+QLV1dFEkak1+28ViBanoQj4qeqdCW4vGIgTANbHiLLYhqoeyUcmR+BCSc/ 5EcCTDAwsRxbUPD8zy2obg4cG6r8NODkxFpgJJn43a6/UHrbN6LkGlWGT7bEga0uRN77Gw 0P4nqBRR2XKYCDQ1ZEWrVMlfv+8WgC3lGONmwBYbgz1akfIVi5abYSrmqbAsnpHWAQ6pM+ ftm2mnM453GYXW8APcmGWXxiZhNrilxRON5Z5izUz0XWEBse0sEwB8oRIxpOO5psXwJ2OX JKrI7sNADycJkDqYWN1V+Vj0cnpVrSmrYud+HI4rqKRYdlz/tiR7u9zBAva8QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713552535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oMiChvFNlblPtNFShra1YHaOpI8eQH8MEJ+L9AjvKKI=; b=ag0ifcXaM9UaLGQBoviJaIakQUlGZ3wViq0MXqEPcVSV2lH6BYsx8J/3H6+OqorC9W6fKS lDZje9m/PITt30+zYAUloCNTO/JRofHGZh5YalgIqcRugnJXmrGPSm24/NtAOK+DDSkVbB 4boRUEi/Xvu2fSYLVFVxaHjZEqTkzYfA/52KJ7LgJgzsAt62D1FztKqvqRuPfmk3vC5EaT x4XFhqVndDrxrVyvSpRuyk6JjPngGuL/S7WWT0ybs/N2hJna1TV9Fmdp4DqlNFVn4EkeO9 TSLGa2dsS6wkMii0nm3Lw6RG9lDqjPGdqsmeAvlmOXbATy0EVjrBq9G3/ZIZSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLkFL6Tllz14PS; Fri, 19 Apr 2024 18:48: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 43JImsDs003447; Fri, 19 Apr 2024 18:48:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JImsOV003444; Fri, 19 Apr 2024 18:48:54 GMT (envelope-from git) Date: Fri, 19 Apr 2024 18:48:54 GMT Message-Id: <202404191848.43JImsOV003444@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: e1e636193db4 - main - tests: move atf_python/sys/ into the tests package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e1e636193db45630c7881246d25902e57c43d24e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e1e636193db45630c7881246d25902e57c43d24e commit e1e636193db45630c7881246d25902e57c43d24e Author: Lexi Winter AuthorDate: 2024-04-16 11:18:23 +0000 Commit: Mark Johnston CommitDate: 2024-04-19 18:48:37 +0000 tests: move atf_python/sys/ into the tests package Reviewed by: markj MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1174 --- tests/atf_python/sys/Makefile | 1 + tests/atf_python/sys/net/Makefile | 1 + tests/atf_python/sys/netlink/Makefile | 1 + tests/atf_python/sys/netpfil/Makefile | 1 + tests/atf_python/sys/netpfil/ipfw/Makefile | 1 + 5 files changed, 5 insertions(+) diff --git a/tests/atf_python/sys/Makefile b/tests/atf_python/sys/Makefile index 85f66a85088e..a5a1a532104d 100644 --- a/tests/atf_python/sys/Makefile +++ b/tests/atf_python/sys/Makefile @@ -2,6 +2,7 @@ .PATH: ${.CURDIR} +PACKAGE=tests FILES= __init__.py SUBDIR= net netlink netpfil diff --git a/tests/atf_python/sys/net/Makefile b/tests/atf_python/sys/net/Makefile index 05b1d8afe863..70d5b1a3284b 100644 --- a/tests/atf_python/sys/net/Makefile +++ b/tests/atf_python/sys/net/Makefile @@ -2,6 +2,7 @@ .PATH: ${.CURDIR} +PACKAGE=tests FILES= __init__.py rtsock.py tools.py vnet.py .include diff --git a/tests/atf_python/sys/netlink/Makefile b/tests/atf_python/sys/netlink/Makefile index 73ce5ac50261..6a40a93f3ae9 100644 --- a/tests/atf_python/sys/netlink/Makefile +++ b/tests/atf_python/sys/netlink/Makefile @@ -2,6 +2,7 @@ .PATH: ${.CURDIR} +PACKAGE=tests FILES= __init__.py attrs.py base_headers.py message.py netlink.py \ netlink_generic.py netlink_route.py utils.py diff --git a/tests/atf_python/sys/netpfil/Makefile b/tests/atf_python/sys/netpfil/Makefile index 417a16d85359..47e7a0d4d4f1 100644 --- a/tests/atf_python/sys/netpfil/Makefile +++ b/tests/atf_python/sys/netpfil/Makefile @@ -2,6 +2,7 @@ .PATH: ${.CURDIR} +PACKAGE=tests FILES= __init__.py SUBDIR= ipfw diff --git a/tests/atf_python/sys/netpfil/ipfw/Makefile b/tests/atf_python/sys/netpfil/ipfw/Makefile index a85dc7de9417..fde36de23c93 100644 --- a/tests/atf_python/sys/netpfil/ipfw/Makefile +++ b/tests/atf_python/sys/netpfil/ipfw/Makefile @@ -2,6 +2,7 @@ .PATH: ${.CURDIR} +PACKAGE=tests FILES= __init__.py insns.py insn_headers.py ioctl.py ioctl_headers.py \ ipfw.py utils.py From nobody Fri Apr 19 18:48:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLkFN52Mxz5HXrN; Fri, 19 Apr 2024 18:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLkFN0v4Wz4npt; Fri, 19 Apr 2024 18:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713552536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0d8eywxsLfjCGnwRckGXbNf2Emk1DXhvo2qsxIvhk4=; b=NQ+GP+3ph/bhzGP8k1LmQ8/+HF3eMNrqC0zPsP6msdEoTJ4EqQ07gUSg8J3/6cH0XSUOvK ZUjRHzdKjD1dFMerSgARwSE7K4B5dYGzFUxq/rG76qo0ocpiWLRqOXoVNtih2UmcjGZoas x/RIj9ZfAcH32wcuv45R4dxCzpWcmOrsG62qGQLVACQ9XHAo2QznfpIVazbxdtyFiGWOJl hTOycHCmDiJ9oMVVmfpzqlVIQKr7zCGpAM0N5NpGA3vUFvFRMkdriEnLAhj4fysOOmdzrl N4pXol8QjUUjYHHBwsFjP3QutrrAluH6hmDJ7qyIdBW4KE6aJTVrRNUg7JfTOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713552536; a=rsa-sha256; cv=none; b=iTjtcr3GQ1tSBYtK1bLYLiy9ynkiCYW1QGLrB88vHZ8yRxrlDnA6qTWYQhoQJrmLMyQeGe YWSUqxaE23Eo+3VP4teHVC8rRtQWmmBLf20wu+skiCp52Nj9JVUAO6pSZkN4mhH40KQPg3 RGcJYex6Y5luKBPptBczizNzSe9aG8s0+FOdNQwb0CRJHWYRy0LJvbodrPQeO4zVHvNY1i 8Vi1k+SdxOVlW9L/Md2xUuht9RaNy2FOBZ8SOHKMy9H/YsheMuD5q3GlIorgK6+aOCg1nO uMKPmFxiwEm8B6OCG3YEvg8y3sHcl2LEeTViAMJWY2nVyY3UIKQowYbvtxL8mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713552536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0d8eywxsLfjCGnwRckGXbNf2Emk1DXhvo2qsxIvhk4=; b=auVjAJ+FLQf+KA3tY/dT2WayCZZSOF4Mo8YLj2aWaBWoTXEe0oh9Xoi/kVm5++IugM9NsX BQFOiQRDow2texAl5HMNu3bo82RlxsXFle5uwci0OLw73xpHVSTxksrnj8CehFl1us2SW1 k3iIQ48aq6RyyyudHKKCS4OVFEPwhIPOadZIvtBav7njalo7wzP6GzKLsXHWshd1SZmZ3B Y0voTBasXsfBo8kJW8z/1ZjS9fuqwjwgg9gOGcTNcmqjWQqStUug5hkx8iZYPB64hJ5qHO v6zn83LWOdS3HHHV7WONx3WXDpz6fg26aVV9LNAbZUjzF9Xw6CYq6S39IthDFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLkFN0TvNz14PT; Fri, 19 Apr 2024 18:48: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 43JImtWS003502; Fri, 19 Apr 2024 18:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JImtqF003499; Fri, 19 Apr 2024 18:48:55 GMT (envelope-from git) Date: Fri, 19 Apr 2024 18:48:55 GMT Message-Id: <202404191848.43JImtqF003499@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: 87b0195ace1a - main - ctags: Use C99 bool instead of defining our own List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 87b0195ace1a71a1a07244890be3aaef72e1ffcd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87b0195ace1a71a1a07244890be3aaef72e1ffcd commit 87b0195ace1a71a1a07244890be3aaef72e1ffcd Author: Collin Funk AuthorDate: 2024-02-07 00:34:50 +0000 Commit: Mark Johnston CommitDate: 2024-04-19 18:48:37 +0000 ctags: Use C99 bool instead of defining our own Use stdbool.h definitions instead of defining non-standard ones. Signed-off-by: Collin Funk Reviewed by: markj MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1107 --- usr.bin/ctags/C.c | 76 ++++++++++++++++++++++++------------------------- usr.bin/ctags/ctags.c | 22 +++++++------- usr.bin/ctags/ctags.h | 11 ++++--- usr.bin/ctags/fortran.c | 12 ++++---- usr.bin/ctags/lisp.c | 8 +++--- usr.bin/ctags/tree.c | 2 +- usr.bin/ctags/yacc.c | 10 +++---- 7 files changed, 70 insertions(+), 71 deletions(-) diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c index 283a08ec555d..20a2cf072aa9 100644 --- a/usr.bin/ctags/C.c +++ b/usr.bin/ctags/C.c @@ -37,10 +37,10 @@ #include "ctags.h" -static int func_entry(void); +static bool func_entry(void); static void hash_entry(void); static void skip_string(int); -static int str_entry(int); +static bool str_entry(int); /* * c_entries -- @@ -52,13 +52,13 @@ c_entries(void) int c; /* current character */ int level; /* brace level */ int token; /* if reading a token */ - int t_def; /* if reading a typedef */ + bool t_def; /* if reading a typedef */ int t_level; /* typedef's brace level */ char *sp; /* buffer pointer */ char tok[MAXTOKEN]; /* token buffer */ lineftell = ftell(inf); - sp = tok; token = t_def = NO; t_level = -1; level = 0; lineno = 1; + sp = tok; token = t_def = false; t_level = -1; level = 0; lineno = 1; while (GETC(!=, EOF)) { switch (c) { /* @@ -92,11 +92,11 @@ c_entries(void) */ endtok: if (sp > tok) { *sp = EOS; - token = YES; + token = true; sp = tok; } else - token = NO; + token = false; continue; /* @@ -174,7 +174,7 @@ c_entries(void) */ case ';': if (t_def && level == t_level) { - t_def = NO; + t_def = false; get_line(); if (sp != tok) *sp = EOS; @@ -207,7 +207,7 @@ c_entries(void) /* no typedefs inside typedefs */ if (!t_def && !memcmp(tok, "typedef",8)) { - t_def = YES; + t_def = true; t_level = level; break; } @@ -233,15 +233,15 @@ c_entries(void) if (sp == tok + sizeof tok - 1) /* Too long -- truncate it */ *sp = EOS; - else + else *sp++ = c; - token = YES; + token = true; } continue; } sp = tok; - token = NO; + token = false; } } @@ -249,7 +249,7 @@ c_entries(void) * func_entry -- * handle a function reference */ -static int +static bool func_entry(void) { int c; /* current character */ @@ -287,7 +287,7 @@ func_entry(void) SETLINE; } } - return (NO); + return (false); fnd: /* * we assume that the character after a function's right paren @@ -299,7 +299,7 @@ fnd: if (c == '\n') SETLINE; if (c == EOF) - return NO; + return false; /* * Recognize the gnu __attribute__ extension, which would * otherwise make the heuristic test DTWT @@ -311,7 +311,7 @@ fnd: } } else { if (intoken(c)) { - if (anext - maybe_attribute + if (anext - maybe_attribute < (ptrdiff_t)(sizeof attribute - 1)) *anext++ = c; else break; @@ -320,7 +320,7 @@ fnd: *anext++ = '\0'; if (strcmp(maybe_attribute, attribute) == 0) { (void)ungetc(c, inf); - return NO; + return false; } break; } @@ -331,12 +331,12 @@ fnd: skip_comment(c); else { /* don't ever "read" '/' */ (void)ungetc(c, inf); - return (NO); + return (false); } } if (c != '{') (void)skip_key('{'); - return (YES); + return (true); } /* @@ -365,7 +365,7 @@ hash_entry(void) if (sp == tok + sizeof tok - 1) /* Too long -- truncate it */ *sp = EOS; - else + else *sp++ = c; } *sp = EOS; @@ -381,7 +381,7 @@ hash_entry(void) if (sp == tok + sizeof tok - 1) /* Too long -- truncate it */ *sp = EOS; - else + else *sp++ = c; if (GETC(==, EOF)) return; @@ -409,7 +409,7 @@ skip: if (c == '\n') { /* get rid of rest of define */ * str_entry -- * handle a struct, union or enum entry */ -static int +static bool str_entry(int c) /* c is current character */ { int curline; /* line started on */ @@ -419,17 +419,17 @@ str_entry(int c) /* c is current character */ curline = lineno; while (iswhite(c)) if (GETC(==, EOF)) - return (NO); + return (false); if (c == '{') /* it was "struct {" */ - return (YES); + return (true); for (sp = tok;;) { /* get next token */ if (sp == tok + sizeof tok - 1) /* Too long -- truncate it */ *sp = EOS; - else + else *sp++ = c; if (GETC(==, EOF)) - return (NO); + return (false); if (!intoken(c)) break; } @@ -446,12 +446,12 @@ str_entry(int c) /* c is current character */ break; if (c != '{') { (void)ungetc(c, inf); - return (NO); + return (false); } } *sp = EOS; pfnote(tok, curline); - return (YES); + return (true); } /* @@ -468,7 +468,7 @@ skip_comment(int t) /* t is comment character */ switch(c) { /* comments don't nest, nor can they be escaped. */ case '*': - star = YES; + star = true; break; case '/': if (star && t == '*') @@ -480,7 +480,7 @@ skip_comment(int t) /* t is comment character */ return; /*FALLTHROUGH*/ default: - star = NO; + star = false; break; } } @@ -495,7 +495,7 @@ skip_string(int key) int c, skip; - for (skip = NO; GETC(!=, EOF); ) + for (skip = false; GETC(!=, EOF); ) switch (c) { case '\\': /* a backslash escapes anything */ skip = !skip; /* we toggle in case it's "\\" */ @@ -506,7 +506,7 @@ skip_string(int key) default: if (c == key && !skip) return; - skip = NO; + skip = false; } } @@ -514,21 +514,21 @@ skip_string(int key) * skip_key -- * skip to next char "key" */ -int +bool skip_key(int key) { - int c, - skip, - retval; + int c; + bool skip; + bool retval; - for (skip = retval = NO; GETC(!=, EOF);) + for (skip = retval = false; GETC(!=, EOF);) switch(c) { case '\\': /* a backslash escapes anything */ skip = !skip; /* we toggle in case it's "\\" */ break; case ';': /* special case for yacc; if one */ case '|': /* of these chars occurs, we may */ - retval = YES; /* have moved out of the rule */ + retval = true; /* have moved out of the rule */ break; /* not used by C */ case '\'': case '"': @@ -551,7 +551,7 @@ skip_key(int key) norm: if (c == key && !skip) return (retval); - skip = NO; + skip = false; } return (retval); } diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index 1f8966a409db..b8d642520466 100644 --- a/usr.bin/ctags/ctags.c +++ b/usr.bin/ctags/ctags.c @@ -86,8 +86,8 @@ main(int argc, char **argv) setlocale(LC_ALL, ""); - aflag = uflag = NO; - tflag = YES; + aflag = uflag = false; + tflag = true; while ((ch = getopt(argc, argv, "BFTadf:tuwvx")) != -1) switch(ch) { case 'B': @@ -97,7 +97,7 @@ main(int argc, char **argv) searchar = '/'; break; case 'T': - tflag = NO; + tflag = false; break; case 'a': aflag++; @@ -109,7 +109,7 @@ main(int argc, char **argv) outfile = optarg; break; case 't': - tflag = YES; + tflag = true; break; case 'u': uflag++; @@ -251,24 +251,24 @@ init(void) const unsigned char *sp; for (i = 0; i < 256; i++) { - _wht[i] = _etk[i] = _itk[i] = _btk[i] = NO; - _gd[i] = YES; + _wht[i] = _etk[i] = _itk[i] = _btk[i] = false; + _gd[i] = true; } #define CWHITE " \f\t\n" for (sp = CWHITE; *sp; sp++) /* white space chars */ - _wht[*sp] = YES; + _wht[*sp] = true; #define CTOKEN " \t\n\"'#()[]{}=-+%*/&|^~!<>;,.:?" for (sp = CTOKEN; *sp; sp++) /* token ending chars */ - _etk[*sp] = YES; + _etk[*sp] = true; #define CINTOK "ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz0123456789" for (sp = CINTOK; *sp; sp++) /* valid in-token chars */ - _itk[*sp] = YES; + _itk[*sp] = true; #define CBEGIN "ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz" for (sp = CBEGIN; *sp; sp++) /* token starting chars */ - _btk[*sp] = YES; + _btk[*sp] = true; #define CNOTGD ",;" for (sp = CNOTGD; *sp; sp++) /* invalid after-function chars */ - _gd[*sp] = NO; + _gd[*sp] = false; } /* diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h index c9a7539b277a..b74bf7ea7602 100644 --- a/usr.bin/ctags/ctags.h +++ b/usr.bin/ctags/ctags.h @@ -30,10 +30,9 @@ * */ -#define bool char +/* This header requires bool for some externed symbols. */ +#include -#define YES 1 -#define NO 0 #define EOS '\0' #define ENDLINE 50 /* max length of pattern */ @@ -81,14 +80,14 @@ extern char lbuf[LINE_MAX]; extern char *lbp; extern char searchar; /* ex search character */ -extern int cicmp(const char *); +extern bool cicmp(const char *); extern void get_line(void); extern void pfnote(const char *, int); -extern int skip_key(int); +extern bool skip_key(int); extern void put_entries(NODE *); extern void toss_yysec(void); extern void l_entries(void); extern void y_entries(void); -extern int PF_funcs(void); +extern bool PF_funcs(void); extern void c_entries(void); extern void skip_comment(int); diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c index 55d8d824f568..4375076f5914 100644 --- a/usr.bin/ctags/fortran.c +++ b/usr.bin/ctags/fortran.c @@ -41,14 +41,14 @@ static void takeprec(void); char *lbp; /* line buffer pointer */ -int +bool PF_funcs(void) { bool pfcnt; /* pascal/fortran functions found */ char *cp; char tok[MAXTOKEN]; - for (pfcnt = NO;;) { + for (pfcnt = false;;) { lineftell = ftell(inf); if (!fgets(lbuf, sizeof(lbuf), inf)) return (pfcnt); @@ -120,7 +120,7 @@ PF_funcs(void) (void)strlcpy(tok, lbp, sizeof(tok)); /* possible trunc */ get_line(); /* process line for ex(1) */ pfnote(tok, lineno); - pfcnt = YES; + pfcnt = true; } /*NOTREACHED*/ } @@ -129,7 +129,7 @@ PF_funcs(void) * cicmp -- * do case-independent strcmp */ -int +bool cicmp(const char *cp) { int len; @@ -140,9 +140,9 @@ cicmp(const char *cp) continue; if (!*cp) { lbp += len; - return (YES); + return (true); } - return (NO); + return (false); } static void diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c index e219fcee4634..e721bf8f757d 100644 --- a/usr.bin/ctags/lisp.c +++ b/usr.bin/ctags/lisp.c @@ -44,7 +44,7 @@ void l_entries(void) { - int special; + bool special; char *cp; char savedc; char tok[MAXTOKEN]; @@ -57,15 +57,15 @@ l_entries(void) lbp = lbuf; if (!cicmp("(def")) continue; - special = NO; + special = false; switch(*lbp | ' ') { case 'm': if (cicmp("method")) - special = YES; + special = true; break; case 'w': if (cicmp("wrapper") || cicmp("whopper")) - special = YES; + special = true; } for (; !isspace(*lbp); ++lbp) continue; diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c index e8250bcbcf67..7643d1895b93 100644 --- a/usr.bin/ctags/tree.c +++ b/usr.bin/ctags/tree.c @@ -100,7 +100,7 @@ add_node(NODE *node, NODE *cur_node) if (!cur_node->been_warned) if (!wflag) fprintf(stderr, "Duplicate entry in files %s and %s: %s (Warning only)\n", node->file, cur_node->file, node->entry); - cur_node->been_warned = YES; + cur_node->been_warned = true; } else if (dif < 0) if (cur_node->left) diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c index 502fbc98b714..71dddaa36f67 100644 --- a/usr.bin/ctags/yacc.c +++ b/usr.bin/ctags/yacc.c @@ -48,7 +48,7 @@ y_entries(void) bool in_rule; char tok[MAXTOKEN]; - in_rule = NO; + in_rule = false; while (GETC(!=, EOF)) switch (c) { @@ -62,12 +62,12 @@ y_entries(void) break; case '{': if (skip_key('}')) - in_rule = NO; + in_rule = false; break; case '\'': case '"': if (skip_key(c)) - in_rule = NO; + in_rule = false; break; case '%': if (GETC(==, '%')) @@ -82,7 +82,7 @@ y_entries(void) break; case '|': case ';': - in_rule = NO; + in_rule = false; break; default: if (in_rule || (!isalpha(c) && c != '.' && c != '_')) @@ -101,7 +101,7 @@ y_entries(void) } if (c == ':') { pfnote(tok, lineno); - in_rule = YES; + in_rule = true; } else (void)ungetc(c, inf); From nobody Fri Apr 19 19:18:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLkvm6LTpz5HZwb; Fri, 19 Apr 2024 19:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLkvm5mV8z4sHC; Fri, 19 Apr 2024 19:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713554324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O5RmZeXE+EzquzX08ARapFiSbh0kEBGg4U0FxCxrLIg=; b=kZxhFGy5VT5vQCT2gWmkiTJZavtZu2ylyi+7imlVTsjBVxZaKPoKEcyVDMMv0jJuABB6Y+ E/6SPycqcLB1IM+NjiLfef0LSe3vsghW7zUXGZb59aK6MV56KqFzKM06XBiZvXQn9zVQ7p +Qzm5E1Z04fwSQOiOAlkdu9ECpTajGCOte1EuGDK+H3zFWecBcJsWL4GhQk93eE8H4M34F wgFDyuDLxhVP3OIC0GAoJ4BaFg2GzkeAUibevt93FuYyoyJEDxCmmAWN+vNKUOodtB1Cfc 67EnoJ99vNOhCQXApoL3IKlNK3Q6tKbgCNZza2EzIxTJ5BqDiNhwOIBdeCXbpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713554324; a=rsa-sha256; cv=none; b=Np4kE+Yh32z17OXihsRXNR2z08wPxyYsNF0+4afiq6mbeE+t4KyYI2o1HnF06kOniPhEzZ Sib314jPsRWU0KclL4nQzFtBnSUJN+71oRAXcE1GSUTU5dHtF9aEGOnctgcSsrZbVAo9KA dpCEEzEYQy8mDpdlMKL4tQKOWpeNSxxgeemcggjJol7fsUZ0D26OsNWTIhv13FXVNnYxT/ 12y9Af3wkbFkF3+o+RyJ/LkQ/VK8Cq23yA+TwsPfGqABrbNi4oeUogfewVLrr6Gfb4Cjdw RRnIVRDVsNoTk3R5Yyot4y+s27a4Zn5xK+KLU4hOjE84CyFaqtbdYuFxi29utw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713554324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O5RmZeXE+EzquzX08ARapFiSbh0kEBGg4U0FxCxrLIg=; b=NJWVZ9q1RH83c1I6u4063hwFWn2ydvf+lMae1jrMGYFyRi4JDhgAfrR38eJEVB1guxkYFk wDVQ1ccDrzf7yl4cb0RsylzNR6NmnfRpvEL0/A6EID1aZQiwt2GRYDS1EFITsLE6K95dAn 2fu9VGNxfUaBGECMGUrddUAFhpm+pZMwXMcuC/VdxuMnZdjlqwQ3pWcTD6YaqhH+Zk37yY DnGv/oND8XM8Vlg36aXYEN1kF2Td54eLEUlu/Z7Lxcg8CgAdcP70YVbVu0w0R3vhjmN1zp XB1LhhBMKo6TKVpoC3mLlWSuhLt6dnv6oWKLcQsnuSaJ7AyyikTTOOzqyvtakQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLkvm5FfWz14pw; Fri, 19 Apr 2024 19:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43JJIiKb055259; Fri, 19 Apr 2024 19:18:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JJIif0055256; Fri, 19 Apr 2024 19:18:44 GMT (envelope-from git) Date: Fri, 19 Apr 2024 19:18:44 GMT Message-Id: <202404191918.43JJIif0055256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 68a3a7fc9483 - main - kasan: fix false-positive kasan_report upon thread reuse List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68a3a7fc94833020403190c20bd9be186c6156ce Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=68a3a7fc94833020403190c20bd9be186c6156ce commit 68a3a7fc94833020403190c20bd9be186c6156ce Author: Ka Ho Ng AuthorDate: 2024-04-19 19:18:27 +0000 Commit: Ka Ho Ng CommitDate: 2024-04-19 19:18:27 +0000 kasan: fix false-positive kasan_report upon thread reuse In fork1(), if a thread is reused and thread_alloc_stack() is not called, mark the reused thread's kstack pages clean in the KASAN shadow buffer. Sponsored by: Juniper Networks, Inc. MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44875 --- sys/kern/kern_fork.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index c7b2b1195841..d0044dfc19a0 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -1026,6 +1027,10 @@ fork1(struct thread *td, struct fork_req *fr) error = ENOMEM; goto fail2; } + } else { + kasan_mark((void *)td2->td_kstack, + ptoa(td2->td_kstack_pages), + ptoa(td2->td_kstack_pages), 0); } } From nobody Fri Apr 19 21:25:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLnjk2pDLz5HmTq; Fri, 19 Apr 2024 21:25: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 4VLnjk245Yz45ZV; Fri, 19 Apr 2024 21:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713561914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fen/UPLQMYGNyhBIruar8AEKroU975rmcpsryhyLjlE=; b=v74JqHmLopsb7hzTeC+qwL1NwfqyfrHszIsqxnW21ulpRPSPYKsEQHJXG/qteXZ9JgU/hJ kmc1LH0uaM/pMzPpe9TxArZA7Sq5lypKeNn6LTakJ0qPSqwfcpgsTKesrXOiNNIh09NLZ7 0szMBbWqu1i7n4TfLhOVFTuJIbnlvvNTqJTb5P2EB4LEgj6WxbLzb5Vcj/C/ZMl6p3KBW3 kcSGRKEvzl8OGG2cd5aMzvhFgFyil9wKhPROR5q452Vjn2Khfvxb3rzGAfdUJw+x3eyuVT zVWpvYMD7ww02OoKcB9h3pyUfyzABdOoHESRheMJz23Skh6o+sjfLKGPjTN1FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713561914; a=rsa-sha256; cv=none; b=HqHxIMSDwhClLdQHr7IKNEGz0FJNxlMSmhxTbV0Cu84OCvXN+Xsfq813yDdv51FYlmgc7f FlitSIKh2NSfYT/3cfHEHlHTVo+483zMuR7i1lQtouBFDW0x6/WON3eUNtPgMVhdvOv+uC J1paiQmoy2NaRnA8Jel+nHJsiYuRFa5iYawd5ugkM4I3Pb/0Sn9xCHYnPV18nCQ5Heqdxg yZCNLr+NAHW3Qsgq7xIM2yYYQbw8hxqBdW4JdY4DcbnXXZJgFKJ/nYZOQBvloX/8o1IXGu l6KTCQH3Hj/oufVOZqBK+x5gxnSZp2l4O2nHoxDF+j58cdNemTGispaIQ7VvfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713561914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fen/UPLQMYGNyhBIruar8AEKroU975rmcpsryhyLjlE=; b=qviYTbFnk2UXxrus58dW20Q3nv8osM4KU8xKfjsZRuEOazsbY1xFf27bdhrm8Tyqdfsdzt 8/LBVbufT0kvQ+NQh+0kOluPi6WXIPk1o2EiJT0J8vB7ARvc1fgsvf/rZO7QElzZCYxOAh eC8d95aa9hnCJ5R5g3ML5/eePZeBxRzXgqnXcL65WtVYgbKJUfZZPprgJngNT+OKMP3tH6 8IxGAQ5YJisL9m2Gi9Kz+awwTaJVU1Lnh8AsB/X3/Px7tNbVkshHbFc6kXfAVLLqey5c0p JpDv3c3LStpAxNy9IitV6/wCJviIbi+drDmgneC+q4CxSrIxZhNOIULNIuBfxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLnjk1fvvz18KK; Fri, 19 Apr 2024 21:25: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 43JLPEwL073861; Fri, 19 Apr 2024 21:25:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLPEie073858; Fri, 19 Apr 2024 21:25:14 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:25:14 GMT Message-Id: <202404192125.43JLPEie073858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 6e83504c6031 - main - Revert "lib{c,sys}: normalize export of openat, setcontext, and swapcontext" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e83504c603157e9fc1660d2a1556036492662fc Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6e83504c603157e9fc1660d2a1556036492662fc commit 6e83504c603157e9fc1660d2a1556036492662fc Author: Brooks Davis AuthorDate: 2024-04-19 21:21:46 +0000 Commit: Brooks Davis CommitDate: 2024-04-19 21:25:04 +0000 Revert "lib{c,sys}: normalize export of openat, setcontext, and swapcontext" I put the symbols in the wrong file (should have been lib/libc/sys/Symbol.map), added a duplicate pdfork entry due to a botch rebase, and there seems to be a issue with gcc13/binutils not exposing the symbols so revert the whole thing while I debug. This reverts commit ee632fb9eb4a060a4087a7f5425bfe36e65cda61. --- lib/libc/sys/openat.c | 1 + lib/libc/sys/setcontext.c | 1 + lib/libc/sys/swapcontext.c | 1 + lib/libsys/Symbol.sys.map | 4 ---- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libc/sys/openat.c b/lib/libc/sys/openat.c index 389360a5a9f5..1cd8e7d90745 100644 --- a/lib/libc/sys/openat.c +++ b/lib/libc/sys/openat.c @@ -37,6 +37,7 @@ __weak_reference(__sys_openat, __openat); __sym_compat(openat, __impl_openat, FBSD_1.1); __weak_reference(openat, __impl_openat); +__sym_default(openat, openat, FBSD_1.2); #pragma weak openat int diff --git a/lib/libc/sys/setcontext.c b/lib/libc/sys/setcontext.c index 301cca84c4f9..96b5dc115067 100644 --- a/lib/libc/sys/setcontext.c +++ b/lib/libc/sys/setcontext.c @@ -36,6 +36,7 @@ __weak_reference(__sys_setcontext, __setcontext); __sym_compat(setcontext, __impl_setcontext, FBSD_1.0); __weak_reference(setcontext, __impl_setcontext); +__sym_default(setcontext, setcontext, FBSD_1.2); #pragma weak setcontext int diff --git a/lib/libc/sys/swapcontext.c b/lib/libc/sys/swapcontext.c index 42793a516c70..b69a5b19e698 100644 --- a/lib/libc/sys/swapcontext.c +++ b/lib/libc/sys/swapcontext.c @@ -38,6 +38,7 @@ __weak_reference(__sys_swapcontext, __swapcontext); __sym_compat(swapcontext, __impl_swapcontext, FBSD_1.0); __weak_reference(swapcontext, __impl_swapcontext); +__sym_default(swapcontext, swapcontext, FBSD_1.2); #pragma weak swapcontext int diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 359570c413a4..822c007d32f1 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -301,8 +301,6 @@ FBSD_1.2 { cap_getmode; getloginclass; getpagesizes; - openat; - pdfork; pdgetpid; pdkill; posix_fallocate; @@ -311,9 +309,7 @@ FBSD_1.2 { rctl_get_limits; rctl_add_rule; rctl_remove_rule; - setcontext; setloginclass; - swapcontext; }; FBSD_1.3 { From nobody Fri Apr 19 21:40:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLp352bqHz5HnnH; Fri, 19 Apr 2024 21:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLp3527f7z46GJ; Fri, 19 Apr 2024 21:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713562817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IgqkOhv6K90L1p3e2SZo2RdqrRmdKIKE/YXb2IOI18=; b=YQf78MFfGZ33f+YtOBiKoHY9QNYCRHbIrUNpWVtLygGbAKFCnrTEXlnA4ifr8q+XMyiY2Y ci+4b2+5cN/e2yZInQMCMKx0EY7rHKQQ+onvY+rzU0Tujb4Joab2hRwiRy3QeEpf5yZrOS uV16hP2R6L6qf9I+LC9mwLLJDfemfARD7XBtMaNudHpew4ODY3iRSNhfMJ4jxJ1zKLUOqP kBzu+xctcXndshaDY8L5QPWVReL5KUc8EnA5m0+L2BLKfW6Bh9goRkCxgoDWB/8bCPNKLs czbEh1+vxhUBzf8nMN4ZS23TKO99YMoky511SgEb1VWtqUvV+jVMNL6dqRgW8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713562817; a=rsa-sha256; cv=none; b=sFltURjuuyW+tti/FeNLSjmnD5deKr4al+CwPguf3Kcu+z7413/G+fKs/W+yoKP1b10XLP JQAASOc8ewBMGADPNJzd8PcRqneJDOtLZ8v3cjl9249hxRmRg16KBQSy5dX7z6RthHjTQK wNVWmhSbsKkOpyedAnPMfdIYftCbJGDyZmGpmMvkGdWKOeb04AtqVSH4PWslmGdbjSneaN M6LQDMRdlw6xoMLaIC4TpNSTqwTgciamTKMJw42tteUdfwjCQH8tZFYOsdl2Og9UHrS5rn 6UUhlZ1V0xDbo9TPxoJRDZ8ycCOLMJ9v/TFnMJx6wiwizErTb8jpW28B8NDR0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713562817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+IgqkOhv6K90L1p3e2SZo2RdqrRmdKIKE/YXb2IOI18=; b=iIIhFc+ys9mojYvnLa2koHHikKCTScnQU0bxN6/Y6QvIvZIGLPjWYA88cy13TkGm0+tbFO WlyR7+q81+9NfgyRJRs+3Lt3vjBa+MBR1rOCdKNm4hSQen/vPQiJZK6Xwb53KxWi+rYkwO l11P0KjlROLWztHK+J2RwoIMJq+fly92wvzE6I32yMTGpscmiqXgEMp4QRoqC2h08Xz7lq jVQyTKLPTicoVbSvIGeoxec+A942Jk8OG8GhJ9hK9MMD6F9nDKrc6y23Z0kyVNHDb0qyF/ 3ITW/4PBVxDOgI1ZllxSYF1dL9UKfpEs5b3HMX78FUprUQOIwB9gxtPSrClmHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLp351kstz18dH; Fri, 19 Apr 2024 21:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43JLeHiK000040; Fri, 19 Apr 2024 21:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLeHCa000032; Fri, 19 Apr 2024 21:40:17 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:40:17 GMT Message-Id: <202404192140.43JLeHCa000032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 04e0313a7158 - main - ztest: use ASSERT3P to compare pointers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04e0313a7158f3d8623228f10da969bb21abc568 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=04e0313a7158f3d8623228f10da969bb21abc568 commit 04e0313a7158f3d8623228f10da969bb21abc568 Author: Brooks Davis AuthorDate: 2024-04-19 21:31:53 +0000 Commit: Brooks Davis CommitDate: 2024-04-19 21:31:53 +0000 ztest: use ASSERT3P to compare pointers Fixes i386-gcc13 build. Direct commit while waiting for upstream. Pull Request: https://github.com/openzfs/zfs/pull/16115 --- sys/contrib/openzfs/cmd/ztest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/cmd/ztest.c b/sys/contrib/openzfs/cmd/ztest.c index 684ab586bb93..b0fea8b3cfb4 100644 --- a/sys/contrib/openzfs/cmd/ztest.c +++ b/sys/contrib/openzfs/cmd/ztest.c @@ -8045,7 +8045,7 @@ ztest_raidz_expand_run(ztest_shared_t *zs, spa_t *spa) ztest_expand_io_t *thread_args; ASSERT3U(ztest_opts.zo_raidz_expand_test, !=, RAIDZ_EXPAND_NONE); - ASSERT3U(rzvd->vdev_ops, ==, &vdev_raidz_ops); + ASSERT3P(rzvd->vdev_ops, ==, &vdev_raidz_ops); ztest_opts.zo_raidz_expand_test = RAIDZ_EXPAND_STARTED; /* Setup a 1 MiB buffer of random data */ From nobody Fri Apr 19 21:52:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpKN2SCkz5HpnN; Fri, 19 Apr 2024 21:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLpKN1tvRz493w; Fri, 19 Apr 2024 21:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8xg3THCzT0lWBbPOrMPz6JjITQCmczKiEToMFb4UWsI=; b=p5jQx6D0or0UEfmtZanSMyqmuWcNq4f3jNhFJrrzE6uIsrFyp2tOGPYF9QurhQTMffASob JUmjhTGLiwbbd6j4jfPqwIAbBbOephhIZfWmCLEjuAcOmwThKcuHhe8k5nunMXyANLtwI9 n+qH0gi8je7r5aX+4zGIgTtGaKwGooiMGIlqb6E0FrnfVZhLjNVNTQbFnvY3GafcpanCQS v7emgKWN7HJQBn90btE698y49I3GIeKA7LOBmdM+RU19+YrlQ46juZnbFS35wrFvwGFHJf 4kVFcmEW0euMVtnHzLkeUWRoviY2oTS4W8E5ko1WyddIzU+hI1zv7bnQD5W3OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563560; a=rsa-sha256; cv=none; b=bYZFrR+CknGENbTW4TbISpjX/T8p1BdX4Ir2C3ndIpLn/9xWFGhf++/fB1hCULcmP7CCJi Rb0Ak2gyTTQinLP5wNXjtwpTLMiLUjGW8O+HNZY+tHZyGMQWhTeUfPU4x2YDT5PS12enBY hXSgzu73iM9EfpaAWs3M0fmKFY6NKBFwMuH0SlmGT7YCBR78gR8YEcyTYxNFxTJJwYV1Lh PKl2rYhtaBCcWdFSSxB4qAT5j6u1LNDY6Phx5GYZaENGEZNE6FFYjvJ0rxYoMflqPlaPhm tkYffRRoFhyFRbgfLQOdKOBN9LUlwEnUA4Blag6lb8XQpo6+VLaGqTioVFlsvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8xg3THCzT0lWBbPOrMPz6JjITQCmczKiEToMFb4UWsI=; b=E6D5HQyFFfLIPfr7iawM/RIkH0zOz7wjX9oWid8xGxoOm0Qhf79kfrMhwwcjs0ikF6xpa6 WIev+OQS7dtP4/pQcx/hBXRlRjwYfFw/clKt3q9cSWnLg/C2Jp7BpU+PL5rZvl9OiyNiGu +Kj3l956hReV30o9m6fHRivZqgv52PbOkr1lo4MSY+Qx1bphuhO4Xhq3fA0XyAiXAbs8cx R91KVvElC4vpwPzGc9MTLHGEGgN0pCNfaBxp6slDX6rG6zmwHI07TOmQtJUENM6ZcbxIRL 48uEa+YGNRO1pCREJPuQh7KrEwcPixXb6OWLLYMcI0/tXUDeQM5/G/Vsa7HwEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpKN1VdKz19C3; Fri, 19 Apr 2024 21:52: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 43JLqeJt023747; Fri, 19 Apr 2024 21:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLqeWL023744; Fri, 19 Apr 2024 21:52:40 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:52:40 GMT Message-Id: <202404192152.43JLqeWL023744@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: b05785953e55 - main - cut: use getline() instead of fgetln() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b05785953e555e3dd13a162a8854076212026ca5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b05785953e555e3dd13a162a8854076212026ca5 commit b05785953e555e3dd13a162a8854076212026ca5 Author: Martin Tournoij AuthorDate: 2024-04-19 21:11:30 +0000 Commit: Warner Losh CommitDate: 2024-04-19 21:52:21 +0000 cut: use getline() instead of fgetln() This replaces fgetln() with getline(). The main reason for this is portability, making things easier for people who want to compile these tools on non-FreeBSD systems. I appreciate that's probably not the top concern for FreeBSD base tools, but fgetln() is impossible to port to most platforms, as concurrent access is essentially impossible to implement fully correct without the line buffer on the FILE struct. Other than this, many generic FreeBSD tools compile fairly cleanly on Linux with a few small changes. Most uses of fgetln() pre-date getline() support (added in 2009 with 69099ba2ec8b), and there's been some previous patches (ee3ca711a898 8c98e6b1a7f3 1a2a4fc8ce1b) for other tools. Obtained from: https://github.com/dcantrell/bsdutils and https://github.com/chimera-linux/chimerautils Signed-off-by: Martin Tournoij Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/893 --- usr.bin/cut/cut.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index df4a2d7eb132..60ff5a31062a 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -268,14 +268,15 @@ b_cut(FILE *fp, const char *fname __unused) static int b_n_cut(FILE *fp, const char *fname) { - size_t col, i, lbuflen; - char *lbuf; + size_t col, i, bufsize = 0; + ssize_t lbuflen; + char *lbuf = NULL; int canwrite, clen, warned; mbstate_t mbs; memset(&mbs, 0, sizeof(mbs)); warned = 0; - while ((lbuf = fgetln(fp, &lbuflen)) != NULL) { + while ((lbuflen = getline(&lbuf, &bufsize, fp)) >= 0) { for (col = 0; lbuflen > 0; col += clen) { if ((clen = mbrlen(lbuf, lbuflen, &mbs)) < 0) { if (!warned) { @@ -324,6 +325,7 @@ b_n_cut(FILE *fp, const char *fname) if (lbuflen > 0) putchar('\n'); } + free(lbuf); return (warned); } @@ -382,21 +384,22 @@ f_cut(FILE *fp, const char *fname) int field, i, isdelim; char *pos, *p; int output; - char *lbuf, *mlbuf; - size_t clen, lbuflen, reallen; + char *lbuf = NULL; + size_t clen, bufsize = 0, reallen; + ssize_t lbuflen; - mlbuf = NULL; - while ((lbuf = fgetln(fp, &lbuflen)) != NULL) { + while ((lbuflen = getline(&lbuf, &bufsize, fp)) >= 0) { reallen = lbuflen; /* Assert EOL has a newline. */ - if (*(lbuf + lbuflen - 1) != '\n') { + if (lbuflen > 0 && *(lbuf + lbuflen - 1) != '\n') { /* Can't have > 1 line with no trailing newline. */ - mlbuf = malloc(lbuflen + 1); - if (mlbuf == NULL) - err(1, "malloc"); - memcpy(mlbuf, lbuf, lbuflen); - *(mlbuf + lbuflen) = '\n'; - lbuf = mlbuf; + if ((ssize_t)bufsize < (lbuflen + 1)) { + bufsize = lbuflen + 1; + lbuf = realloc(lbuf, bufsize); + } + if (lbuf == NULL) + err(1, "realloc"); + lbuf[lbuflen] = '\n'; reallen++; } output = 0; @@ -404,7 +407,7 @@ f_cut(FILE *fp, const char *fname) clen = mbrtowc(&ch, p, lbuf + reallen - p, NULL); if (clen == (size_t)-1 || clen == (size_t)-2) { warnc(EILSEQ, "%s", fname); - free(mlbuf); + free(lbuf); return (1); } if (clen == 0) @@ -431,7 +434,7 @@ f_cut(FILE *fp, const char *fname) NULL); if (clen == (size_t)-1 || clen == (size_t)-2) { warnc(EILSEQ, "%s", fname); - free(mlbuf); + free(lbuf); return (1); } if (clen == 0) @@ -463,7 +466,7 @@ f_cut(FILE *fp, const char *fname) } (void)putchar('\n'); } - free(mlbuf); + free(lbuf); return (0); } From nobody Fri Apr 19 21:52:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpKP3hq9z5HprS; Fri, 19 Apr 2024 21:52: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 4VLpKP2tT4z49ML; Fri, 19 Apr 2024 21:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+7KUXkSVAhFh9hfp6U7SN0y65+w5iUXKlK82p3n8LM=; b=Y+mIda4rTlhrKjyit7q+Otr9SP9xWVn3D4QXkHb9bHAeNKCHiX1iFBAyGKZwz1CzjBNgXZ Kv5fxBJl7PkLmyWHq3Vf3sOCniLgNa4qC5krzUrH4VlWfOJds2zRZx2dhB3AsBdhH7KSBn m3SQZSCccC+GLbG1TrqTXVZPMgwY0uvZ4rF9XKDxwLJlGBBYu/rQsUUxEXzLcCha4reO/9 IQ6rcD6hTfOAZIvIWOYHJE7EJl/snfnS4/XHhCFzlu72VtZBMc9zAl8K8cxF6g1MsgsqhS IQdrtj0KbcRiCjMeNKWLkg0mNxjLNf9av1dMOHqsdVLWWMrKMcvLkWF1STAQcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563561; a=rsa-sha256; cv=none; b=t7fdysH+1vK3/GiAdkKTDLAG3t+aPvyjV66wxHpf4az8+Ybia5WEhMXPviMxdMdrhDLyGv i5vQf/SxqHIIj6sInkepX+kCEZXt9Mmtd0Ataz0IBaNpyeBWAEiqCwCibTRl3Jv2f8PI1b ibW+9KYbCpzoLjY+nf+NEE0hzPOcmggLgZM81Oua0GULqBVdXTr8oh9pGc9WfzDhwqNXPe sz1U0edxM6xd6fHKryDd1MZwxFE9aodeezfFEIS4uUKAsfbLbgf90x4Nn/hk4RRgJJLiWv gNkYhE4Dg2OCbfRv0Ryjw0XQRTBLBophjOqaV7pQhvIxP0Sh5K0Eq7QN7aLkuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+7KUXkSVAhFh9hfp6U7SN0y65+w5iUXKlK82p3n8LM=; b=JcxI4Nf4QtqDkGv8il9A8a5HxlqBnlsf48ULxN9+wl89B5AqmvSEorhSxU0McoqgDDyiZG Ea42j90cX7/Qs29dePA3nPHXq+L49GlJqPiBK7JNfOJnOBUrf+N9PuNVDabFBVxRO3bVzx iBi+tlcmHM8qXbvX6I9xK1g8MA29YD/ifV0TW1Tuw2mK6mG75yPIpUzLuBydQg07htQb3i HBEEWiUxz8VacuMJ1qUn3Y7eu03e84S6Nl9fs/GE16F73RoSJ6QtqBiV5fcLJqFEo1Q8kw RijenEc9kkoHQOZsIbnEKlhje2xKDqqXoL0IrME6LK/tpsBb7jibXNG6BIM18Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpKP2Tx6z18tp; Fri, 19 Apr 2024 21:52: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 43JLqfHk023792; Fri, 19 Apr 2024 21:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLqfel023789; Fri, 19 Apr 2024 21:52:41 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:52:41 GMT Message-Id: <202404192152.43JLqfel023789@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: 9744821765fc - main - diff: use getline() instead of fgetln() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9744821765fccd6c9b44d47804b6913cdf616d4e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9744821765fccd6c9b44d47804b6913cdf616d4e commit 9744821765fccd6c9b44d47804b6913cdf616d4e Author: Martin Tournoij AuthorDate: 2024-04-19 21:11:30 +0000 Commit: Warner Losh CommitDate: 2024-04-19 21:52:21 +0000 diff: use getline() instead of fgetln() This replaces fgetln() with getline(). The main reason for this is portability, making things easier for people who want to compile these tools on non-FreeBSD systems. I appreciate that's probably not the top concern for FreeBSD base tools, but fgetln() is impossible to port to most platforms, as concurrent access is essentially impossible to implement fully correct without the line buffer on the FILE struct. Other than this, many generic FreeBSD tools compile fairly cleanly on Linux with a few small changes. Most uses of fgetln() pre-date getline() support (added in 2009 with 69099ba2ec8b), and there's been some previous patches (ee3ca711a898 8c98e6b1a7f3 1a2a4fc8ce1b) for other tools. Obtained from: https://github.com/dcantrell/bsdutils and https://github.com/chimera-linux/chimerautils Signed-off-by: Martin Tournoij Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/893 --- usr.bin/diff/diff.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 15ebbca28bd7..67aab0de91b5 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -517,20 +517,23 @@ static void read_excludes_file(char *file) { FILE *fp; - char *buf, *pattern; - size_t len; + char *pattern = NULL; + size_t blen = 0; + ssize_t len; if (strcmp(file, "-") == 0) fp = stdin; else if ((fp = fopen(file, "r")) == NULL) err(2, "%s", file); - while ((buf = fgetln(fp, &len)) != NULL) { - if (buf[len - 1] == '\n') - len--; - if ((pattern = strndup(buf, len)) == NULL) - err(2, "xstrndup"); + while ((len = getline(&pattern, &blen, fp)) >= 0) { + if ((len > 0) && (pattern[len - 1] == '\n')) + pattern[len - 1] = '\0'; push_excludes(pattern); + /* we allocate a new string per line */ + pattern = NULL; + blen = 0; } + free(pattern); if (strcmp(file, "-") != 0) fclose(fp); } From nobody Fri Apr 19 21:52:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpKQ4Z3Vz5Hpwr; Fri, 19 Apr 2024 21:52: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 4VLpKQ3vRvz49MP; Fri, 19 Apr 2024 21:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563562; h=from:from:reply-to:subject:subject: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+lluVUVZZKbn+wKF6LuLYvyjQyXn/Ta1q9XgjHVjTw=; b=w7ZTfAsXqURly36uC/3hvY12R5AZ9fJnTZOZ6Y0mhJyMvSUULf6A/WulKeSQxwI1reJNv1 wcuzxuVIvjXoUrEe+pOZSQSNSC5v5hNDxiNQT4CA6mY3YtdjE37X5XIXCkWk5y3OmES2CU 395bwswi6bT5si+armEoUVbqsc9yTcLL2jiWekv1CwtfRHRKDNBXK7fkCfvj4t+Bi4BINs KClxVG6XbBv74rcyUt6dt2BJgzE0JKi9xEvEgP9YhIzoC01CgGwDS899aacNlymjZjlx7N wfw2pDdLBWQfJwb4nigGrgIMxu8NbxtTHUFyp5s8V/upekEuj4ix/2DxCiN6gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563562; a=rsa-sha256; cv=none; b=q8r99H5Zrjjn9cogRFb6q2wVtExtk7O/4uU5yxZTWltOWB7oGCdBMylAoHMrXeuMxXO5g3 f8H1/kQkIxA8I24N1ADV7KeivKOhCgWBAQMctPZFgeW/tY9AaYUkgjZn/CMRt0EqAdTceS zErFN/YdmyVsoomiJqxnNb096G3zq5yIlvFl274dQUJUhKEHy5kgJ3bAfYYTaftjbiGcuc 1BLBNEyoxq7UivRU2yVWaQ+1KYv7ZPthZq793yjm0MoKXjYUcgUBHFvIloSUEfSAeV6q/T tUzq8hojwlN6sjUlmZi0tJ7Lxv0nMzrJU9A8o9tHEIAJZvWBQcah4YJyvWnkMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563562; h=from:from:reply-to:subject:subject: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+lluVUVZZKbn+wKF6LuLYvyjQyXn/Ta1q9XgjHVjTw=; b=CYb7Yqh5l4lhWunYCK8xxSFMsqlPetRNW9t/PE7eLIw4/nvTcMvmyNl6uzGZa/ACM8XTRA P7g+a5DA/VD7mdUyzg9kE13QhGst4k1sK/DpHekkam8sxnksOYsKNae7krIxNUco5hlTjz df4+05e55tAkgPgBxdDpxZG2rYfBm2XRgCHuCJzc/jyapDv21ETccJZ7/M0bntJBnUp9sA PABelZdhM9j8IiM5sWx15BOzDzaVHca3yJWUkuOkeFUdGyzrw7/8islqW/9DimT+/4qhjd F7bmeqqPkqFyfRZmQkcUPyioogmZVcUB108dk+kOF0c4/6a8ZwHYaAKXzlDLgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpKQ3WcSz18cW; Fri, 19 Apr 2024 21:52: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 43JLqgcY023837; Fri, 19 Apr 2024 21:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLqgL7023834; Fri, 19 Apr 2024 21:52:42 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:52:42 GMT Message-Id: <202404192152.43JLqgL7023834@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: 3abcc79c6a25 - main - head: use getline() instead of fgetln() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 3abcc79c6a25fe9846be5a036d9a44086fb00163 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3abcc79c6a25fe9846be5a036d9a44086fb00163 commit 3abcc79c6a25fe9846be5a036d9a44086fb00163 Author: Martin Tournoij AuthorDate: 2024-04-19 21:11:30 +0000 Commit: Warner Losh CommitDate: 2024-04-19 21:52:22 +0000 head: use getline() instead of fgetln() This replaces fgetln() with getline(). The main reason for this is portability, making things easier for people who want to compile these tools on non-FreeBSD systems. I appreciate that's probably not the top concern for FreeBSD base tools, but fgetln() is impossible to port to most platforms, as concurrent access is essentially impossible to implement fully correct without the line buffer on the FILE struct. Other than this, many generic FreeBSD tools compile fairly cleanly on Linux with a few small changes. Most uses of fgetln() pre-date getline() support (added in 2009 with 69099ba2ec8b), and there's been some previous patches (ee3ca711a898 8c98e6b1a7f3 1a2a4fc8ce1b) for other tools. Obtained from: https://github.com/dcantrell/bsdutils and https://github.com/chimera-linux/chimerautils Signed-off-by: Martin Tournoij Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/893 --- usr.bin/head/head.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c index 598d54b1c1ed..62796ae144a1 100644 --- a/usr.bin/head/head.c +++ b/usr.bin/head/head.c @@ -156,12 +156,13 @@ main(int argc, char *argv[]) static void head(FILE *fp, intmax_t cnt) { - char *cp; - size_t error, readlen; + char *cp = NULL; + size_t error, bufsize = 0; + ssize_t readlen; - while (cnt != 0 && (cp = fgetln(fp, &readlen)) != NULL) { + while (cnt != 0 && (readlen = getline(&cp, &bufsize, fp)) >= 0) { error = fwrite(cp, sizeof(char), readlen, stdout); - if (error != readlen) + if ((ssize_t)error != readlen) err(1, "stdout"); cnt--; } From nobody Fri Apr 19 21:52:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpKS1ZYvz5Hpsn; Fri, 19 Apr 2024 21:52: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 4VLpKR4fRLz49Q6; Fri, 19 Apr 2024 21:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8/iqOfCfr4dRarpWDiE3B9mixU3BjGOzMqq8bSgrSY=; b=X7vBM3wT2EN+ZIWAOai6IUQ5dTn1uVi6rv2D/XAXjqV4hf7fDs2rX5PCSH4sy9oBDVNMu4 mKl5jTZJwRxOMU2jFG+/AnWOyVdWmuGg4fvhsRs1mduuZE2U+Lq4b73d/a0MEWo/UU8kvl 7e1oewsPYINvo3si+gOUxwuANGsZrR28kEGBBLik2uRbhUqURazEoO5Fo8ryLMoNgmbUwe ODspUey/oku38KLuW9m/IQUyI3rTcLBPh/GA8cRdJmk/aOHJK+RSpwlMp+WJpF2YLgEFF6 wVSEwRpfd/CWPYdwWFmiOmnSNwLApELBp/g8loYohJaqIi739MmNtAdaKDumUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563563; a=rsa-sha256; cv=none; b=hwaFcXYx+7b5RzO5KNJ/ZHXyNX6r3CpS7gfgDo7Dn2bd6XjltTu3g7gYjOEnuy64GZFXsi Jikh3CwKo3w2gwPuK55wj8qnJWx+1JbF8FpPsr7yYpjpVW69xnOb/chYPGyizdqiu+484V 3qc+8oCor6gKam/5Z7nbCwT/4tFx9WB9G2P+CSIgnjejWo+Ag/W2HZJG11wUHUS+TC4nmF fckvZtTx90Oyl6+agsfJYSPCipOdMtIgZu0CGEpyDRefyiZiRsXei/NS3sgPH32lm0vn4q y/nLY7lK44fd/Gd6anQtZjsa9XzOgnXTrqdfJjFwHvJpd9C9dAMx7B5/jSfJpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8/iqOfCfr4dRarpWDiE3B9mixU3BjGOzMqq8bSgrSY=; b=D7RbW7FjplOdCY2Hx/VhliorXvVi6oh0xNgcwiFIWqDRGLGQ3SOEIJ3DWa16EtsP09mXnI IBf9DbE+4i11QF4/QWGl7QKq7hi+Dj+6KGRjrgC8hap4Eu+nMSJlm3J/5p/oaEY+Ub8wdI z0KnNUMZG1WclbjrfWLk71yiYscz2uIqgl1P0jfRBdxcEYXjzuSkRhX4VRFTi88p5rpAlR RHPIenv/CVAOcOTmu2nJxEm2MdNlewEXVG7Ly/TMkUZBw4LbBfHLYlHsRZhlbe7XqvmCYZ kSHbL/sIufP1R7h+x8pnCRqokaBDpjAn3NBpSZrdlgLAJijTE4GnCOIo3NZL5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpKR4Cylz18cX; Fri, 19 Apr 2024 21:52: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 43JLqhHQ023882; Fri, 19 Apr 2024 21:52:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLqhSN023879; Fri, 19 Apr 2024 21:52:43 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:52:43 GMT Message-Id: <202404192152.43JLqhSN023879@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: d3643c9efe78 - main - join: use getline() instead of fgetln() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d3643c9efe7806c17c11251acd299f70b112c596 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d3643c9efe7806c17c11251acd299f70b112c596 commit d3643c9efe7806c17c11251acd299f70b112c596 Author: Martin Tournoij AuthorDate: 2024-04-19 21:11:30 +0000 Commit: Warner Losh CommitDate: 2024-04-19 21:52:22 +0000 join: use getline() instead of fgetln() This replaces fgetln() with getline(). The main reason for this is portability, making things easier for people who want to compile these tools on non-FreeBSD systems. I appreciate that's probably not the top concern for FreeBSD base tools, but fgetln() is impossible to port to most platforms, as concurrent access is essentially impossible to implement fully correct without the line buffer on the FILE struct. Other than this, many generic FreeBSD tools compile fairly cleanly on Linux with a few small changes. Most uses of fgetln() pre-date getline() support (added in 2009 with 69099ba2ec8b), and there's been some previous patches (ee3ca711a898 8c98e6b1a7f3 1a2a4fc8ce1b) for other tools. Obtained from: https://github.com/dcantrell/bsdutils and https://github.com/chimera-linux/chimerautils Signed-off-by: Martin Tournoij Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/893 --- usr.bin/join/join.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index b1be8cd81690..79469cdc52db 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -262,9 +262,10 @@ static void slurp(INPUT *F) { LINE *lp, *lastlp, tmp; - size_t len; + size_t blen = 0; + ssize_t len; int cnt; - char *bp, *fieldp; + char *bp, *buf = NULL, *fieldp; /* * Read all of the lines from an input file that have the same @@ -307,21 +308,21 @@ slurp(INPUT *F) F->pushbool = 0; continue; } - if ((bp = fgetln(F->fp, &len)) == NULL) + if ((len = getline(&buf, &blen, F->fp)) < 0) { + free(buf); return; - if (lp->linealloc <= len + 1) { + } + if (lp->linealloc <= (size_t)(len + 1)) { lp->linealloc += MAX(100, len + 1 - lp->linealloc); if ((lp->line = realloc(lp->line, lp->linealloc)) == NULL) err(1, NULL); } - memmove(lp->line, bp, len); + memmove(lp->line, buf, len); /* Replace trailing newline, if it exists. */ - if (bp[len - 1] == '\n') + if (buf[len - 1] == '\n') lp->line[len - 1] = '\0'; - else - lp->line[len] = '\0'; bp = lp->line; /* Split the line into fields, allocate space as necessary. */ @@ -345,6 +346,7 @@ slurp(INPUT *F) break; } } + free(buf); } static char * From nobody Fri Apr 19 21:52:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpKV1DR3z5HprY; Fri, 19 Apr 2024 21:52: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 4VLpKT6Clpz495J; Fri, 19 Apr 2024 21:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Lq4NnQH1hKOh3pyyMIhI+gmmBM4Z3WmzZMvw9iRrX8=; b=b4Dd0YtWEMDjp0gWxAk6jtzaOe4DcqzpoTccaSWRW+FB2mQQ+8EAmIlj+vSuuQ3oW4/yeV 0RAQaGBfmp5rf3pY56newIlvQw/UZ7kq3T/5Zk2VZyF3vftQOb8C9wk5wZVCMn9f6OLi9z CtKKSqoCpw3QOwL7iKdb4yIXrlPIcQZqDTmhWYAvKQDiW4Xn2+yc3bTbzjjQMuYuahD3jo lO9FbUugoKCofXhHlLIBKr9PJQAnMaQGyKOKMP2GCjwIfeKN54uzV06c2EE5URALuD11Kj yXBeilLdZUWAuH5A9sT3SPNaTlWJoeFUkW8RHZ/EvnilEk0ZApyN141PqXxdJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563565; a=rsa-sha256; cv=none; b=Qwph9UR0lgG16le8u7nadryF+xr7DygNGAsFJuOpBKFN92uE1cZMCw+k56l031S0FG1DTs v6iOWHa/CCkYDKiR4oh7+I5JMDnEvgIGBhLsUIc4JCGYw+g36k6SIs1Z2VCI/MQ7DScpx7 nr6+Aun8SOKuzXrk5vayciAbAzFIfH5lRQAGqsOYAogvlfpIc3FnZ+FAsWV7yp6Vbnrk42 ZK1jDXS0UV+XuLhERexoDRmZqf7qhucVVjBXeVrvTw7cbNs+25Uy9ofWFOkpgw9rviNwjg 0eEppMzwFldsZkjslwsO/JQH59sJNhPuNKl+0Xidb62fvhQdl8/lV6zzOdqLFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Lq4NnQH1hKOh3pyyMIhI+gmmBM4Z3WmzZMvw9iRrX8=; b=Kdy02l6KNAzcPN9VcaBDk5twgg08+5ltoe7lJrC5PpXIU9y99D8OCA8bkmjXQUShNPELl9 NpRjCr9gQP9M63wnfZu+KRH4caDXF+Yf5XenohD+cLrV/m9d6/EEdLrgfT9u58OlA7axsa E+CzOFDPmRxbBJzPHIo8Nn1ITReq//Ec+h4RM87rkpOm35DUZycKECThiKM2y+eQKJaDSq HCCCaaj91fjIFOQ8HNAWOOCkIamigiIL9qrOFwnuW7ZeuAqo7Ih/XxsxBuEHOLKNa3chEU kbRYuCoYR9WwcgDSlGsWyl2/TJCRYtZ0V/DtKvonx+deD62JJCW9t9ZroSbRSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpKT5rCqz18ff; Fri, 19 Apr 2024 21:52: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 43JLqjN6023979; Fri, 19 Apr 2024 21:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLqjAO023976; Fri, 19 Apr 2024 21:52:45 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:52:45 GMT Message-Id: <202404192152.43JLqjAO023976@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: 5fbdcd65fe5c - main - xargs: use getline() instead of fgetln() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 5fbdcd65fe5cc08959a6ea692b501ec0e98f8b9d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5fbdcd65fe5cc08959a6ea692b501ec0e98f8b9d commit 5fbdcd65fe5cc08959a6ea692b501ec0e98f8b9d Author: Martin Tournoij AuthorDate: 2024-04-19 21:11:31 +0000 Commit: Warner Losh CommitDate: 2024-04-19 21:52:22 +0000 xargs: use getline() instead of fgetln() This replaces fgetln() with getline(). The main reason for this is portability, making things easier for people who want to compile these tools on non-FreeBSD systems. I appreciate that's probably not the top concern for FreeBSD base tools, but fgetln() is impossible to port to most platforms, as concurrent access is essentially impossible to implement fully correct without the line buffer on the FILE struct. Other than this, many generic FreeBSD tools compile fairly cleanly on Linux with a few small changes. Most uses of fgetln() pre-date getline() support (added in 2009 with 69099ba2ec8b), and there's been some previous patches (ee3ca711a898 8c98e6b1a7f3 1a2a4fc8ce1b) for other tools. Obtained from: https://github.com/dcantrell/bsdutils and https://github.com/chimera-linux/chimerautils Signed-off-by: Martin Tournoij Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/893 --- usr.bin/xargs/xargs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index d2c7d087645f..237beff26504 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -770,22 +770,22 @@ static int prompt(void) { regex_t cre; - size_t rsize; + size_t rsize = 0; int match; - char *response; + char *response = NULL; FILE *ttyfp; if ((ttyfp = fopen(_PATH_TTY, "r")) == NULL) return (2); /* Indicate that the TTY failed to open. */ (void)fprintf(stderr, "?..."); (void)fflush(stderr); - if ((response = fgetln(ttyfp, &rsize)) == NULL || + if (getline(&response, &rsize, ttyfp) < 0 || regcomp(&cre, nl_langinfo(YESEXPR), REG_EXTENDED) != 0) { (void)fclose(ttyfp); return (0); } - response[rsize - 1] = '\0'; match = regexec(&cre, response, 0, NULL, 0); + free(response); (void)fclose(ttyfp); regfree(&cre); return (match == 0); From nobody Fri Apr 19 21:52:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpKT0g2zz5HqBM; Fri, 19 Apr 2024 21:52: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 4VLpKS5X87z493S; Fri, 19 Apr 2024 21:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vWXn2wMSdhPiL/CydSeFN80pa7we3GS9op3w3Ioy4c=; b=bRSkeDh/Vk3nrE1x+JSY/PrFvoyrOptXIshtBAFODqd2j0G8dHF0HH79Mks3HyaKlBBtP8 0lMxGaA2O4cQq1uF5xvbbkoG2PDwmkQ88LQIxFxqOtTUEtM2P8/dLZallvP3BzwFuBGx18 DwA6tuk4/w9ze4sJrE5JiZvmCp5JVe/ttQILHl4h+uUsjCdDD0cXQ88WlX0GTlUmWrza7S 4ABJ36b88NbkNQ4MuQEyV58+V05gLli7FE1YsQzxw9MNSsKgY8JsDcI6s7t5X0Njkqe7/a T3C9OvvF13LPIeKjIBu3BuGY31YOBgAsRM7940C+yItaHC+3iud4Fk489z/M1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563564; a=rsa-sha256; cv=none; b=TNt36xX0+CG6xBbn2fGSsEalbRhK3ruKqdZxBc9c8IF3sema5yaXRun1pn3fPErr/hsZ6b GZXw/hMrBuWntDP56BiImBQe7RSsZXiYswaedoA/2Br87Ja9PeTU9wIFjI+eVOqt8Xrf25 CVkcS8IKrUYNv6plyuWdisi3eckiT50uyHqYM2TVFoiTLYCFv0psnm6Ca8lrkwLNTtr+gv YZ57V0adaPqms1LPfZpBNeA66LMyAQDyZlodnssAQs/IQVc+emalHrfo9YJg1oB7KRR52+ +QMx0GMsgFkWrO5vR9BvxzjNpYRuWCKV+w8+ANNrUg1PLndOOnJr8L8QOXyjYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vWXn2wMSdhPiL/CydSeFN80pa7we3GS9op3w3Ioy4c=; b=eiIXjtx5cOmBsIGGkw3uSDzlOFLlsmJEZe3yldRnl4zOzwlnbWCd/T22B6x+2I6YdZVsH/ tmbge8ycO+7krtvjpsebRe308ko5+SPBfgi59zSLl84KVyohJ2SiPul6/jI9XVo6oHoLTZ l885pb7vVY749BP8j8mpEj/3n2jLn7Le89WfQ4cNylFg7xNxN0oh+3N0vSNz1s+ziC0Squ uyrWUuSzXHsSHsfGyCck4fwcXWZ0DPopEOWh8rI3dGXI0v6DvXTwdEm6PGom9h+bYRxh4d jXWj+2tPs7jTWqqETR1OBfowp4smAAKWqYq9AhqAoi7wBk0EDOqdOpw3bp3I+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpKS57tzz18tq; Fri, 19 Apr 2024 21:52: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 43JLqiYI023931; Fri, 19 Apr 2024 21:52:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLqiZ9023928; Fri, 19 Apr 2024 21:52:44 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:52:44 GMT Message-Id: <202404192152.43JLqiZ9023928@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: 25696725b65b - main - patch: use getline() instead of fgetln() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 25696725b65b651814799574fdfadb1b1a5e0b02 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=25696725b65b651814799574fdfadb1b1a5e0b02 commit 25696725b65b651814799574fdfadb1b1a5e0b02 Author: Martin Tournoij AuthorDate: 2024-04-19 21:11:30 +0000 Commit: Warner Losh CommitDate: 2024-04-19 21:52:22 +0000 patch: use getline() instead of fgetln() This replaces fgetln() with getline(). The main reason for this is portability, making things easier for people who want to compile these tools on non-FreeBSD systems. I appreciate that's probably not the top concern for FreeBSD base tools, but fgetln() is impossible to port to most platforms, as concurrent access is essentially impossible to implement fully correct without the line buffer on the FILE struct. Other than this, many generic FreeBSD tools compile fairly cleanly on Linux with a few small changes. Most uses of fgetln() pre-date getline() support (added in 2009 with 69099ba2ec8b), and there's been some previous patches (ee3ca711a898 8c98e6b1a7f3 1a2a4fc8ce1b) for other tools. Obtained from: https://github.com/dcantrell/bsdutils and https://github.com/chimera-linux/chimerautils Signed-off-by: Martin Tournoij Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/893 --- usr.bin/patch/inp.c | 19 +++++++------------ usr.bin/patch/pch.c | 17 ++++++++++------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c index 24fdcac1b7c6..ccc9a39b117b 100644 --- a/usr.bin/patch/inp.c +++ b/usr.bin/patch/inp.c @@ -283,8 +283,9 @@ static void plan_b(const char *filename) { FILE *ifp; - size_t i, j, len, maxlen; - char *lbuf = NULL, *p; + size_t i = 0, j, blen = 0, maxlen = 1; + ssize_t len; + char *p = NULL; bool found_revision = (revision == NULL); using_plan_a = false; @@ -295,26 +296,20 @@ plan_b(const char *filename) pfatal("can't open file %s", TMPINNAME); len = 0; maxlen = 1; - while ((p = fgetln(ifp, &len)) != NULL) { + while ((len = getline(&p, &blen, ifp)) >= 0) { if (p[len - 1] == '\n') p[len - 1] = '\0'; else { - /* EOF without EOL, copy and add the NUL */ - if ((lbuf = malloc(len + 1)) == NULL) - fatal("out of memory\n"); - memcpy(lbuf, p, len); - lbuf[len] = '\0'; - p = lbuf; - + /* EOF without EOL */ last_line_missing_eol = true; len++; } if (revision != NULL && !found_revision && rev_in_string(p)) found_revision = true; - if (len > maxlen) + if ((size_t)len > maxlen) maxlen = len; /* find longest line */ } - free(lbuf); + free(p); if (ferror(ifp)) pfatal("can't read file %s", filename); diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index fb53ff86f9ef..71f73125a8cb 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1213,14 +1213,15 @@ hunk_done: size_t pgets(bool do_indent) { - char *line; - size_t len = 0; + char *line = NULL; + ssize_t len = 0; + size_t buflen = 0; int indent = 0, skipped = 0; - line = fgetln(pfp, &len); - if (line != NULL) { - if (len + 1 > buf_size) { - while (len + 1 > buf_size) + if ((len = getline(&line, &buflen, pfp)) >= 0) { + char *linep = line; + if ((size_t)(len + 1) > buf_size) { + while ((size_t)(len + 1) > buf_size) buf_size *= 2; free(buf); buf = malloc(buf_size); @@ -1239,8 +1240,10 @@ pgets(bool do_indent) } memcpy(buf, line, len - skipped); buf[len - skipped] = '\0'; + line = linep; } - return len; + free(line); + return (len > 0) ? len : 0; } From nobody Fri Apr 19 21:56:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpPb1yWCz5HqGw; Fri, 19 Apr 2024 21:56: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 4VLpPb1F37z4DD9; Fri, 19 Apr 2024 21:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SY3mlAvjnU+ZmdGBdsrW3fM/M56OENzPa+Pn2nNvcmk=; b=EZP9NnnowPHIYC8JFHRHAFBZdB76kwIwWWOS3xSQJiSOVMxg/EF3y25K1jG06fYVBgKMJR ZuxJ0agul9Rk/kKjfpNLxQO/D5ctRm3OJySAAP32AaDOFgCbwe5UtiFlWsCJVErczp43ug mHqw2eIBGvwbR0+B14TIOA5vVAci+AlaSMB2GHoKAcaOBk5ip+CQKhzBB92kgt2mnDKD2l 2vkOccZpIznV9L6R4J/ppAn4x+yjnvSsq0hizq+hTS11ppaDeXbKPFe5hDlT4jg2XApZbO isnU6XgZaD9oQfkOzrWDybkdQCmmawxy0G+uAECce6sWBAfBCBmuKjrRdIBMuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563779; a=rsa-sha256; cv=none; b=KJtXHCvVbcNtBDJKe44Fcdm3Ou7hB+/To8A6j/ZWsLjhY9xi5JMTtpaRDCshDr6kAb/5MO IoHlxGMtJr8aJk+l4yc+2V+3ote5rzYZwTJvdjy8kt83acyJ2yFRlAoMFvT3ly6D5mn5Kx dlK88PF3fFel7phHf6prn2TQMxRkmMdxv1eg5gyM3wz2lw7boV4uYc6Iw/J6zDUMsUOrzW pI8gVnx/NB03KrMksCN5e5rpFmvFbPDPr43JJKtFJMnlv395S0Zj6ARvR8AgQPc4bVgIR3 wY9lkO4IVT8O0FBjQ2l8fimd5MnC9bYS/WhCViDCB+IidHh5tZ0dFDfnDN/OiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SY3mlAvjnU+ZmdGBdsrW3fM/M56OENzPa+Pn2nNvcmk=; b=aR3B0MYf8cobrva3sb+Pq9NBru0L7MUxFk0kXIIunQKJxEFrMOOcNsR0bEQQcCBgvi2Ha3 EBf2ModYDLfTIZ/aafccU8Jscmu2B39Aph+uMXdZh98VZF5apH9V6+vCxT7/ExxJAqZzvS og0i0uXPEJ+9aP/wT7NE7CVIMpb+fyh6yBBhTuuj7ltSoZShgBgSJRKDZdXXLgaIyKhCuN nKVMx4uLxbhCYfrm8b0+VtYvFjDIzG45b3tWihhPO2X8FSVTpiSb1ilnoS4O/IyWwrX8p1 xsfQINyhwAZS35D32Q1djh9p7+zHAp7UcyAuK3xjePEM4pfhdaenxN3+QcUSnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpPb0qs4z19C4; Fri, 19 Apr 2024 21:56: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 43JLuJxb024645; Fri, 19 Apr 2024 21:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLuJTD024642; Fri, 19 Apr 2024 21:56:19 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:56:19 GMT Message-Id: <202404192156.43JLuJTD024642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0b9e3585805e - main - libgcc_{eh,s}: restore __*_frame_info symbols post llvm18 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b9e3585805e83718c3ebdab923aca51597193cd Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0b9e3585805e83718c3ebdab923aca51597193cd commit 0b9e3585805e83718c3ebdab923aca51597193cd Author: Brooks Davis AuthorDate: 2024-04-19 21:45:05 +0000 Commit: Brooks Davis CommitDate: 2024-04-19 21:56:13 +0000 libgcc_{eh,s}: restore __*_frame_info symbols post llvm18 The upstream llvm commit 5eb44df1b64d made the addition of these GCC compatability symbols dependent on build configuration rather than hardcoded for amd64, i386, and powerpc. Reenable them. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D44877 --- lib/libgcc_eh/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 9e194cc875f1..75e7d743a720 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -17,6 +17,9 @@ SRCS_EXC+= UnwindRegistersSave.S SRCS_EXC+= libunwind.cpp SRCS+= ${SRCS_EXC} +.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "powerpc" +CFLAGS.UnwindLevel1-gcc-ext.c+= -D_LIBUNWIND_SUPPORT_FRAME_APIS +.endif .for file in ${SRCS_EXC:M*.c} CFLAGS.${file}+= -fno-exceptions -funwind-tables .if ${MK_ASAN} != "no" From nobody Fri Apr 19 21:56:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpPc2xG1z5HqNC; Fri, 19 Apr 2024 21:56: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 4VLpPc1v9sz4D6K; Fri, 19 Apr 2024 21:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PjkUqK0P+FxdYMD8SfTwzhJg7MkpTzsGqvbIthqiGIA=; b=Rk3TGs5IkreiQnlLstMH9fpzAMOxvAcX3Yp6upmNmS4z9VaDm83IQm3kdwN4IhUt3qUNvZ 7merLhC9EMPGyFzkIAoxqNFt1FHUyYxuL5NR333bTwHH1p5k/6fbYvTR/yfj3L4C3maqYR Q4atmCzxkQW/ti8PQdCgItckXoZkRa2MTb/LtUduXtcv/Tez0W4Fb1PoaiBoEmvIrUTZ4i 2tdNLc5j4rjMwI/pOhrRSEURcNxoc02Ut5aK2jurZul6Q85Y6mxbN4B68lCzMhUBvvR+9I gkQiPnGGya/N3POd3pygqtQdr569Yfx1hMHNG9Xxo3+wUGimvOuNq/lRD827gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563780; a=rsa-sha256; cv=none; b=LrNgIH0tMJVzo6R8qOvCXPB9jcclopr2gaK0apTuk/TyeNpeMMT5dfaVXmgX0jj1YNXKlQ alFM2TT1fFPyB1M7x3L44RuCWl9TIA3a0pLgeZ0MhCdkRZeDrf/brlCfRQ7uLGqMhQ/YMz Ra0wi1uC1WByxk/ABCCaKfep9tckzVpqH/0n5/E1MEhsq9Zx2skVTJLVw++05xLbZ6Q8Ub zejAWNgkBIAsvO74uopWiv60qjKhkFJZHHlAMSGrcC/mZCiXlCkU+iX0W+b+0LyYQZryTM TfmkwKwwOGIf/TeX5V36ZJjQXblD7VYc9JxEn5z4rflOfmAkAb8JoVXWAPKnAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PjkUqK0P+FxdYMD8SfTwzhJg7MkpTzsGqvbIthqiGIA=; b=vtit4DlxXOlUUNq6jzkwZtOThbfwyIFM8NI1p7uHxKsK51TMnlejpSOG0ePhxFmdQO0rBy Voj4fR7MfPr4b6E3YtqN1h/iYkMSFHYEdnvFfzhFQNNZax3smQlFhFrt6Fv1xyPBair2rs 6Ha556LCYlJMIgzl53ZZeLP6THa/w1jO/AdXdyl+BGMHrZZaLo0vyDZSj85jDQfHiQ+iCT K5Mt81u0mTv/XFt3pBsUOX74Cn5OKQ3nN4tXlo4hTm56BHw2/xMRnkqWxvaWd/t4N/jvjZ DHasBu6FUjoMV9Bti8lrE8MLtX2ZWlCVOnZKX9F9bLSzBbc5KEqPeO+1XmvAkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpPc1Vdlz19Gb; Fri, 19 Apr 2024 21:56: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 43JLuKmN024693; Fri, 19 Apr 2024 21:56:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLuKTv024690; Fri, 19 Apr 2024 21:56:20 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:56:20 GMT Message-Id: <202404192156.43JLuKTv024690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 44e89340fe34 - main - libgcc_s: expose __divmoddi4 on i386 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44e89340fe349abc020732958c6debd12b5adf2c Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=44e89340fe349abc020732958c6debd12b5adf2c commit 44e89340fe349abc020732958c6debd12b5adf2c Author: Brooks Davis AuthorDate: 2024-04-19 21:52:42 +0000 Commit: Brooks Davis CommitDate: 2024-04-19 21:56:13 +0000 libgcc_s: expose __divmoddi4 on i386 GCC has used this for some time (since 7.0) and apparently we were getting away with using the hidden symbol, but when linking with --no-undefined-version we get an error unless it's properly exported. (For anyone who wonders at the assymetry, __udivmoddi4 is indeed much older and was introduced with GCC 3.0.) MFC after: 3 days Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D44878 --- lib/libgcc_s/Symbol.map | 6 ++++++ lib/libgcc_s/Versions.def | 3 +++ 2 files changed, 9 insertions(+) diff --git a/lib/libgcc_s/Symbol.map b/lib/libgcc_s/Symbol.map index a30403f9811a..2c507656f037 100644 --- a/lib/libgcc_s/Symbol.map +++ b/lib/libgcc_s/Symbol.map @@ -221,3 +221,9 @@ GCC_4.6.0 { __unordtf2; }; #endif + +GCC_7.0.0 { +#ifdef __i386__ + __divmoddi4; +#endif +}; diff --git a/lib/libgcc_s/Versions.def b/lib/libgcc_s/Versions.def index d28e9042f744..526387e055df 100644 --- a/lib/libgcc_s/Versions.def +++ b/lib/libgcc_s/Versions.def @@ -31,3 +31,6 @@ GCC_4.3.0 { GCC_4.6.0 { } GCC_4.3.0; + +GCC_7.0.0 { +} GCC_4.6.0; From nobody Fri Apr 19 21:56:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLpPd4RDzz5HqNG; Fri, 19 Apr 2024 21:56: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 4VLpPd3Ctpz4DK7; Fri, 19 Apr 2024 21:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VEN+83h5GJr4lD2KreUREpTwcjVQ2hdNhPTog0tGgFM=; b=j4xxLvhpieNRmCvWGM5pIfXcvdMw26R/e8qekB6pivtVYwSGfNApI2ggv+iDXWst32hL/S x7bOc4tnR9RAKmKTa4ClopFPGQ/HEGHwl+oVmSzLGg4zoIEttWxewC9598AmDLbKTVFQP8 BY+AHustSKUx53uRZNuTvNmvfVLys2Ja6+BdmWdqU+WCWIT6KDBytkVcnkMIcx08DX4TXo /+IxSILYPR1pFZrU66ZAndLGn0+vqNxIIU/PTSUtwboqg5Mo9nxIKQWWuV3Hh6fJkurx9b Xf9oUPQtD4EQ59t07qWp/jy1XJXDZmvnFKpNrxzd6fAHvcnuzyPt8mFGragdgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563781; a=rsa-sha256; cv=none; b=DXW1K593+ml3BM+QgqkevUcHKwPiiv+qWobXxRSWKom4nc5zVr1m7nStIc7L8DxvzLMGoU R50d+u04FUXoHctKv9ggXTS7Th379KEEuPPxC/q5d5UDfqjGuRYS2qsD1UB7WaZzLIpmvA BnHvzcnfuMeATY6ejeTvkRVmsnarCy7q9WCE36XKQDZtKLo3CWJhv6KVlPaqT5GxqO75WZ cnHQp+/WSzK9BZQkF1UzCXFpfGMdtzRaIHrE7iPM3UOW9qKmrXjWCxXyP/EtXhdrky9+De XJPufOqXQ2XMAlCf9UZjkj9n/BQ2FELsI65o187OypoTOAsH4j6k3fuj9gxzJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VEN+83h5GJr4lD2KreUREpTwcjVQ2hdNhPTog0tGgFM=; b=BFQWbOcSKbndrILNoXokuLACPCEpQWq5elJNWlVe3Ewjz+jCi/K+4oNUojUK8/EGFECN2J MSkgP+D5q0/kkKQpSiAm4S0oVrRD7oPR/n5nHEaltkoAm56jtdCI0TDglmYut7fekm05y6 zRGpE2pMZb4idUfBwxYndwMeVOmr4cEqf6aRBznqhdSw+LJogDbJA06nd1sWdY9m7GhS+e Z6P06siureYDN8h0vadCDfale17BQdGWJo2bzi7pY3CSUV7nKjX5ViyLvurQfPaS7mwT7u DxWOMUVPoYtnHhU6ldyuunaueexh9UGEtfpTq7cZ87nk3Qm0evxLG/EsUtO6IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLpPd2pGLz18fj; Fri, 19 Apr 2024 21:56: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 43JLuLCc024742; Fri, 19 Apr 2024 21:56:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLuL21024739; Fri, 19 Apr 2024 21:56:21 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:56:21 GMT Message-Id: <202404192156.43JLuL21024739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: f0bd655a615e - main - libc/quad: further narrow list of i386 symbols List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0bd655a615e5edad45e25c1699bd847be01f959 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f0bd655a615e5edad45e25c1699bd847be01f959 commit f0bd655a615e5edad45e25c1699bd847be01f959 Author: Brooks Davis AuthorDate: 2024-04-19 21:54:39 +0000 Commit: Brooks Davis CommitDate: 2024-04-19 21:56:13 +0000 libc/quad: further narrow list of i386 symbols It's unclear to me why lld didn't complain about these are they aren't present and haven't been. Instead ld.bfd complained. Reviewed by: dim Fixes: 6e6cd03c911c libc/quad: narrow list of symbols exposed on i386 Differential Revision: https://reviews.freebsd.org/D44879 --- lib/libc/quad/Symbol.map | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/quad/Symbol.map b/lib/libc/quad/Symbol.map index 81f794acd498..f7dcdebfc7ae 100644 --- a/lib/libc/quad/Symbol.map +++ b/lib/libc/quad/Symbol.map @@ -8,27 +8,27 @@ FBSD_1.0 { #ifndef __i386__ __adddi3; __anddi3; -#endif __ashldi3; __ashrdi3; +#endif __cmpdi2; __divdi3; +#ifndef __i386__ __fixdfdi; __fixsfdi; __fixunsdfdi; __fixunssfdi; __floatdidf; __floatdisf; -#ifndef __i386__ __floatunsdidf; __iordi3; __lshldi3; -#endif __lshrdi3; +#endif __moddi3; +#ifndef __i386__ __muldi3; __negdi2; -#ifndef __i386__ __one_cmpldi2; #endif __qdivrem; From nobody Fri Apr 19 22:34:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqF95SnWz5Hsrj; Fri, 19 Apr 2024 22:34: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 4VLqF94tRrz4JZk; Fri, 19 Apr 2024 22:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jII6fwA5e71JYlMcrEUglimX7ClfLumPKFoy6NHu0F0=; b=ng5FV58CiiIrIdZyzUKosLRMLoVD6FWucA0FRlVycCLpKF/3emjeyO4eR8Dy+v68jbamAh iGuZ3m/KxKlA0BjJl2whlAn5d6Bf1+XsPqDd9o2zA1HhisjpZk+eKAPYB4zOyBIeejN2VC w3sfUGSegnJPp5uWaFhBMScFeI3TnmsQNijFZyH10H4GZibU91YklamoNVfrAKms8FVwxl g1XUNGPLa6XWEy9arDvSIgnBuYuLDIOtOvRqcyJ8YynjmF+xcWXzpQOE7eqMaAiWHrrev8 fJNV4xJVxo6LsAKYslQCDau+lfB3mXsfdPO8DphSUMRPRmFlMlTiD7kBm183LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566045; a=rsa-sha256; cv=none; b=cvKB88CHA4Q92QkgDxObalRE7oG2l34EHcdQyVy6CuZjNpLR9ecMAI/a7LyTEOuXVro/Q+ cO7Savsi6mzok0hZ1DUxXfDHn6yyn+3TX92UTu7S1l3rYuz2ohqLByzOhybzd1lOgfRqu1 4sH3L9ErNi2c7x1uoFmDMOchFJY9ONlbD47WxKRgt16Zyyremi3WSnZfONmLUjJwraWRgR LKulI/BMnuwlX6KnjUXElEKOPQ17McaI/GdZm7COR5JXGWWYtVZjMA4o7mwMYtK2WAXJMX mE4JIyRo62W3Afrb+qUcwSP7V6sVxl4Pcxfja3/aNC2D8w829nyp31OtMaTXCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jII6fwA5e71JYlMcrEUglimX7ClfLumPKFoy6NHu0F0=; b=lWa7YkireW9H53YT8lGwyVumPULUqhvDeZVgTc5EHUnmhz2LFh0VFY2412ph33nzZ++aVk WscE96AZnEnhVC14iAh89LP952dZT4Dh5xywi3fqc4vOfA54SdlJGixEBlp9u0ccIpkDqG CwVNexM15pZ5EHwdiKb9In1P0eB94sv/MUZbXCnpcM9hXWRQoq5rcGguS95ucmayF0D9hY QdHoFvT1IjZNGOuwoMIwvr7XEl38cCsRDSTu97z6lG4K9+FbpeKMROnEaKYDabYjwBS2wQ +/XzQDL9CYTvjiRMaHi8VerfGcZjgK3IWrsLB3Vg9zxW2PWz6y/dXknVnLX13Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqF94TKRz1B24; Fri, 19 Apr 2024 22:34: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 43JMY5Tl092520; Fri, 19 Apr 2024 22:34:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMY5vv092517; Fri, 19 Apr 2024 22:34:05 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:34:05 GMT Message-Id: <202404192234.43JMY5vv092517@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: 961bcbeef251 - main - mailwrapper(8): change behaviour if mailer.conf cannot be opened List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 961bcbeef251b87463446860fca9910a461a3909 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=961bcbeef251b87463446860fca9910a461a3909 commit 961bcbeef251b87463446860fca9910a461a3909 Author: Lexi Winter AuthorDate: 2023-12-30 15:09:15 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:20:44 +0000 mailwrapper(8): change behaviour if mailer.conf cannot be opened Previously, mailwrapper(8) would default to invoking _PATH_DEFAULTMTA (i.e., dma) if mailer.conf couldn't be opened for any reason, including transient errors like ENFILE. This behaviour is undesirable, because if the administrator has configured a different MTA in mailer.conf, they almost certainly don't want mailwrapper to unpredictably fall back to the compiled-in default; and in any case, the default MTA is probably not running, meaning the mail may be queued and then never delivered, which is worse than not accepting it to begin with. Change this behaviour depending on why mailer.conf can't be opened: - If it doesn't exist, keep the existing behaviour of falling back to the default MTA, on the assumption that this is a reasonable default if mailer.conf hasn't been configured at all. - If it cannot be opened for any other reason, do not invoke an MTA and instead return an error to the caller. PR: 25218 Reviewed by: imp, emaste, markj Pull Request: https://github.com/freebsd/freebsd-src/pull/969 --- usr.sbin/mailwrapper/mailwrapper.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c index f11361f10daa..b060ff970045 100644 --- a/usr.sbin/mailwrapper/mailwrapper.c +++ b/usr.sbin/mailwrapper/mailwrapper.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -110,13 +111,23 @@ main(int argc, char *argv[], char *envp[]) mailerconf = _PATH_MAILERCONF; if (config == NULL && ((config = fopen(mailerconf, "r")) == NULL)) { - addarg(&al, NULL); + int serrno = errno; openlog(getprogname(), LOG_PID, LOG_MAIL); - syslog(LOG_INFO, "cannot open %s, using %s as default MTA", - mailerconf, _PATH_DEFAULTMTA); - closelog(); - execve(_PATH_DEFAULTMTA, al.argv, envp); - err(EX_OSERR, "cannot exec %s", _PATH_DEFAULTMTA); + + if (serrno == ENOENT) { + addarg(&al, NULL); + syslog(LOG_INFO, "%s does not exist, using %s as default MTA", + mailerconf, _PATH_DEFAULTMTA); + closelog(); + execve(_PATH_DEFAULTMTA, al.argv, envp); + err(EX_OSERR, "cannot exec %s", _PATH_DEFAULTMTA); + } else { + syslog(LOG_INFO, "cannot open %s: %s", + mailerconf, strerror(serrno)); + closelog(); + errno = serrno; + err(EX_OSERR, "cannot open %s", mailerconf); + } /*NOTREACHED*/ } From nobody Fri Apr 19 22:34:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqFB6Dxbz5HssG; Fri, 19 Apr 2024 22:34: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 4VLqFB5ZL3z4Jd6; Fri, 19 Apr 2024 22:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vKLUJlAQ1JieBmvkXr5vZwP4BhoX3s+FWwxmoKD6Hk=; b=ZwqDaalM1Srw6MitRd9bCTS22T/7oPSoMRyKZ0UWHNPDcnDsBm4MNoP1wdA4qMpK5S4+4/ E/IaBIHKAFgD8igoOSctI5giWY9dWadALuhodEgLGpgYnrKtWy/sHmgY28ocjm03U/xlCO yiUsM50zRELEs41c3FsX6TciqLxfxB8sQMvLf+JlRdORzwBEXYwkID1vLBtK3yLAcNKh05 RYTgh0SW6tukF4Y7MxCawOcTH3aU7ffTcxqnbnar0naJAvxh022G6kdknF/jHMqmF0xnSB OAlYfd2jSNwYEdR4DY6XsH7F7VufccMN4lbrzrmobNOz3L4L+xVxiak7gxAhtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566046; a=rsa-sha256; cv=none; b=X9Xrz6sBdsYSOGRl0GlqRALSH66O4eznTKI/OOP89PsTevwGXfzhlEYBG2FF79P8qViyG7 2qpdxx29hK3XeK1QXBO1+TRre8YoOrBXnI1oiMCWvidK3iEJeLvYKwDCvR+1OZXH+v/5QA fUVqj/AYUoytr7HZiaQbF+Gc8UcpzU5hlRgz1AWjb4Tt3D3qkD/qjtdge+78aX52eZ81YP YWxBxde0j4AwCW9aryOy3sxEU/XQDUsIW9FjO6tVpmcmqYVHniQMwva5mdd2bAy1PmpfiL jw+TEfUUiTXsrYGhSajh6TFlrNugE5iK3Fk406c3eWxJUKTsMdJqdLY/9FrZ4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vKLUJlAQ1JieBmvkXr5vZwP4BhoX3s+FWwxmoKD6Hk=; b=SVSz8+A6oilvlwYwBD4yBlviyUbtCwoOxZmktS6kVDC9iiPb9u0wZSaXZZF5206cb6Im7G L+hOaskvglx1fCsc9k+YjXrsgLH+7Xfbkd03Rc92+GSeCDBJyH0Ezb0vLbT1EUmMvhCUqR gmRF7SWskpBFjPqDUl4tyQjxNFRAWegNi9zvSbwqTQMAnuSKK9D7kjPgbljxUhrrJf+TeA 4fyDYrykEpYIFta86mYi0lbUnDnXGVGPy29f+O/IuchZiZJtRiFxd7AusX8dm5IvijwcXY mGd2WwWQItEmRA6ANjmcoV1PWOVK/a+bWOEye8r3mN7DSDVLMn8tpBt9i+PSlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqFB59cRz1B25; Fri, 19 Apr 2024 22:34: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 43JMY6SW092577; Fri, 19 Apr 2024 22:34:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMY6I7092574; Fri, 19 Apr 2024 22:34:06 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:34:06 GMT Message-Id: <202404192234.43JMY6I7092574@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: bcc57e971597 - main - intro.2: Import HISTORY from OpenBSD but our style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: bcc57e971597d28a3ab1f972775b295cc60e1017 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bcc57e971597d28a3ab1f972775b295cc60e1017 commit bcc57e971597d28a3ab1f972775b295cc60e1017 Author: Alexander Ziaee AuthorDate: 2024-04-19 22:22:39 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:30:14 +0000 intro.2: Import HISTORY from OpenBSD but our style Reviewed by: imp, brooks Pull Request: https://github.com/freebsd/freebsd-src/pull/1065 --- lib/libsys/intro.2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libsys/intro.2 b/lib/libsys/intro.2 index 07b294e344a7..11ed5b6be2f9 100644 --- a/lib/libsys/intro.2 +++ b/lib/libsys/intro.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 8, 2016 +.Dd April 19, 2024 .Dt INTRO 2 .Os .Sh NAME @@ -763,3 +763,8 @@ chosen from the address family in which the socket was created. .Sh SEE ALSO .Xr intro 3 , .Xr perror 3 +.Sh HISTORY +The +.Nm Ns Pq 2 +manual page first appeared in +.At v5 . From nobody Fri Apr 19 22:34:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqFC6lttz5HsXF; Fri, 19 Apr 2024 22:34: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 4VLqFC69kpz4Jjd; Fri, 19 Apr 2024 22:34:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+rSGbqqDAxts8bbnaS6kY0Nv+9jMJHthbXS4aIjQfA=; b=brkk+vqeV80f8Yh1G5eSdUtOpgP5tdxdN3tS3tDw+zpAO5KQIrnYd155wOfRCjVDHecG8q eQrUD7sIZN+jfmyXJFOp6Ff7Xf2DikwReUPmi8gdhVSnzPYKy7GkvYVyh7eltuoUCP5VIN jDAb7vMXRuCLrFkCrRt6UI4s1WODZTALe02ihiEMTTOsZ0ntZIW9W4uRi7OjFKhU88jP5E S9Uv6i9Lx269uGO/9CicgBgZ5KMeK8iHGOIht971oTLpzATdioyHTqOPWf8GQn8Ta+HIaA hztmtEpxn2+Qx4xIEXt76KUSj19cTaobcHbtLIC0L9umKJQJwELP97jiffptlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566047; a=rsa-sha256; cv=none; b=M8xMbAzL3/GJji4vWdmrmXsJoIIgFx27fmwM3NtXdxdC+61VMzx97s8SFZonTuPJGDW149 ogLMccG9fyyv57mnPTqA/aHSIrOhRcfPdrE2smjFRWbUi1PgdaBn+qvsqXLcYObR4kceLn /vQvoBqJaVU6JFXsxqumfIYgb6OHA5e+gAAD5ZWyGfzkopxm/HSf9imNXiDiBl3VIyL8iF N2Xw2t8te5KjiwZc1FEFxX+YHJAhlV1NORJga0ye/i+Bve49ycoIfiN9Cx2jRaEre+nmHW Np6prC6YhxCKdM40V90IIUucTf8DjWkw8MCY2+kdhRPNP6AXKGrHoE1//bVndg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+rSGbqqDAxts8bbnaS6kY0Nv+9jMJHthbXS4aIjQfA=; b=fJMoER6VFIrixVhEuSSJA4nOtUmKXA2K//oEVgYU5BkCZAMVl0vW0oqA85GXQSZpPN7IGF 66LubhSV1vmjVJ5T2/cXLZY5hvkD4MAqYR0X+lb1ZecAstvvQi0V2kt+0KjYGyFa8l2HeF GnV/qXdL9/QN1DPGpcRjvbrzJl/j6ynPdCn1DJL0LVNtnn9lzkvp+SmXrRfJzy96qwrocd /QG9GuIwuBoq5xiKTeaQRAYEOXTeCA99MsI9VxUGMMHHY7PtY0advdqvPk+J9SSpy528k+ U5Jhe4YhP1G8NW58zKHQwNwx9x4CwCgGWVMsX/GJ2Wn2SNjQmhjwm2wwzkEExQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqFC5n4Vz1B4J; Fri, 19 Apr 2024 22:34: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 43JMY7um092625; Fri, 19 Apr 2024 22:34:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMY7oP092622; Fri, 19 Apr 2024 22:34:07 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:34:07 GMT Message-Id: <202404192234.43JMY7oP092622@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: 9e8df7900f52 - main - intro.2: Tweak grammar and syntax for consistency List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9e8df7900f5285fb6815fbd333cf6e084679879c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8df7900f5285fb6815fbd333cf6e084679879c commit 9e8df7900f5285fb6815fbd333cf6e084679879c Author: Alexander Ziaee AuthorDate: 2024-04-19 22:22:39 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:30:19 +0000 intro.2: Tweak grammar and syntax for consistency Reviewed by: imp, brooks Pull Request: https://github.com/freebsd/freebsd-src/pull/1065 --- lib/libsys/intro.2 | 224 ++++++++++++++++++++++++----------------------------- 1 file changed, 101 insertions(+), 123 deletions(-) diff --git a/lib/libsys/intro.2 b/lib/libsys/intro.2 index 11ed5b6be2f9..277b24c81eea 100644 --- a/lib/libsys/intro.2 +++ b/lib/libsys/intro.2 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 1980, 1983, 1986, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -44,10 +47,11 @@ their error returns, and other common definitions and concepts. .\"(more later...) .Sh RETURN VALUES Nearly all of the system calls provide an error number referenced via -the external identifier errno. +the external identifier +.Va errno . This identifier is defined in .In sys/errno.h -as +as: .Pp .Dl extern int * __error(); .Dl #define errno (* __error()) @@ -65,12 +69,13 @@ variable that is compatible with the previous definition. .Pp When a system call detects an error, it returns an integer value -indicating failure (usually -1) +indicating failure +.Pq usually -1 and sets the variable .Va errno accordingly. -(This allows interpretation of the failure on receiving -a -1 and to take action accordingly.) +This allows interpretation of the failure on receiving +-1 and to take action accordingly. Successful calls never set .Va errno ; once set, it remains until another error occurs. @@ -96,10 +101,8 @@ pathname was an empty string. No process could be found corresponding to that specified by the given process ID. .It Er 4 EINTR Em "Interrupted system call" . -An asynchronous signal (such as -.Dv SIGINT -or -.Dv SIGQUIT ) +An asynchronous signal +.Pq such as Dv SIGINT or Dv SIGQUIT was caught by the process during the execution of an interruptible function. If the signal handler performs a normal return, the @@ -107,7 +110,9 @@ interrupted system call will seem to have returned the error condition. .It Er 5 EIO Em "Input/output error" . Some physical input or output error occurred. This error will not be reported until a subsequent operation on the same file -descriptor and may be lost (over written) by any subsequent errors. +descriptor and may be lost +.Pq over written +by any subsequent errors. .It Er 6 ENXIO Em "Device not configured" . Input or output on a special file referred to a device that did not exist, or @@ -118,9 +123,7 @@ loaded on a drive. .It Er 7 E2BIG Em "Argument list too long" . The number of bytes used for the argument and environment list of the new process exceeded the current limit -.Dv ( NCARGS -in -.In sys/param.h ) . +.Pq Dv NCARGS in In sys/param.h . .It Er 8 ENOEXEC Em "Exec format error" . A request was made to execute a file that, although it has the appropriate permissions, @@ -128,13 +131,13 @@ was not in the format required for an executable file. .It Er 9 EBADF Em "Bad file descriptor" . A file descriptor argument was out of range, referred to no open file, -or a read (write) request was made to a file that was only open for -writing (reading). +or a read +.Pq write +request was made to a file that was only open for writing +.Pq reading . .It Er 10 ECHILD Em "\&No child processes" . A -.Xr wait 2 -or -.Xr waitpid 2 +.Xr wait 2 or Xr waitpid 2 function was executed by a process that had no existing or unwaited-for child processes. .It Er 11 EDEADLK Em "Resource deadlock avoided" . @@ -177,13 +180,11 @@ not a directory, when a directory was expected. An attempt was made to open a directory with write mode specified. .It Er 22 EINVAL Em "Invalid argument" . Some invalid argument was supplied. -(For example, -specifying an undefined signal to a +For example, specifying an undefined signal to a .Xr signal 3 -function -or a +function or a .Xr kill 2 -system call). +system call. .It Er 23 ENFILE Em "Too many open files in system" . Maximum number of open files allowable on the system has been reached and requests for an open cannot be satisfied @@ -196,13 +197,14 @@ The .Xr getdtablesize 2 system call will obtain the current limit. .It Er 25 ENOTTY Em "Inappropriate ioctl for device" . -A control function (see -.Xr ioctl 2 ) +A control function +.Pq see Xr ioctl 2 was attempted for a file or special device for which the operation was inappropriate. .It Er 26 ETXTBSY Em "Text file busy" . -The new process was a pure procedure (shared text) file -which was open for writing by another process, or +The new process was a pure procedure +.Pq shared text +file which was open for writing by another process, or while the pure procedure file was being executed an .Xr open 2 call requested write access. @@ -220,34 +222,31 @@ on the file system. .It Er 29 ESPIPE Em "Illegal seek" . An .Xr lseek 2 -system call was issued on a socket, pipe or -.Tn FIFO . +system call was issued on a socket, pipe or FIFO. .It Er 30 EROFS Em "Read-only file system" . An attempt was made to modify a file or directory on a file system that was read-only at the time. .It Er 31 EMLINK Em "Too many links" . -Maximum allowable hard links to a single file has been exceeded (limit -of 32767 hard links per file). +Maximum allowable hard links to a single file has been exceeded +.Pq limit of 32767 hard links per file . .It Er 32 EPIPE Em "Broken pipe" . -A write on a pipe, socket or -.Tn FIFO -for which there is no process -to read the data. +A write on a pipe, socket or FIFO for which there is no process to read +the data. .It Er 33 EDOM Em "Numerical argument out of domain" . A numerical input argument was outside the defined domain of the mathematical function. .It Er 34 ERANGE Em "Result too large" . A numerical result of the function was too large to fit in the -available space (perhaps exceeded precision). +available space +.Pq perhaps exceeded precision . .It Er 35 EAGAIN Em "Resource temporarily unavailable" . This is a temporary condition and later calls to the same routine may complete normally. .It Er 36 EINPROGRESS Em "Operation now in progress" . -An operation that takes a long time to complete (such as -a -.Xr connect 2 ) -was attempted on a non-blocking object (see -.Xr fcntl 2 ) . +An operation that takes a long time to complete, such as +.Xr connect 2 , +was attempted on a non-blocking object +.Pq see Xr fcntl 2 . .It Er 37 EALREADY Em "Operation already in progress" . An operation was attempted on a non-blocking object that already had an operation in progress. @@ -261,11 +260,7 @@ or some other network limit. .It Er 41 EPROTOTYPE Em "Protocol wrong type for socket" . A protocol was specified that does not support the semantics of the socket type requested. -For example, you cannot use the -.Tn ARPA -Internet -.Tn UDP -protocol with type +For example, you cannot use the ARPA Internet UDP protocol with type .Dv SOCK_STREAM . .It Er 42 ENOPROTOOPT Em "Protocol not available" . A bad option or level was specified in a @@ -292,10 +287,7 @@ system or no implementation for it exists. .It Er 47 EAFNOSUPPORT Em "Address family not supported by protocol family" . An address incompatible with the requested protocol was used. For example, you should not necessarily expect to be able to use -.Tn NS -addresses with -.Tn ARPA -Internet protocols. +NS addresses with ARPA Internet protocols. .It Er 48 EADDRINUSE Em "Address already in use" . Only one usage of each address is normally permitted. .It Er 49 EADDRNOTAVAIL Em "Can't assign requested address" . @@ -329,7 +321,8 @@ request on a connected socket specified a destination when already connected. .It Er 57 ENOTCONN Em "Socket is not connected" . An request to send or receive data was disallowed because -the socket was not connected and (when sending on a datagram socket) +the socket was not connected and +.Pq when sending on a datagram socket no address was supplied. .It Er 58 ESHUTDOWN Em "Can't send after socket shutdown" . A request to send data was disallowed because the socket @@ -343,8 +336,7 @@ or .Xr send 2 request failed because the connected party did not properly respond after a period of time. -(The timeout -period is dependent on the communication protocol.) +The timeout period is dependent on the communication protocol. .It Er 61 ECONNREFUSED Em "Connection refused" . No connection could be made because the target machine actively refused it. @@ -361,10 +353,8 @@ characters, or an entire path name exceeded .Brq Dv PATH_MAX characters. -(See also the description of -.Dv _PC_NO_TRUNC -in -.Xr pathconf 2 . ) +See also the description of +.Dv _PC_NO_TRUNC in Xr pathconf 2 . .It Er 64 EHOSTDOWN Em "Host is down" . A socket operation failed because the destination host was down. .It Er 65 EHOSTUNREACH Em "No route to host" . @@ -388,33 +378,24 @@ exhausted, or the allocation of an inode for a newly created file failed because the user's quota of inodes was exhausted. .It Er 70 ESTALE Em "Stale NFS file handle" . -An attempt was made to access an open file (on an -.Tn NFS -file system) +An attempt was made to access an open file +.Pq on an NFS file system which is now unavailable as referenced by the file descriptor. -This may indicate the file was deleted on the -.Tn NFS -server or some +This may indicate the file was deleted on the NFS server or some other catastrophic event occurred. .It Er 72 EBADRPC Em "RPC struct is bad" . -Exchange of -.Tn RPC -information was unsuccessful. +Exchange of RPC information was unsuccessful. .It Er 73 ERPCMISMATCH Em "RPC version wrong" . -The version of -.Tn RPC -on the remote peer is not compatible with +The version of RPC on the remote peer is not compatible with the local version. .It Er 74 EPROGUNAVAIL Em "RPC prog. not avail" . The requested program is not registered on the remote host. .It Er 75 EPROGMISMATCH Em "Program version wrong" . The requested version of the program is not available on the remote host -.Pq Tn RPC . +.Pq RPC . .It Er 76 EPROCUNAVAIL Em "Bad procedure for program" . -An -.Tn RPC -call was attempted for a procedure which does not exist +An RPC call was attempted for a procedure which does not exist in the remote program. .It Er 77 ENOLCK Em "No locks available" . A system-imposed limit on the number of simultaneous file @@ -427,11 +408,9 @@ The file was the wrong type for the operation, or a data file had the wrong format. .It Er 80 EAUTH Em "Authentication error" . Attempted to use an invalid authentication ticket to mount a -.Tn NFS -file system. +NFS file system. .It Er 81 ENEEDAUTH Em "Need authenticator" . -An authentication ticket must be obtained before the given -.Tn NFS +An authentication ticket must be obtained before the given NFS file system may be mounted. .It Er 82 EIDRM Em "Identifier removed" . An IPC identifier was removed while the current process was waiting on it. @@ -486,18 +465,18 @@ during a system boot. .El .Sh DEFINITIONS .Bl -tag -width Ds -.It Process ID . +.It Process ID Each active process in the system is uniquely identified by a non-negative integer called a process ID. The range of this ID is from 0 to 99999. .It Parent process ID -A new process is created by a currently active process (see -.Xr fork 2 ) . +A new process is created by a currently active process +.Pq see Xr fork 2 . The parent process ID of a process is initially the process ID of its creator. If the creating process exits, the parent process ID of each child is set to the ID of the calling process's -reaper (see -.Xr procctl 2 ) , +reaper +.Pq see Xr procctl 2 , normally .Xr init 8 . .It Process Group @@ -505,9 +484,8 @@ Each active process is a member of a process group that is identified by a non-negative integer called the process group ID. This is the process ID of the group leader. -This grouping permits the signaling of related -processes (see -.Xr termios 4 ) +This grouping permits the signaling of related processes +.Pq see Xr termios 4 and the job control mechanisms of .Xr csh 1 . .It Session @@ -520,25 +498,22 @@ group in the new session. A process that has created a new session by a successful call to .Xr setsid 2 , is known as a session leader. -Only a session leader may acquire a terminal as its controlling terminal (see -.Xr termios 4 ) . +Only a session leader may acquire a terminal as its controlling terminal +.Pq see Xr termios 4 . .It Controlling process A session leader with a controlling terminal is a controlling process. .It Controlling terminal A terminal that is associated with a session is known as the controlling terminal for that session and its members. -.It "Terminal Process Group ID" +.It Terminal Process Group ID A terminal may be acquired by a session leader as its controlling terminal. Once a terminal is associated with a session, any of the process groups within the session may be placed into the foreground by setting the terminal process group ID to the ID of the process group. This facility is used -to arbitrate between multiple jobs contending for the same terminal; -(see -.Xr csh 1 -and -.Xr tty 4 ) . -.It "Orphaned Process Group" +to arbitrate between multiple jobs contending for the same terminal +.Pq see Xr csh 1 and Xr tty 4 . +.It Orphaned Process Group A process group is considered to be .Em orphaned if it is not under the control of a job control shell. @@ -551,9 +526,10 @@ is normally changed to be .Xr init 8 , which is in a separate session. Not all members of an orphaned process group are necessarily orphaned -processes (those whose creating process has exited). +processes +.Pq those whose creating process has exited . The process group of a session leader is orphaned by definition. -.It "Real User ID and Real Group ID" +.It Real User ID and Real Group ID Each user on the system is identified by a positive integer termed the real user ID. .Pp @@ -567,42 +543,46 @@ the real group ID. All processes have a real user ID and real group ID. These are initialized from the equivalent attributes of the process that created it. -.It "Effective User Id, Effective Group Id, and Group Access List" +.It Effective User Id, Effective Group Id, and Group Access List Access to system resources is governed by two values: the effective user ID, and the group access list. The first member of the group access list is also known as the effective group ID. -(In POSIX.1, the group access list is known as the set of supplementary +In POSIX.1, the group access list is known as the set of supplementary group IDs, and it is unspecified whether the effective group ID is -a member of the list.) +a member of the list. .Pp The effective user ID and effective group ID are initially the process's real user ID and real group ID respectively. Either -may be modified through execution of a set-user-ID or set-group-ID -file (possibly by one its ancestors) (see -.Xr execve 2 ) . -By convention, the effective group ID (the first member of the group access -list) is duplicated, so that the execution of a set-group-ID program -does not result in the loss of the original (real) group ID. +may be modified through execution of a set-user-ID or set-group-ID file +.Pq possibly by one its ancestors +.Pq see Xr execve 2 . +By convention, the effective group ID +.Pq the first member of the group access list +is duplicated, so that the execution of a set-group-ID program +does not result in the loss of the original +.Pq real +group ID. .Pp The group access list is a set of group IDs used only in determining resource accessibility. Access checks are performed as described below in ``File Access Permissions''. -.It "Saved Set User ID and Saved Set Group ID" +.It Saved Set User ID and Saved Set Group ID When a process executes a new file, the effective user ID is set to the owner of the file if the file is set-user-ID, and the effective -group ID (first element of the group access list) is set to the group -of the file if the file is set-group-ID. +group ID +.Pq first element of the group access list +is set to the group of the file if the file is set-group-ID. The effective user ID of the process is then recorded as the saved set-user-ID, and the effective group ID of the process is recorded as the saved set-group-ID. These values may be used to regain those values as the effective user -or group ID after reverting to the real ID (see -.Xr setuid 2 ) . -(In POSIX.1, the saved set-user-ID and saved set-group-ID are optional, +or group ID after reverting to the real ID +.Pq see Xr setuid 2 . +In POSIX.1, the saved set-user-ID and saved set-group-ID are optional, and are used in setuid and setgid, but this does not work as desired -for the super-user.) +for the super-user. .It Super-user A process is recognized as a .Em super-user @@ -629,12 +609,11 @@ an ordinary file, special file, or directory. These characters may be arbitrary eight-bit values, excluding .Dv NUL -.Tn ( ASCII -0) and the +.Pq ASCII 0 +and the .Ql \&/ -character (slash, -.Tn ASCII -47). +character +.Pq slash, ASCII 47 . .Pp Note that it is generally unwise to use .Ql \&* , @@ -656,7 +635,7 @@ by slashes, optionally followed by a file name. The total length of a path name must be less than .Brq Dv PATH_MAX characters. -(On some systems, this limit may be infinite.) +On some systems, this limit may be infinite. .Pp If a path name begins with a slash, the path search begins at the .Em root @@ -681,7 +660,7 @@ and respectively. Dot refers to the directory itself and dot-dot refers to its parent directory. -.It "Root Directory and Current Working Directory" +.It Root Directory and Current Working Directory Each process has associated with it a concept of a root directory and a current working directory for the purpose of resolving path name searches. @@ -690,8 +669,8 @@ directory of the root file system. .It File Access Permissions Every file in the file system has a set of access permissions. These permissions are used in determining whether a process -may perform a requested operation on the file (such as opening -a file for writing). +may perform a requested operation on the file +.Pq such as opening a file for writing . Access permissions are established at the time a file is created. They may be changed at some later time @@ -717,8 +696,7 @@ Read, write, and execute/search permissions on a file are granted to a process if: .Pp The process's effective user ID is that of the super-user. -(Note: -even the super-user cannot execute a non-executable file.) +Note that even the super-user cannot execute a non-executable file. .Pp The process's effective user ID matches the user ID of the owner of the file and the owner permissions allow the access. From nobody Fri Apr 19 22:34:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqFF1zjlz5HsXH; Fri, 19 Apr 2024 22:34: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 4VLqFF070Vz4Jxt; Fri, 19 Apr 2024 22:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LNZsca0U0dCReD/Rg4LTWcPWlFd6DJV51e2tnCSGhrk=; b=nBUOZVrNuq1LstlzySTfZ5aqnGrXjf9WTjE4xcAVxZxNqSk0jpqKnkGdHjtJhftKiORTUB iMtRh1IzjrOpB8OY029yV9KL4uhObNNJYV/x2FCLsge2nAvB4TeCE5+lyuVn579SSwlrDE 3+QOp8ECuq2oZ1nl5U1qKR1YDGcD8mWSU5Cv4PP4hW2Hs5e/9aHhiPUjhPbrbVmwJKoKqh Rg1XbAKNwVYDEw1gVygQvxCRTc3T2vgH3JiNZCwMkEuADO9+bYhkCkJXH2lbd2NRneOoOf dyAYPH1sakcGYn0iYB7dMNOEWWZokzcpmfHAt42pUJtjH1U4+pOmftwipTrfNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566049; a=rsa-sha256; cv=none; b=pO3dLQ+EpeUBDo+CgvWlfdW+r/BE3b0Tj/H28CoqLnl81WYgtGR16HJ2oB0Ne//O+a9o8x kOFvB12q4aO//zbsWomiKk/rzUXsxRHvZ5DqZSvQJ36EjAnZ/q7iBWCBcbJYLkbYeTcPTO MriGsSXzVuL8DZGK2dO5llO/3C+IsJvH7ps+EJNjxtuHdwL/8ou6izFoedxJEEYlfGuRut kP0DUkS81bZgDfeR7bVjZGE3byz8cJjKtxCgUdEgalSjS0dFivqyVN/EjJJBp6TiFHJh8m fWin0OKI6q3cVcRm3CiIrzBnYgh6EBnkxhkbJdgLQxiZxPiB4cL2lAq3/Pm++g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LNZsca0U0dCReD/Rg4LTWcPWlFd6DJV51e2tnCSGhrk=; b=L7I59c47ASXrvXuciG/LQ8gowdzq6V0PylAodX1QdAF+9QqTQkyGCqm7f3SPQqJ92C0sgm HIsr2Q7eXuUiYmMzve0tZxlnFdt8Z6SRdqeFsgVsPEc2wyTzmXnc7aqCV2Fs/Ljd6GA8U6 Qvj6aR6sDPaK4Vx6eorufJhy0bXd6JCiChtFbVK6oHbIW2GPhp4lAbbyi/DQyY4FRcI+Ni 7fjTBJf7qNH8Dd/b7xithH1hrlYQoCFi9b50ftdGzteTG87orI61OwwbAXm0zQBavD/UhB MHgX0PCfBID9aPjkVcn+jVOB1Ar9sruEdxZLh+FlG+jph3gAoCXZHAWf5VuS7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqFD6ptnz19fW; Fri, 19 Apr 2024 22:34: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 43JMY8aI092674; Fri, 19 Apr 2024 22:34:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMY8oH092671; Fri, 19 Apr 2024 22:34:08 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:34:08 GMT Message-Id: <202404192234.43JMY8oH092671@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: 4696ca7baf2f - main - intro.2: Add FILES mentioning table of syscalls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4696ca7baf2f09080d8e51a1783fcab853bb3d14 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4696ca7baf2f09080d8e51a1783fcab853bb3d14 commit 4696ca7baf2f09080d8e51a1783fcab853bb3d14 Author: Alexander Ziaee AuthorDate: 2024-04-19 22:22:39 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:30:23 +0000 intro.2: Add FILES mentioning table of syscalls Reviewed by: imp, brooks Pull Request: https://github.com/freebsd/freebsd-src/pull/1065 --- lib/libsys/intro.2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libsys/intro.2 b/lib/libsys/intro.2 index 277b24c81eea..e4ee662e96d2 100644 --- a/lib/libsys/intro.2 +++ b/lib/libsys/intro.2 @@ -738,6 +738,11 @@ for a specific group of protocols. Each socket has an address chosen from the address family in which the socket was created. .El +.Sh FILES +.Bl -inset -compact +.It Pa /usr/include/sys/syscall.h +Table of currently available system calls. +.El .Sh SEE ALSO .Xr intro 3 , .Xr perror 3 From nobody Fri Apr 19 22:34:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqFG3hhtz5HssM; Fri, 19 Apr 2024 22:34: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 4VLqFG0xN6z4JkC; Fri, 19 Apr 2024 22:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fh9y0NBNOsT3j1NW31AqWExd6yXO2dH7zG+SAo77+5U=; b=FfR1WjLRUVc2RVTJ7KffKCQP2nMNK0yqgswYvzlzUsuE7zfpgzxZ8GLBeG+L8/N3ea1jBv xCjhDyveCXJTdBM9vHn3QyHeMKzW4iul6Ad0id7Dqsai5cSZ5jSS3pQcsHqixun5ktgf6n F4+fTqyEuHCPzBZmNgWB5YpK726JUcY8N4T9CGlH4Ytq16TNcfBQvc+/7XrBriL9CUOzaG e3eSvNK3I/NpyEQOOOGYZbhSVss7h8GMaHwxvZjTONtKcZ1mMghmGzRhg+z2xTpjquwCjP knu5jADbINw6v/mBTD5vb3h7zuNdB6b1KMC8HHL7ftxyIvdfFVsmYjwgVAEdKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566050; a=rsa-sha256; cv=none; b=S5HuIAmtlAtFq951Ll+aRhPfjb/vyjNVuHGBdZ8wVgIeX2MNvH6+f9rsvY1c6IVqethAgT cigBfATJdXEYRBNlJjcPezNORiI569CD5820bcpNguSZu1odECM47CX5SKOKt70HnIXN3W ReNOi4sIYMdz3/jdrJkgWAjdJ9nL7AsvQo0L6gkLuS5N2Ahy6zheemuqOk9wXuqYeR2zVW reRGieAPW0kde3CTzVjfE8KW5XN6bCPwwESC16poutVF9wXglL48PZe1AjUAr5chKZHEpp jQmFzl5968x84zOwP+4wAQaSN/euvbHD5Qu4jdU871y/5E1c81857c+idOi9hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fh9y0NBNOsT3j1NW31AqWExd6yXO2dH7zG+SAo77+5U=; b=CzXeUCjg6swbzgbdtgDUJnMxBa0mYHWSQekRQNGoi774wiW8DQwedpFauCXAwh3JVQMTvd tpluWY6OFQF+9mMndcPrdWRxMH3pMcLgJeEzxXSf8ytOJte7PFzQLzlH9NepoYP9h1Lmy7 KxU3FznAqcH+AAtSPaTUi0dtKn7yPF0DnwrlQEuoil/OMxppFIJK8ciZ+59ldIPSCkE/aY HdrR4aiVEVKc2Qrm2fXm4S3BOteD+BvX8LFSVJGf0fA/fG7URSp8olKodyc2gpN01kiqSh O1rAAwrx2ExxhIWgPloAchypzjVoqXGPsvx8tyGiYUB/6vakUPUuODfUm8Ju5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqFG0XTVz19fX; Fri, 19 Apr 2024 22:34: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 43JMYAha092722; Fri, 19 Apr 2024 22:34:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMY9NM092719; Fri, 19 Apr 2024 22:34:09 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:34:09 GMT Message-Id: <202404192234.43JMY9NM092719@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: d846f33bb6d4 - main - intro.2: Section RETURN VALUES is actually ERRORS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d846f33bb6d4f2d25ddf5c0b4dc0dcf4096b0d52 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d846f33bb6d4f2d25ddf5c0b4dc0dcf4096b0d52 commit d846f33bb6d4f2d25ddf5c0b4dc0dcf4096b0d52 Author: Alexander Ziaee AuthorDate: 2024-04-19 22:22:39 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:30:27 +0000 intro.2: Section RETURN VALUES is actually ERRORS Reviewed by: imp, brooks Pull Request: https://github.com/freebsd/freebsd-src/pull/1065 --- lib/libsys/intro.2 | 1350 ++++++++++++++++++++++++++-------------------------- 1 file changed, 675 insertions(+), 675 deletions(-) diff --git a/lib/libsys/intro.2 b/lib/libsys/intro.2 index e4ee662e96d2..c8eee277f268 100644 --- a/lib/libsys/intro.2 +++ b/lib/libsys/intro.2 @@ -45,703 +45,703 @@ their error returns, and other common definitions and concepts. .\".Sy System call restart .\".Pp .\"(more later...) -.Sh RETURN VALUES -Nearly all of the system calls provide an error number referenced via -the external identifier -.Va errno . -This identifier is defined in -.In sys/errno.h -as: +.Sh DEFINITIONS +.Bl -tag -width Ds +.It Process ID +Each active process in the system is uniquely identified by a non-negative +integer called a process ID. +The range of this ID is from 0 to 99999. +.It Parent process ID +A new process is created by a currently active process +.Pq see Xr fork 2 . +The parent process ID of a process is initially the process ID of its creator. +If the creating process exits, +the parent process ID of each child is set to the ID of the calling process's +reaper +.Pq see Xr procctl 2 , +normally +.Xr init 8 . +.It Process Group +Each active process is a member of a process group that is identified by +a non-negative integer called the process group ID. +This is the process +ID of the group leader. +This grouping permits the signaling of related processes +.Pq see Xr termios 4 +and the job control mechanisms of +.Xr csh 1 . +.It Session +A session is a set of one or more process groups. +A session is created by a successful call to +.Xr setsid 2 , +which causes the caller to become the only member of the only process +group in the new session. +.It Session leader +A process that has created a new session by a successful call to +.Xr setsid 2 , +is known as a session leader. +Only a session leader may acquire a terminal as its controlling terminal +.Pq see Xr termios 4 . +.It Controlling process +A session leader with a controlling terminal is a controlling process. +.It Controlling terminal +A terminal that is associated with a session is known as the controlling +terminal for that session and its members. +.It Terminal Process Group ID +A terminal may be acquired by a session leader as its controlling terminal. +Once a terminal is associated with a session, any of the process groups +within the session may be placed into the foreground by setting +the terminal process group ID to the ID of the process group. +This facility is used +to arbitrate between multiple jobs contending for the same terminal +.Pq see Xr csh 1 and Xr tty 4 . +.It Orphaned Process Group +A process group is considered to be +.Em orphaned +if it is not under the control of a job control shell. +More precisely, a process group is orphaned +when none of its members has a parent process that is in the same session +as the group, +but is in a different process group. +Note that when a process exits, the parent process for its children +is normally changed to be +.Xr init 8 , +which is in a separate session. +Not all members of an orphaned process group are necessarily orphaned +processes +.Pq those whose creating process has exited . +The process group of a session leader is orphaned by definition. +.It Real User ID and Real Group ID +Each user on the system is identified by a positive integer +termed the real user ID. .Pp -.Dl extern int * __error(); -.Dl #define errno (* __error()) +Each user is also a member of one or more groups. +One of these groups is distinguished from others and +used in implementing accounting facilities. +The positive +integer corresponding to this distinguished group is termed +the real group ID. .Pp -The -.Va __error() -function returns a pointer to a field in the thread specific structure for -threads other than the initial thread. -For the initial thread and -non-threaded processes, -.Va __error() -returns a pointer to a global -.Va errno -variable that is compatible with the previous definition. +All processes have a real user ID and real group ID. +These are initialized from the equivalent attributes +of the process that created it. +.It Effective User Id, Effective Group Id, and Group Access List +Access to system resources is governed by two values: +the effective user ID, and the group access list. +The first member of the group access list is also known as the +effective group ID. +In POSIX.1, the group access list is known as the set of supplementary +group IDs, and it is unspecified whether the effective group ID is +a member of the list. .Pp -When a system call detects an error, -it returns an integer value -indicating failure -.Pq usually -1 -and sets the variable -.Va errno -accordingly. -This allows interpretation of the failure on receiving --1 and to take action accordingly. -Successful calls never set -.Va errno ; -once set, it remains until another error occurs. -It should only be examined after an error. -Note that a number of system calls overload the meanings of these -error numbers, and that the meanings must be interpreted according -to the type and circumstances of the call. +The effective user ID and effective group ID are initially the +process's real user ID and real group ID respectively. +Either +may be modified through execution of a set-user-ID or set-group-ID file +.Pq possibly by one its ancestors +.Pq see Xr execve 2 . +By convention, the effective group ID +.Pq the first member of the group access list +is duplicated, so that the execution of a set-group-ID program +does not result in the loss of the original +.Pq real +group ID. .Pp -The following is a complete list of the errors and their -names as given in -.In sys/errno.h . -.Bl -hang -width Ds -.It Er 0 Em "Undefined error: 0" . -Not used. -.It Er 1 EPERM Em "Operation not permitted" . -An attempt was made to perform an operation limited to processes -with appropriate privileges or to the owner of a file or other -resources. -.It Er 2 ENOENT Em "No such file or directory" . -A component of a specified pathname did not exist, or the -pathname was an empty string. -.It Er 3 ESRCH Em "No such process" . -No process could be found corresponding to that specified by the given -process ID. -.It Er 4 EINTR Em "Interrupted system call" . -An asynchronous signal -.Pq such as Dv SIGINT or Dv SIGQUIT -was caught by the process during the execution of an interruptible -function. -If the signal handler performs a normal return, the -interrupted system call will seem to have returned the error condition. -.It Er 5 EIO Em "Input/output error" . -Some physical input or output error occurred. -This error will not be reported until a subsequent operation on the same file -descriptor and may be lost -.Pq over written -by any subsequent errors. -.It Er 6 ENXIO Em "Device not configured" . -Input or output on a special file referred to a device that did not -exist, or -made a request beyond the limits of the device. -This error may also occur when, for example, -a tape drive is not online or no disk pack is -loaded on a drive. -.It Er 7 E2BIG Em "Argument list too long" . -The number of bytes used for the argument and environment -list of the new process exceeded the current limit -.Pq Dv NCARGS in In sys/param.h . -.It Er 8 ENOEXEC Em "Exec format error" . -A request was made to execute a file -that, although it has the appropriate permissions, -was not in the format required for an -executable file. -.It Er 9 EBADF Em "Bad file descriptor" . -A file descriptor argument was out of range, referred to no open file, -or a read -.Pq write -request was made to a file that was only open for writing -.Pq reading . -.It Er 10 ECHILD Em "\&No child processes" . -A -.Xr wait 2 or Xr waitpid 2 -function was executed by a process that had no existing or unwaited-for -child processes. -.It Er 11 EDEADLK Em "Resource deadlock avoided" . -An attempt was made to lock a system resource that -would have resulted in a deadlock situation. -.It Er 12 ENOMEM Em "Cannot allocate memory" . -The new process image required more memory than was allowed by the hardware -or by system-imposed memory management constraints. -A lack of swap space is normally temporary; however, -a lack of core is not. -Soft limits may be increased to their corresponding hard limits. -.It Er 13 EACCES Em "Permission denied" . -An attempt was made to access a file in a way forbidden -by its file access permissions. -.It Er 14 EFAULT Em "Bad address" . -The system detected an invalid address in attempting to -use an argument of a call. -.It Er 15 ENOTBLK Em "Block device required" . -A block device operation was attempted on a non-block device or file. -.It Er 16 EBUSY Em "Device busy" . -An attempt to use a system resource which was in use at the time -in a manner which would have conflicted with the request. -.It Er 17 EEXIST Em "File exists" . -An existing file was mentioned in an inappropriate context, -for instance, as the new link name in a -.Xr link 2 -system call. -.It Er 18 EXDEV Em "Cross-device link" . -A hard link to a file on another file system -was attempted. -.It Er 19 ENODEV Em "Operation not supported by device" . -An attempt was made to apply an inappropriate -function to a device, -for example, -trying to read a write-only device such as a printer. -.It Er 20 ENOTDIR Em "Not a directory" . -A component of the specified pathname existed, but it was -not a directory, when a directory was expected. -.It Er 21 EISDIR Em "Is a directory" . -An attempt was made to open a directory with write mode specified. -.It Er 22 EINVAL Em "Invalid argument" . -Some invalid argument was supplied. -For example, specifying an undefined signal to a -.Xr signal 3 -function or a -.Xr kill 2 -system call. -.It Er 23 ENFILE Em "Too many open files in system" . -Maximum number of open files allowable on the system -has been reached and requests for an open cannot be satisfied -until at least one has been closed. -.It Er 24 EMFILE Em "Too many open files" . -Maximum number of file descriptors allowable in the process -has been reached and requests for an open cannot be satisfied -until at least one has been closed. -The -.Xr getdtablesize 2 -system call will obtain the current limit. -.It Er 25 ENOTTY Em "Inappropriate ioctl for device" . -A control function -.Pq see Xr ioctl 2 -was attempted for a file or -special device for which the operation was inappropriate. -.It Er 26 ETXTBSY Em "Text file busy" . -The new process was a pure procedure -.Pq shared text -file which was open for writing by another process, or -while the pure procedure file was being executed an -.Xr open 2 -call requested write access. -.It Er 27 EFBIG Em "File too large" . -The size of a file exceeded the maximum. -.It Er 28 ENOSPC Em "No space left on device" . -A -.Xr write 2 -to an ordinary file, the creation of a -directory or symbolic link, or the creation of a directory -entry failed because no more disk blocks were available -on the file system, or the allocation of an inode for a newly -created file failed because no more inodes were available -on the file system. -.It Er 29 ESPIPE Em "Illegal seek" . -An -.Xr lseek 2 -system call was issued on a socket, pipe or FIFO. -.It Er 30 EROFS Em "Read-only file system" . -An attempt was made to modify a file or directory -on a file system that was read-only at the time. -.It Er 31 EMLINK Em "Too many links" . -Maximum allowable hard links to a single file has been exceeded -.Pq limit of 32767 hard links per file . -.It Er 32 EPIPE Em "Broken pipe" . -A write on a pipe, socket or FIFO for which there is no process to read -the data. -.It Er 33 EDOM Em "Numerical argument out of domain" . -A numerical input argument was outside the defined domain of the mathematical -function. -.It Er 34 ERANGE Em "Result too large" . -A numerical result of the function was too large to fit in the -available space -.Pq perhaps exceeded precision . -.It Er 35 EAGAIN Em "Resource temporarily unavailable" . -This is a temporary condition and later calls to the -same routine may complete normally. -.It Er 36 EINPROGRESS Em "Operation now in progress" . -An operation that takes a long time to complete, such as -.Xr connect 2 , -was attempted on a non-blocking object -.Pq see Xr fcntl 2 . -.It Er 37 EALREADY Em "Operation already in progress" . -An operation was attempted on a non-blocking object that already -had an operation in progress. -.It Er 38 ENOTSOCK Em "Socket operation on non-socket" . -Self-explanatory. -.It Er 39 EDESTADDRREQ Em "Destination address required" . -A required address was omitted from an operation on a socket. -.It Er 40 EMSGSIZE Em "Message too long" . -A message sent on a socket was larger than the internal message buffer -or some other network limit. -.It Er 41 EPROTOTYPE Em "Protocol wrong type for socket" . -A protocol was specified that does not support the semantics of the -socket type requested. -For example, you cannot use the ARPA Internet UDP protocol with type -.Dv SOCK_STREAM . -.It Er 42 ENOPROTOOPT Em "Protocol not available" . -A bad option or level was specified in a -.Xr getsockopt 2 -or -.Xr setsockopt 2 -call. -.It Er 43 EPROTONOSUPPORT Em "Protocol not supported" . -The protocol has not been configured into the -system or no implementation for it exists. -.It Er 44 ESOCKTNOSUPPORT Em "Socket type not supported" . -The support for the socket type has not been configured into the -system or no implementation for it exists. -.It Er 45 EOPNOTSUPP Em "Operation not supported" . -The attempted operation is not supported for the type of object referenced. -Usually this occurs when a file descriptor refers to a file or socket -that cannot support this operation, -for example, trying to -.Em accept -a connection on a datagram socket. -.It Er 46 EPFNOSUPPORT Em "Protocol family not supported" . -The protocol family has not been configured into the -system or no implementation for it exists. -.It Er 47 EAFNOSUPPORT Em "Address family not supported by protocol family" . -An address incompatible with the requested protocol was used. -For example, you should not necessarily expect to be able to use -NS addresses with ARPA Internet protocols. -.It Er 48 EADDRINUSE Em "Address already in use" . -Only one usage of each address is normally permitted. -.It Er 49 EADDRNOTAVAIL Em "Can't assign requested address" . -Normally results from an attempt to create a socket with an -address not on this machine. -.It Er 50 ENETDOWN Em "Network is down" . -A socket operation encountered a dead network. -.It Er 51 ENETUNREACH Em "Network is unreachable" . -A socket operation was attempted to an unreachable network. -.It Er 52 ENETRESET Em "Network dropped connection on reset" . -The host you were connected to crashed and rebooted. -.It Er 53 ECONNABORTED Em "Software caused connection abort" . -A connection abort was caused internal to your host machine. -.It Er 54 ECONNRESET Em "Connection reset by peer" . -A connection was forcibly closed by a peer. -This normally -results from a loss of the connection on the remote socket -due to a timeout or a reboot. -.It Er 55 ENOBUFS Em "\&No buffer space available" . -An operation on a socket or pipe was not performed because -the system lacked sufficient buffer space or because a queue was full. -.It Er 56 EISCONN Em "Socket is already connected" . -A -.Xr connect 2 -request was made on an already connected socket; or, -a -.Xr sendto 2 +The group access list is a set of group IDs +used only in determining resource accessibility. +Access checks +are performed as described below in ``File Access Permissions''. +.It Saved Set User ID and Saved Set Group ID +When a process executes a new file, the effective user ID is set +to the owner of the file if the file is set-user-ID, and the effective +group ID +.Pq first element of the group access list +is set to the group of the file if the file is set-group-ID. +The effective user ID of the process is then recorded as the saved set-user-ID, +and the effective group ID of the process is recorded as the saved set-group-ID. +These values may be used to regain those values as the effective user +or group ID after reverting to the real ID +.Pq see Xr setuid 2 . +In POSIX.1, the saved set-user-ID and saved set-group-ID are optional, +and are used in setuid and setgid, but this does not work as desired +for the super-user. +.It Super-user +A process is recognized as a +.Em super-user +process and is granted special privileges if its effective user ID is 0. +.It Descriptor +An integer assigned by the system when a file is referenced +by +.Xr open 2 or -.Xr sendmsg 2 -request on a connected socket specified a destination -when already connected. -.It Er 57 ENOTCONN Em "Socket is not connected" . -An request to send or receive data was disallowed because -the socket was not connected and -.Pq when sending on a datagram socket -no address was supplied. -.It Er 58 ESHUTDOWN Em "Can't send after socket shutdown" . -A request to send data was disallowed because the socket -had already been shut down with a previous -.Xr shutdown 2 -call. -.It Er 60 ETIMEDOUT Em "Operation timed out" . -A -.Xr connect 2 +.Xr dup 2 , +or when a socket is created by +.Xr pipe 2 , +.Xr socket 2 or -.Xr send 2 -request failed because the connected party did not -properly respond after a period of time. -The timeout period is dependent on the communication protocol. -.It Er 61 ECONNREFUSED Em "Connection refused" . -No connection could be made because the target machine actively -refused it. -This usually results from trying to connect -to a service that is inactive on the foreign host. -.It Er 62 ELOOP Em "Too many levels of symbolic links" . -A path name lookup involved more than 32 -.Pq Dv MAXSYMLINKS -symbolic links. -.It Er 63 ENAMETOOLONG Em "File name too long" . -A component of a path name exceeded +.Xr socketpair 2 , +which uniquely identifies an access path to that file or socket from +a given process or any of its children. +.It File Name +Names consisting of up to .Brq Dv NAME_MAX -characters, or an entire -path name exceeded +characters may be used to name +an ordinary file, special file, or directory. +.Pp +These characters may be arbitrary eight-bit values, +excluding +.Dv NUL +.Pq ASCII 0 +and the +.Ql \&/ +character +.Pq slash, ASCII 47 . +.Pp +Note that it is generally unwise to use +.Ql \&* , +.Ql \&? , +.Ql \&[ +or +.Ql \&] +as part of +file names because of the special meaning attached to these characters +by the shell. +.It Path Name +A path name is a +.Dv NUL Ns -terminated +character string starting with an +optional slash +.Ql \&/ , +followed by zero or more directory names separated +by slashes, optionally followed by a file name. +The total length of a path name must be less than .Brq Dv PATH_MAX characters. -See also the description of -.Dv _PC_NO_TRUNC in Xr pathconf 2 . -.It Er 64 EHOSTDOWN Em "Host is down" . -A socket operation failed because the destination host was down. -.It Er 65 EHOSTUNREACH Em "No route to host" . -A socket operation was attempted to an unreachable host. -.It Er 66 ENOTEMPTY Em "Directory not empty" . -A directory with entries other than +On some systems, this limit may be infinite. +.Pp +If a path name begins with a slash, the path search begins at the +.Em root +directory. +Otherwise, the search begins from the current working directory. +A slash by itself names the root directory. +An empty +pathname refers to the current directory. +.It Directory +A directory is a special type of file that contains entries +that are references to other files. +Directory entries are called links. +By convention, a directory +contains at least two links, .Ql .\& and -.Ql ..\& -was supplied to a remove directory or rename call. -.It Er 67 EPROCLIM Em "Too many processes" . -.It Er 68 EUSERS Em "Too many users" . -The quota system ran out of table entries. -.It Er 69 EDQUOT Em "Disc quota exceeded" . -A -.Xr write 2 -to an ordinary file, the creation of a -directory or symbolic link, or the creation of a directory -entry failed because the user's quota of disk blocks was -exhausted, or the allocation of an inode for a newly -created file failed because the user's quota of inodes -was exhausted. -.It Er 70 ESTALE Em "Stale NFS file handle" . -An attempt was made to access an open file -.Pq on an NFS file system -which is now unavailable as referenced by the file descriptor. -This may indicate the file was deleted on the NFS server or some -other catastrophic event occurred. -.It Er 72 EBADRPC Em "RPC struct is bad" . -Exchange of RPC information was unsuccessful. -.It Er 73 ERPCMISMATCH Em "RPC version wrong" . -The version of RPC on the remote peer is not compatible with -the local version. -.It Er 74 EPROGUNAVAIL Em "RPC prog. not avail" . -The requested program is not registered on the remote host. -.It Er 75 EPROGMISMATCH Em "Program version wrong" . -The requested version of the program is not available -on the remote host -.Pq RPC . -.It Er 76 EPROCUNAVAIL Em "Bad procedure for program" . -An RPC call was attempted for a procedure which does not exist -in the remote program. -.It Er 77 ENOLCK Em "No locks available" . -A system-imposed limit on the number of simultaneous file -locks was reached. -.It Er 78 ENOSYS Em "Function not implemented" . -Attempted a system call that is not available on this -system. -.It Er 79 EFTYPE Em "Inappropriate file type or format" . -The file was the wrong type for the operation, or a data file had -the wrong format. -.It Er 80 EAUTH Em "Authentication error" . -Attempted to use an invalid authentication ticket to mount a -NFS file system. -.It Er 81 ENEEDAUTH Em "Need authenticator" . -An authentication ticket must be obtained before the given NFS -file system may be mounted. -.It Er 82 EIDRM Em "Identifier removed" . -An IPC identifier was removed while the current process was waiting on it. -.It Er 83 ENOMSG Em "No message of desired type" . -An IPC message queue does not contain a message of the desired type, or a -message catalog does not contain the requested message. -.It Er 84 EOVERFLOW Em "Value too large to be stored in data type" . -A numerical result of the function was too large to be stored in the caller -provided space. -.It Er 85 ECANCELED Em "Operation canceled" . -The scheduled operation was canceled. -.It Er 86 EILSEQ Em "Illegal byte sequence" . -While decoding a multibyte character the function came along an -invalid or an incomplete sequence of bytes or the given wide -character is invalid. -.It Er 87 ENOATTR Em "Attribute not found" . -The specified extended attribute does not exist. -.It Er 88 EDOOFUS Em "Programming error" . -A function or API is being abused in a way which could only be detected -at run-time. -.It Er 89 EBADMSG Em "Bad message" . -A corrupted message was detected. -.It Er 90 EMULTIHOP Em "Multihop attempted" . -This error code is unused, but present for compatibility with other systems. -.It Er 91 ENOLINK Em "Link has been severed" . -This error code is unused, but present for compatibility with other systems. -.It Er 92 EPROTO Em "Protocol error" . -A device or socket encountered an unrecoverable protocol error. -.It Er 93 ENOTCAPABLE Em "Capabilities insufficient" . -An operation on a capability file descriptor requires greater privilege than -the capability allows. -.It Er 94 ECAPMODE Em "Not permitted in capability mode" . -The system call or operation is not permitted for capability mode processes. -.It Er 95 ENOTRECOVERABLE Em "State not recoverable" . -The state protected by a robust mutex is not recoverable. -.It Er 96 EOWNERDEAD Em "Previous owner died" . -The owner of a robust mutex terminated while holding the mutex lock. -.It Er 97 EINTEGRITY Em "Integrity check failed" . -An integrity check such as a check-hash or a cross-correlation failed. -The integrity error falls in the kernel I/O stack between -.Er EINVAL -that identifies errors in parameters to a system call and -.Er EIO -that identifies errors with the underlying storage media. -It is typically raised by intermediate kernel layers such as a -filesystem or an in-kernel GEOM subsystem when they detect inconsistencies. -Uses include allowing the -.Xr mount 8 -command to return a different exit value to automate the running of -.Xr fsck 8 -during a system boot. -.El -.Sh DEFINITIONS -.Bl -tag -width Ds -.It Process ID -Each active process in the system is uniquely identified by a non-negative -integer called a process ID. -The range of this ID is from 0 to 99999. -.It Parent process ID -A new process is created by a currently active process -.Pq see Xr fork 2 . -The parent process ID of a process is initially the process ID of its creator. -If the creating process exits, -the parent process ID of each child is set to the ID of the calling process's -reaper -.Pq see Xr procctl 2 , -normally -.Xr init 8 . -.It Process Group -Each active process is a member of a process group that is identified by -a non-negative integer called the process group ID. -This is the process -ID of the group leader. -This grouping permits the signaling of related processes -.Pq see Xr termios 4 -and the job control mechanisms of -.Xr csh 1 . -.It Session -A session is a set of one or more process groups. -A session is created by a successful call to -.Xr setsid 2 , -which causes the caller to become the only member of the only process -group in the new session. -.It Session leader -A process that has created a new session by a successful call to -.Xr setsid 2 , -is known as a session leader. -Only a session leader may acquire a terminal as its controlling terminal -.Pq see Xr termios 4 . -.It Controlling process -A session leader with a controlling terminal is a controlling process. -.It Controlling terminal -A terminal that is associated with a session is known as the controlling -terminal for that session and its members. -.It Terminal Process Group ID -A terminal may be acquired by a session leader as its controlling terminal. -Once a terminal is associated with a session, any of the process groups -within the session may be placed into the foreground by setting -the terminal process group ID to the ID of the process group. -This facility is used -to arbitrate between multiple jobs contending for the same terminal -.Pq see Xr csh 1 and Xr tty 4 . -.It Orphaned Process Group -A process group is considered to be -.Em orphaned -if it is not under the control of a job control shell. -More precisely, a process group is orphaned -when none of its members has a parent process that is in the same session -as the group, -but is in a different process group. -Note that when a process exits, the parent process for its children -is normally changed to be -.Xr init 8 , -which is in a separate session. -Not all members of an orphaned process group are necessarily orphaned -processes -.Pq those whose creating process has exited . -The process group of a session leader is orphaned by definition. -.It Real User ID and Real Group ID -Each user on the system is identified by a positive integer -termed the real user ID. +.Ql \&.. , +referred to as +.Em dot +and +.Em dot-dot +respectively. +Dot refers to the directory itself and +dot-dot refers to its parent directory. +.It Root Directory and Current Working Directory +Each process has associated with it a concept of a root directory +and a current working directory for the purpose of resolving path +name searches. +A process's root directory need not be the root +directory of the root file system. +.It File Access Permissions +Every file in the file system has a set of access permissions. +These permissions are used in determining whether a process +may perform a requested operation on the file +.Pq such as opening a file for writing . +Access permissions are established at the +time a file is created. +They may be changed at some later time +through the +.Xr chmod 2 +call. .Pp -Each user is also a member of one or more groups. -One of these groups is distinguished from others and -used in implementing accounting facilities. -The positive -integer corresponding to this distinguished group is termed -the real group ID. +File access is broken down according to whether a file may be: read, +written, or executed. +Directory files use the execute +permission to control if the directory may be searched. .Pp -All processes have a real user ID and real group ID. -These are initialized from the equivalent attributes -of the process that created it. -.It Effective User Id, Effective Group Id, and Group Access List -Access to system resources is governed by two values: -the effective user ID, and the group access list. -The first member of the group access list is also known as the -effective group ID. -In POSIX.1, the group access list is known as the set of supplementary -group IDs, and it is unspecified whether the effective group ID is -a member of the list. +File access permissions are interpreted by the system as +they apply to three different classes of users: the owner +of the file, those users in the file's group, anyone else. +Every file has an independent set of access permissions for +each of these classes. +When an access check is made, the system +decides if permission should be granted by checking the access +information applicable to the caller. .Pp -The effective user ID and effective group ID are initially the -process's real user ID and real group ID respectively. -Either -may be modified through execution of a set-user-ID or set-group-ID file -.Pq possibly by one its ancestors -.Pq see Xr execve 2 . -By convention, the effective group ID -.Pq the first member of the group access list -is duplicated, so that the execution of a set-group-ID program -does not result in the loss of the original -.Pq real -group ID. +Read, write, and execute/search permissions on +a file are granted to a process if: .Pp -The group access list is a set of group IDs -used only in determining resource accessibility. -Access checks -are performed as described below in ``File Access Permissions''. -.It Saved Set User ID and Saved Set Group ID -When a process executes a new file, the effective user ID is set -to the owner of the file if the file is set-user-ID, and the effective -group ID -.Pq first element of the group access list -is set to the group of the file if the file is set-group-ID. -The effective user ID of the process is then recorded as the saved set-user-ID, -and the effective group ID of the process is recorded as the saved set-group-ID. -These values may be used to regain those values as the effective user -or group ID after reverting to the real ID -.Pq see Xr setuid 2 . -In POSIX.1, the saved set-user-ID and saved set-group-ID are optional, -and are used in setuid and setgid, but this does not work as desired -for the super-user. -.It Super-user -A process is recognized as a -.Em super-user -process and is granted special privileges if its effective user ID is 0. -.It Descriptor -An integer assigned by the system when a file is referenced -by -.Xr open 2 -or -.Xr dup 2 , -or when a socket is created by -.Xr pipe 2 , -.Xr socket 2 -or -.Xr socketpair 2 , -which uniquely identifies an access path to that file or socket from -a given process or any of its children. -.It File Name -Names consisting of up to -.Brq Dv NAME_MAX -characters may be used to name -an ordinary file, special file, or directory. +The process's effective user ID is that of the super-user. +Note that even the super-user cannot execute a non-executable file. .Pp -These characters may be arbitrary eight-bit values, -excluding -.Dv NUL -.Pq ASCII 0 -and the -.Ql \&/ -character -.Pq slash, ASCII 47 . +The process's effective user ID matches the user ID of the owner +of the file and the owner permissions allow the access. .Pp -Note that it is generally unwise to use -.Ql \&* , -.Ql \&? , -.Ql \&[ +The process's effective user ID does not match the user ID of the +owner of the file, and either the process's effective +group ID matches the group ID +of the file, or the group ID of the file is in +the process's group access list, +and the group permissions allow the access. +.Pp +Neither the effective user ID nor effective group ID +and group access list of the process +match the corresponding user ID and group ID of the file, +but the permissions for ``other users'' allow access. +.Pp +Otherwise, permission is denied. +.It Sockets and Address Families +A socket is an endpoint for communication between processes. +Each socket has queues for sending and receiving data. +.Pp +Sockets are typed according to their communications properties. +These properties include whether messages sent and received +at a socket require the name of the partner, whether communication +is reliable, the format used in naming message recipients, etc. +.Pp +Each instance of the system supports some +collection of socket types; consult +.Xr socket 2 +for more information about the types available and +their properties. +.Pp +Each instance of the system supports some number of sets of +communications protocols. +Each protocol set supports addresses +of a certain format. +An Address Family is the set of addresses +for a specific group of protocols. +Each socket has an address +chosen from the address family in which the socket was created. +.El +.Sh FILES +.Bl -inset -compact +.It Pa /usr/include/sys/syscall.h +Table of currently available system calls. +.El +.Sh ERRORS +Nearly all of the system calls provide an error number referenced via +the external identifier +.Va errno . +This identifier is defined in +.In sys/errno.h +as: +.Pp +.Dl extern int * __error(); +.Dl #define errno (* __error()) +.Pp +The +.Va __error() +function returns a pointer to a field in the thread specific structure for +threads other than the initial thread. +For the initial thread and +non-threaded processes, +.Va __error() +returns a pointer to a global +.Va errno +variable that is compatible with the previous definition. +.Pp +When a system call detects an error, +it returns an integer value +indicating failure +.Pq usually -1 +and sets the variable +.Va errno +accordingly. +This allows interpretation of the failure on receiving +-1 and to take action accordingly. +Successful calls never set +.Va errno ; +once set, it remains until another error occurs. +It should only be examined after an error. +Note that a number of system calls overload the meanings of these +error numbers, and that the meanings must be interpreted according +to the type and circumstances of the call. +.Pp +The following is a complete list of the errors and their +names as given in +.In sys/errno.h . +.Bl -hang -width Ds +.It Er 0 Em "Undefined error: 0" . +Not used. +.It Er 1 EPERM Em "Operation not permitted" . +An attempt was made to perform an operation limited to processes +with appropriate privileges or to the owner of a file or other +resources. +.It Er 2 ENOENT Em "No such file or directory" . +A component of a specified pathname did not exist, or the +pathname was an empty string. +.It Er 3 ESRCH Em "No such process" . +No process could be found corresponding to that specified by the given +process ID. +.It Er 4 EINTR Em "Interrupted system call" . +An asynchronous signal +.Pq such as Dv SIGINT or Dv SIGQUIT +was caught by the process during the execution of an interruptible +function. +If the signal handler performs a normal return, the +interrupted system call will seem to have returned the error condition. +.It Er 5 EIO Em "Input/output error" . +Some physical input or output error occurred. +This error will not be reported until a subsequent operation on the same file +descriptor and may be lost +.Pq over written +by any subsequent errors. +.It Er 6 ENXIO Em "Device not configured" . +Input or output on a special file referred to a device that did not +exist, or +made a request beyond the limits of the device. +This error may also occur when, for example, +a tape drive is not online or no disk pack is +loaded on a drive. +.It Er 7 E2BIG Em "Argument list too long" . +The number of bytes used for the argument and environment +list of the new process exceeded the current limit +.Pq Dv NCARGS in In sys/param.h . +.It Er 8 ENOEXEC Em "Exec format error" . +A request was made to execute a file +that, although it has the appropriate permissions, +was not in the format required for an +executable file. +.It Er 9 EBADF Em "Bad file descriptor" . +A file descriptor argument was out of range, referred to no open file, +or a read +.Pq write +request was made to a file that was only open for writing +.Pq reading . +.It Er 10 ECHILD Em "\&No child processes" . +A +.Xr wait 2 or Xr waitpid 2 +function was executed by a process that had no existing or unwaited-for +child processes. +.It Er 11 EDEADLK Em "Resource deadlock avoided" . +An attempt was made to lock a system resource that +would have resulted in a deadlock situation. +.It Er 12 ENOMEM Em "Cannot allocate memory" . +The new process image required more memory than was allowed by the hardware +or by system-imposed memory management constraints. +A lack of swap space is normally temporary; however, +a lack of core is not. +Soft limits may be increased to their corresponding hard limits. +.It Er 13 EACCES Em "Permission denied" . +An attempt was made to access a file in a way forbidden +by its file access permissions. +.It Er 14 EFAULT Em "Bad address" . +The system detected an invalid address in attempting to +use an argument of a call. +.It Er 15 ENOTBLK Em "Block device required" . +A block device operation was attempted on a non-block device or file. +.It Er 16 EBUSY Em "Device busy" . +An attempt to use a system resource which was in use at the time +in a manner which would have conflicted with the request. +.It Er 17 EEXIST Em "File exists" . +An existing file was mentioned in an inappropriate context, +for instance, as the new link name in a +.Xr link 2 +system call. +.It Er 18 EXDEV Em "Cross-device link" . +A hard link to a file on another file system +was attempted. *** 415 LINES SKIPPED *** From nobody Fri Apr 19 22:34:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqFH4MNfz5HsQF; Fri, 19 Apr 2024 22:34: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 4VLqFH22vhz4K5c; Fri, 19 Apr 2024 22:34:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l96DOuKanYFnZrqPwXajzsrV0yLOZc3+f8ch4MTZGdY=; b=JEiEo8278PGFPObIh9eF4wnIxn0+1TcBMN+CMjt1ERFcHdBCemBQFC2zgPmg1krjkw/+tI M4ViTldtBjeO7vrH5ndTmWu45ilS6xwJ9VdUvemxWR3vqX5aSllLNIUM6YjRPXTS9CIhjM KncQ/0hhMa6WB6oLeyiI/0s0F0HXL8cOztIrFRu4XBgv29yc2xUAr6ICL5WtNE2798teuq +2bARIu0zWKL/3wVrMjJYSroi63KdIB+ChT33i0yG04kNOycrhWZw/x+kMWIave2M5JZ7/ yX4nQ0gmO/KKCfIdQkWVw8Um1gPELe/1rRoDjtsa0R+3uS9FMrRbu8x2ZOQhGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566051; a=rsa-sha256; cv=none; b=wsoujlsKk30hRMqSpm9bIZ8NjfkoukuPfTQ2dCbqJRjLp6L8cBSRoqclW1KvpHS8eZD0J9 MyGe+V48v5du6xVdn6jCNL0hrgevKf8L/CdtUDAb4q4rOjAFtGyJwnlTQXQSlikVk1J4NQ r5JsKDM7w5c58E4mCL30uuQFFpev5YShEB1StrYpjLQcZgsaVHayKlmmm34Kuu4nD+DL0d QVf8HmQFdPUxcgv/Px7241bwfHUa+rwVqYWhRupVqeWTBCmED9F2xhljgAFujzvhQ8r/ro Sk799U2FgIZBiStK+TnfDMr/Z29f/6zHcEmWln0FlQOg63kIxoW0ePnRC0INcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l96DOuKanYFnZrqPwXajzsrV0yLOZc3+f8ch4MTZGdY=; b=Vs2RvXSB3KbCPa/f3jhy/VPfw04UIjh9KNRo4W7rNGWB2q7c9xighs7rNYVWguQ/ohF1lx BwieUudXnjXm1I6hLwDuhrMoZW7rdcJ1Os9z2H71MxVemurSrNELGweTF63PD9c1YpjYlX 0qb11qaADEsdE1TksyPf9AFMNp24bzCA4tOu5jdse1oAfPnkJo2kmvj+hb3rwP4A9sg5aS fOvOReKrgtwF3OJUNqYaIp11vVm/B6/nMvYwHG7wD+jbnfuJ6c2Ngh5lFwt5lJTtGNjOxP FVW/6zGCLD4ZZy9B525SNy1Ky37BBW+/CK6A8xluuUv4N3hQYKsxcvr0GTU9og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqFH1Nmgz1B4K; Fri, 19 Apr 2024 22:34: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 43JMYBaw092770; Fri, 19 Apr 2024 22:34:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMYBbE092767; Fri, 19 Apr 2024 22:34:11 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:34:11 GMT Message-Id: <202404192234.43JMYBbE092767@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: de525c502a3a - main - intro.2: Integrate introduction with state of page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: de525c502a3aab50de42df39f4b0c2840f4c09a6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=de525c502a3aab50de42df39f4b0c2840f4c09a6 commit de525c502a3aab50de42df39f4b0c2840f4c09a6 Author: Alexander Ziaee AuthorDate: 2024-04-19 22:22:39 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:30:32 +0000 intro.2: Integrate introduction with state of page Reviewed by: imp, brooks Pull Request: https://github.com/freebsd/freebsd-src/pull/1065 --- lib/libsys/intro.2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libsys/intro.2 b/lib/libsys/intro.2 index c8eee277f268..6e7abeb2c373 100644 --- a/lib/libsys/intro.2 +++ b/lib/libsys/intro.2 @@ -39,8 +39,12 @@ .Sh SYNOPSIS .In errno.h .Sh DESCRIPTION -This section provides an overview of the system calls, -their error returns, and other common definitions and concepts. +This section contains the system calls which comprise the +.Fx +programming environment. +This page also provides an overview of common definitions and concepts +relevant to system calls, where to find a table of the system calls +currently available on your system, and their error returns. .\".Pp .\".Sy System call restart .\".Pp From nobody Fri Apr 19 22:34:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqFJ4lsLz5Hsxy; Fri, 19 Apr 2024 22:34: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 4VLqFJ2qfPz4K66; Fri, 19 Apr 2024 22:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BG7/9GXmvxV/DdojDeRfeLwGvvZ3NdCjmG5N49XFRZ4=; b=u/5f48M7/GY8BxA0BqCfEnVBB0lBrJZLki7XRGN3yLWPII4pMc7r1DN5ix2TnwhVhroeb8 FZD3LyQbvqkkkLE42KcPIwgwrE7e/Bqc4kWRJ2kz7cCVxWlji34xDAbQztEx9wH00SVbLD qc8iV4IUwIj0Je/piajg5ybCACarY9AcoAcagO6fAaTigNpJwD03H64Tq7+zd2gfkKU8yu zjqrbZmNQYDcpOs1gjx18+YPuNhzcKWCak+CC7pmvGJgcByK1fnoiwXmntHm6WM/GWaYAx +sWdKSSzBbsMHGg7raowXzn7bFaz0IpKV+sIzSzfXpGxwmnvKPZ1bXUb9uw5SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566052; a=rsa-sha256; cv=none; b=GKFlfaEzwF+sUn4xCTLBdP+2KQOvRGWzy9rsaOTguEe4PqP/s+7wWAyG27I/dt0lXe3qnT PU1pHryNR/Va0krPzvAF341QM28tEG2rdJy4KEKGS8dNVBIIg1PQEUBi2UFcJYuOQ1ozki m5KXM3oS+wPH/lXzrd3iBtPWSCbPMMuWHiWUcbSoAFgNjsXiUks+RXq6bDQSBJFNn6mIdG fAUSVh2aLW3HWALH71VOV5CcLmUXD2unkMjqmVmNzvLYJaJssugzk5paNUJ3HjC0Y7eKxI qoPNswTHfPoI+BCs/aC0SJ/EhS4+L7T0ehJIPSyE9ZzHcKEa5zlS4MnSYnBxWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BG7/9GXmvxV/DdojDeRfeLwGvvZ3NdCjmG5N49XFRZ4=; b=rXIXkyGCmrF9o7N40KwDqBIbtm0d4WQrkeNK10FPtscDEogqa7WZxfVOuaMJqxnZKUw+Kg k7cbHhv1ytq90NcsLcnctbSx/eB2zE/nEd9+M3FJfal540sbpHMfOULhq1R1yFuQkKiYZg +3z7PXnm+oAZXQKDpMNxxcYpYPN8pFYPYTRTnrFxpD6Y5IvzP1U5DKzPzovTzBz/OvRap0 naliNoTcBvv03mCtIb0ENfUfWry9dsZjGQIX+mDDe0zGhrh5OAiAah426jGm+TZv/96niY MmYcxJx80xtZ3AmbDRppJpUm74W8Gnej+NAS/dL0bdcbjuHUy949ebCK8AcbcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqFJ2P9Gz19VG; Fri, 19 Apr 2024 22:34: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 43JMYCam092815; Fri, 19 Apr 2024 22:34:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMYCgk092812; Fri, 19 Apr 2024 22:34:12 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:34:12 GMT Message-Id: <202404192234.43JMYCgk092812@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: 725a9f47324d - main - bsdiff: Use mmap instead of malloc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 725a9f47324d42037db93c27ceb40d4956872f3e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=725a9f47324d42037db93c27ceb40d4956872f3e commit 725a9f47324d42037db93c27ceb40d4956872f3e Author: Ricardo Branco AuthorDate: 2024-04-19 22:32:43 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:33:07 +0000 bsdiff: Use mmap instead of malloc Note: This follows the current style of the bsdiff.c and bspatch.c files, which is rather far from style(9). Reviewed by: imp, cpervica Pull Request: https://github.com/freebsd/freebsd-src/pull/1076 --- usr.bin/bsdiff/bsdiff/bsdiff.c | 25 ++++++++++++------------- usr.bin/bsdiff/bspatch/bspatch.c | 16 +++++++++------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c index a4813253b23e..06a8812308c8 100644 --- a/usr.bin/bsdiff/bsdiff/bsdiff.c +++ b/usr.bin/bsdiff/bsdiff/bsdiff.c @@ -38,6 +38,7 @@ #include #include #include +#include #ifndef O_BINARY #define O_BINARY 0 @@ -115,7 +116,7 @@ int main(int argc,char *argv[]) { int fd; u_char *old,*new; - off_t oldsize,newsize; + off_t oldsize,newsize,xnewsize; saidx_t *I; off_t scan,pos,len; off_t lastscan,lastpos,lastoffset; @@ -147,10 +148,9 @@ int main(int argc,char *argv[]) err(1, "%s", argv[1]); } - if (((old=malloc(oldsize+1))==NULL) || - (lseek(fd,0,SEEK_SET)!=0) || - (read(fd,old,oldsize)!=oldsize) || - (close(fd)==-1)) err(1,"%s",argv[1]); + old = mmap(NULL, oldsize+1, PROT_READ, MAP_SHARED, fd, 0); + if (old == MAP_FAILED || close(fd) == -1) + err(1, "%s", argv[1]); if(((I=malloc((oldsize+1)*sizeof(saidx_t)))==NULL)) err(1,NULL); @@ -168,10 +168,9 @@ int main(int argc,char *argv[]) err(1, "%s", argv[2]); } - if (((new=malloc(newsize+1))==NULL) || - (lseek(fd,0,SEEK_SET)!=0) || - (read(fd,new,newsize)!=newsize) || - (close(fd)==-1)) err(1,"%s",argv[2]); + new = mmap(NULL, newsize+1, PROT_READ, MAP_SHARED, fd, 0); + if (new == MAP_FAILED || close(fd) == -1) + err(1, "%s", argv[2]); if(((db=malloc(newsize+1))==NULL) || ((eb=malloc(newsize+1))==NULL)) err(1,NULL); @@ -304,9 +303,9 @@ int main(int argc,char *argv[]) errx(1, "BZ2_bzWriteClose, bz2err = %d", bz2err); /* Compute size of compressed diff data */ - if ((newsize = ftello(pf)) == -1) + if ((xnewsize = ftello(pf)) == -1) err(1, "ftello"); - offtout(newsize - len, header + 16); + offtout(xnewsize - len, header + 16); /* Write compressed extra data */ if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL) @@ -330,8 +329,8 @@ int main(int argc,char *argv[]) free(db); free(eb); free(I); - free(old); - free(new); + munmap(old, oldsize+1); + munmap(new, newsize+1); return 0; } diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c index d7fabddabbfe..ea43d78b12a1 100644 --- a/usr.bin/bsdiff/bspatch/bspatch.c +++ b/usr.bin/bsdiff/bspatch/bspatch.c @@ -42,6 +42,7 @@ #include #include #include +#include #ifndef O_BINARY #define O_BINARY 0 @@ -151,7 +152,7 @@ int main(int argc, char *argv[]) if (cap_enter() < 0) err(1, "failed to enter security sandbox"); - cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); + cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK, CAP_MMAP_R); cap_rights_init(&rights_wr, CAP_WRITE); cap_rights_init(&rights_dir, CAP_UNLINKAT); @@ -220,12 +221,13 @@ int main(int argc, char *argv[]) errx(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err); if ((oldsize = lseek(oldfd, 0, SEEK_END)) == -1 || - oldsize > SSIZE_MAX || - (old = malloc(oldsize)) == NULL || - lseek(oldfd, 0, SEEK_SET) != 0 || - read(oldfd, old, oldsize) != oldsize || - close(oldfd) == -1) + oldsize > SSIZE_MAX) err(1, "%s", argv[1]); + + old = mmap(NULL, oldsize+1, PROT_READ, MAP_SHARED, oldfd, 0); + if (old == MAP_FAILED || close(oldfd) != 0) + err(1, "%s", argv[1]); + if ((new = malloc(newsize)) == NULL) err(1, NULL); @@ -294,7 +296,7 @@ int main(int argc, char *argv[]) newfile = NULL; free(new); - free(old); + munmap(old, oldsize+1); return (0); } From nobody Fri Apr 19 22:48:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqZH3pJVz5Htgp; Fri, 19 Apr 2024 22:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLqZH3WMHz4Nh8; Fri, 19 Apr 2024 22:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vPrixTsf/TdM5kn8tfn4j+rvFZmx72cHmjULM8Zj/M=; b=gyNT1GFnBlsUopjQK/9aQfrdRz4o8mSN+fVEjgdZZcgCC9yknJhxoDbaQvMRNE0L8U6gjv pL5THXHOeU49ZPPqbNeQhScC+zZAuff3YwfaT1KL5kp84AihQbOPxH8A7ZiN7u8S7fGp0U Fl6u3xb9T4FTMp6JvtC07kOz2gozf7aG4fgZL1T9LmSGuvL+wWQ208l+lhAAgYOo4QoJxx cNuy8lSSKQWPYigmKy1Jqbn0UH1ByyKpC/lOAeIu1LupHSE5142wwgfi4TmJg7lxayeilo ZFZSIuUXf+MtawFB1DenajMhIn25XMkYduVKLMiMlPBKoBI6oix+70v4SNOTvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566935; a=rsa-sha256; cv=none; b=s5dGT+5gBcUKD4s/BwjWT75kDbZtrFeT6RdBsasSW5WdkZdS/3U9T/+UsDXoguWvxwZb/g ZfugPCNPisujnEahQH+uycjxhrAzyLxPCdSTVjPzCUoTVBvbfdfTsrG7wIktudlDAo2jC7 gX9asc2bPApjsAIb3w9N9Tes2DdB32cKEnSl0Wqluf6xLQ59ZYfBb1Lw6TWQQhVx4cAehp HaCiZCcw8HPwf4vg7/8thB5eO4JzM/4a7RR0RJifCGtr9TcntAKo4mFotCnzb+kmloMGu4 uielX2MBPRrspP25yDSkU0aFq/TSHtG5wGkgADzMm4lHSu1Loj87yVMyzpsbzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vPrixTsf/TdM5kn8tfn4j+rvFZmx72cHmjULM8Zj/M=; b=OVpuh+zx7vLFxcbTbSYBSfoFcKbIE9rdJRVU0sl9nE6EHJUxuMMwz/FmhejhtTnKt7CT8N njyVh3V9kUovCQ7NlZiqkGa37Mn9LyyBwgE4IB+NSw3Bfu2NETvX7MlO0eT1gXhg0EvPi7 QlH+pgTB8Pj20jF5x5r8SBZit8jzqAJYf9biTGPO4gKDt51AKWWZASZ2KyFt3oFS6QwZ2F 55z3n7WFc9QOdxeUsfDf9UCfUJzhO6a0MvcETUT4TO+vb+MRZpPoyEzxCQYJLKFekJ9Py/ wK6lcXK3nQutvKPi7yl6qZeiTCLmlSxXjLwtT88yBfCAlVwsuWJZi8mYOj/llQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqZH30lqz1BVH; Fri, 19 Apr 2024 22:48: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 43JMmtTC010809; Fri, 19 Apr 2024 22:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMmtVv010806; Fri, 19 Apr 2024 22:48:55 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:48:55 GMT Message-Id: <202404192248.43JMmtVv010806@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: 54e231b373ef - main - Add support for i2c-tiny-usb: usb to iic bridge List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 54e231b373ef617c348706c6c64a2e049ea738ec Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=54e231b373ef617c348706c6c64a2e049ea738ec commit 54e231b373ef617c348706c6c64a2e049ea738ec Author: Denis Bodor AuthorDate: 2024-04-19 22:38:37 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:40:23 +0000 Add support for i2c-tiny-usb: usb to iic bridge Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1123 --- share/man/man4/Makefile | 1 + share/man/man4/i2ctinyusb.4 | 85 ++++++++++ sys/conf/files | 1 + sys/dev/usb/misc/i2ctinyusb.c | 302 ++++++++++++++++++++++++++++++++++++ sys/modules/usb/Makefile | 1 + sys/modules/usb/i2ctinyusb/Makefile | 35 +++++ 6 files changed, 425 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b668cccf50ae..020b009893d5 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -207,6 +207,7 @@ MAN= aac.4 \ ${_hv_vss.4} \ hwpmc.4 \ ${_hwpstate_intel.4} \ + i2ctinyusb.4 \ iavf.4 \ ichsmb.4 \ ${_ichwd.4} \ diff --git a/share/man/man4/i2ctinyusb.4 b/share/man/man4/i2ctinyusb.4 new file mode 100644 index 000000000000..78169a0506ff --- /dev/null +++ b/share/man/man4/i2ctinyusb.4 @@ -0,0 +1,85 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 Denis Bodor +.\" +.\" 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 February 18, 2024 +.Dt I2CTINYUSB 4 +.Os +.Sh NAME +.Nm i2ctinyusb +.Nd driver for a USB / I2C bridge device +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device i2ctinyusb" +.Cd "device usb" +.Cd "device iicbus" +.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 +i2ctinyusb_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for the device designed by Till Harbaum known +as i2c-tiny-usb. This is initially a very simple circuit built with +an Atmel AVR ATtiny45, but a Raspberry Pi Pico (RP2040) implementation +also exists. +.Pp +The +.Nm +driver creates a +.Xr iicbus 4 +child bus to expose the iic functions, enabling I2C sensors, converters +and displays to be connected to any computer with a USB port. +.Pp +More information about this device can be found at: +.Bd -literal -offset indent +https://github.com/harbaum/I2C-Tiny-USB +.Ed +.Pp +and (for the Raspberry Pi Pico version): +.Bd -literal -offset indent +https://github.com/Nicolai-Electronics/rp2040-i2c-interface +.Ed +.Pp +The I2C controller supports read and write transactions with up to 1024 +bytes of data, and a write followed by the repeated start followed by a +read transactions up to 1024 bytes. +Zero length transfers are not supported. +.Sh SEE ALSO +.Xr iicbus 4 , +.Xr usb 4 +.Sh HISTORY +The +.Nm +driver and this manual page was written by +.An Denis Bodor Aq Mt dbodor@rollmops.ninja . diff --git a/sys/conf/files b/sys/conf/files index 941fa6a5a48b..27ef78e51001 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3355,6 +3355,7 @@ dev/usb/misc/cp2112.c optional cp2112 dev/usb/misc/udbp.c optional udbp dev/usb/misc/ugold.c optional ugold dev/usb/misc/uled.c optional uled +dev/usb/misc/i2ctinyusb.c optional i2ctinyusb # # USB input drivers # diff --git a/sys/dev/usb/misc/i2ctinyusb.c b/sys/dev/usb/misc/i2ctinyusb.c new file mode 100644 index 000000000000..cae20880e441 --- /dev/null +++ b/sys/dev/usb/misc/i2ctinyusb.c @@ -0,0 +1,302 @@ +/*- + * Copyright (c) 2024 Denis Bodor + * 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. + */ + +/* + * i2c-tiny-usb, DIY USB to IIC bridge (using AVR or RP2040) from + * Till Harbaum & Nicolai Electronics + * See : + * https://github.com/harbaum/I2C-Tiny-USB + * and + * https://github.com/Nicolai-Electronics/rp2040-i2c-interface + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include "iicbus_if.h" + +// commands via USB, must match command ids in the firmware +#define CMD_ECHO 0 +#define CMD_GET_FUNC 1 +#define CMD_SET_DELAY 2 +#define CMD_GET_STATUS 3 +#define CMD_I2C_IO 4 +#define CMD_SET_LED 8 +#define CMD_I2C_IO_BEGIN (1 << 0) +#define CMD_I2C_IO_END (1 << 1) +#define STATUS_IDLE 0 +#define STATUS_ADDRESS_ACK 1 +#define STATUS_ADDRESS_NAK 2 + +struct i2ctinyusb_softc { + struct usb_device *sc_udev; + device_t sc_iic_dev; + device_t iicbus_dev; + struct mtx sc_mtx; +}; + +#define USB_VENDOR_EZPROTOTYPES 0x1c40 +#define USB_VENDOR_FTDI 0x0403 + +static const STRUCT_USB_HOST_ID i2ctinyusb_devs[] = { + { USB_VPI(USB_VENDOR_EZPROTOTYPES, 0x0534, 0) }, + { USB_VPI(USB_VENDOR_FTDI, 0xc631, 0) }, +}; + +/* Prototypes. */ +static int i2ctinyusb_probe(device_t dev); +static int i2ctinyusb_attach(device_t dev); +static int i2ctinyusb_detach(device_t dev); +static int i2ctinyusb_transfer(device_t dev, struct iic_msg *msgs, + uint32_t nmsgs); +static int i2ctinyusb_reset(device_t dev, u_char speed, u_char addr, + u_char *oldaddr); + +static int +usb_read(struct i2ctinyusb_softc *sc, int cmd, int value, int index, + void *data, int len) +{ + int error; + struct usb_device_request req; + uint16_t actlen; + + req.bmRequestType = UT_READ_VENDOR_INTERFACE; + req.bRequest = cmd; + USETW(req.wValue, value); + USETW(req.wIndex, (index >> 1)); + USETW(req.wLength, len); + + error = usbd_do_request_flags(sc->sc_udev, &sc->sc_mtx, &req, data, 0, + &actlen, 2000); + + if (error) + actlen = -1; + + return (actlen); +} + +static int +usb_write(struct i2ctinyusb_softc *sc, int cmd, int value, int index, + void *data, int len) +{ + int error; + struct usb_device_request req; + uint16_t actlen; + + req.bmRequestType = UT_WRITE_VENDOR_INTERFACE; + req.bRequest = cmd; + USETW(req.wValue, value); + USETW(req.wIndex, (index >> 1)); + USETW(req.wLength, len); + + error = usbd_do_request_flags(sc->sc_udev, &sc->sc_mtx, &req, data, 0, + &actlen, 2000); + + if (error) { + actlen = -1; + } + + return (actlen); +} + +static int +i2ctinyusb_probe(device_t dev) +{ + struct usb_attach_arg *uaa; + + uaa = device_get_ivars(dev); + + if (uaa->usb_mode != USB_MODE_HOST) + return (ENXIO); + + if (usbd_lookup_id_by_uaa(i2ctinyusb_devs, sizeof(i2ctinyusb_devs), + uaa) == 0) { + device_set_desc(dev, "I2C-Tiny-USB I2C interface"); + return (BUS_PROBE_DEFAULT); + } + + return (ENXIO); +} + +static int +i2ctinyusb_attach(device_t dev) +{ + struct i2ctinyusb_softc *sc; + struct usb_attach_arg *uaa; + int err; + + sc = device_get_softc(dev); + + uaa = device_get_ivars(dev); + device_set_usb_desc(dev); + + sc->sc_udev = uaa->device; + mtx_init(&sc->sc_mtx, "i2ctinyusb lock", NULL, MTX_DEF | MTX_RECURSE); + + sc->iicbus_dev = device_add_child(dev, "iicbus", -1); + if (sc->iicbus_dev == NULL) { + device_printf(dev, "iicbus creation failed\n"); + err = ENXIO; + goto detach; + } + err = bus_generic_attach(dev); + + return (0); + +detach: + i2ctinyusb_detach(dev); + return (err); +} + +static int +i2ctinyusb_detach(device_t dev) +{ + struct i2ctinyusb_softc *sc; + int err; + + sc = device_get_softc(dev); + + err = bus_generic_detach(dev); + if (err != 0) + return (err); + device_delete_children(dev); + + mtx_destroy(&sc->sc_mtx); + + return (0); +} + +static int +i2ctinyusb_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) +{ + struct i2ctinyusb_softc *sc; + uint32_t i; + int ret = 0; + int cmd = CMD_I2C_IO; + struct iic_msg *pmsg; + unsigned char pstatus; + + sc = device_get_softc(dev); + + mtx_lock(&sc->sc_mtx); + + for (i = 0; i < nmsgs; i++) { + pmsg = &msgs[i]; + if (i == 0) + cmd |= CMD_I2C_IO_BEGIN; + if (i == nmsgs - 1) + cmd |= CMD_I2C_IO_END; + + if ((msgs[i].flags & IIC_M_RD) != 0) { + if ((ret = usb_read(sc, cmd, pmsg->flags, pmsg->slave, pmsg->buf, + pmsg->len)) != pmsg->len) { + printf("Read error: got %u\n", ret); + ret = EIO; + goto out; + } + } else { + if ((ret = usb_write(sc, cmd, pmsg->flags, pmsg->slave, pmsg->buf, + pmsg->len)) != pmsg->len) { + printf("Write error: got %u\n", ret); + ret = EIO; + goto out; + } + + } + // check status + if ((ret = usb_read(sc, CMD_GET_STATUS, 0, 0, &pstatus, 1)) != 1) { + ret = EIO; + goto out; + } + + if (pstatus == STATUS_ADDRESS_NAK) { + ret = EIO; + goto out; + } + } + + ret = 0; + +out: + mtx_unlock(&sc->sc_mtx); + return (ret); +} + +static int +i2ctinyusb_reset(device_t dev, u_char speed, u_char addr, u_char *oldaddr) +{ + struct i2ctinyusb_softc *sc; + int ret; + + sc = device_get_softc(dev); + + mtx_lock(&sc->sc_mtx); + ret = usb_write(sc, CMD_SET_DELAY, 10, 0, NULL, 0); + mtx_unlock(&sc->sc_mtx); + + if (ret < 0) + printf("i2ctinyusb_reset error!\n"); + + return (0); +} + +static device_method_t i2ctinyusb_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, i2ctinyusb_probe), + DEVMETHOD(device_attach, i2ctinyusb_attach), + DEVMETHOD(device_detach, i2ctinyusb_detach), + + /* I2C methods */ + DEVMETHOD(iicbus_transfer, i2ctinyusb_transfer), + DEVMETHOD(iicbus_reset, i2ctinyusb_reset), + DEVMETHOD(iicbus_callback, iicbus_null_callback), + + DEVMETHOD_END +}; + +static driver_t i2ctinyusb_driver = { + .name = "iichb", + .methods = i2ctinyusb_methods, + .size = sizeof(struct i2ctinyusb_softc), +}; + +DRIVER_MODULE(i2ctinyusb, uhub, i2ctinyusb_driver, NULL, NULL); +MODULE_DEPEND(i2ctinyusb, usb, 1, 1, 1); +MODULE_DEPEND(i2ctinyusb, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); +MODULE_VERSION(i2ctinyusb, 1); + +/* vi: set ts=8 sw=8: */ diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile index 3a81c7fd44f3..2d166a95dc03 100644 --- a/sys/modules/usb/Makefile +++ b/sys/modules/usb/Makefile @@ -50,6 +50,7 @@ SUBDIR += atp cfumass uhid uhid_snes ukbd ums udbp uep wmt wsp ugold uled \ usbhid SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umcs umodem umoscom uplcom uslcom uvisor uvscom +SUBDIR += i2ctinyusb SUBDIR += cp2112 SUBDIR += udl SUBDIR += uether aue axe axge cdce cdceem cue ${_kue} mos rue smsc udav uhso \ diff --git a/sys/modules/usb/i2ctinyusb/Makefile b/sys/modules/usb/i2ctinyusb/Makefile new file mode 100644 index 000000000000..9cb37843935c --- /dev/null +++ b/sys/modules/usb/i2ctinyusb/Makefile @@ -0,0 +1,35 @@ +# +# +# Copyright (c) Denis Bodor +# +# 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. +# + +S= ${SRCTOP}/sys + +.PATH: $S/dev/usb/misc + +KMOD= i2ctinyusb +SRCS= i2ctinyusb.c +SRCS+= i2ctinyusb.c device_if.h bus_if.h opt_usb.h usbdevs.h iicbus_if.h + +.include From nobody Fri Apr 19 22:48:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqZJ5St8z5HtpX; Fri, 19 Apr 2024 22:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLqZJ3nKvz4NWZ; Fri, 19 Apr 2024 22:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JXB/pP/RjvdCBe6GYUxZclSm3BoCNQIOgtxKoiG2W74=; b=xRQLUSebyk5+NpfaJVJbxwEJuMSEbRy9yGWMu9G8uw48b78APz4bHIpDQPXbegUl4IUZbl UI8lSiDun3TSm/OL0AM9USVMDyQdPa00+/fR014UgVPPAM8tHl3F3R29bhJ+SfTicWEXie akXi9D+ZLHK24+3GKKyfqlC6mqIZv/kKelvJhsgKn6h198wZJdMl96ksQI76HYwU8AnMuK wAiLZdTm4zoXqliWOjp8tFTylm6PrFM4B+beV1T9uJOGGScS4QvyXJtB2tJ9ytyad/QnjR iqoVqJ4TH7ifT7lupzV5fr9+QPjPkbJIDhMXVOF/YtQPeL4tf2c7xYaoWtKq8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566936; a=rsa-sha256; cv=none; b=ZBJtgO/BVR/kmiQnBhdJIXZLrD5TYOzCa8MtiIkUGbh+e0BQvl8GJVoHiW/B591s8kg0fB 5U5x3E3DINGke9fbMOrpdCq0BNvmtWcbDaBxhQb1UUIAGbaQsJRq38Lyp4i6FsB+bgQym5 X/qXSPpmBfDWjz9hxMAbOMG1AvFm+gveAOChl61DLcGUZMQsyH7aqMcgqZlVUXvMkrXh3r QddHjUIn3MBUqh42+TtXt9NvQNZwiqKTNcwexGrOW7uCSgbkVyVeGudKqjUloCsXGunI4C iRhUM7SH08P9EHZPxC1YoHgG54Yvv4d6F9hssVDByrKyHD2O4DBkx25XCXbbbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JXB/pP/RjvdCBe6GYUxZclSm3BoCNQIOgtxKoiG2W74=; b=HE2cRgxocUgp3e2IHO3Gq3B2A+qT/GlYlGkYco3pnOOj1ONRcMqyOIgR7sJZJSs8p2JUYz il9lgKi7i56eeGq/u7hCBl8VSoSKhrFXDgAeW/0gzpUbtr/1GWspFQ0LXDwRSBmABWNjgz HayKeZDl972gxtXTqjbg0GOTySjWmx5fNgAGW1+lM26w6BnXi0Mi0D0pFG66THBfw3V7pU 75+bB8GFnG80emH7Xe4pLjd5EMAmf26BTZDJCyF97ZHfOiraH8MN2WGgPXBiEFQZWiaso0 b/HAL37nLHTpushWPZjC2phYIEaRX2nnO0q/mTEfvMa4vFyP3cHtnbVFHL8B9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqZJ3NtZz1BS0; Fri, 19 Apr 2024 22:48: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 43JMmuPJ010855; Fri, 19 Apr 2024 22:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMmuMj010852; Fri, 19 Apr 2024 22:48:56 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:48:56 GMT Message-Id: <202404192248.43JMmuMj010852@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: bf2fd4755086 - main - ig4_reg: Update datasheet link List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: bf2fd4755086292d5e5797e94c175e22da1fafa8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2fd4755086292d5e5797e94c175e22da1fafa8 commit bf2fd4755086292d5e5797e94c175e22da1fafa8 Author: Ahmad Khalifa AuthorDate: 2024-04-19 22:43:19 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:44:57 +0000 ig4_reg: Update datasheet link Reviewed by: imp, markj, Elliott Mitchell Pull Request: https://github.com/freebsd/freebsd-src/pull/1125 --- sys/dev/ichiic/ig4_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ichiic/ig4_reg.h b/sys/dev/ichiic/ig4_reg.h index 71247b1f90d3..35342f7d79aa 100644 --- a/sys/dev/ichiic/ig4_reg.h +++ b/sys/dev/ichiic/ig4_reg.h @@ -37,7 +37,7 @@ * * Datasheet reference: Section 22. * - * http://www.intel.com/content/www/us/en/processors/core/4th-gen-core-family-mobile-i-o-datasheet.html?wapkw=datasheets+4th+generation + * https://www.intel.com/content/dam/www/public/us/en/documents/datasheets/4th-gen-core-family-mobile-i-o-datasheet.pdf * * This is a from-scratch driver under the BSD license using the Intel data * sheet and the linux driver for reference. All code is freshly written From nobody Fri Apr 19 22:48:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqZL0CwXz5Httv; Fri, 19 Apr 2024 22:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLqZK4rJzz4NTF; Fri, 19 Apr 2024 22:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWl9gBd3gs6J0pjB651OnIfFeDn4jYJHrQELO9K5Z/E=; b=AKcktsD7+OW4D1v4lQ9mKavSE+bufgWAXDVSrnFqZC9qqfMA9GQVUkfbxsryI3IbIIRlQb iQOVtSPLNhm5rQrNoswE89yUpIimttZOBZFGYGxuqEr5OCK1g6cvCzmAnHWUTxrQ9vr6ic vyCE92e9gDxGDM0D2VPx4Iki/OX4FrKIaySkA12d3GfNktAwEaUOQmqRbOw9ecTfBAFkuB xRjijGs5cEjViDQYt3LgQ77ukeRbxu915JmET2VykLEHrmb7XUl0wS2DO/hccvyJ4DJ7PU 0ZjVqrXUFd932trGnA7ovmx7L8sOXRcF59vpwHRvcOfCN0dkp+NGiCjR1nYaDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566937; a=rsa-sha256; cv=none; b=C8JYV7MAvRVs9rd4mWcoyoLdA+bYpqkZRkDqtnVfP43XpmoVGKXGodoP+DQnU/KZU8vas9 xRBS52l0F4+kBSHkdekGysqBvgAVAClg7Vh5wBzyPy/jOEzVwa3xKpVZRv1f1EfDLcREsc TnCoKPtaT6tuy2t7RMqU02+3mg9Kw/HtumTFgk8OWKACRz6oso2i+Eef5C0ba4FD1fy4C6 lmqzFmaj8DD2qRmk0yhpyLsBZ8kzndYJYG1gIVqKiLbVyjaFtDp2Ev59++cNuyhmlYTwdh Nut4a7OMOo5CIeguAYTsdgOFthDRrjBUAPioBaT+l1uXnmDQYqwyv8F4c7pVAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWl9gBd3gs6J0pjB651OnIfFeDn4jYJHrQELO9K5Z/E=; b=aKVqZ2zZZQAmBptk63lLw26sUwkH/29ROyJOD86zP7ipqzE9xABURerOm9/kXuLIReZQ96 lpzVZ7ZIxWPbdC7kpxaYzRv7SqUpfnHo2poXVhlxTghAPO0XsnEYdS0tMjgvllENF+9jUB ILkE1v3S0zkgpjk3MnFnqgSKqij0dlT2gc24rXfuzHzryIuibuQG46zoHqlD+7ntRXP7r+ uSUch2QIHhTj9qVxCZjEi6ii0wq2hl2BZyjKWHN5qp5Ngjik5nu9Ry8w8KrKryv2uuRLtJ 5DxWL29w9z93EzDPc1INkbs1Lecf1pZAOHG6OvSZHbm30YmMhN/0SoirvwDrdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqZK4Q3Tz19p3; Fri, 19 Apr 2024 22:48: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 43JMmvVV010901; Fri, 19 Apr 2024 22:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMmvxl010898; Fri, 19 Apr 2024 22:48:57 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:48:57 GMT Message-Id: <202404192248.43JMmvxl010898@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: d0cc25f770ae - main - acpi_cmbat: Use nitems instead of sizeof List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d0cc25f770aee068bcbaee89aa2f52cc5dd79dd5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d0cc25f770aee068bcbaee89aa2f52cc5dd79dd5 commit d0cc25f770aee068bcbaee89aa2f52cc5dd79dd5 Author: Ahmad Khalifa AuthorDate: 2024-04-19 22:43:19 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:44:57 +0000 acpi_cmbat: Use nitems instead of sizeof Reviewed by: imp, markj, Elliott Mitchell Pull Request: https://github.com/freebsd/freebsd-src/pull/1125 --- sys/dev/acpica/acpi_cmbat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c index 8c08868456d7..aeda34c3acff 100644 --- a/sys/dev/acpica/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -344,7 +344,7 @@ acpi_cmbat_get_bix(void *arg) bix_buffer.Pointer = NULL; bix_buffer.Length = ACPI_ALLOCATE_BUFFER; - for (n = 0; n < sizeof(bobjs); n++) { + for (n = 0; n < nitems(bobjs); n++) { as = AcpiEvaluateObject(h, bobjs[n].name, NULL, &bix_buffer); if (!ACPI_FAILURE(as)) { res = (ACPI_OBJECT *)bix_buffer.Pointer; @@ -355,7 +355,7 @@ acpi_cmbat_get_bix(void *arg) bix_buffer.Length = ACPI_ALLOCATE_BUFFER; } /* Both _BIF and _BIX were not found. */ - if (n == sizeof(bobjs)) { + if (n == nitems(bobjs)) { ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), "error fetching current battery info -- %s\n", AcpiFormatException(as)); From nobody Fri Apr 19 22:48:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqZM0lJDz5HtrS; Fri, 19 Apr 2024 22:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLqZL5r53z4Nkh; Fri, 19 Apr 2024 22:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O1TjI1xoK+RUyb5LWVyVR9VGvnpYwbufW87Y2PkTmiU=; b=QGs+QWlJV0TkPwBjpLiqaW/GY/X04TdBwkT/yrbS0AswLKBSpsoOGhbgse0MP+1L6O7L/h NMeydHxZ/PQIMvtWd7tUGKeuxzQOQcqS4Z064iYDnZGXWpJkF93DI5LWMWR7nTAEEXuy6C 2SlGDLz0Y4kcGWOtp5hzzgMQarkwn8obdoDhBCdQu7+l+qijKbwxeBLp158XoBt+9QWkTf ygtIOzTnUIx1NcdxKM4V4bURfjK4ofw2U9CdFmGnV75+DhAsMDoN/q81pRYfLCQWud6ORR ISFRTWCTCP/SetEH07Jxkmd0dlRojC8xiDbsHSVxwqi4uPCmPTjB2sPspUsyag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566938; a=rsa-sha256; cv=none; b=xxImiEu/uzq5VKD3FERqYDSxiFCpU4VrpqlaEgtxIT/ygs81ISq+TGuWyKvPuMKjZjZdQu A1kuW8fCUDkDipY+10j14nGkmlHdoOz66ZMMpM8mNebPdNFSgmb1Agey3wcz+4g6dkxkCP 5Bv9mB5F/rgKBuLrc5uV72Gzw0eCyjNYMVyPvad07EtrqPPl94ez+ymgrBFb09SAPUyes3 DInuY3WgefrTxQSMEXqBzV6SjcV04osU5K9BT5lDr3ttxgm+O0Y6MIDBae6XW0CNq47MRh jPhBj+yc8fd5Z2b7u8FfwZ1cDO6IZ1XpH4HlpSIU0QO/00qUC/C4plNYnujf2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O1TjI1xoK+RUyb5LWVyVR9VGvnpYwbufW87Y2PkTmiU=; b=w7THfJKOmGBF5p/9Vgi3ikng1LalAOKL9fV5AOjyAnGpkONHBTRiRtRS90kUJYyh6stz8m 5+QZLpBV/k0vWuKMNhQCNm3WkyPNv6ntgDP6Rw5V3TohBAiMcUgwdp6xEZ2BZrBXbfkUs5 kawrRp+0Av4OsUTYii74wVeu2Are4GGuMxF6Wz6mKJhOgozY9riJ5eW1NiU6JCeaY0xa/Z 3KCNi99LesYU2yiwFLw6SgvLOOevkW6+jYScNDaeAuk548jawftXnSUWnleRyNlvbTdpBK YyQwQ3n0oFP6DxxX9hk9VgAzsE1GzqZewX8uMfpVHF4+B2mwtAVpO8Kyg9ze2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqZL5Pz8z1BS1; Fri, 19 Apr 2024 22:48: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 43JMmwDP010942; Fri, 19 Apr 2024 22:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMmwe7010939; Fri, 19 Apr 2024 22:48:58 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:48:58 GMT Message-Id: <202404192248.43JMmwe7010939@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: 493715f9b817 - main - ig4_iic: Warn on NACK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 493715f9b8173da8a1ca8af12a22eb1ded79d4eb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=493715f9b8173da8a1ca8af12a22eb1ded79d4eb commit 493715f9b8173da8a1ca8af12a22eb1ded79d4eb Author: Ahmad Khalifa AuthorDate: 2024-04-19 22:43:19 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:44:57 +0000 ig4_iic: Warn on NACK Some DSDTs define non-existent devices, warn the user when an access is attempted on one of these devices. Reviewed by: imp, markj, Elliott Mitchell Pull Request: https://github.com/freebsd/freebsd-src/pull/1125 --- sys/dev/ichiic/ig4_iic.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c index 98c160ec9fd2..652d5a084f8b 100644 --- a/sys/dev/ichiic/ig4_iic.c +++ b/sys/dev/ichiic/ig4_iic.c @@ -675,6 +675,10 @@ ig4iic_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) rpstart = !stop; } + if (error == IIC_ENOACK && bootverbose) + device_printf(dev, "Warning: NACK for slave address 0x%x\n", + msgs[i].slave >> 1); + if (!allocated) sx_unlock(&sc->call_lock); return (error); From nobody Fri Apr 19 22:48:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqZN1zckz5HtPB; Fri, 19 Apr 2024 22:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLqZM6nrpz4Nsn; Fri, 19 Apr 2024 22:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E9BJymRe9w/ilBRw0hQ2V52w53baBqHxis5cjhWBZ7w=; b=ZNT/69A2Mp/9uu1IAvSItdWiMNrfSuo8uUFRXQ42vz0W9ngSFYf+z07sToi4hN4gbG3uq/ AeKB90d+o3BEfMty3pgHusW5kQygGRt+ZtD4EfeaKbT5Os+NrqbgYfoyIVFFYo/H6IgYdb ugw6URel5NOiRWvsn+E9YFepo/fC1QuusfpXinet/RMMuBI70Y5EhBuPiZf1PaR+FzWEo6 pEZ4YV+ST61vArdzAztIv6KBi8xmhC2mzz/2n98ZfBgKuJzHSaB8j43RLy7PFY93x0oXI/ RJU3gAZy6GcIAkTVHqEvUreYo/va8xUPjJpUXwyiAcTzXHmy6HfL9V3ROJFBVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566940; a=rsa-sha256; cv=none; b=D2LlUxaH0z2R0MMy8qXl1/lZqCDoDHEizP1AhECqyWF/gALC2N29ZtIMF57HG76vHRYCsb aJQA3ZysM7zC86IpCdiCsnZP0AvNjmu10De0HMkWVWZBxPhlYSiVdQt6NfePG+l0GhfBsd GKaIc3QrerOSx6kCOrVzfgzYpKhucJ0CYHskNFg2tNAibVAUph0/2uyc0R2EmAbtbjKwmN JZoKG0gxgU8ylk+cjVbhkrwb6atMdAcyXfQjs68iTwPu6GGlaWIfsuZqcwcdLn3MTNC5hB mUqUBXboyNMatfBWW5V4ip3pULd8Hgi/KvMOxf9TtExRf84rW67gD5nlrag1Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E9BJymRe9w/ilBRw0hQ2V52w53baBqHxis5cjhWBZ7w=; b=IbZXjFbu49FGGMVbyDlazwHDnPco8aR1w91dSdjGMFJrn67cB6t7tEuZL0bO3jyAygCpzc hPNB5CTQdj/+hOVujvq7X/tyd3g5xlqT4sWGaaTMqVJaee51MpxU/wq3qAibPj6MSB3z44 0+AZyXmug3OAdpZ3PDHdWIIQ+qYuCWBVYaKabS4PTeg+bGkqnSCOG85BOp9AW6DCpPnab0 yxW5W4piey/4Eb5Z7cpVug1MKky61ilDmUFI+8/xHp8a4YbMpaqeARHc4rIXaTC7SvFXaz o/vCmxGIL5tgiDuD5xkLByC/ucon8hZZlbbXNQWS2Vcd9LsjNBt6Pr1gkvwkCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqZM6Q4Dz1BRT; Fri, 19 Apr 2024 22:48: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 43JMmxpr010983; Fri, 19 Apr 2024 22:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMmxXZ010980; Fri, 19 Apr 2024 22:48:59 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:48:59 GMT Message-Id: <202404192248.43JMmxXZ010980@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: 67677a654aa7 - main - acpi_iicbus: Shift slave address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 67677a654aa7456f18077ccbaa9c40f39a36d21a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=67677a654aa7456f18077ccbaa9c40f39a36d21a commit 67677a654aa7456f18077ccbaa9c40f39a36d21a Author: Ahmad Khalifa AuthorDate: 2024-04-19 22:43:19 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:44:57 +0000 acpi_iicbus: Shift slave address The address is expected to need shifting. see https://uefi.org/specs/ACPI/6.5/13_System_Mgmt_Bus_Interface_Specification.html#smbus-slave-addresses Reviewed by: imp, markj, Elliott Mitchell Pull Request: https://github.com/freebsd/freebsd-src/pull/1125 --- sys/dev/iicbus/acpi_iicbus.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/iicbus/acpi_iicbus.c b/sys/dev/iicbus/acpi_iicbus.c index 2cff0cde9e48..4b61387b0ed6 100644 --- a/sys/dev/iicbus/acpi_iicbus.c +++ b/sys/dev/iicbus/acpi_iicbus.c @@ -254,6 +254,9 @@ acpi_iicbus_space_handler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, sc = __containerof(info, struct acpi_iicbus_softc, space_handler_info); dev = sc->super_sc.dev; + /* the address is expected to need shifting */ + sb->SlaveAddress <<= 1; + switch (Function) { case AML_FIELD_ATTRIO(AML_FIELD_ATTRIB_SEND_RECEIVE, ACPI_READ): val = acpi_iicbus_recvb(dev, sb->SlaveAddress, gsb->data); From nobody Fri Apr 19 22:49:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLqZP2CXPz5Htpb; Fri, 19 Apr 2024 22:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLqZP0r3hz4Nl1; Fri, 19 Apr 2024 22:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wCUoPfz3ma6XmZzi+Y80zin5MUO1sgE3lO5pV8Lk8TI=; b=sidJAqkgB5a6WCjwRstsPbxDR+GQOx+XPQggfTH6i4TOTsFDV1NzwcSxSn23zac+0L/J7T 1ALMIE9/6RJAmaPNcOvFcN/Y1pJkq59p2AayxIHW7zTQJWTxpzMMIALat0RupMCSSyCVN8 +Q0wEIjHb8MIAFBIZgGpsXXbP8jQ3HloHdEWEZ7joE6+GnMSPijoeTO1iBvbbwuGhgK57/ 1bMOrl2O0zN/NAo8NOkQJF4ltsVjeIu0uTt7qg/CXpqXzlES3LyQIFTqVvs7BiKYUiC9zl WhIwp1OAUhoEADLsxgpZL3CijuOZGggq2Iiz4E7TyCL+bDm568ZBOH1YsCk+Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713566941; a=rsa-sha256; cv=none; b=PWgt2CVKkKlDa42ka6zgEL40t2eSQjfkrwjj5xHUvxUnCUlKfcsZlrWqe4wV3zWFkQkgAp OOaVd12ByFsGXQ+WuQEwkI2mHjFdWoFEl3uxboAfPYjPPiO/xpvgAqstC8xgshexmJ4KSP A1/PH8RSDuVjWiSzit6PaVgTlHEZf9KXXj1Ire426cKUJ2or69kMq+TsAsdUVXlTJijUTU C1zpt2qRN8kzLxTfaHbAsY+KIwDZR+9RazyDKMX9ZYwS9BH3ntMWzfxeUwm9el89RaTFww mOp+8/ZeU2VCjsOL2/wbVuwpwmDaARHSCDCy6DmElmSyRDUZDZfpU9JHZWBnAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713566941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wCUoPfz3ma6XmZzi+Y80zin5MUO1sgE3lO5pV8Lk8TI=; b=SiWzSXYJClRSMC1dMdRR4mBsZjXRJfSvKjYhswBt6qTKooc4bcUqinVTR63zRicbvbZLUj ahhOaAT5n46Gd9waXzSF6E34Iya8fmgqberNhXFExaWbtmf1OUOS3zTRHn5ok77vOyRxJH ZI1bd3pBwRdUzBh27V98gI3+CREFPSlpPK8EhxKi9vB5EVwirms2gwOAiPI5U5P68L+/R+ mt2QKEOHNKsEigv16fn/FqgkRo6Ic6rsQgrRXGUTEvybGbLtOh8ja+7VpPayTiec0lOkW5 VxYAU2aBwg2zPnahxEw34o87EvPHoEPR8qhIvQZ8/5pdTOY93JZYimnJ5kD16g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLqZP0NfPz1BG9; Fri, 19 Apr 2024 22:49: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 43JMn01h011035; Fri, 19 Apr 2024 22:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JMn08Y011032; Fri, 19 Apr 2024 22:49:00 GMT (envelope-from git) Date: Fri, 19 Apr 2024 22:49:00 GMT Message-Id: <202404192249.43JMn08Y011032@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: a8fd0a5f4423 - main - glabel: Remove support for old reiserfs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: a8fd0a5f4423637a73de390e65c0c1e00f0668ff Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8fd0a5f4423637a73de390e65c0c1e00f0668ff commit a8fd0a5f4423637a73de390e65c0c1e00f0668ff Author: Ricardo Branco AuthorDate: 2024-04-19 22:47:55 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:48:28 +0000 glabel: Remove support for old reiserfs Reviewed by: imp, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/1101 --- lib/geom/label/glabel.8 | 5 +- sys/conf/files | 1 - sys/geom/label/g_label.c | 1 - sys/geom/label/g_label.h | 1 - sys/geom/label/g_label_reiserfs.c | 123 ----------------------------------- sys/modules/geom/geom_label/Makefile | 1 - 6 files changed, 1 insertion(+), 131 deletions(-) diff --git a/lib/geom/label/glabel.8 b/lib/geom/label/glabel.8 index a23f425bc5e1..a133b4abff72 100644 --- a/lib/geom/label/glabel.8 +++ b/lib/geom/label/glabel.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 27, 2023 +.Dd April 19, 2024 .Dt GLABEL 8 .Os .Sh NAME @@ -113,9 +113,6 @@ CD ISO9660 (directory EXT2FS (directory .Pa /dev/ext2fs/ ) . .It -REISERFS (directory -.Pa /dev/reiserfs/ ) . -.It NTFS (directory .Pa /dev/ntfs/ ) . .El diff --git a/sys/conf/files b/sys/conf/files index 27ef78e51001..59d99b9f832b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3646,7 +3646,6 @@ geom/label/g_label_flashmap.c optional geom_label geom/label/g_label_iso9660.c optional geom_label geom/label/g_label_msdosfs.c optional geom_label geom/label/g_label_ntfs.c optional geom_label -geom/label/g_label_reiserfs.c optional geom_label geom/label/g_label_ufs.c optional geom_label geom/label/g_label_gpt.c optional geom_label | geom_label_gpt geom/label/g_label_disk_ident.c optional geom_label diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c index a38ed8294202..e20e5b50e80b 100644 --- a/sys/geom/label/g_label.c +++ b/sys/geom/label/g_label.c @@ -101,7 +101,6 @@ const struct g_label_desc *g_labels[] = { &g_label_iso9660, &g_label_msdosfs, &g_label_ext2fs, - &g_label_reiserfs, &g_label_ntfs, &g_label_disk_ident, &g_label_flashmap, diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h index baca2b71c02f..69bfbf3910a1 100644 --- a/sys/geom/label/g_label.h +++ b/sys/geom/label/g_label.h @@ -73,7 +73,6 @@ extern struct g_label_desc g_label_ufs_volume; extern struct g_label_desc g_label_iso9660; extern struct g_label_desc g_label_msdosfs; extern struct g_label_desc g_label_ext2fs; -extern struct g_label_desc g_label_reiserfs; extern struct g_label_desc g_label_ntfs; extern struct g_label_desc g_label_gpt; extern struct g_label_desc g_label_gpt_uuid; diff --git a/sys/geom/label/g_label_reiserfs.c b/sys/geom/label/g_label_reiserfs.c deleted file mode 100644 index f70ad43d3998..000000000000 --- a/sys/geom/label/g_label_reiserfs.c +++ /dev/null @@ -1,123 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2005 Stanislav Sedov - * 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 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 - -#define REISERFS_NEW_DISK_OFFSET 64 * 1024 -#define REISERFS_OLD_DISK_OFFSET 8 * 1024 -#define REISERFS_SUPER_MAGIC "ReIsEr" - -typedef struct reiserfs_sb { - uint8_t fake1[52]; - char s_magic[10]; - uint8_t fake2[10]; - uint16_t s_version; - uint8_t fake3[26]; - char s_volume_name[16]; -} reiserfs_sb_t; - -static reiserfs_sb_t * -g_label_reiserfs_read_super(struct g_consumer *cp, off_t offset) -{ - reiserfs_sb_t *fs; - u_int secsize; - - secsize = cp->provider->sectorsize; - - KASSERT(secsize != 0, ("Tasting a disk with 0 sectorsize")); - if (secsize < sizeof(*fs)) - return (NULL); - if ((offset % secsize) != 0) - return (NULL); - - fs = g_read_data(cp, offset, secsize, NULL); - if (fs == NULL) - return (NULL); - - if (strncmp(fs->s_magic, REISERFS_SUPER_MAGIC, - strlen(REISERFS_SUPER_MAGIC)) != 0) { - g_free(fs); - return (NULL); - } - - return (fs); -} - -static void -g_label_reiserfs_taste(struct g_consumer *cp, char *label, size_t size) -{ - struct g_provider *pp; - reiserfs_sb_t *fs; - - g_topology_assert_not(); - pp = cp->provider; - label[0] = '\0'; - - /* Try old format */ - fs = g_label_reiserfs_read_super(cp, REISERFS_OLD_DISK_OFFSET); - if (fs == NULL) { - /* Try new format */ - fs = g_label_reiserfs_read_super(cp, REISERFS_NEW_DISK_OFFSET); - } - if (fs == NULL) - return; - - /* Check version */ - if (fs->s_version == 2) { - G_LABEL_DEBUG(1, "reiserfs file system detected on %s.", - pp->name); - } else { - goto exit_free; - } - - /* Check for volume label */ - if (fs->s_volume_name[0] == '\0') - goto exit_free; - - /* Terminate label */ - fs->s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0'; - strlcpy(label, fs->s_volume_name, size); - -exit_free: - g_free(fs); -} - -struct g_label_desc g_label_reiserfs = { - .ld_taste = g_label_reiserfs_taste, - .ld_dirprefix = "reiserfs/", - .ld_enabled = 1 -}; - -G_LABEL_INIT(reiserfs, g_label_reiserfs, "Create device nodes for REISERFS volumes"); diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile index 4ed9c6e5630e..19e0ee446fa1 100644 --- a/sys/modules/geom/geom_label/Makefile +++ b/sys/modules/geom/geom_label/Makefile @@ -10,7 +10,6 @@ SRCS+= g_label_gpt.c SRCS+= g_label_iso9660.c SRCS+= g_label_msdosfs.c SRCS+= g_label_ntfs.c -SRCS+= g_label_reiserfs.c SRCS+= g_label_ufs.c SRCS+= opt_geom.h SRCS+= vnode_if.h From nobody Fri Apr 19 23:11:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLr4X1Mjwz5Hwdt; Fri, 19 Apr 2024 23:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLr4X0y1jz4RwZ; Fri, 19 Apr 2024 23:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cbQmdlsqr7jRewuc0mFcN3b4ttLF8nPt48lbPz3nQow=; b=CY2AU0hf7eKoi74CkyWMsq0LclL04tlJaJZegkqXXHHzSTcKxAruyuC61u4tYg+vW6Nv+b 2ow2QmHjfrNOaDZK31lNZcIUEvq/z4WHnxAcLTqT2pHGA17EeCD2VO11PYsdRLw9TVARtw 9PNelEybPA54vvbnKQWrKXvZdeOXGKpd8fjH42X9Y5SG/4yYT8fnyME4KtezBJ/bfQKeJt HlCnTgn9ke4p2RF/dufHPL/XV6x/53MidBPd9o2V0TeXZqwaBcAZ1/FTIltJnfUodIxe3y IKiMQuYSbFhQGc/Lt8FogoIJwBt6AkC4WZJw0t46xD7c0ch0emX03n3BYfK5lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713568300; a=rsa-sha256; cv=none; b=utimGgzLW2exFKGkpZbmMYdgexn+RFMItr1TycbJbnwyjD6H2wffvEs3L9hCyBSrzdguKL 701tKW1ilTr5X/1Ywkn7Bfop6dUEeoeLblCCtClQCQq/pVwM0B7Q5QlUj1Ksck4htw4n+W 2PJ3f7VJ/sQuo8T68gyMDCOsMn0CUaNFavLa1yetKvFrTkwAtSZFPucPv3r3i3DrQcR3Ri RbB+YsRw8uhfzQSzBYOo1sJ1cRingPf8h/2Nub5hup/Sanp+R5CZErJFXv+6snBxeOI9ym WD9yOsG1xNJMzL0Ent4PbqlkDSZbaUUGH9whTfF5S01WxYxr6aONpG5x5w/vug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cbQmdlsqr7jRewuc0mFcN3b4ttLF8nPt48lbPz3nQow=; b=Rte0eXL2GmWTOirtoWFiXas5x8/LtNkPRYAswADGdYepMEl+/NaqNKvW4We+BEVJ0IQlp0 P8C0um5z/XPS2BdHxhhIP8I4b++aRbwyP9fqJMHpnl/9ybZm9PDvBHJnACqWRqAtTYmEtM sGhb6BZFyQyYjywx7fQmz425OBMPg3OMwrodIH/qfCKEKyCHVoYCM9xjompqz0QAFRy266 /0N6bH30HquqSd5NPlMepwTmq2DBjPcJgZrJWf2+oFvC+X6gEz2nnAvPFvjhy2a4ra1KXC 00KvgRLzBHc+s1TTm2KKqLjue9YWi26xtA3OY03Pb+2RuWCEUILFt16Be5DJ3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLr4X0YL1z1BXc; Fri, 19 Apr 2024 23:11: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 43JNBdan058496; Fri, 19 Apr 2024 23:11:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JNBdFE058493; Fri, 19 Apr 2024 23:11:39 GMT (envelope-from git) Date: Fri, 19 Apr 2024 23:11:39 GMT Message-Id: <202404192311.43JNBdFE058493@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: 1f2776e12360 - main - Add support for Intel Atom S1200 UART List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1f2776e123603042944aad9f41ceb46b5b28d8ae Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1f2776e123603042944aad9f41ceb46b5b28d8ae commit 1f2776e123603042944aad9f41ceb46b5b28d8ae Author: Henrich Hartzer AuthorDate: 2024-04-19 22:52:49 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:52:51 +0000 Add support for Intel Atom S1200 UART PR: 278316 Signed-off-by: Henrich Hartzer Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1164 --- sys/dev/uart/uart_bus_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index 02dfb60fe9ea..5f82ef9307d0 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -135,6 +135,8 @@ static const struct pci_id pci_ns8250_ids[] = { { 0x1d0f, 0x8250, 0x1d0f, 0, "Amazon PCI serial device", 0x10 }, { 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5xxxx Serial Port", 0x10, 8 * DEFAULT_RCLK }, +{ 0x8086, 0x0c5f, 0xffff, 0, "Atom Processor S1200 UART", + 0x10 | PCI_NO_MSI }, { 0x8086, 0x0f0a, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#1", 0x10, 24 * DEFAULT_RCLK, 2 }, { 0x8086, 0x0f0c, 0xffff, 0, "Intel ValleyView LPIO1 HSUART#2", 0x10, From nobody Fri Apr 19 23:11:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLr4Y31sMz5Hwmp; Fri, 19 Apr 2024 23:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLr4Y1VNbz4Rwb; Fri, 19 Apr 2024 23:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCV9keSt2pV498SSeUNZOUKQl3bkZE/pPfKXdaUiYCE=; b=SwzteUG/SKp9C7SgLfqljehdYhibCrmBVf1qMw+ChdDeXhfNPPDGY3iRbteJPQJ9Z2ZSiw 8oR9wQoLHGaqNdljjDeIl3UMTu/gMavEbHIUCdPYbmAAWsLDjx4AUc/KwxftSJwuc9zkr/ L+/UFLKrHsRDDeOacB3Q9F9fZVQRdIM9czvkeFiJOIKHEQ+JrzT/3YcMX6Hz/pEr4vFeu7 /9yXOCZi8ralyoTvGEkDtomfMcSKHdKRSoC6y4nRyKBWBy+CTyMrN/pcXTeXEE5lSBnArp JDLqLI6HhFc9qOsESvYwSBJ4CKgjItjW5QbSOnye0aM/yRJXJ9pW8FeSCyMGTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713568301; a=rsa-sha256; cv=none; b=niiq1nU1KWl6JuRHPhtJAgE8dHfQIqa5Qh2gSgcXu9M3xqw4pMuN7fW+WbdHMdC/LinfbK XlAhpCib5lltowG/2S5cyk5azaZ+xrllCExWJ7xjk+zhYH4Lju7pdR6hWZVcs2K42IC4VF 1eFWfodkVsBo6q6Es3xP4+CmJ90J8YQrcnORALw6DFheXNlTQ4yFw9iB1JV/lNvUsOedY7 qscmHnADR7ZFiAw7i/xQ5/rPwvB10X26K8lt/NQzTo2XF/cULD3QMwCHBNp+wnVKRjUKQn Q9vaXyeFaTWnOOHfmi2Iwa7r1DzJlRMizoSaJKm8jUTB9miNedgt3csO8ysd9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCV9keSt2pV498SSeUNZOUKQl3bkZE/pPfKXdaUiYCE=; b=ktqqi4ynj437jSemkQCdb5yt4aPqKUJc7kZ8umkOv7J22aLeUgNLmmA62r8XkIBzN26m8L DJNglTf0loUi/0lLW36xjOdjB6yXpPucr6A+uSBfBd4EhEcYcbPdUb2K8HIPMXA2VyAXPv qwQuY9E6tOyihm7pZetJyO6RNKttr0dCeGqrvLwSnoa3gr7lWaln8zNOJ4QuYd8NLgOxLn cQoy4ZER90vqWMl8cHynHkB/6z8eVG6jx0TlKdFTQK/qoC5mrWqp1tGgdSmxg3h/MpEfSU od/4sRnqfDDByUbH55L8b9CGi3D98JaZ4tKIY91yaYRU6XbCygjaND26b7VZPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLr4Y16cHz1BXd; Fri, 19 Apr 2024 23:11: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 43JNBf3U059451; Fri, 19 Apr 2024 23:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JNBfbB059446; Fri, 19 Apr 2024 23:11:41 GMT (envelope-from git) Date: Fri, 19 Apr 2024 23:11:41 GMT Message-Id: <202404192311.43JNBfbB059446@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: 0bdcfb08f2d5 - main - usr.bin/units: use else..if to avoid calling the next branch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 0bdcfb08f2d5b80523275adcdd64facb102eedbc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bdcfb08f2d5b80523275adcdd64facb102eedbc commit 0bdcfb08f2d5b80523275adcdd64facb102eedbc Author: rilysh AuthorDate: 2024-04-19 22:53:05 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:54:30 +0000 usr.bin/units: use else..if to avoid calling the next branch Even if the first branch succeeds, next time it will still check for the second branch (which will be false) as the first one was true. Add an else..if statement to address this. Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1165 --- usr.bin/units/units.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c index 78b7e4020ed3..1b6d0ed90b4a 100644 --- a/usr.bin/units/units.c +++ b/usr.bin/units/units.c @@ -497,8 +497,7 @@ lookupunit(const char *unit) } } free(copy); - } - if (unit[strlen(unit) - 1] == 's') { + } else if (unit[strlen(unit) - 1] == 's') { copy = dupstr(unit); copy[strlen(copy) - 1] = 0; for (i = 0; i < unitcount; i++) { From nobody Fri Apr 19 23:11:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLr4Z3xJ2z5Hwmr; Fri, 19 Apr 2024 23:11: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 4VLr4Z2V9kz4RZ0; Fri, 19 Apr 2024 23:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kttYfDUsPkczV5jmdXgc1E9eGjpZWaociR3kLVY64lQ=; b=tMB1WJKxsZ7o1l8BMmv4exf3s6SRMj0Wpq1ZMD5p4+r/hXs1lk098mulXhhXvuPJyuAdQw 6DRwVcq+3Kipy15bXuALO5Hq/lr36ciIWPm5xfFmgcD/koi1Ftx86L7oWNa3mTboxB2nmR egP14HkvBpkMcnoOeui29xMPYnURMqXqL5EjkY691fz/mR4bTPYyxbjm2oA+TEKPKTs73W wBuiCyG/mfQMvR4cXQ3hwZMvNAGN1vRhQqY2E/H5D0G/MQrZQGA3KQjPprdgMwRoWQHtS2 fQXB+dhCHBi0li7vMFqiM8ig/9s5bL783qTRgnsIKv/H039cXEj0QiUoAx2rmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713568302; a=rsa-sha256; cv=none; b=xxMuDoSBcfUlo0pVM7G1OgiCbK+fIKb+tSLISfTkAIdiCy//zIcIK02O1vE44I9cQ1t20q /YcvzuXnWIsz1ktf2o4DgJ5ZrZ1b5M+/p1kN1n9J2Tr6/ooy8DnMGKim5PHUY5CMxeR8US rB8NgpMBPsRB0eFECuV6hmwjRt3jIG6/0GUgpQ7Ak+B+EXX8GoOiLSCz3AWXhEi5MYzGN6 WXw/uIShAAKOMed2sh7F+nUjzR+uP5Oj4IKOThJASA0Lj3VdSBjIoFy3SDsnJwQ0117sJo 8xhXG+1j4ptCy0flnq9hcrVTnWmQWEILkKAr8lctfCcwQ7QUShym2qnIRkOhfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kttYfDUsPkczV5jmdXgc1E9eGjpZWaociR3kLVY64lQ=; b=v1+HtNRxBbm2n9jMd9kcdqyvmTqf5jfyU2zzvH3EUN+QdIiN863pZ3GprJdHT7QfQYCu/k vecHBcCunjli6OxWrxddk630X9IHbkVVSVyHJqHNhN7InBoddgVTKAbk30mdleUuMTcOKQ 6/UWPcBod/lLebe7bdCiuxz+kxbqb0BnuT6ZSyzdz1OyRHRpJbs6Tibb9VowMmKyeor7pq n6FcYEp0zgUUD4Dogfc8yGjDEhjiRHXCXuWLIUQkkbyf+11PZLHaajksYpS7ZwUy+5/T6Q Qkt/ZoZKnHfd/5RLY6DoQUB01PV+vwZvlFHJ0FtJ0sdDHT1+7+VV/j7J2m2rRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLr4Z26Gxz1CFF; Fri, 19 Apr 2024 23:11: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 43JNBgOu059622; Fri, 19 Apr 2024 23:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JNBgeG059619; Fri, 19 Apr 2024 23:11:42 GMT (envelope-from git) Date: Fri, 19 Apr 2024 23:11:42 GMT Message-Id: <202404192311.43JNBgeG059619@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: 42acb16bb86f - main - rescue: add ipfw, pfctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 42acb16bb86fe6ec18c0591f9a9a3dbad1719d1d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=42acb16bb86fe6ec18c0591f9a9a3dbad1719d1d commit 42acb16bb86fe6ec18c0591f9a9a3dbad1719d1d Author: Lexi Winter AuthorDate: 2024-04-19 22:53:23 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:54:31 +0000 rescue: add ipfw, pfctl Rationale for this change: - ipf is already there - if the kernel is configured with a packet filter which drops packets by default, pfctl or ipfw will be required in the rescue environment to make the network functional. - rescue's stated purpose is to be useful for small/embedded systems (and is also quite useful for small jails); a rescue-based router would want these binaries. On amd64, this increases the size of rescue from 17346200 to 17907248, or 561048 bytes (3.2%). Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1169 --- rescue/rescue/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index c1ba22885618..6dceea6f5077 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -119,6 +119,15 @@ CRUNCH_PROGS_sbin+= ipf CRUNCH_LIBS_ipf+= ${LIBIPF} .endif +.if ${MK_IPFW} != "no" +CRUNCH_PROGS_sbin+= ipfw +.endif + +.if ${MK_PF} != "no" +CRUNCH_PROGS_sbin+= pfctl +CRUNCH_LIBS_pfctl+= ${LIBPFCTL} ${LIBNV} +.endif + .if ${MK_ROUTED} != "no" CRUNCH_PROGS_sbin+= routed rtquery .endif From nobody Fri Apr 19 23:11:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLr4b6zYyz5Hwpj; Fri, 19 Apr 2024 23:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLr4b3QbKz4RlR; Fri, 19 Apr 2024 23:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XAMZRh+Gww0LwY34Nvhl0QYqB2RHz8i3m2gX7B/lnM=; b=W4ePQIKej1rwUfAyP6AVTBaG66Vlwj6lsZ876bGOx2+w/ajH3MBSP4u9LpZ1VxbXA+mtY5 6KUTjbkrRhTgZPZOUcREXjom6EEWp+vbPUNcBUkOo2h83bWeqJpbXH98WRIXJLhwPwuPhn 9nk8a7XP9ZK9iOHzce8gO6Tup3j6D7W5553fbq9iNhC3TnQK0yrgNwpEgbyFl21848Um/8 k1MU3JqSbxLRu8NsvZp8P/Y8ABKQAENP08Vb1RTXLlXZINQTV1z4XLPGGWum52bZOgFCAJ Y2to15xzDMQQZ2c1iziDkPbxyi01EnSozLRQdrr3rcbg8sCGWqIW2bxWo5OJhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713568303; a=rsa-sha256; cv=none; b=oH6rhH6fH4jsNsexjm6C8Xv1Rdvzwh7A4R+cgtHyrdVHOM8fJ2p9ZMSom2K6AD13vQ5h5P mdDxA5rAXnACCGLcdCSnoHSYEFuNDkXm3xoJlVaYVRmhjRGSf+bC3FNrfqc+2ZJK06n8aK WYNEGv0/+9ayw1TZ6ww0fEYCHPS7jAax3DB16ZaZTXF+wi+ZYDNNFUJQDi9HcQgWDqxAEj 192RGtsZobmr2zXk8UV95qs4xCdbicYSfKtnCdQnoCj6lLI3n8nNIesL6Z9xJWCQc3u8Gr qWNsAy0e1cAzXFI24kLhni3+iKiaMcovPS9zem9T0AagNY+9aggW2t6e3MSJrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XAMZRh+Gww0LwY34Nvhl0QYqB2RHz8i3m2gX7B/lnM=; b=iNDnk+XSw2OXS7PnoMmlGyUMxXHm6mZ3KuwbeZwfiYWLYb2XZadmwcuWztz8AtsF6v2jRc fQcSnjZBX3OfE4SkPvKFrgANHYBKNiFnlSKXz+1/HdsLObREuPyrrZCsFQw+6/x2fvUXat gOY4o0zxxCddx3c9iQXNL6YCHtlQdldRUP1U+jPn8YQbsn5ex0OVU2pa+hqcspeXchi+l8 EjjJaM0WQADcLVCrRSMNG5xCGzOihOjeFDPyDvI/WVUYIX3eN+1lORG5/b3VsQ2HEcwgdo B3tpQ4vP+7mF2hZ1QrDOI/AtahlCfeyCBnza2SfDr51LgbQl1n2+UwfIW2qWng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLr4b2vyMz1C3S; Fri, 19 Apr 2024 23:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43JNBhux059670; Fri, 19 Apr 2024 23:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JNBh3F059667; Fri, 19 Apr 2024 23:11:43 GMT (envelope-from git) Date: Fri, 19 Apr 2024 23:11:43 GMT Message-Id: <202404192311.43JNBh3F059667@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: dbd0366f3434 - main - package: move lpr into its own package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: dbd0366f3434e2444792b431997dcaecfbf899ee Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dbd0366f3434e2444792b431997dcaecfbf899ee commit dbd0366f3434e2444792b431997dcaecfbf899ee Author: Lexi Winter AuthorDate: 2024-04-19 22:53:30 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:54:31 +0000 package: move lpr into its own package Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1171 --- libexec/rc/rc.d/Makefile | 4 +++- release/packages/Makefile.package | 2 ++ usr.sbin/lpr/chkprintcap/Makefile | 1 + usr.sbin/lpr/filters.ru/Makefile | 1 + usr.sbin/lpr/filters.ru/koi2855/Makefile | 1 + usr.sbin/lpr/filters.ru/koi2alt/Makefile | 1 + usr.sbin/lpr/filters/Makefile | 1 + usr.sbin/lpr/lp/Makefile | 1 + usr.sbin/lpr/lpc/Makefile | 1 + usr.sbin/lpr/lpd/Makefile | 1 + usr.sbin/lpr/lpq/Makefile | 1 + usr.sbin/lpr/lpr/Makefile | 1 + usr.sbin/lpr/lprm/Makefile | 1 + usr.sbin/lpr/lptest/Makefile | 1 + usr.sbin/lpr/pac/Makefile | 1 + usr.sbin/newsyslog/newsyslog.conf.d/Makefile | 5 ++++- usr.sbin/syslogd/Makefile | 5 ++++- 17 files changed, 26 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 320408d5d62c..15dcc811d9b4 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -257,7 +257,9 @@ CONSOLEPACKAGE= console-tools .endif .if ${MK_LPR} != "no" -CONFS+= lpd +CONFGROUPS+= LP +LP+= lpd +LPPACKAGE= lp .endif .if ${MK_KERBEROS} != "no" diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index ed3da78665be..72a521eebe8b 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -100,6 +100,8 @@ kerberos-lib_COMMENT= Kerberos Libraries kerberos-lib_DESC= Kerberos Libraries kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel +lp_COMMENT= Printer subsystem +lp_DESC= Printer subsystem manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages mlx-tools_COMMENT= Mellanox Utilities diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile index 4895305ba9bb..600b71237426 100644 --- a/usr.sbin/lpr/chkprintcap/Makefile +++ b/usr.sbin/lpr/chkprintcap/Makefile @@ -1,6 +1,7 @@ .PATH: ${.CURDIR:H}/common_source +PACKAGE=lp PROG= chkprintcap MAN= chkprintcap.8 SRCS= chkprintcap.c skimprintcap.c diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile index c3f7e6162369..05971920182c 100644 --- a/usr.sbin/lpr/filters.ru/Makefile +++ b/usr.sbin/lpr/filters.ru/Makefile @@ -1,6 +1,7 @@ SUBDIR= koi2alt koi2855 +PACKAGE=lp FILES= bjc-240.sh.sample .include "Makefile.inc" diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile index ec6d8cb2c198..53d6a5bd9869 100644 --- a/usr.sbin/lpr/filters.ru/koi2855/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile @@ -1,4 +1,5 @@ +PACKAGE=lp PROG= koi2855 MAN= diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile index 84a1e1eb4b00..6b005afac0a6 100644 --- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile @@ -1,4 +1,5 @@ +PACKAGE=lp PROG= koi2alt MAN= diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index 024fb738f0fb..b3d7cbab9c56 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -1,6 +1,7 @@ BINDIR= ${LIBEXECDIR}/lpr +PACKAGE=lp PROG= lpf MAN= diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile index c726c0bb25ee..59562bdc6f13 100644 --- a/usr.sbin/lpr/lp/Makefile +++ b/usr.sbin/lpr/lp/Makefile @@ -1,6 +1,7 @@ BINDIR= /usr/bin +PACKAGE=lp SCRIPTS=lp.sh MAN= lp.1 diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index 545f0f7ed121..ccc7fb503ee0 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -1,6 +1,7 @@ .PATH: ${.CURDIR:H}/common_source +PACKAGE=lp PROG= lpc MAN= lpc.8 SRCS= lpc.c cmds.c cmdtab.c movejobs.c diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile index 944a3e1a83ab..c4f4f5e0e56a 100644 --- a/usr.sbin/lpr/lpd/Makefile +++ b/usr.sbin/lpr/lpd/Makefile @@ -1,4 +1,5 @@ +PACKAGE=lp CONFS= hosts.lpd printcap PROG= lpd MAN= lpd.8 diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile index 0010eb05e968..d8fe64de2c84 100644 --- a/usr.sbin/lpr/lpq/Makefile +++ b/usr.sbin/lpr/lpq/Makefile @@ -1,6 +1,7 @@ BINDIR= /usr/bin +PACKAGE=lp PROG= lpq BINOWN= root BINGRP= daemon diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile index 7f7fa6d1fd71..84f965b728b8 100644 --- a/usr.sbin/lpr/lpr/Makefile +++ b/usr.sbin/lpr/lpr/Makefile @@ -3,6 +3,7 @@ BINDIR= /usr/bin +PACKAGE=lp PROG= lpr MAN= lpr.1 printcap.5 BINOWN= root diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile index 11c5a7a5a7ac..1fac5ce73471 100644 --- a/usr.sbin/lpr/lprm/Makefile +++ b/usr.sbin/lpr/lprm/Makefile @@ -3,6 +3,7 @@ BINDIR= /usr/bin +PACKAGE=lp PROG= lprm BINOWN= root BINGRP= daemon diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile index 2f44f09acd89..a48836389049 100644 --- a/usr.sbin/lpr/lptest/Makefile +++ b/usr.sbin/lpr/lptest/Makefile @@ -1,4 +1,5 @@ +PACKAGE=lp PROG= lptest CFLAGS+= -I${.CURDIR:H}/common_source diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile index c3b6f5078fca..eb40bfa7a4d2 100644 --- a/usr.sbin/lpr/pac/Makefile +++ b/usr.sbin/lpr/pac/Makefile @@ -1,6 +1,7 @@ .PATH: ${.CURDIR:H}/common_source +PACKAGE=lp PROG= pac MAN= pac.8 diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile index 4b2dff13723b..e0451c228f5a 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile +++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile @@ -15,7 +15,10 @@ FTPDIR= /etc/newsyslog.conf.d .endif .if ${MK_LPR} != "no" -CONFS+= lpr.conf +CONFGROUPS+= LP +LP+= lpr.conf +LPPACKAGE= lp +LPDIR= /etc/newsyslog.conf.d .endif .if ${MK_OFED} != "no" diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile index d612b5a0a6af..492b5529fc89 100644 --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -31,7 +31,10 @@ FTPPACKAGE= ftpd .endif .if ${MK_LPR} != "no" -SYSLOGD_D+= lpr.conf +CONFGROUPS+= LP +LP+= lpr.conf +LPDIR= /etc/syslog.d +LPPACKAGE= lp .endif .if ${MK_PPP} != "no" From nobody Fri Apr 19 23:11:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLr4c6gP9z5HwZx; Fri, 19 Apr 2024 23:11: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 4VLr4c47dcz4RlZ; Fri, 19 Apr 2024 23:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ibh07fiqW7lga7EQsqCgZa8lB6YGn9Vy5LUGYLCONDw=; b=in7WSjyc9Y86ZLw0Fvmsvwfc5SNiQ9P8/b94dp5/uieSwvb2psPZx3V+a1ERDRWFbw0qqB 8X3AO7KYbvUwRBRDZX8hpi/8ADNDMvV5LsIFw8cQstMrIih2PpjO+mDWGLwwMyQSjzdILE 9JpPhvbE6GZNRf0618SM2In3Ng9BMbsL/jnhXKY9BA8T6JQCHEk4enzQe4r4zsmBBTBBYa Cinuy4aFoIdbVouRicys3kYiKzNVQWwdhKxzMvFh8UUuRCX9etzaZbmhyy+nEwS/auzrYp 7RDTM/LBru3/WgnSqKLfaTaFQZ3+/KDieM+qH/+Nhiaa4QdGYydJxbMgs2xq9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713568304; a=rsa-sha256; cv=none; b=J2zH0WtljSJLfRD6SO4AXJVqcBwyt27aS24oEs0YHCHsLKdFMcqRpYxtzkN8lSKwC8Mp5J 3XFEgwnlc2lAUUlp/lu+rbgOA1LrsaQMQtkowRus8/E9rsJCD8+rajHHLRGmx05X301EtO 41iLyx1gmEcSg3UyNg5vCxyKXCZanQ5Rn2mbXouFhBaZGzeK1BLj5oHEWFs2/0oSb6wQt7 jCEu2SxQ1gwW/+osv/19lG2a2GSmbK7SE+SS6//uYS92meIOxBg78BNDoyKvvhBXgeP2KH OvNet6GK4etfRQYTQ7rdixdVKimwZlL/HB7KRgQUf7XjgXQuN6eR2VgiYCYhUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713568304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ibh07fiqW7lga7EQsqCgZa8lB6YGn9Vy5LUGYLCONDw=; b=JeP/iqi0HwnEOo98GCSTnwphpJfIN0x6Y/3hciJam463+7Qf3GZYQI0vbkkZ46NrD90EWo o2OHvCEdBiuy88OOz2LvUaRY55/Iy5chyrZHcxqljNH4bwgjf+e4b1jCTcyoznLD6pPlQk uZRWnWxElUGXlBH99PTnfhhaj/a9Ya8ajgMUd6v1oA+ulAVda8EZBpqhvYK2duzjud2HQh VFojvup5pqSQLaM6p6R/mOdtilYaR/3wAT5j7KRSrQ/X8K1fju7htLW3O8Mg6kI1uvWPd1 pprb1Y4r/obV9SnbniAx/j4vCKSe8eQIT9GG+x2sL3XMqGyuQo4v+MLIreg3IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLr4c3lm5z1CFG; Fri, 19 Apr 2024 23:11: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 43JNBiQa059732; Fri, 19 Apr 2024 23:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JNBiVS059729; Fri, 19 Apr 2024 23:11:44 GMT (envelope-from git) Date: Fri, 19 Apr 2024 23:11:44 GMT Message-Id: <202404192311.43JNBiVS059729@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: 1bd4f769caf8 - main - add dtb support for RPI CM4, CM4s, CM4_ioBoard List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1bd4f769caf8ffda35477e3c0b2c92348cf2fd5d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1bd4f769caf8ffda35477e3c0b2c92348cf2fd5d commit 1bd4f769caf8ffda35477e3c0b2c92348cf2fd5d Author: Klaus Küchemann AuthorDate: 2024-04-19 22:53:46 +0000 Commit: Warner Losh CommitDate: 2024-04-19 22:54:32 +0000 add dtb support for RPI CM4, CM4s, CM4_ioBoard Signed-off-by: Klaus Küchemann Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1182 --- release/arm64/RPI.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/arm64/RPI.conf b/release/arm64/RPI.conf index 1a36a3af521e..a38385a24e80 100644 --- a/release/arm64/RPI.conf +++ b/release/arm64/RPI.conf @@ -3,7 +3,8 @@ # DTB_DIR="/usr/local/share/rpi-firmware" -DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2710-rpi-cm3.dtb bcm2711-rpi-4-b.dtb" +DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2710-rpi-cm3.dtb \ + bcm2711-rpi-4-b.dtb bcm2711-rpi-cm4-io.dtb bcm2711-rpi-cm4.dtb bcm2711-rpi-cm4s.dtb" EMBEDDED_TARGET_ARCH="aarch64" EMBEDDED_TARGET="arm64" EMBEDDEDBUILD=1 From nobody Sat Apr 20 06:35:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM1wG3f88z5H8G1; Sat, 20 Apr 2024 06:35: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 4VM1wG37ghz3xHt; Sat, 20 Apr 2024 06:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713594910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rKM+dEVMg8UnmudIwMLrMqoJBdHou6rfLLpOO0n+ZKY=; b=h/uIN2KoDirOfduigwEQrRLufkrLH0wk2BLGCgpwyeRS67q44JS6C/9bqcb6/fkweMUHKy chRumLIJzgnIFY6nlUiBaUzLvtrb+IhPMuhlndE7Mjreicw9TEAHyFVs9xmzxeCgyVklOD wYYetfV1pPxcNiYzYUan0/8fYSTQ8TJU21EzT3X1qCZAAcSTf8RaiA0CH0JKFF/7fcbuhG hdJxSGxM6tW4aCgw+QRmLHABixy9hftlD/Gjw+aRODK9K2/pnc92yp3jQRIV/rOOBDM9th v5QYLkP+GAmng6UE/KmSe8EVUSZKAfRyZp1HPYsPC9AkPNXujVImeELiipBB9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713594910; a=rsa-sha256; cv=none; b=rryVB9eQb4DkAXNpIdGdjZ4Ga1Pk7LUposfJOVEOEQ8gaTJiX8JzGJrsqvjVbjK2AIY2nI 1qxRmU2OEgXOe5WXi52jNK8/EYUtD8fSvJhGUMyqgoEgFxDTmJ9hDpYg30jlPPVCE1yd7/ ubG44kBB24xdZL5Efb6gNyRMcyfJRGQbgb0KebnbvUhn6xdUUfxLNPt+rp0J6Go4xztnSD adrXJQT7zVxkk4mhmkU/2VvayxuG4G61DnZ7PegDPmvVk7gT4egYeaYWjqxsI3eth2g7vB sCiNEUCFHYs2Xg3P/bV0M5iOpDzVYaiDgzIEc2W7E4jlkgOrrf5/WOnKCPR5tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713594910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rKM+dEVMg8UnmudIwMLrMqoJBdHou6rfLLpOO0n+ZKY=; b=v0NmI1eavli2vC/sTghNPxyudb/9d7EnZtOCqC4YUFkPedNd9WZQ5QYGUyLOVwo5Iijdgo vYanRf0pVtjm7w3zo8J+MdrFKf5oSTzZ7V7pYNUg0axVTG6r4ZU0dInJjTL/oRaRCWUL7r 15VAlaGfoL/kjQqKPBSxpsmsFYaxEJTAV0vJ1TqiUY5/1ZuP0L6+4pn+ko2CjIFRxSDkc/ QPKwZCOnp2nsXqHZl9FmUsLLWZkZ7vopOdv2igXOWtfkt74A4j93s4gyNZsIbQnCf19uid +G75y2fR0ZxKoU9yRv4G2yjaVBPt4z3X/raJ5/Wk0UkiFLn4n77xSk0Tbw57mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM1wG2fv7zR4P; Sat, 20 Apr 2024 06:35: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 43K6ZAwB004937; Sat, 20 Apr 2024 06:35:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43K6ZAf1004934; Sat, 20 Apr 2024 06:35:10 GMT (envelope-from git) Date: Sat, 20 Apr 2024 06:35:10 GMT Message-Id: <202404200635.43K6ZAf1004934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 21ffadb6e6e0 - main - ldconfig: document changed default byte-order List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21ffadb6e6e05c2326d9c904d505e15167dd6c10 Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=21ffadb6e6e05c2326d9c904d505e15167dd6c10 commit 21ffadb6e6e05c2326d9c904d505e15167dd6c10 Author: Stefan Eßer AuthorDate: 2024-04-20 06:30:35 +0000 Commit: Stefan Eßer CommitDate: 2024-04-20 06:34:22 +0000 ldconfig: document changed default byte-order Document that the hints file is created in little-endian byte-order by default now. The -B option can be used to create a big-endian hints file. Currently, both formats are accepted by the run-time linker on all architectures. MFC after: 3 days Relnotes: yes --- sbin/ldconfig/ldconfig.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8 index f3ced2220e9a..e3cb2c00a353 100644 --- a/sbin/ldconfig/ldconfig.8 +++ b/sbin/ldconfig/ldconfig.8 @@ -32,7 +32,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 February 28, 2024 +.Dd April 20, 2024 .Dt LDCONFIG 8 .Os .Sh NAME @@ -107,7 +107,8 @@ on 64-bit systems that support running 32-bit binaries. Ignored for backwards compatibility. .It Fl B Force writing big-endian binary data to the hints file. -The default is to create hints files in the native byte-order of the host. +The default is to create hints files in little-endian byte-order on all +architectures.. Reading of and merging into hints files preserves the endianness of the existing hints file. .It Fl R From nobody Sat Apr 20 08:30:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM4Tf3qZyz5HK7L; Sat, 20 Apr 2024 08:30: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 4VM4Tf3MMkz475P; Sat, 20 Apr 2024 08:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713601846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RaEX0LAmjXUdeFoCWPqCfoqZv5AXkdMg1+2GCqawrYQ=; b=AsXYzcH2naRxauQC0+srX8Rjdl/k4WMgPMVKUe+Ra64+KdfSo3+ORcQar1SMqpgKZJ31dA ZDBEr0uiBHF8+AQj26K9mLzAWdenQUvcWa4EQzKFCKoL7keK0dws+XHg5n07y+SLA8l6L2 LW75oh0myvMTuxda9ZAU0XQbI+TK2w8txOn47vk8+AnLJJZYWvi9fEDEXH7VK4h2exAByT +zg0kp2e2vvB25OOUc1wfoXSwU9wz4NWwTdwJFfIgey6xuP8c7Cw1J9XT9gmVoJ+NdWRLf l1ZWaEdV/h7XrOP1KIBuH5DU1xOWQTlv1s6Hnd2/XEvTtfC4VXsd4XICPtNq3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713601846; a=rsa-sha256; cv=none; b=Xzrbil+soPeNRE5dSYp6ntPslZClEauZBowaF+q4sVq6lnkq9Iin9Syp6m1dJxICTlyboE 1hTjelWCC7bGYI71BQGcsFEDrDFg7RjTsZ36ZkxKdmh1CKceQ3wONnBtXvPnv3C4qVC4Si hpb3GI0r/BPZz6U2AHha+PNaCaiOOb6tE6V56Lu6kGif90btrt3IMKGye4Ikghsp32va3C aDfQ5hTAMjxjfEDSBkD0qeNXKtXG67ZqEBs8J4Uz8cxHAvDYeIXv5a5EBxzmO33eO3gzzP U5MF9gxHrJSUN0MaxBopOEtPJ9Sike6cj3Nq1YaidwqsOfhN+Gxdaeo1NKCN5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713601846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RaEX0LAmjXUdeFoCWPqCfoqZv5AXkdMg1+2GCqawrYQ=; b=WU5O/iBkQhZPdBIaCOxudCoTWZ+Mc64UmWFhfcnPX2uD6XMYTQ7gzhQda1R4f8QPCJBEo2 4hu8koNQWFHgNmoPaNe4rJJ7xMtj3dH6B41Rnuum8XtIr0EZpG0IoJ/OdfjRc4K9X+CStl 5R46MTDn5XgbugwvjR4asX3HDZ9xw4jwKae4Yc0d2uOjv30JtsIBtwib+HPdI+U8dTlAys b2zV3PlO+OhMAzJ9v4PzqNaQDeqWNEDWYkuD+/l7bu+Dspjpzux/T0q/uzUAVc2NV5NLP/ pdebpzKTo6pqHrBegAbXmb3BEUl980YUq/Tms3oy0BA8nKt5pLo+5apsa6xqxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM4Tf2vS8zV7b; Sat, 20 Apr 2024 08:30: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 43K8UkQi000572; Sat, 20 Apr 2024 08:30:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43K8UkDt000569; Sat, 20 Apr 2024 08:30:46 GMT (envelope-from git) Date: Sat, 20 Apr 2024 08:30:46 GMT Message-Id: <202404200830.43K8UkDt000569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 14a5c1068d37 - main - man: do not ignore the exit status of roff tools List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14a5c1068d3751173dc41f3097b12e95791b2160 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=14a5c1068d3751173dc41f3097b12e95791b2160 commit 14a5c1068d3751173dc41f3097b12e95791b2160 Author: Wolfram Schneider AuthorDate: 2024-04-20 08:24:58 +0000 Commit: Wolfram Schneider CommitDate: 2024-04-20 08:30:33 +0000 man: do not ignore the exit status of roff tools PR: 223516 Approved by: emaste, bapt Differential Revision: https://reviews.freebsd.org/D44798 --- usr.bin/man/man.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index fd51648757a9..03803b777463 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -33,6 +33,12 @@ # it is better to terminate it. ulimit -t 20 +# do not ignore the exit status of roff tools +set -o pipefail + +# ignore SIGPIPE exits because pagers may exit before reading all their input. +trap '' SIGPIPE + # Usage: add_to_manpath path # Adds a variable to manpath while ensuring we don't have duplicates. # Returns true if we were able to add something. False otherwise. @@ -312,7 +318,7 @@ man_check_for_so() { # We need to loop to accommodate multiple .so directives. while true do - line=$($cattool "$manpage" | head -n1) + line=$($cattool "$manpage" 2>/dev/null | head -n1) case "$line" in .so*) trim "${line#.so}" decho "$manpage includes $tstr" From nobody Sat Apr 20 09:15:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM5TJ5v0Nz5HNh8; Sat, 20 Apr 2024 09:15: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 4VM5TJ50pBz4GKh; Sat, 20 Apr 2024 09:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713604532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=14wSb3smRW/1wMGD0muKDEZqmnr02xRzkpH0v3h1RB0=; b=IHpxlci31zcnvzvHxgzIQ0zD/q/rcrRmY2+6Xp53scJh6J/c1/flHidcYmIoWggQT5yXoa CcCyqMdYishBEFcz9dl4eeLsiTsl1bVdA8aImAup9zvGbwfHQa1sNBpUJrBEomm9Fkm4vP 3A/8qL3ztUvAT+uW2meE5ilcWI9FWP/xsotJgN6ZzPEvWRWkltG/ApRVafMYW6MYTliEhd Sx+E8xAWvZSwtOoBq/FQdYH+PpHrCBwRPAOiVFhU8sA4PHb25bSeXDRvxULqXCfbArPzfs WF9jfkI/FPAL4GTqAM6dRp2mpYbQ/eJdb5wCkqX2z5IDM4WFiS/XPc0+PgU4xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713604532; a=rsa-sha256; cv=none; b=RuRbDNIJz0uXZlQbisvKOPFiXIVCtqwq+fjOpg/O6yK4IZBuckJeKBLmlXiN3FNXRUieYu AcOermCrUw4YTBefnTLSabkbqHET7wpNEqPW7IZkpx7gKuv6bUuPhg0R01yWt0+kKpRQhM qMQlrozpTynyIVDlMTplnEF1Fa+97z39KNrVQInMJZ4nauvw/aYZzm8UaRbFPP1hCnnr88 zVAgz474pdnSCcLv1NdyPF+y48hseyg7Oq+wLWwrh3iNlbxjBC6ppSjvxPsyVB4oxww4IM YzzJRVxEX/ZhGrVV5ukbWkriVPOc3miU67QDvSjCeQxfCrh+9EEh1RoHo6Zn0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713604532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=14wSb3smRW/1wMGD0muKDEZqmnr02xRzkpH0v3h1RB0=; b=uN0iffeNtWEXvH+9LdLGA684VfDX/HPq8OCAIdkXlS+viqjSXtX1xkxtQCUhEp4FeKjuSg WICOhOVrAG7LYVIA1Xlgo/7w6muDl7DLzpC5bW2tT5Va1HDH9PePYf47XH8uRwwOwrq3X/ an9wdfbYIWAtP3UfFG23vxgkeuWKzdFKmR3afi6+3dRHlApCFdBYPl83m0W2Yk5IsjNvn8 OkkoSOcHYi2fW9BJ3Yto5DAPfcCvQ+5nirMGSTzjaVZHVMPGcwlddK6bI8sPdBcaLoXAyO XFCmFWUTRRXZYpMF1Ba1KRwBEVdp2gSXpwzyw+k3Kdkt23pCuccYDQgVjJ8APA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM5TJ4cHqzX7K; Sat, 20 Apr 2024 09:15: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 43K9FWxk075654; Sat, 20 Apr 2024 09:15:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43K9FWnF075651; Sat, 20 Apr 2024 09:15:32 GMT (envelope-from git) Date: Sat, 20 Apr 2024 09:15:32 GMT Message-Id: <202404200915.43K9FWnF075651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 5235e9d646e7 - main - binmiscctl.8: Remove a double word List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5235e9d646e7771cc532b8fc02f742a8157a41e5 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5235e9d646e7771cc532b8fc02f742a8157a41e5 commit 5235e9d646e7771cc532b8fc02f742a8157a41e5 Author: Gordon Bergling AuthorDate: 2024-04-20 09:15:20 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 09:15:20 +0000 binmiscctl.8: Remove a double word - s/the the/the/ MFC after: 3 days --- usr.sbin/binmiscctl/binmiscctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8 index 36b69f5d3375..178389920448 100644 --- a/usr.sbin/binmiscctl/binmiscctl.8 +++ b/usr.sbin/binmiscctl/binmiscctl.8 @@ -128,7 +128,7 @@ To make the interpreter automatically available in jails and chroots, use the .Fl -pre-open option to allow the kernel to open the binary at configuration time -rather then lazily when the the interpreted program is started. +rather then lazily when the interpreted program is started. .Pp The interpreter .Ar path From nobody Sat Apr 20 09:19:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM5Yl1wBFz5HPQr; Sat, 20 Apr 2024 09:19: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 4VM5Yl1M7zz4H6C; Sat, 20 Apr 2024 09:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713604763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fge95N1qsveYMLo53+EBaEyCdXGVsybnULRGjKL/5Dw=; b=LS0U6Turs41D5ML17syftTmlJAnUiRkHWxeFFt10+wGNR0s0FeVoG9sveWl/wD9jUZ0tPI 1866atblY2GASVDMmcjBwL+XkNDDV8nEJIrPp8f+dIEpqNH58t+DQ7GRW5x2cW8PkyXQn+ 6I2gXbpFtInbCkhK4xXUzmClronABP3nVoCDmGALzrOUQJvPPouhHy3QC/g3IPPWooGZSf FESRRuQKl8HKSw9yZ7PFEw/0cMBGYZ8MYpzB7IzErJiDfmXcT7MTXNErU0NH1EgBdhhqYp EH2lIgzcfpqMhz7r0hEETR1gi7JRNdT/5EWhDbZabEAGxTKpZBVSWLh+7inZWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713604763; a=rsa-sha256; cv=none; b=GNDaV0pYIaCz9d1NNXMvz4qZzQZVZ9uA/JjBxORnEGjElLoYB45+6kLOXXKopbZjVYNEBb VvEVMFciXIUJe5/Fg33BPAocbCNDbmpB0De4Tsy72YUVap3KrAdrfkbpmv+TL+9aOl+I1L N+UcDUmhvtR1xFIuYRu6yFi/Ti+8PfIUkvBBYhCmrQfzabD6Mjv2mcZtNzOT5/rxTH6YZX 2RlD6sN9T7Mt4odlTZkSPrZEELrlNLepWyeU39XtQ9eCTNTA35ee5PTY5GDlQ6/jHNV+WU Yesvu+ESv9P26LzKoLVUYrVp/Bcs76xOD9Hhx/QYSBUQ+WqEz2tTDyjc+dPyNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713604763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fge95N1qsveYMLo53+EBaEyCdXGVsybnULRGjKL/5Dw=; b=TT7AQMi4q0070mZQdzbDmZZQFGZCvi9F9WqK7NfpgCBuXoFY3QHlADlVoRgsm6f1CN3d7n 9qeOx3QwCI/RYYFyFSQXzoOg7+vtFtQdFe/GgC+1HxudQeZMo7p8+1AAcKD7RFSTzd7L7K V2r4VPY8ZMAn8EmVKLujNM9ZhDUOmAmK0i+b9TjdHHcFi18VJzcbZD+/uuavyk9Lqovblo 4zL5rjZwCN5SZ9VndBWTAi/3iiF0gqwEmJ/jNv9XxG35rRRAhspyUeW11a/wVw4topgwkY PYQqfjQHm1xa91EnMP57nXEebm2gSGy4pe8nxdkRaKlRg/mWuoieIkZFQLNLCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM5Yl0qVJzWTw; Sat, 20 Apr 2024 09:19: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 43K9JNeI076298; Sat, 20 Apr 2024 09:19:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43K9JNl7076295; Sat, 20 Apr 2024 09:19:23 GMT (envelope-from git) Date: Sat, 20 Apr 2024 09:19:23 GMT Message-Id: <202404200919.43K9JNl7076295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 6573ce292fc5 - main - nvmecontrol(8): Remove a double word in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6573ce292fc5ddc6c846860b3fa98473e3f5d1c6 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6573ce292fc5ddc6c846860b3fa98473e3f5d1c6 commit 6573ce292fc5ddc6c846860b3fa98473e3f5d1c6 Author: Gordon Bergling AuthorDate: 2024-04-20 09:18:59 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 09:18:59 +0000 nvmecontrol(8): Remove a double word in a source code comment - s/the the/the/ MFC after: 3 days --- sbin/nvmecontrol/nvmecontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h index 2ce4ad4c5c2b..394a88608692 100644 --- a/sbin/nvmecontrol/nvmecontrol.h +++ b/sbin/nvmecontrol/nvmecontrol.h @@ -96,7 +96,7 @@ void print_intel_add_smart(const struct nvme_controller_data *cdata __unused, vo * this. Older compilers will support 128-bit ints on 64-bit * platforms. Otherwise we truncate this to 64-bit on 32-bit systems with older * compilers. We also check for > C18 instead of >= C23 because clang 17 was - * released before the the __STDC_VERSION__ was defined. + * released before the __STDC_VERSION__ was defined. */ #define UINT128_DIG 39 #if __STDC_VERSION__ >= 202311L From nobody Sat Apr 20 09:22:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM5cx3J8rz5HPYl; Sat, 20 Apr 2024 09:22: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 4VM5cx0mz3z4Hh8; Sat, 20 Apr 2024 09:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713604929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXOYrHA5hA9NCL2KsgKY5Lv9ou4Mvkw/d9nQ3Mp7JWw=; b=ugybJEZkspjMpvzYQKoGO9tsumsZiWRktiqhFKBF3C2l1HX5H3XfhwflArtwxiRMqAl/WT qfJtcfTb1pIy/mmDqFLgscVWRTZwaFJbIWu1Jhj+12u87Pfyre0pJd6vmSiAZJLZqfOsBl DTWNZdbN/E788xpLUjuRE30muQhRG8Tgt/c962Ko0c6JEUjZfpyPPDkABeIg/aj8Lj3Bzo 40mr8oFxm/pLdaJ9OjujsS//LJxdhFoRR3TsO9CxhOKqG6NzkelxRC3F1riZMlEZvXQs+N DBTGEMrGmahnVozD23ZJFEmHv1j2W9EJnH3rugs5BmT+RBpRS0LYJ76U3QXznw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713604929; a=rsa-sha256; cv=none; b=cit2zcvPuBWNL2oSNgywPRRe6G3g9/2bEsxzmSFu99SOY4PIq/IKrSazBVZUS7XZTFZJJq u4z/I1fs7gK7Gx1/wRxsurqjsU/3TPl1jBX4carD3ODVYTWWJP7n4n+4epN/8IpXtZsmgq COg7wXBCP9hCKKA6uWCFG6RGL+N4N29tbY58sFyzQ6jfU8UUU+go/IQuDsr2wsNSmeTKZe FQj+okGHYfrUBHWU+5mKFSMGjVOIJ3AClITPUw6wvnbNevJK6Vxm8jlRHTUs9k40ePYWuh VFMSMGVt/M02yj/ndbsjxvFAne1dPdh03kLCws6IBANQEztNiwpNOmiSaJ0DGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713604929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mXOYrHA5hA9NCL2KsgKY5Lv9ou4Mvkw/d9nQ3Mp7JWw=; b=VJfpV+WYplp9RZ8obl8+VPxHGHG2ZPjinHM3Ulg/cC4d0gWQ+4baTZwZZ5jbbens5SYOi/ 5xafJY+xcqMI/iHZ/0ddoaI0o0hxP4jt+NUkWP4ZVtAf9oIu/ODK3pRVY5pkNQDKjGQYKa FtpOabeiua9PQu3q/sMMT3fY9SZCay9MD+JXDOz+oE1xW3YY5thb92h0DerZsx5NJnNpwO 3VCrxDCb2RhsHJLwuc7dJ56Xmva8rP5slSWzgYOKk7Yk5uRdKp5zV88X01Giuq2u1bXldt HvUbp3EUtMbCq99hJmpraIsk1Z8gnBfHmHGQKTtWCx4Hyt5AkaJ58cxjNPc7Mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM5cw69mlzX85; Sat, 20 Apr 2024 09:22: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 43K9M8B1088474; Sat, 20 Apr 2024 09:22:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43K9M83s088471; Sat, 20 Apr 2024 09:22:08 GMT (envelope-from git) Date: Sat, 20 Apr 2024 09:22:08 GMT Message-Id: <202404200922.43K9M83s088471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 742f4b77583c - main - tarfs(5): Grammar fix for a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 742f4b77583c12ad31edfb3d6f7173f37bd0e88c Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=742f4b77583c12ad31edfb3d6f7173f37bd0e88c commit 742f4b77583c12ad31edfb3d6f7173f37bd0e88c Author: Gordon Bergling AuthorDate: 2024-04-20 09:21:54 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 09:21:54 +0000 tarfs(5): Grammar fix for a source code comment - s/the the/of the/ MFC after:i 3 days --- sys/fs/tarfs/tarfs_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c index f2828c60f8a7..8c97fab185fc 100644 --- a/sys/fs/tarfs/tarfs_vnops.c +++ b/sys/fs/tarfs/tarfs_vnops.c @@ -296,7 +296,7 @@ tarfs_lookup(struct vop_cachedlookup_args *ap) *vpp, tnp); #endif /* TARFS_DEBUG */ - /* Store the result the the cache if MAKEENTRY is specified in flags */ + /* Store the result of the cache if MAKEENTRY is specified in flags */ if ((cnp->cn_flags & MAKEENTRY) != 0 && cnp->cn_nameiop != CREATE) cache_enter(dvp, *vpp, cnp); From nobody Sat Apr 20 09:31:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM5qv42Vcz5HQDf; Sat, 20 Apr 2024 09:31: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 4VM5qv3bMcz4JSF; Sat, 20 Apr 2024 09:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713605499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/etgFwyAa6d4rvKOsJY8Q2S5FvCAlUgyk6hJ6VhZz84=; b=Rafjl/AOsUmSpetKwju+5ix2Zg0S5O3xsMve3YsAiUpxFOnAh0Q7M15l3PpWdsW+mUmB6z P4Jf5Nds/oclwP44iq38nWTcDhBZDDy46BgrIrqtbHM4rYRU4lF8rbS45PU4BcGh585JbM Ze23EyQFXUavDOFD+pfm6mUjyRZOO5fQEMFwXRZCU8+P6VIuW4y67MK6dgRDQv6R04MZxe szdje804E2pLgXCMWDNOexKLoal6AXJGc464rbuvAICRcB9El3LLWGG1ykEm2ZrPF73n4D ed7GUt1O0cFH0bSuFdjUtm5xkLhH7scTAqeFb0mxzBM7IcOOf2Gsqu4KhwNdqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713605499; a=rsa-sha256; cv=none; b=wS5LHrwKP71E1JGufGDwB7Ohbxd/qN/51L3U2zC006sIJGw4jFACKxZnu+4D9/EKaTsIVo e9ihpNivtoTEDR7FI0j9ST0rHFQ01qypSie60HQoVYqA2DilABsMN7h+jgceVTpfqh4gFy XirLYyBNCYYc+/EvE95d3jqJRM+jM/4M1ZyJibsQ+/gcBn4uT723kWdYdGHc+KPWn4wf4Q DvH6J+mvwAitkynvzVyGuTOV+d7Ua3zl7tWTgdYG8qpOkdt+z3/9+t+M6ypW+qG1w7EJKF sOHBXQLU4BCxU5T+2O9bEn83pbNrjfx/QJqGQwuYF3s/329wPxeQc4dgxCXf3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713605499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/etgFwyAa6d4rvKOsJY8Q2S5FvCAlUgyk6hJ6VhZz84=; b=KeDB1S+7ujXVt+HYUV4gOw2YHnReY7VF+8yUrML+flN1t6KJaT7X5/iCk86SJu4QuhRE+q gh5InPifN+aX5JmKEfTGWmCiUp6/E3BlTJQhWYqTN9aIhlwcIhf63AbWBC5pcczuXQjJ22 bUqQTOlDHGrYi73rOFpQkmUHQ51aE+VlSNOrfBIDRlT/h6YGUuEIE/OXt7DrKIJH1BVSa/ n4eRGveRzIwu5GVQY9wEoJ6uD2DUdiVUd38y4ctmyaISWH/p10AiAnDZ3Xq7umAoIgek10 Y60a3dPmpYUfokC9JkdNPV5Y8wk9ad+ZZmt6gXrRf3C4JDFyUA0rz7OR0g2zmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM5qv3BXSzXFt; Sat, 20 Apr 2024 09:31: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 43K9VdZJ006394; Sat, 20 Apr 2024 09:31:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43K9Vd56006391; Sat, 20 Apr 2024 09:31:39 GMT (envelope-from git) Date: Sat, 20 Apr 2024 09:31:39 GMT Message-Id: <202404200931.43K9Vd56006391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: bbef63ec27fd - main - timerfd.2: Remove a double word List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbef63ec27fdb86814e34c4b4013cd92ba86bc42 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bbef63ec27fdb86814e34c4b4013cd92ba86bc42 commit bbef63ec27fdb86814e34c4b4013cd92ba86bc42 Author: Gordon Bergling AuthorDate: 2024-04-20 09:31:25 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 09:31:25 +0000 timerfd.2: Remove a double word - s/is is/is/ MFC after: 3 days --- lib/libsys/timerfd.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsys/timerfd.2 b/lib/libsys/timerfd.2 index e5dab05821bd..7a112ad0dfcb 100644 --- a/lib/libsys/timerfd.2 +++ b/lib/libsys/timerfd.2 @@ -300,7 +300,7 @@ object fails if: .It Bq Er EAGAIN The timer's expiration counter is zero and the .Nm -object is is set for non-blocking I/O. +object is set for non-blocking I/O. .It Bq Er ECANCELED The timer was created with the clock ID .Dv CLOCK_REALTIME , From nobody Sat Apr 20 12:03:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9Bd4TZ6z5HftR; Sat, 20 Apr 2024 12:03: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 4VM9Bd23p4z46l9; Sat, 20 Apr 2024 12:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r4s8HpUlMNlZ9YbnsesbwCotugoq4JVt20TzJnZ0WnQ=; b=gWCQY40KxP04eIjoXMR4B5RZIyyqsf2pv4toITfQ7Dm/WYn0duqDerQwGMmvl2LnYpKxnH xkm3arZpzcH0TP8pPpyL7YT7c3mRc4cgFJOE3LEyNlNVqyQenHHQDbs4TAkZJI4P3ba5Al W+g9OfBrpQ4pWjUWhc1f1H/QlzvSWfNMmSzu85fEHU95ySkUZ3Mg9QCU8TLz0u/I54sIO2 we9blHOKfq7BXglpnPxb4nK8PGI+HIYGKgdB4l8ytUnVHmqT2YUPqOUIIxbCqgRC7jsoco K5HrrU8fHdMtMiFYr4A04STUDyTZ/zAiE2JJcqnt7rnqh4h+i/yA40Lq8SuJ1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713614585; a=rsa-sha256; cv=none; b=Sdml1WfYZimR9rXBsTaBGH4MAZA+YiSXNAbGIHBcg7CcVmyKNTg/tL0Q7UNUlS3GcHB8mW 5w3OfQ0A8cWzmh8l2Qpuc19ZTAz1RGHDegl2xwFXoD2JGI/yaPhsNQKsUoMHpPLnckVz9F lmqerKEsk8Ub+a7PgWjSDxgstdLs7bDG4BHGTxTQM0OW3sAVZ/wTRZomFbtqqleN7N0dfE 44vPHccmpJ7Kkzbsvil3hcw9KL9XoJvlyXDD9J8zmVJZS28eeTUK8GxmnMNDc4WLCfExUy tkx5gLCdNXyp4i1taAHMZc0TB3fXGp3qvsaLLjXzODR1FJopEhkvCG/ShVV6LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r4s8HpUlMNlZ9YbnsesbwCotugoq4JVt20TzJnZ0WnQ=; b=uWtTb0HHhf4NlZlQS78UDS0jePtG39d+hLI+269+D3jVpEkPTCCvSo1vgsgEIKgUYGF2dF mLDdBezBtfdqlFj8Bc4CYS13ZW2qkpRUN0BjbE9trB87Z4snIyZQJrlOabZfz2hWirSc47 Jdd7qIaDOsjdVnz9ziZ6/105/TY7bcZvoT+qdPL4YPn/fGiJX61CFawVis28OrOMizjI7b 8QBvSOpt2hC4VOqAsSx6+O7DEECph+BcyfLA+QKwzN7PBQSzCRV735uvHmnXEkb8aiiEtM F83o7v+cwWKOqzMML8W6RsNWEe4vyAUgzFijSbwj5sQ9Bnm0WUL5PCDdrPjx/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9Bd1g9XzcSx; Sat, 20 Apr 2024 12:03: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 43KC35Ua068070; Sat, 20 Apr 2024 12:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KC35Wp068067; Sat, 20 Apr 2024 12:03:05 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:03:05 GMT Message-Id: <202404201203.43KC35Wp068067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 68b9eb9185f5 - main - ifconfig(8): Fix two typos in source code comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68b9eb9185f5569d05b5fecb178048f00c3b5c1a Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=68b9eb9185f5569d05b5fecb178048f00c3b5c1a commit 68b9eb9185f5569d05b5fecb178048f00c3b5c1a Author: Gordon Bergling AuthorDate: 2024-04-20 12:01:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:01:23 +0000 ifconfig(8): Fix two typos in source code comments - s/the the/the/ MFC after: 3 days --- sbin/ifconfig/ifieee80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index bde079deb4c6..c6875785f8f5 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -2784,7 +2784,7 @@ printvhtcap(if_ctx *ctx, const char *tag, const u_int8_t *ie) const struct ieee80211_vht_cap *vhtcap; uint32_t vhtcap_info; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtcap)) { printf(""); return; @@ -2814,7 +2814,7 @@ printvhtinfo(if_ctx *ctx, const char *tag, const u_int8_t *ie) if (ctx->args->verbose) { const struct ieee80211_vht_operation *vhtinfo; - /* Check that the the right size. */ + /* Check that the right size. */ if (ie[1] != sizeof(*vhtinfo)) { printf(""); return; From nobody Sat Apr 20 12:03:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9Bf44RNz5Hfr6; Sat, 20 Apr 2024 12:03: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 4VM9Bf2yQnz46lB; Sat, 20 Apr 2024 12:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YTcr1eQsbRIleWi6OUfcPYy32lvdinlWw2Q8vT4SaMI=; b=F0fG78+0rGM/W0CArmRqriag1hQjj9WZhxpHJgfLybpDTbMcjWV0pJn+WE2WU9iRbFu2t8 6VaDklHJQzprghacbvllOun/f5Lbqz3fWty7oM2sM2PGQz+aE/ZlfCM+qblJYzQgOiax52 7ajH3NrugCmKrPp7zcluBjfETzXndMmFSrEGFyy8lVxBqErUlxZHgLoFUdgwKLpp5MFQUc +Nfck7oHDnwf7+1Xa53drga736Ptpi5X7/FIAH5hEU1cmW/j/8llhoDCzf5TQy3M7AKsOh VEPkTvwvwuD/3QSgb7AtLJ0hFWSzwSGZuB2ugvJtxlWBaEdX5LfPJ0hgI8NVAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713614586; a=rsa-sha256; cv=none; b=nhJl93jlSm113LT0vyqfiIHJItWBaQevMp7+ve7Z3x+jRVTE1QNymOhL7bs4psIqJH0sUJ ShXKtyg9w4lp/OBXqm55p6oHDcmOBnppQQnENBtDpNkK5DL5F7omwjCpZfYGzNC2L6T8KR H0/YEu99XS+39ywKHKIj2u1FRWUV5ueHzbfUmQBxmVEjxiRubOLNvlewUrJShtl3MW5GTL c+CB1ZSkrvesbwU4Gcd2uV+T1Ui/0OR+lPVM2lXybSFjUeLsdVD9+QZvU+yV1RUrhQu8Zo uZAJzeJpyoijuFVGXFw81hsQfkY/NnpV8/T2D8FIuUGFuveF65b8pQhh3zw/NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YTcr1eQsbRIleWi6OUfcPYy32lvdinlWw2Q8vT4SaMI=; b=xOuumYm8BDK+2HqpsmCHG6OubYztH8+/9dZWmYQGa2oI/eZUxZk1Gk0BJ7PiwXC7Z3j2Jj N9VHBy0/Hw26nAyxG5/px7zXvCmusSQBNsg9C6kOybQ1ub+OKZcz3Lgc4TAJ/EH3NuktvY pSgqFl0Erttqw+hjEljnj5QzfDmf+uPRlVvitD+HDZsgvOm5SMwGBm5aJymIeMM5VFb7ln YVy1qg8Mm33Xa6K9X+hhtPP7JarWQuD5O/h0rQ0+Go0RtkjOZgXMl7x+IdHKdsyeJurqM4 NlZfrroFywnqF15i6EyJh40cC12tOY2IgzhN/99v88Pi7kM01jOXgYQvhoDkCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9Bf2Ys7zcSy; Sat, 20 Apr 2024 12:03: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 43KC36Vu068130; Sat, 20 Apr 2024 12:03:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KC36DO068127; Sat, 20 Apr 2024 12:03:06 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:03:06 GMT Message-Id: <202404201203.43KC36DO068127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: e1e149ad8ada - main - mwlstats: Fix a typo in an error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4 commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4 Author: Gordon Bergling AuthorDate: 2024-04-20 12:02:54 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:02:54 +0000 mwlstats: Fix a typo in an error message - s/the the/the/ MFC after: 5 days --- tools/tools/mwl/mwlstats/mwlstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/mwl/mwlstats/mwlstats.c b/tools/tools/mwl/mwlstats/mwlstats.c index 925ed62de716..c9f6fe1ada2b 100644 --- a/tools/tools/mwl/mwlstats/mwlstats.c +++ b/tools/tools/mwl/mwlstats/mwlstats.c @@ -126,7 +126,7 @@ static const struct fmt mwlstats[] = { #define S_RX_FRAGERROR AFTER(S_RX_OVERFLOW) { 6, "rxfrag", "rxfrag", "rx failed in f/w due to defrag" }, #define S_RX_MEMERROR AFTER(S_RX_FRAGERROR) - { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of of memory" }, + { 5, "rxmem", "rxmem", "rx failed in f/w 'cuz out of memory" }, #define S_PTRERROR AFTER(S_RX_MEMERROR) { 6, "badptr", "badptr", "MAC internal pointer problem" }, #define S_TX_UNDERFLOW AFTER(S_PTRERROR) From nobody Sat Apr 20 12:04:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9Db1RVJz5HfdJ; Sat, 20 Apr 2024 12:04: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 4VM9Db0hQrz47R4; Sat, 20 Apr 2024 12:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9SxTYLjOSQJbAoUyt+Ca4GMTxTqpJVWVEL0FbdYMbI4=; b=bLC1phdo8bswC1BSmMSuzCL2rS5p9jlILP6abMW+vDeOZG491GV2NAQV08SnBr37HrM2Cs Yf4v1uTRjy+lDTIxIcBgfHefpVLi1nU6vWNC2Cskmzja+HeApefphRG9X8FqBRDlHWEwoy ia2asMbijoTRzopP6CStyRs3jAIqswoTIxcv40zBTCnbmwOPmWlUWIfPjz7AWZI3XY1HZS lA0ctufdQscmOQSC3lesLsfC5RakkvbWH2V1hHBmG5I8MWnasQeMpn5Khj4ZfL8sfCucBh JOWWPzI/5ywsBu3R3rvTHVikHyFk9EAnnbtUU9mStQJdsuMRQi0pOzT/pxKxvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713614687; a=rsa-sha256; cv=none; b=EpU932GSGe7ELhrbwBBZ2OW14h/F5SPoFXIdlK7PyVCV4EqdtA15PKvqgjyrWiilnyv5Cc 9miVmLygQVfp9LD09Z9t1zq7aPWVg2KfPUuDpQbVmrlEgwunVy9fXTdPQFyy6ZemvGLmvu ty586pEAx0HW+eW/PYnvUC1DC8Snk43Ypf/vkLvK/rCEVyLao/Y28vcXLm+BowmzkFKnPl JRBIf2K9+LFkpA8Ke0MzlveBOIHi0xE4SwHhpnxhk9GwqDhPKaqWD2qjT2U0DULpf7yv2U y1WF+VWsXqEqz+F6Y4GnAyR8gx4VMMG+TAPLvdRbFKt9M7jYcjPAa8JUhgV6MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9SxTYLjOSQJbAoUyt+Ca4GMTxTqpJVWVEL0FbdYMbI4=; b=Z66PETZeTNYm/3utCfsISfdhghf5P5YehA6A8VHPg6pd0IbhgcEOIf+GJKmKOj6DNI6U0N 3gYcdp6w1D9MFW3Yj3dT8zI9h3Pd8qJwGdxHuns8Gwumg85B0NoqPn6DwkvYBrZ4zuTcPM PuwGGzDgV4JbYv+EzwUQbZ95tyaLjHd2wVe6Q8nvtF6ifQyRRPzfyzmCrOmklQ/5XYsEls JxQ4Vfm1gWORGEgch0QRNgi6Dj+zTo48NyNlH/4kekXQzl1BvN26pNIwtbQrKeLupmiS7o sa3h3VTyK4U/PIUnLMGDDjLyDv4hCraMEqVZrsFiD9tPUhk+4+0GEJ0T0gqPnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9Db0HqYzcBR; Sat, 20 Apr 2024 12:04: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 43KC4kW2068480; Sat, 20 Apr 2024 12:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KC4k73068477; Sat, 20 Apr 2024 12:04:46 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:04:46 GMT Message-Id: <202404201204.43KC4k73068477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: cf5d9c41246c - main - sys: Remove two double words in source code comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf5d9c41246c0583b28d5c1101c6f334e38a67e9 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cf5d9c41246c0583b28d5c1101c6f334e38a67e9 commit cf5d9c41246c0583b28d5c1101c6f334e38a67e9 Author: Gordon Bergling AuthorDate: 2024-04-20 12:04:31 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:04:31 +0000 sys: Remove two double words in source code comments - s/of of/of/ MFC after: 5 days --- sys/sys/link_elf.h | 2 +- sys/sys/types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h index 2ef044032f58..9752bdff55dc 100644 --- a/sys/sys/link_elf.h +++ b/sys/sys/link_elf.h @@ -58,7 +58,7 @@ typedef struct link_map { caddr_t l_base; /* Base Address of library */ const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ + struct link_map *l_next, *l_prev; /* linked list of mapped libs */ caddr_t l_addr; /* Load Offset of library */ const char *l_refname; /* object we are filtering for */ } Link_map; diff --git a/sys/sys/types.h b/sys/sys/types.h index 608e74287487..129ca0f2f4c4 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -317,7 +317,7 @@ typedef _Bool bool; * The major and minor numbers are encoded in dev_t as MMMmmmMm (where * letters correspond to bytes). The encoding of the lower 4 bytes is * constrained by compatibility with 16-bit and 32-bit dev_t's. The - * encoding of of the upper 4 bytes is the least unnatural one consistent + * encoding of the upper 4 bytes is the least unnatural one consistent * with this and other constraints. Also, the decoding of the m bytes by * minor() is unnatural to maximize compatibility subject to not discarding * bits. The upper m byte is shifted into the position of the lower M byte From nobody Sat Apr 20 12:07:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9HK37pGz5Hftj; Sat, 20 Apr 2024 12:07: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 4VM9HK2Yyhz47x8; Sat, 20 Apr 2024 12:07:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pc5YGdBc0zNpiSV1EU1cYXcNn6n95sFQMwb3Oy4D2B4=; b=cdLrepBAz22tb9qHL7aXrD309TQ1sflZXZdXGmNucHX3A1LvPHydl+uWAOrQkuwVkfmpD7 oF1ExSYnJYngxl2Fgj8rkAmlqnCcW75rG58tswqsIfaXlmWDdRCN7vylg54hUcHRe3YbGr 5C06BYNAc8nNFOjUTmQo4pQz4yhV2L+MFPhhMUrEvBengTkwCzZPV6mejFqhS0ZsgdUBuk Qg8aLK60jjXiD9ElJjaa6hgprpOVz5vkObwJb7ycLzrPIRppymg4kIZ0t9VUv2iWfPfX7J PGKMQqaa5FL9qr0kNP1LNz/0W6/uE8rrDUtEeGMKeq1ZaRLIEh02nb0jzc2znw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713614829; a=rsa-sha256; cv=none; b=HPTpBI3ogu8L3zqNbTVJzAMzHH44mDQo1etq8Vqrf4Y1GJROi2t6n2EQQRlK/CDcXUIFeG dHlF5OcDcZdrYgixbxdK/nlRAkUOVXpMpo0mngnZOw7Dt5pzbAni9IlcoqlwVzoMzRwFuB ztZekiRVjUt5YOHe5Mm/C2KrpbC8/uRL2auIT1wWoO3K3yYpxPI3/SFWNpnKq6TT93MsVW ivUqzpUyk9Rf/jCgNeb5cgX81m2Tk0wlhTFx8SfbGGZjMFjlmkOYDywKjtdUl2iEjTVkc7 kPLRkoRyRPkqRPcrLys9mm3V2hnseE9hl6pIpIELOqJI7YY6c38slerR6jf00w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pc5YGdBc0zNpiSV1EU1cYXcNn6n95sFQMwb3Oy4D2B4=; b=V5jN5NmdSKefNsmkFfk98qWpIgYV/WzKrQcw+zmKhdBNtYprTgmkmTycEzRRX9q/U16uIA rBjuWo0QC1GEcZMu4t8Cb3fyjaChy5sQcK2IgBHshampmq6EPRNPbkskH9hyaVDLoMVUvA VS5x36U6WCGS9Uy4t0V3oc5qZPCPOJ0GRIyY/MjJ0xRrPxnjFLhM43TO1SNwTWdqm2yTkd x27I+0bKGW3Fp25TtZTU1a5AITivFOIM30kEZJ+SCUbTrep4QnIziV8rxRpWLgSVO9JVT1 2zFccZklQdnqcB0JT7X612LyTgxQjYe5z/2tmTg9rPxRg4MowkDd3Qx8SqToOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9HK23nyzcRQ; Sat, 20 Apr 2024 12:07: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 43KC79WJ068925; Sat, 20 Apr 2024 12:07:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KC79gu068922; Sat, 20 Apr 2024 12:07:09 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:07:09 GMT Message-Id: <202404201207.43KC79gu068922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 516e591db11a - main - arm64: Remove a double word in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 516e591db11a29c7bb3d8135a94530b27b94f91d Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=516e591db11a29c7bb3d8135a94530b27b94f91d commit 516e591db11a29c7bb3d8135a94530b27b94f91d Author: Gordon Bergling AuthorDate: 2024-04-20 12:06:53 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:06:53 +0000 arm64: Remove a double word in a source code comment - s/of of/of/ MFC after: 3 days --- sys/arm64/qoriq/qoriq_dw_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c index ca67b5d9cbc6..2d7de343564a 100644 --- a/sys/arm64/qoriq/qoriq_dw_pci.c +++ b/sys/arm64/qoriq/qoriq_dw_pci.c @@ -60,7 +60,7 @@ struct qoriq_dw_pci_cfg { uint32_t pex_pf0_dgb; /* offset of PEX_PF0_DBG register */ - uint32_t ltssm_bit; /* LSB bit of of LTSSM state field */ + uint32_t ltssm_bit; /* LSB bit of LTSSM state field */ }; struct qorif_dw_pci_softc { From nobody Sat Apr 20 12:08:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9JZ1cDrz5Hfsv; Sat, 20 Apr 2024 12:08: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 4VM9JZ15Fqz48j1; Sat, 20 Apr 2024 12:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2JhYmK5TNeoYCyEq4mw5anrg6sroMHXdrttS5nlbtPs=; b=SgaiWE1BDo1cq3Ekih5ht5MjhiUwZX+KlwIt+EfRRv6XkBUC5RpcJA0gXFG/nG6T2GMkqY HR6OpXy22pDcRVaKDaQ0eWSmPVCEmd7M6eTb2PNWExXnbXE+StSygjgK6pCsSIbU0kdFD3 y9+C6ap9rs1k0v06V30S3jF+5Aw05Y2rWGlBAjVwjufMVTgZw/inIuGIJ1Rp4VRwS61TfZ r9Ih9tLdkSUd7yfa3GjZ1GyrxqppLNfx8BY0i14jygs/xA505wcl1Ax+HxOeILfioWzl0I 7NFZBM6mMra1o6OGma1QuAtLSRSg9I3d24MPj5+QZU7LQj1s/N/b+k/10z4VYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713614894; a=rsa-sha256; cv=none; b=TQCPSl6FNlp92DqyX+QZCODd8mD2cwj5p3iTl1hgvcn88D4uiz/wr5kB14fMkjQ8+KoyO3 PWWLYO5C3n3W4ZqqYgAL1yPxzXM1YuWKVEV1dBJGtK61ETSEivCpw++5fomvazZqnzT5PO 40eg3XTgh56pZi4qB5Hq04wTvGvT+RKRxuKlsnJrcDH2qHei4+uykk7zns4boAsVyxeiR0 IkraklRsM02BqW/z2agzr4LHOtOFF6+FZH1TnByRdaBnAHICUxzu3FXS5fBy50lHZdjR8l 6orSEj+XBX9Z2eqO+913VnRjD+Aae5T1l2Ary/VuR0FA+YjBXdI/rqSFkF6ZYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2JhYmK5TNeoYCyEq4mw5anrg6sroMHXdrttS5nlbtPs=; b=mbwGHhFsn4QJoGXmoGd2DhjXX+UDPML8KPI9b/USoKqFwvxHX1iE9paCDyMk/x4GvIJIi9 CIyXsPdYusiD5d8uhc4FdVAueAuMYJ7yd/gLSQb7wZ9AOtPCbAgqHKUNhrSl0iRSO9xS6t hg+RYtdZxMrzwiusuF9dttuCfWVCpAi8RWGGEiX0sB3Ek3PO9pjbesdlLCEpoyBc6GHlfX 5MsZOZByKg+oGZKagQiNPo88nQDeOlcX43iU+8VcuaZv48+b1+2b3zdON5IjRKOyKSmA4Z Ds2vLz3M8uFn1p7aHFVSW9clruJOyP/ucndPmuDroyzFKbeumd6etNY5mcicCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9JZ0ZDRzcT2; Sat, 20 Apr 2024 12:08: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 43KC8DJL069192; Sat, 20 Apr 2024 12:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KC8DTU069189; Sat, 20 Apr 2024 12:08:13 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:08:13 GMT Message-Id: <202404201208.43KC8DTU069189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 1ff65c57e337 - main - NOTES: Remove a double word in comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ff65c57e337ddb1681af5f98da0fa757cefc5ad Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff65c57e337ddb1681af5f98da0fa757cefc5ad commit 1ff65c57e337ddb1681af5f98da0fa757cefc5ad Author: Gordon Bergling AuthorDate: 2024-04-20 12:08:04 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:08:04 +0000 NOTES: Remove a double word in comment - s/of of/of/ MFC after: 3 days --- sys/conf/NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 4280d477bcb5..cdeee4eb7fd6 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2803,7 +2803,7 @@ options MAXFILES=999 options RANDOM_ENABLE_UMA # slab allocator # Select this to allow high-rate but potentially expensive -# harvesting of of the m_next pointer in the mbuf. Note that +# harvesting of the m_next pointer in the mbuf. Note that # the m_next pointer is NULL except when receiving > 4K # jumbo frames or sustained bursts by way of LRO. Thus in # the common case it is stirring zero in to the entropy From nobody Sat Apr 20 12:09:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9LB2p5lz5Hfsy; Sat, 20 Apr 2024 12:09: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 4VM9LB1vlFz49TT; Sat, 20 Apr 2024 12:09:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRXplrsKxB1kXws2mmVD4IZbz6VDFhP8AYArQtKTMXg=; b=B6G56ljHHdWmLsaFjatTTqGzirPDKSfZknCEB2dcRNZ+4V4S2e3trAmUCh770dmTwjFdK7 XypbWMdECf5NrJWtegnRDUe5/EDxRZ5sGJuhzvqXd56Yq1Mi6qE5xDXhqcqjUswiVXPe4r 3G6yMkbDQLzAaZzfOcvRsVRLI7eK1OQd7PO4hshHDUiBJxEa/7j9CcI/Yvx1Hd4fAoW4Cl jgyKJZBZNdeRmLftaPuJF8p0jyG0q/+9QFo8xIg/so8nBepregbF/NeBa4j5CDzlklh8eS Y6d6XpDPpoCaIhiyqugeTR3po77qZg4ev1H2XPvfCCTlguQE1PR7CBx1n9ymZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713614978; a=rsa-sha256; cv=none; b=m1PEzp/P1LXD7bVJ4haXQTEk7EQVL0w5lJgY25Yri1hCYT4uASMWdJVIywXng6jUr2lD2j 6LuPYQzrGtVy8/e2cYOy8nvE1hHQbF6RbFgBG36h62RrKmmcHm9YDGYtHiVnQU3/QD3zm5 HISD0j2C0efm+2UHpkj/WwWYpERp0YcX/v6Pgjhc+TZthfZxtocQ5Ca6ZeRK4Xkog0zhrM n2t0bkquFtVflLyd9gVpeFM9mcyHj055t4BizzN8E1GZkjXD8ev1qauyOCSUIsjX+eIlPO G9hZmPl9y5bi8YZYag0PPRK0Ho7pQAcGES1lvFilj8VpqP3WJQ//lYbWJzA4og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713614978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRXplrsKxB1kXws2mmVD4IZbz6VDFhP8AYArQtKTMXg=; b=Ehl+IMBRPjVAjom7JJWDj8+DfgXXSbjRpUXO6NU7cLf4EkaDOpjZM5ikz/OAzMdXojmcat ABqkWLbvj24aLUO0RmUfxQKv9hEYdwDuCREOLALcvzcOIfeugxxI9nCm5VWWoIPOvbW2Xr aRQwEp+D8ASKOXe0DusMjr+Bj6OqlRwXB5lpZsDfss4jglHBRvdlgNentLmUI40nS0Y4a5 9NYjCI9tFHeb0bs6SsugoOfsCjrgCKU9Rm1BpzabtVx7Ah9kYiYyBng55nA5gh20scryJ/ W/H50Jgufx5ePqlLNZ1w5qqs5spQWzNxvjl817BsHUF241SRMdznYfDSa+1mQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9LB1PwtzcT3; Sat, 20 Apr 2024 12:09: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 43KC9cFI069523; Sat, 20 Apr 2024 12:09:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KC9cBa069520; Sat, 20 Apr 2024 12:09:38 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:09:38 GMT Message-Id: <202404201209.43KC9cBa069520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d2747968c068 - main - bhnd(4): Remove a double word in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2747968c068b8cfc890901f4955037bad7adb9a Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d2747968c068b8cfc890901f4955037bad7adb9a commit d2747968c068b8cfc890901f4955037bad7adb9a Author: Gordon Bergling AuthorDate: 2024-04-20 12:09:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:09:18 +0000 bhnd(4): Remove a double word in a source code comment - s/of of/of/ MFC after: 3 days --- sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c index cdb92551e887..5467bcbaac20 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c +++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c @@ -56,7 +56,7 @@ * The Broadcom NVRAM NUL-delimited ASCII format is used by most * Broadcom SoCs. * - * The NVRAM data is encoded as a stream of of NUL-terminated 'key=value' + * The NVRAM data is encoded as a stream of NUL-terminated 'key=value' * strings; the end of the stream is denoted by a single extra NUL character. */ From nobody Sat Apr 20 12:11:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9N22f2gz5HgBc; Sat, 20 Apr 2024 12:11: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 4VM9N22D7Fz49xp; Sat, 20 Apr 2024 12:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713615074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gPMapQXnzppGiAQDu5EyXC1w5HaVwNbjlWpIF5TZD4=; b=iYp5GXziNmlh4A4P3v3KOXn0XZ7LTGa+9W+V1t3rkB7FRjOQgf3lFBf4j6DTwJ5293RyrF cW8/wBGERL8049FDNAyfap20mK3dcWfZKGmJJTYWA6/PQ203SULo7jWLTKwAi4YY4IcEJX k394l7/lj6dm6xs5xKuL9M5xAEe67YCGo8NzxvqcZDYHmBjzELNrPPFHwkO+VNxf4UvwY3 Nh3OcTNO2Taoknl/cdWmBa54ldH+ZmqPwUoVmQIZMue497SZjJdJwpOUcYjUMMggWrDGuI 6bQl4U6pv4EO+YLEIek9tXVVpsqUoffSY4/7Ut7xl4GTEPpzpWBYr3MJMcHXsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713615074; a=rsa-sha256; cv=none; b=ODT2YQV9dTZrCykuDlVQ4FNhuD9RaDHzOdIRLcKYyPFT34973FhwwzicyBbLHBcI+qDJc3 GBpon46NHh1uMVFmjDYxDdRV3T4r9f0ZfMlrrhl1aJn9rk17LGLrmPfkOMPUw6uu10OOYK v23qxcS3qpFnEfK4ALjJKxeseueEEz+zJsPDGoVOQ31fnuIKCDNxai6OiMpAjjTKFMgpEB lQS8V0N4mF9qKxjoIplHWFu0l+z6ipIsoAyM1blYOHPXatV9HqruF+sBgLIacFNskOsf2B lJfSTVh6EQ1rJvtkt9gTxlanFJxCamE+dB+yM+jEKB66hOMqrl6GS1STU9Ciwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713615074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gPMapQXnzppGiAQDu5EyXC1w5HaVwNbjlWpIF5TZD4=; b=pxwkQvxGlShQ60LFXiDAP8FHb4vXyf46qr1BXCbCD48GOHBHF2h+6wloe0LXB7/Q0DhML4 7qOGMWMuNX/jGbqbZ2NdN3BI1UMx1uvYO/wHa+hNjlOaCKqir5gKL08v4ZK/83RbEzHcgw i7CvGtSQGOBDH3GT8hPHoUHL/9obQWIVj3DGHprOutSwwXJFvsb+K3DgwkOiBCgb1b1s28 HD6fZbYlbEn0Pi6OUn2dOLOy1E33DpRGGWILRLXNRTpokeLzSMj+Jz5/RnO6WlF7Kc3zRe az+TRivW+kqteQRFzg8WirB4bvOa7JTrRzlNteFAQMDn00YiTOQc/BDs3QRN5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9N21qfgzcRm; Sat, 20 Apr 2024 12:11: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 43KCBEi9079419; Sat, 20 Apr 2024 12:11:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KCBEox079416; Sat, 20 Apr 2024 12:11:14 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:11:14 GMT Message-Id: <202404201211.43KCBEox079416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 604511f84ae6 - main - usb(4): Remove a double word in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 604511f84ae6378db25ae3080e9db2e3bc9e0811 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=604511f84ae6378db25ae3080e9db2e3bc9e0811 commit 604511f84ae6378db25ae3080e9db2e3bc9e0811 Author: Gordon Bergling AuthorDate: 2024-04-20 12:10:59 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:10:59 +0000 usb(4): Remove a double word in a source code comment - s/of of/of/ MFC after: 3 days --- sys/dev/usb/usb_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index a4355de237c5..c4fe3b4a6ab6 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -2484,7 +2484,7 @@ usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len) #ifdef USB_VERBOSE /* - * Descriptions of of known vendors and devices ("products"). + * Descriptions of known vendors and devices ("products"). */ struct usb_knowndev { uint16_t vendor; From nobody Sat Apr 20 12:12:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9PY2TTkz5HgHg; Sat, 20 Apr 2024 12:12: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 4VM9PX6NZWz4CjS; Sat, 20 Apr 2024 12:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713615153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E5+2P3dzfqiAOqyIxJ0luPHFLXjpvSj2x6DuGYDQHrU=; b=cD01jHervPnl1u84Eyt6cOIin9i/RceEf1OmrCcRli/K/gU8dpGVuJlSoAmHTK9Rl3P1J1 GR7OuGd6tAtApBF/bTWTYU0zGFH8hz5dIihbSPNKm1BjRqqW+AV9fu80T40EBNeUPww0hj anW27kb/5cxwEwq0WQyHLuS4ZMLFK8+O0i2alhw7svsn7TDNv7CMGU2qq4EykbldBJsrVJ XJZUc1qYZAgZDH7wgQHMbWKD/3BxJZuR45uL8/K6l6JDd+skQ7YXS7xrXxFakUmWIIquPo x9JeoOYnNhWr9/nly0iphGM+pdY4INP4wU19htNQJ6aBQFdDttjtrgS7gBLNtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713615153; a=rsa-sha256; cv=none; b=bWeQbIJOTDd0g6qqvQAQHPFDvb+7fTxKfp+r31YyiW91nFDgKLjTFS3IjXo+AYAoFFGFeC 88iI3uogoLY5Q14udVkj5wwHSNU14/Uy2jnJdXowzZ+xqILxz5EY2flm6tkvgWD36Qq41o +isMXO+DEKgvAdpNVW0lSKvirvHI06+qtebyzdbO6hR4FiG6Y0YkHV071/Z+lCOdrqAI22 BhLnER5XhWRm2l/9IvEtSapS/gjpCE/dssJ8HLx2TnorzOAv7CLqrLIa9uCxwFuCUI0m0v Vqh0yDpillTI8mh5eScXm+YlqBh++n76QiE5i0ot8BEAV3xo/H/6y95l3bC2Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713615153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E5+2P3dzfqiAOqyIxJ0luPHFLXjpvSj2x6DuGYDQHrU=; b=TBwlZiSyrF+L/dreLDbxZYe8VhItRQEcyAoeEwpyR+jjKxMFpd++qfrygVtGhBqXtVIeDd b1O1UKNvFe4aKicaiOGG+VDlpaUsnfGFWDj0LK/IkAKviJdAYaORAvkNFtQUWMtdAOATSL mKTPkVsw0xnJp8QfoVcW3qFmWkQa1DK/aBoubgjJ6uw+3iEClh8P21FN/LdhS4ln1KHjE3 EdKbofph0AQwuWnabLG2o6z/479z3v3OfkHXsew4dxVvWQJlYb1L6fqQ3yCdw8yTsJbvu4 NASkHSEQ60vqrSsAWLuyt4v4HXZ0hIM1nso1IBf0QVYYv8zqMqpXsbiQigxWxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9PX5rLhzcbP; Sat, 20 Apr 2024 12:12: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 43KCCWDP085158; Sat, 20 Apr 2024 12:12:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KCCW5m085155; Sat, 20 Apr 2024 12:12:32 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:12:32 GMT Message-Id: <202404201212.43KCCW5m085155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 1bbdcf62d3ac - main - safe(4): Remove a double word in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7 commit 1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7 Author: Gordon Bergling AuthorDate: 2024-04-20 12:12:23 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:12:23 +0000 safe(4): Remove a double word in a source code comment - s/of of/of/ MFC after: 3 days --- sys/dev/safe/safe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index bafee29b9a9a..da2afbd38fad 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -1777,7 +1777,7 @@ safe_dmamap_aligned(const struct safe_operand *op) * of an operation. The hardware requires that each ``particle'' * but the last in an operation result have the same size. We * fix that size at SAFE_MAX_DSIZE bytes. This routine returns - * 0 if some segment is not a multiple of of this size, 1 if all + * 0 if some segment is not a multiple of this size, 1 if all * segments are exactly this size, or 2 if segments are at worst * a multiple of this size. */ From nobody Sat Apr 20 12:14:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9Rq6kGLz5HgsP; Sat, 20 Apr 2024 12:14: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 4VM9Rq5t9Mz4G7t; Sat, 20 Apr 2024 12:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713615271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CEBvEFwNhewWsuVrZl2U3AwDWo0S8kKqJVQkoMZ1G9c=; b=PhmTwFepJMaxuW8azQpm3VQWRIsbTzYx2RA/ZAWu1JIOzFeTAQi0BSzKFQidbNs9ihci6y LOpMpZ7OSQx21q0n9wkiju+d+J0m15adwa48lWRwUigOQHxmuacRScvkfXbbxlvEasZo3W X30tdQSN/jsM94IvNqliBP/N63tlPxwj0W+FG+9Ve6llR+jrkdp28t4JZwTSl/Isc3R7X1 hf9hZqQKWV0DwJtv2QhMDQTlqe/Of/tgp7XWXWLa4d4byYez9U420uMwB0j1fBCWjyqJ4E orThf+52GYSgKPAPoHwUB2TDTDFhMbwS2zsiuKhvNheYLgX70EdJtdjSunQmCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713615271; a=rsa-sha256; cv=none; b=EgmZxb5J6Ti8dzrpsUJK+ez4OvsriCkU4UT1PxwPUZogssgKjfVveq8xRJEyJGM09vJUQL iJKZ+R1QpO+R6GMqsPStDj4A0NBhLTTnQUMxnJY/navjUDKEbO/QqCVopHU7RKI3FrO1Ab 8JB/+UEoEABGAkT633Xniy/zgItpdz2roEDi0ZK46sIEYJKLhj5dBGy6JMMH13JLUDYg7+ 8GK28qxl/NOiugiEG/p0ldhUi6tCCfewghzfmijboSyfy+4vPDjEiRROMTuN2f4ZzUiCuP XasCKMw1aZwm6022UVp5G7F5cjiSYlXyWHEU4JVg+OhSn8hGN12OHvMZMJJxjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713615271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CEBvEFwNhewWsuVrZl2U3AwDWo0S8kKqJVQkoMZ1G9c=; b=GaFebyVjObE5fyef49AxV4VmTEFhyt/6fDI95fKj2E9MG/YbG/EqUNrr40aaHzd9fN0at9 ZFoPYhfyVdqhCXUByvdIOtScjdMkhadvHpoMvdSix3cljTfeaTv2r7bP9NOM0Lisy7x+kw pq0LkAHVJXWZcjGyqqg3hjUfh9a4k61z3N3hyiQhTdMvGwZa/8oomty7r/6BaJ7fVh7HBT 1dRYa2dMS0RO392o8oQymHm8ls3fC7p6dU2gWsVTD6PfxlYeu2CY0O45Bk2kRKE26n+DSe S/sOuToLZsZ0r4iTAugPI6lCAEBFESB82Cok1wj3/bRbwy0gTuz/A2UqQZ+zyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9Rq55RNzcSJ; Sat, 20 Apr 2024 12:14: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 43KCEVRP085583; Sat, 20 Apr 2024 12:14:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KCEVTo085580; Sat, 20 Apr 2024 12:14:31 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:14:31 GMT Message-Id: <202404201214.43KCEVTo085580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: e6c45f377d5b - main - i386: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6c45f377d5b3bc28fc51a67c40dfa45c2087895 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e6c45f377d5b3bc28fc51a67c40dfa45c2087895 commit e6c45f377d5b3bc28fc51a67c40dfa45c2087895 Author: Gordon Bergling AuthorDate: 2024-04-20 12:13:33 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:13:33 +0000 i386: Fix a typo in a source code comment - s/slighly/slightly/ MFC after: 1 week --- sys/i386/include/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index dae829b2c0f6..5aca9fb15181 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -91,7 +91,7 @@ __mbu(void) */ /* - * Always use lock prefixes. The result is slighly less optimal for + * Always use lock prefixes. The result is slightly less optimal for * UP systems, but it matters less now, and sometimes UP is emulated * over SMP. * From nobody Sat Apr 20 12:14:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VM9Rs0vnsz5HgjQ; Sat, 20 Apr 2024 12:14: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 4VM9Rs0FJtz4GLd; Sat, 20 Apr 2024 12:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713615273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OyOdxsC6H+pfMYUAOHE+LVkEiBg+EOtYmkvNtZYFvo=; b=jZIwtMfguqX4qNZJf0XZu19aoSbzZfCyL89t3qMn+nJEhh24TqZhAkwNF4tgADyU19bAvr d5sgIHQ8tAKtEvVKCmeQTDY3n0vQn5pdDcLkiV8z1MMCSqto5zixhsx6dY26NUy5vEsqJt 83wXWHtPtT9AzGfrS+7NNXiTFNk+sXIv9jPY96Mu5eyPtN+4JE7JXpJ62W3nwtQy/rdi/d sxhkjxVGU6JVtFGtHHD2iKUsHCg768mY7dvaxHZaAyNLHztd1WyuN6tm1duoq/xIvGFu+/ QeiovzwQfXxjJzu5FrpGw2J+aCpsXJx1DWLlJ/ZK6uRcfAeCat2LE2Ib+nEsYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713615273; a=rsa-sha256; cv=none; b=KOi96Hyr0XJwNecM3FJ7/eY5ih2Ygu6vyYXsXiAJXHEBCnrN8BqIrKkYNdk0wOUR7/2kk0 y8XSRyre2GZxkDlYHg4FdDb1+bzolOEUCLAE8IVxhH560Xih/b+CkQdvWXc5DCSRGKTOOY HD3LIaDWtqVtT4qlYn29B+n+gw/cMs5bePwvPymV16kM9OdaGTiW7J6dmBz4G5GI31cDaE eV/fsLWMRiatHYpNM2rMOHvZSq9jaf3sJe2FUnE7kw9+ePMkEXFFLw93zk42zVkVAZ7GT5 UdxMr2P7M9SVcRe6Fh9L5eJWMszbtFlQMLCqY32zWFASGHJJy2RkDBWABFW4Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713615273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OyOdxsC6H+pfMYUAOHE+LVkEiBg+EOtYmkvNtZYFvo=; b=CJOqUzCPvHYHDydWAShsao1lxdA0CtdFSjxu5KIEwz4APVyWllYeXDaAkLA5JenuJPRAxW Z7GBP88GVDYTkWMhaxG8YlvdFo5eK653zVJG7i+NbZC+1q/QmV75BGDi26bpKHXMmDeP45 at2l9niZBsdJ0YkxplTKkeDIjgZ5fGfPwXVUg2lyCk6o4ky5J8qpxEEtinbmYK8FFb/6jL sF29zOGGUF3734AxFJYWgnhOy/KNT7cqd1jvqJJWcXXlYYJUBJVFSgbKsRr4Y31v5zGRPr KUpIx1fDXQek9SLsTxF1Fzupq9zXK+eHjI5D7NHVLLIqhdq5+/ZLEJokncTMPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VM9Rr6PD4zcFS; Sat, 20 Apr 2024 12:14: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 43KCEWem085640; Sat, 20 Apr 2024 12:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KCEWEG085637; Sat, 20 Apr 2024 12:14:32 GMT (envelope-from git) Date: Sat, 20 Apr 2024 12:14:32 GMT Message-Id: <202404201214.43KCEWEG085637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: fa3b320668ba - main - ds1307(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa3b320668ba6068014337bbbb05dbd39ac8dfb6 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fa3b320668ba6068014337bbbb05dbd39ac8dfb6 commit fa3b320668ba6068014337bbbb05dbd39ac8dfb6 Author: Gordon Bergling AuthorDate: 2024-04-20 12:14:21 +0000 Commit: Gordon Bergling CommitDate: 2024-04-20 12:14:21 +0000 ds1307(4): Fix a typo in a source code comment - s/slighly/slightly/ MFC after: 1 week --- sys/dev/iicbus/rtc/ds1307.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/rtc/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c index bf247b618c2c..e8aa6a258edc 100644 --- a/sys/dev/iicbus/rtc/ds1307.c +++ b/sys/dev/iicbus/rtc/ds1307.c @@ -471,7 +471,7 @@ ds1307_gettime(device_t dev, struct timespec *ts) /* * If the chip is in AM/PM mode remember that. * The EPSON uses a 1 to signify 24 hour mode, while the DS uses a 0, - * in slighly different positions. + * in slightly different positions. */ if (sc->chiptype == TYPE_EPSON_RX8035) ampm_mode = !(data[DS1307_HOUR] & RX8035_HOUR_USE_24); From nobody Sat Apr 20 13:50:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMCZd5DQhz5HpSL; Sat, 20 Apr 2024 13:50: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 4VMCZd2ty1z4PMS; Sat, 20 Apr 2024 13:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713621033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQANLxYsjut2vd7/Mmel9Cj1/dQVyD+FTgpOSL9TfKQ=; b=ryN7ujGfiVcu9kMVo62Pwz97lyxesokaaGFzW019ajK6WriU2H2+1cMn7Nq7isUxgoY6k8 2Z205YGLuLgf2fawPQBsWr3qE/YhXuqNsGGBvKSQ+c4S7r7ouF6tSJP9us+Of/p+9P3MKn mvSHVuB8TaKD6KZ8PQG/mypSx37abydje+R3iXvHv2Z316dHxVZdCpvs8CfmjAqwtykFjA YsamQ9XKA1PRLGDLR0/tZrhsscGGwloX1gxBfPjG65Wf63zhnrXF1/HHsmjitko3ChXENw 28XzQo+0D0fPQrkRXxIdZLSGHBTBr8CZOqTalhg+LflKFWqHRtAOTOR38SBQ3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713621033; a=rsa-sha256; cv=none; b=kS5Ann7CO3FRmbC59VK0qQ2N/oEJ4kIAzwX2Lr8Dt9ghCblUqLDPT+YKt9Ctdh6g2H6MDg eRvP7CM5AsRzlFmRO1tHGJ+Vd3ci/ONc8LGNPa2QJ2UhNpH5Pu9gnZijARDLjVnPOuTwLO cGe4+tpeEDHWN3quMFq+VjqKmoq5tE7+spnFIidcjWwOQsQCqylAJ7sUgrRpxccy43mAnr Rl6Qu1a/hEm6D9FUT7NDB2xZAT6je5bgYqv8sjOpTedv1ZW72bYCQkgqRNW/VQTDTo46IK mNR86cs+QSF4C7i4/lzN82Ol81nj1cF/bB88A95B55h9aoFn8D8F/qnuyNKiyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713621033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQANLxYsjut2vd7/Mmel9Cj1/dQVyD+FTgpOSL9TfKQ=; b=v+x5BW7r7PbHhc7xvVdtxi1/F+NWqBkuNQ5S3364pA3rGetnQtvGOmjo09yknbe0k1g+RB KLbDZf2DTxGPqmmHA5Ebmmi9SkpvcgsIe9Z8dvG4qjWTFBJjvakbdAksg2EOVgzP8ARuJA B1/do8nddEquWZKJk5snBH1kix2GyFubpm8pBINP+sz0pz7RXVeUPDstIs+Igfzb9jKcmX a/QSxAZVDWkMU6QdbAU7gc19dsuFinkUSnSgOSQ2oEDn/lywWI8YzBxJH5qm1k3xnNRKFp ClnjukKMCl6+sd6mT1PZ5U8VxzrTNHqdZdoNsbSSV9xrSWxhJy80fp0wcpuzPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMCZd1VgpzfwY; Sat, 20 Apr 2024 13:50: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 43KDoX3V046644; Sat, 20 Apr 2024 13:50:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KDoX0q046641; Sat, 20 Apr 2024 13:50:33 GMT (envelope-from git) Date: Sat, 20 Apr 2024 13:50:33 GMT Message-Id: <202404201350.43KDoX0q046641@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: 8d7473703520 - main - rtld(1): minor clarification for LD_STATIC_TLS_EXTRA List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 8d7473703520f315c1bcd3b3d12498eee10d563e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8d7473703520f315c1bcd3b3d12498eee10d563e commit 8d7473703520f315c1bcd3b3d12498eee10d563e Author: Konstantin Belousov AuthorDate: 2024-04-20 13:47:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-20 13:50:27 +0000 rtld(1): minor clarification for LD_STATIC_TLS_EXTRA Also properly style the paragraph. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- libexec/rtld-elf/rtld.1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 4d97159b0aaf..a152dd444bd7 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -324,8 +324,11 @@ control to any user code. If the variable is specified and has a numeric value, .Nm will set the size of the static TLS extra space to the specified number -of bytes. The static TLS extra space is used when loading objects with -dlopen. The minimum value that can be specified is \'128\'. +of bytes. +The static TLS extra space is used when loading objects compiled for +initial-exec TLS code model with +.Xr dlopen 3 . +The minimum value that can be specified is \'128\'. .El .Sh DIRECT EXECUTION MODE .Nm From nobody Sat Apr 20 14:03:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMCsc2D3yz5HqmX; Sat, 20 Apr 2024 14:03: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 4VMCsc1tJjz4Qvw; Sat, 20 Apr 2024 14:03:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713621812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=63MTFxfe7LM7NV2rRVqZ+ZB9KMvD2OU4MD9F1DzPKnk=; b=TOnLNRIP6VMV7h4l6WY0KfV1uNkP6YyvHiQqtCdROQoFoT6NM+Ojdfm+lgfV9QsyqmmSFy U47Bf/MxGtPLtcBulc/MbiGjH9rztdYSMnU8MifrZ4QCtEp/aW97HsRYYBZ0BZ9KtQyC4O sgOBYuxgNckPvU1Uo2N03GStUUjWEFeMjaX0XbZQswLL2uxcZ8z0Fp3NN0Am1bq/wznTvI CrnQRc0jVpc9B+gw8J4PZJa41Z0QrFu3MHlcSItbY1wg/QAotL+xnvj1NRlQY0IYLEfyEl 4vXO1humXLZqq/KQtljSWC9US+hEcXVAqgJblPP7bGc5KmjciHof6dyRcKpQOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713621812; a=rsa-sha256; cv=none; b=GxTLKkt/nqthMkkVe6gE+T/XOEZFruwaY7OmHre5iAj4EPZzO4KxVFe/YAloWQgt+yAHyF JnjvLHvEFrIFCcjHWjQjphfwLui9OVRjLz/egs3JdaYd+w2xHcofTV93+7WvNlSD1Q8NNZ WgcE01ZcNjFbz6KkmnNTqQncUD4vtMFVg3h6LEZ4m1oGnOFjzBdSxPu5Js6CqNv/8+v/sE wdNkecbS5lhEZh3xdk1eijAhkwMYa/K1qH8bC2MhWDYj6cSgd2F0L/WTdI2tHXgbdaRbNi gwMvMcEDXKa4kUr7mgf5AEquns6186TH0AMW4TX+/yR7Dn2P01lX6U3LJj/XLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713621812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=63MTFxfe7LM7NV2rRVqZ+ZB9KMvD2OU4MD9F1DzPKnk=; b=VGAT2m2U3t6uXwPLG2xV0p6nMRfqwBkfqUBKuq0gpl6lnyd7tE0yImpuZhUWih/PtV1fnw S9y4ff+wPqtTJJjGBWrkIlBcqnLqtemLwVc40DmFthXT9LGlCvl5XiinZ4Awq74sfWC3M0 QS4GmBMEjoKo0Ag9EmpROp73UcBb4SGtXztoaQjzW4939OS1UNW6RCbMSJVPgwoOTY2phH c9kUbP4yjv51SWMQ6eES5ZXXi/GJspDKVKq29i2IrS/VhWV93JiaC28a6YExqIZhqHyCa6 0KN+XuSaqN7nExb/JlAVxKQj624ZMOQpSD7Eu89sU2PTkx7AcrsQCx3Ku2BAvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMCsc1TMHzfxT; Sat, 20 Apr 2024 14:03: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 43KE3WIY071249; Sat, 20 Apr 2024 14:03:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KE3W27071246; Sat, 20 Apr 2024 14:03:32 GMT (envelope-from git) Date: Sat, 20 Apr 2024 14:03:32 GMT Message-Id: <202404201403.43KE3W27071246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: dfa39133b333 - main - Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfa39133b333f57ca3133bf6c71cd75be4c3e801 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=dfa39133b333f57ca3133bf6c71cd75be4c3e801 commit dfa39133b333f57ca3133bf6c71cd75be4c3e801 Author: Dimitry Andric AuthorDate: 2024-04-20 12:01:32 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 14:02:57 +0000 Merge llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.4-0-ge6c3289804a6. PR: 276104 MFC after: 3 days --- .../llvm-project/clang/include/clang/Basic/Attr.td | 2 + .../clang/lib/Format/TokenAnnotator.cpp | 20 ++++---- .../clang/lib/Headers/__stddef_unreachable.h | 4 ++ .../compiler-rt/lib/builtins/riscv/restore.S | 42 +++++++++++++++ .../compiler-rt/lib/builtins/riscv/save.S | 42 +++++++++++++++ .../include/__format/formatter_floating_point.h | 2 +- contrib/llvm-project/libcxx/include/stddef.h | 29 ++++------- contrib/llvm-project/lld/COFF/Chunks.cpp | 7 +++ .../llvm/lib/Analysis/InstructionSimplify.cpp | 3 +- .../llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 7 ++- contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp | 4 +- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 42 +++------------ .../llvm/lib/Target/AArch64/AArch64ISelLowering.h | 3 ++ .../llvm/lib/Target/Mips/Mips32r6InstrInfo.td | 8 +-- .../llvm/lib/Target/Mips/MipsExpandPseudo.cpp | 60 ++++------------------ .../llvm/lib/Target/Sparc/SparcAsmPrinter.cpp | 44 ++++++++++++++++ .../llvm/lib/Target/X86/X86MCInstLower.cpp | 4 +- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 21 +++++++- lib/clang/include/VCSVersion.inc | 6 +-- lib/clang/include/clang/Basic/Version.inc | 6 +-- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +-- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 25 files changed, 234 insertions(+), 140 deletions(-) diff --git a/contrib/llvm-project/clang/include/clang/Basic/Attr.td b/contrib/llvm-project/clang/include/clang/Basic/Attr.td index 58838b01b4fd..dbf2dd2120fb 100644 --- a/contrib/llvm-project/clang/include/clang/Basic/Attr.td +++ b/contrib/llvm-project/clang/include/clang/Basic/Attr.td @@ -1590,6 +1590,7 @@ def RegCall : DeclOrTypeAttr { } def Final : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"final">, CustomKeyword<"sealed">]; let Accessors = [Accessor<"isSpelledAsSealed", [CustomKeyword<"sealed">]>]; let SemaHandler = 0; @@ -2472,6 +2473,7 @@ def Overloadable : Attr { } def Override : InheritableAttr { + let CanPrintOnLeft = 0; let Spellings = [CustomKeyword<"override">]; let SemaHandler = 0; // Omitted from docs, since this is language syntax, not an attribute, as far diff --git a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp index d0c4273cfc7e..4d482e6543d6 100644 --- a/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp +++ b/contrib/llvm-project/clang/lib/Format/TokenAnnotator.cpp @@ -3450,10 +3450,11 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { for (AnnotatedLine *ChildLine : Line.Children) calculateFormattingInformation(*ChildLine); - Line.First->TotalLength = - Line.First->IsMultiline ? Style.ColumnLimit - : Line.FirstStartColumn + Line.First->ColumnWidth; - FormatToken *Current = Line.First->Next; + auto *First = Line.First; + First->TotalLength = First->IsMultiline + ? Style.ColumnLimit + : Line.FirstStartColumn + First->ColumnWidth; + FormatToken *Current = First->Next; bool InFunctionDecl = Line.MightBeFunctionDecl; bool AlignArrayOfStructures = (Style.AlignArrayOfStructures != FormatStyle::AIAS_None && @@ -3475,16 +3476,15 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (const bool IsCtorOrDtor = Tok->is(TT_CtorDtorDeclName); IsCtorOrDtor || isFunctionDeclarationName(Style.isCpp(), *Tok, Line, ClosingParen)) { - if (!IsCtorOrDtor) { - LineIsFunctionDeclaration = true; + if (!IsCtorOrDtor) Tok->setFinalizedType(TT_FunctionDeclarationName); - } + LineIsFunctionDeclaration = true; SeenName = true; break; } } - if (IsCpp && LineIsFunctionDeclaration && + if (IsCpp && (LineIsFunctionDeclaration || First->is(TT_CtorDtorDeclName)) && Line.endsWith(tok::semi, tok::r_brace)) { auto *Tok = Line.Last->Previous; while (Tok->isNot(tok::r_brace)) @@ -3507,7 +3507,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { if (IsCpp) { if (!LineIsFunctionDeclaration) { // Annotate */&/&& in `operator` function calls as binary operators. - for (const auto *Tok = Line.First; Tok; Tok = Tok->Next) { + for (const auto *Tok = First; Tok; Tok = Tok->Next) { if (Tok->isNot(tok::kw_operator)) continue; do { @@ -3644,7 +3644,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const { calculateUnbreakableTailLengths(Line); unsigned IndentLevel = Line.Level; - for (Current = Line.First; Current; Current = Current->Next) { + for (Current = First; Current; Current = Current->Next) { if (Current->Role) Current->Role->precomputeFormattingInfos(Current); if (Current->MatchingParen && diff --git a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h index 518580c92d3f..61df43e9732f 100644 --- a/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h +++ b/contrib/llvm-project/clang/lib/Headers/__stddef_unreachable.h @@ -7,6 +7,8 @@ *===-----------------------------------------------------------------------=== */ +#ifndef __cplusplus + /* * When -fbuiltin-headers-in-system-modules is set this is a non-modular header * and needs to behave as if it was textual. @@ -15,3 +17,5 @@ (__has_feature(modules) && !__building_module(_Builtin_stddef)) #define unreachable() __builtin_unreachable() #endif + +#endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S index 73f64a920d66..6f43842c8ca6 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/restore.S @@ -22,6 +22,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -86,8 +88,29 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + lw s1, 0(sp) + lw s0, 4(sp) + lw ra, 8(sp) + addi sp, sp, 12 + ret + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_restore_12 .type __riscv_restore_12,@function __riscv_restore_12: @@ -161,6 +184,25 @@ __riscv_restore_0: addi sp, sp, 16 ret +#else + + .globl __riscv_restore_2 + .type __riscv_restore_2,@function + .globl __riscv_restore_1 + .type __riscv_restore_1,@function + .globl __riscv_restore_0 + .type __riscv_restore_0,@function +__riscv_restore_2: +__riscv_restore_1: +__riscv_restore_0: + ld s1, 0(sp) + ld s0, 8(sp) + ld ra, 16(sp) + addi sp, sp, 24 + ret + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S index 85501aeb4c2e..3e044179ff7f 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/riscv/save.S @@ -18,6 +18,8 @@ #if __riscv_xlen == 32 +#ifndef __riscv_32e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -92,8 +94,29 @@ __riscv_save_0: sw ra, 12(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -12 + sw s1, 0(sp) + sw s0, 4(sp) + sw ra, 8(sp) + jr t0 + +#endif + #elif __riscv_xlen == 64 +#ifndef __riscv_64e + .globl __riscv_save_12 .type __riscv_save_12,@function __riscv_save_12: @@ -181,6 +204,25 @@ __riscv_save_0: sd ra, 8(sp) jr t0 +#else + + .globl __riscv_save_2 + .type __riscv_save_2,@function + .globl __riscv_save_1 + .type __riscv_save_1,@function + .globl __riscv_save_0 + .type __riscv_save_0,@function +__riscv_save_2: +__riscv_save_1: +__riscv_save_0: + addi sp, sp, -24 + sd s1, 0(sp) + sd s0, 8(sp) + sd ra, 16(sp) + jr t0 + +#endif + #else # error "xlen must be 32 or 64 for save-restore implementation #endif diff --git a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h index 6802a8b7bd4c..46a090a787ae 100644 --- a/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h +++ b/contrib/llvm-project/libcxx/include/__format/formatter_floating_point.h @@ -689,7 +689,7 @@ __format_floating_point(_Tp __value, _FormatContext& __ctx, __format_spec::__par // Let P equal the precision if nonzero, 6 if the precision is not // specified, or 1 if the precision is 0. Then, if a conversion with // style E would have an exponent of X: - int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); + int __p = std::max(1, (__specs.__has_precision() ? __specs.__precision_ : 6)); if (__result.__exponent == __result.__last) // if P > X >= -4, the conversion is with style f or F and precision P - 1 - X. // By including the radix point it calculates P - (1 + X) diff --git a/contrib/llvm-project/libcxx/include/stddef.h b/contrib/llvm-project/libcxx/include/stddef.h index 887776b150e4..1583e78e3739 100644 --- a/contrib/llvm-project/libcxx/include/stddef.h +++ b/contrib/llvm-project/libcxx/include/stddef.h @@ -7,18 +7,6 @@ // //===----------------------------------------------------------------------===// -#if defined(__need_ptrdiff_t) || defined(__need_size_t) || defined(__need_wchar_t) || defined(__need_NULL) || \ - defined(__need_wint_t) - -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif - -# include_next - -#elif !defined(_LIBCPP_STDDEF_H) -# define _LIBCPP_STDDEF_H - /* stddef.h synopsis @@ -36,15 +24,18 @@ Types: */ -# include <__config> +#include <__config> -# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -# endif +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif -# if __has_include_next() -# include_next -# endif +// Note: This include is outside of header guards because we sometimes get included multiple times +// with different defines and the underlying will know how to deal with that. +#include_next + +#ifndef _LIBCPP_STDDEF_H +# define _LIBCPP_STDDEF_H # ifdef __cplusplus typedef decltype(nullptr) nullptr_t; diff --git a/contrib/llvm-project/lld/COFF/Chunks.cpp b/contrib/llvm-project/lld/COFF/Chunks.cpp index 39f4575031be..e2074932bc46 100644 --- a/contrib/llvm-project/lld/COFF/Chunks.cpp +++ b/contrib/llvm-project/lld/COFF/Chunks.cpp @@ -652,6 +652,13 @@ void SectionChunk::getRuntimePseudoRelocs( dyn_cast_or_null(file->getSymbol(rel.SymbolTableIndex)); if (!target || !target->isRuntimePseudoReloc) continue; + // If the target doesn't have a chunk allocated, it may be a + // DefinedImportData symbol which ended up unnecessary after GC. + // Normally we wouldn't eliminate section chunks that are referenced, but + // references within DWARF sections don't count for keeping section chunks + // alive. Thus such dangling references in DWARF sections are expected. + if (!target->getChunk()) + continue; int sizeInBits = getRuntimePseudoRelocSize(rel.Type, file->ctx.config.machine); if (sizeInBits == 0) { diff --git a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp index d0c27cae0dff..72b6dfa181e8 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/InstructionSimplify.cpp @@ -439,7 +439,8 @@ static Value *threadBinOpOverSelect(Instruction::BinaryOps Opcode, Value *LHS, // Check that the simplified value has the form "X op Y" where "op" is the // same as the original operation. Instruction *Simplified = dyn_cast(FV ? FV : TV); - if (Simplified && Simplified->getOpcode() == unsigned(Opcode)) { + if (Simplified && Simplified->getOpcode() == unsigned(Opcode) && + !Simplified->hasPoisonGeneratingFlags()) { // The value that didn't simplify is "UnsimplifiedLHS op UnsimplifiedRHS". // We already know that "op" is the same as for the simplified value. See // if the operands match too. If so, return the simplified value. diff --git a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 3135ec73a99e..e806e0f0731f 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -3575,6 +3575,11 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, return SDValue(); if (Opcode != ISD::UADDO && Opcode != ISD::USUBO) return SDValue(); + // Guarantee identical type of CarryOut + EVT CarryOutType = N->getValueType(0); + if (CarryOutType != Carry0.getValue(1).getValueType() || + CarryOutType != Carry1.getValue(1).getValueType()) + return SDValue(); // Canonicalize the add/sub of A and B (the top node in the above ASCII art) // as Carry0 and the add/sub of the carry in as Carry1 (the middle node). @@ -3622,7 +3627,7 @@ static SDValue combineCarryDiamond(SelectionDAG &DAG, const TargetLowering &TLI, // TODO: match other operations that can merge flags (ADD, etc) DAG.ReplaceAllUsesOfValueWith(Carry1.getValue(0), Merged.getValue(0)); if (N->getOpcode() == ISD::AND) - return DAG.getConstant(0, DL, MVT::i1); + return DAG.getConstant(0, DL, CarryOutType); return Merged.getValue(1); } diff --git a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp index cbb64b299e64..f105bdb4816a 100644 --- a/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp +++ b/contrib/llvm-project/llvm/lib/IR/ConstantRange.cpp @@ -746,7 +746,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, Min = Min.zext(ResultBitWidth); Max = Max.zext(ResultBitWidth); } - return ConstantRange(std::move(Min), std::move(Max)); + return getNonEmpty(std::move(Min), std::move(Max) + 1); } case Instruction::SIToFP: { // TODO: use input range if available @@ -757,7 +757,7 @@ ConstantRange ConstantRange::castOp(Instruction::CastOps CastOp, SMin = SMin.sext(ResultBitWidth); SMax = SMax.sext(ResultBitWidth); } - return ConstantRange(std::move(SMin), std::move(SMax)); + return getNonEmpty(std::move(SMin), std::move(SMax) + 1); } case Instruction::FPTrunc: case Instruction::FPExt: diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 196aa50cf406..95d8ab95b2c0 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -1658,40 +1658,14 @@ AArch64TargetLowering::AArch64TargetLowering(const TargetMachine &TM, setMaxAtomicSizeInBitsSupported(128); if (Subtarget->isWindowsArm64EC()) { - // FIXME: are there other intrinsics we need to add here? - setLibcallName(RTLIB::MEMCPY, "#memcpy"); - setLibcallName(RTLIB::MEMSET, "#memset"); - setLibcallName(RTLIB::MEMMOVE, "#memmove"); - setLibcallName(RTLIB::REM_F32, "#fmodf"); - setLibcallName(RTLIB::REM_F64, "#fmod"); - setLibcallName(RTLIB::FMA_F32, "#fmaf"); - setLibcallName(RTLIB::FMA_F64, "#fma"); - setLibcallName(RTLIB::SQRT_F32, "#sqrtf"); - setLibcallName(RTLIB::SQRT_F64, "#sqrt"); - setLibcallName(RTLIB::CBRT_F32, "#cbrtf"); - setLibcallName(RTLIB::CBRT_F64, "#cbrt"); - setLibcallName(RTLIB::LOG_F32, "#logf"); - setLibcallName(RTLIB::LOG_F64, "#log"); - setLibcallName(RTLIB::LOG2_F32, "#log2f"); - setLibcallName(RTLIB::LOG2_F64, "#log2"); - setLibcallName(RTLIB::LOG10_F32, "#log10f"); - setLibcallName(RTLIB::LOG10_F64, "#log10"); - setLibcallName(RTLIB::EXP_F32, "#expf"); - setLibcallName(RTLIB::EXP_F64, "#exp"); - setLibcallName(RTLIB::EXP2_F32, "#exp2f"); - setLibcallName(RTLIB::EXP2_F64, "#exp2"); - setLibcallName(RTLIB::EXP10_F32, "#exp10f"); - setLibcallName(RTLIB::EXP10_F64, "#exp10"); - setLibcallName(RTLIB::SIN_F32, "#sinf"); - setLibcallName(RTLIB::SIN_F64, "#sin"); - setLibcallName(RTLIB::COS_F32, "#cosf"); - setLibcallName(RTLIB::COS_F64, "#cos"); - setLibcallName(RTLIB::POW_F32, "#powf"); - setLibcallName(RTLIB::POW_F64, "#pow"); - setLibcallName(RTLIB::LDEXP_F32, "#ldexpf"); - setLibcallName(RTLIB::LDEXP_F64, "#ldexp"); - setLibcallName(RTLIB::FREXP_F32, "#frexpf"); - setLibcallName(RTLIB::FREXP_F64, "#frexp"); + // FIXME: are there intrinsics we need to exclude from this? + for (int i = 0; i < RTLIB::UNKNOWN_LIBCALL; ++i) { + auto code = static_cast(i); + auto libcallName = getLibcallName(code); + if ((libcallName != nullptr) && (libcallName[0] != '#')) { + setLibcallName(code, Saver.save(Twine("#") + libcallName).data()); + } + } } } diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h index 541a810fb5cb..74d0c4bde8dd 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.h @@ -1001,6 +1001,9 @@ private: /// make the right decision when generating code for different targets. const AArch64Subtarget *Subtarget; + llvm::BumpPtrAllocator BumpAlloc; + llvm::StringSaver Saver{BumpAlloc}; + bool isExtFreeImpl(const Instruction *Ext) const override; void addTypeForNEON(MVT VT); diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td index 854563ab32bd..3ef04e488f01 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/Mips/Mips32r6InstrInfo.td @@ -152,15 +152,15 @@ class SELNEZ_ENC : SPECIAL_3R_FM<0b00000, 0b110111>; class LWPC_ENC : PCREL19_FM; -class MAX_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; -class MAX_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; +class MAX_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; +class MAX_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; class MIN_S_ENC : COP1_3R_FM<0b011100, FIELD_FMT_S>; class MIN_D_ENC : COP1_3R_FM<0b011100, FIELD_FMT_D>; class MAXA_S_ENC : COP1_3R_FM<0b011111, FIELD_FMT_S>; class MAXA_D_ENC : COP1_3R_FM<0b011111, FIELD_FMT_D>; -class MINA_S_ENC : COP1_3R_FM<0b011110, FIELD_FMT_S>; -class MINA_D_ENC : COP1_3R_FM<0b011110, FIELD_FMT_D>; +class MINA_S_ENC : COP1_3R_FM<0b011101, FIELD_FMT_S>; +class MINA_D_ENC : COP1_3R_FM<0b011101, FIELD_FMT_D>; class SELEQZ_S_ENC : COP1_3R_FM<0b010100, FIELD_FMT_S>; class SELEQZ_D_ENC : COP1_3R_FM<0b010100, FIELD_FMT_D>; diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp index c30129743a96..2c2554b5b4bc 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsExpandPseudo.cpp @@ -388,32 +388,18 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( Opcode = Mips::XOR; break; case Mips::ATOMIC_LOAD_UMIN_I8_POSTRA: - IsUnsigned = true; - IsMin = true; - break; case Mips::ATOMIC_LOAD_UMIN_I16_POSTRA: IsUnsigned = true; - IsMin = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MIN_I8_POSTRA: - SEOp = Mips::SEB; - IsMin = true; - break; case Mips::ATOMIC_LOAD_MIN_I16_POSTRA: IsMin = true; break; case Mips::ATOMIC_LOAD_UMAX_I8_POSTRA: - IsUnsigned = true; - IsMax = true; - break; case Mips::ATOMIC_LOAD_UMAX_I16_POSTRA: IsUnsigned = true; - IsMax = true; - break; + [[fallthrough]]; case Mips::ATOMIC_LOAD_MAX_I8_POSTRA: - SEOp = Mips::SEB; - IsMax = true; - break; case Mips::ATOMIC_LOAD_MAX_I16_POSTRA: IsMax = true; break; @@ -475,42 +461,14 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword( // For little endian we need to clear uninterested bits. if (STI->isLittle()) { - if (!IsUnsigned) { - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), OldVal) - .addReg(OldVal) - .addReg(ShiftAmnt); - BuildMI(loopMBB, DL, TII->get(Mips::SRAV), Incr) - .addReg(Incr) - .addReg(ShiftAmnt); - if (STI->hasMips32r2()) { - BuildMI(loopMBB, DL, TII->get(SEOp), OldVal).addReg(OldVal); - BuildMI(loopMBB, DL, TII->get(SEOp), Incr).addReg(Incr); - } else { - const unsigned ShiftImm = SEOp == Mips::SEH ? 16 : 24; - BuildMI(loopMBB, DL, TII->get(Mips::SLL), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), OldVal) - .addReg(OldVal, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SLL), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - BuildMI(loopMBB, DL, TII->get(Mips::SRA), Incr) - .addReg(Incr, RegState::Kill) - .addImm(ShiftImm); - } - } else { - // and OldVal, OldVal, Mask - // and Incr, Incr, Mask - BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) - .addReg(OldVal) - .addReg(Mask); - BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr) - .addReg(Incr) - .addReg(Mask); - } + // and OldVal, OldVal, Mask + // and Incr, Incr, Mask + BuildMI(loopMBB, DL, TII->get(Mips::AND), OldVal) + .addReg(OldVal) + .addReg(Mask); + BuildMI(loopMBB, DL, TII->get(Mips::AND), Incr).addReg(Incr).addReg(Mask); } + // unsigned: sltu Scratch4, oldVal, Incr // signed: slt Scratch4, oldVal, Incr BuildMI(loopMBB, DL, TII->get(SLTScratch4), Scratch4) diff --git a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp index 215a8ea83190..6855471840e9 100644 --- a/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -434,6 +434,50 @@ bool SparcAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, default: // See if this is a generic print operand return AsmPrinter::PrintAsmOperand(MI, OpNo, ExtraCode, O); + case 'L': // Low order register of a twin word register operand + case 'H': // High order register of a twin word register operand + { + const SparcSubtarget &Subtarget = MF->getSubtarget(); + const MachineOperand &MO = MI->getOperand(OpNo); + const SparcRegisterInfo *RegisterInfo = Subtarget.getRegisterInfo(); + Register MOReg = MO.getReg(); + + Register HiReg, LoReg; + if (!SP::IntPairRegClass.contains(MOReg)) { + // If we aren't given a register pair already, find out which pair it + // belongs to. Note that here, the specified register operand, which + // refers to the high part of the twinword, needs to be an even-numbered + // register. + MOReg = RegisterInfo->getMatchingSuperReg(MOReg, SP::sub_even, + &SP::IntPairRegClass); + if (!MOReg) { + SMLoc Loc; + OutContext.reportError( + Loc, "Hi part of pair should point to an even-numbered register"); + OutContext.reportError( + Loc, "(note that in some cases it might be necessary to manually " + "bind the input/output registers instead of relying on " + "automatic allocation)"); + return true; + } + } + + HiReg = RegisterInfo->getSubReg(MOReg, SP::sub_even); + LoReg = RegisterInfo->getSubReg(MOReg, SP::sub_odd); + + Register Reg; + switch (ExtraCode[0]) { + case 'L': + Reg = LoReg; + break; + case 'H': + Reg = HiReg; + break; + } + + O << '%' << SparcInstPrinter::getRegisterName(Reg); + return false; + } case 'f': case 'r': break; diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp index 58ebe023cd61..7ce0aa22b997 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86MCInstLower.cpp @@ -959,8 +959,10 @@ void X86AsmPrinter::LowerPATCHABLE_OP(const MachineInstr &MI, SmallString<256> Code; unsigned MinSize = MI.getOperand(0).getImm(); - if (NextMI != MI.getParent()->end()) { + if (NextMI != MI.getParent()->end() && !NextMI->isInlineAsm()) { // Lower the next MachineInstr to find its byte size. + // If the next instruction is inline assembly, we skip lowering it for now, + // and assume we should always generate NOPs. MCInst MCI; MCIL.Lower(&*NextMI, MCI); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index 0a9e2c7f49f5..1fbd69e38eae 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -11653,12 +11653,12 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, -1)) TysForDecl.push_back( FixedVectorType::get(CI->getType(), E->Scalars.size())); + auto *CEI = cast(VL0); for (unsigned I : seq(0, CI->arg_size())) { ValueList OpVL; // Some intrinsics have scalar arguments. This argument should not be // vectorized. if (UseIntrinsic && isVectorIntrinsicWithScalarOpAtArg(ID, I)) { - CallInst *CEI = cast(VL0); ScalarArg = CEI->getArgOperand(I); OpVecs.push_back(CEI->getArgOperand(I)); if (isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) @@ -11671,6 +11671,25 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { LLVM_DEBUG(dbgs() << "SLP: Diamond merged for " << *VL0 << ".\n"); return E->VectorizedValue; } + auto GetOperandSignedness = [&](unsigned Idx) { + const TreeEntry *OpE = getOperandEntry(E, Idx); + bool IsSigned = false; + auto It = MinBWs.find(OpE); + if (It != MinBWs.end()) + IsSigned = It->second.second; + else + IsSigned = any_of(OpE->Scalars, [&](Value *R) { + return !isKnownNonNegative(R, SimplifyQuery(*DL)); + }); + return IsSigned; + }; + ScalarArg = CEI->getArgOperand(I); + if (cast(OpVec->getType())->getElementType() != + ScalarArg->getType()) { + auto *CastTy = FixedVectorType::get(ScalarArg->getType(), + VecTy->getNumElements()); + OpVec = Builder.CreateIntCast(OpVec, CastTy, GetOperandSignedness(I)); + } LLVM_DEBUG(dbgs() << "SLP: OpVec[" << I << "]: " << *OpVec << "\n"); OpVecs.push_back(OpVec); if (UseIntrinsic && isVectorIntrinsicWithOverloadTypeAtArg(ID, I)) diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 82f25ad621b6..687fb1656937 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,8 +1,8 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define CLANG_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLDB_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 782f047618b5..536f72efec52 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,8 +1,8 @@ -#define CLANG_VERSION 18.1.3 -#define CLANG_VERSION_STRING "18.1.3" +#define CLANG_VERSION 18.1.4 +#define CLANG_VERSION_STRING "18.1.4" #define CLANG_VERSION_MAJOR 18 #define CLANG_VERSION_MAJOR_STRING "18" #define CLANG_VERSION_MINOR 1 -#define CLANG_VERSION_PATCHLEVEL 3 +#define CLANG_VERSION_PATCHLEVEL 4 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 4115121ebc92..66642a489e94 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 1500000 -#define LLD_VERSION_STRING "18.1.3 (FreeBSD llvmorg-18.1.3-0-gc13b7485b879-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "18.1.4 (FreeBSD llvmorg-18.1.4-0-ge6c3289804a6-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index 7cef82df9e4f..1fc1a4d88b7b 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 18.1.3 -#define LLDB_VERSION_STRING "18.1.3" +#define LLDB_VERSION 18.1.4 +#define LLDB_VERSION_STRING "18.1.4" #define LLDB_VERSION_MAJOR 18 #define LLDB_VERSION_MINOR 1 -#define LLDB_VERSION_PATCH 3 +#define LLDB_VERSION_PATCH 4 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 5cf49eceeced..a017437dc568 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -344,10 +344,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 18.1.3" +#define PACKAGE_STRING "LLVM 18.1.4" /* Define to the version of this package. */ -#define PACKAGE_VERSION "18.1.3" +#define PACKAGE_VERSION "18.1.4" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 2b7d5b3e9504..fb878ccdde4d 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -180,10 +180,10 @@ #define LLVM_VERSION_MINOR 1 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 3 +#define LLVM_VERSION_PATCH 4 /* LLVM version string */ -#define LLVM_VERSION_STRING "18.1.3" +#define LLVM_VERSION_STRING "18.1.4" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index b1a8aef7de29..e324de0f9fc6 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,2 +1,2 @@ -#define LLVM_REVISION "llvmorg-18.1.3-0-gc13b7485b879" +#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Sat Apr 20 15:54:51 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMGL36rxrz5J2Kv; Sat, 20 Apr 2024 15:54: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 4VMGL36LR0z4rmW; Sat, 20 Apr 2024 15:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713628491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddWGn1MuhVtsd7GqfsalYS2EaVqwgn6eY5MOnVVJNH0=; b=VdM+m1tqSXF5dgDh3b9fXFkIxfyAo8JGLpf4V6p3Ts2ZKmfy7oVOyT/nVjp9mjFxqDYys6 ErOJFVdw6YDepNC5QyVvIjgNvQLnQzTSHedWGV4QOEO6wba+Q7tEUNpqZTz43kuBnA6xW3 QDfGn73Dlwbc/Hi+Fl0QpE83UO2A6D913krMeqxBtNVn1IkjsBc3MijS9Pl2NG15rHqcxY ZG2lUhKdwnwsoejvRfM960YWDG4+O+x/kRuwHFjsuhUmjuIg2jUhy3UBDudBpdwFyd+ALs McgK4Debp4T9ss3VAVGrBjOrEg6qqkBcgKbH/6ZzjJGQiC1+St6s33ytmB73qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713628491; a=rsa-sha256; cv=none; b=Ir58YdSac9FcZnPsJQyMKQ3FLV09X/2y1vtvYlSlWOWXsSWUFlYvA1KnuIpfiqH734gfl/ 8030z1ZgRcMADulnmf+EgNMDECFBYU2Q9YRu5Tm248gxsIhiN3qcAYsy7Q7D9pZvDDeEQA iYdC/D6K45iUnu5+eZGh+RTtiNcDELXP2EYUPtDdZ0dVVgBrjG8D5FIEq8WEAox8CqOk4S fH7Djozyj6jiLOKMDuLkWkLJVNihLlnlD/ETnh24YfOdnxi1AzWZTnS/BoT2Obdx2L0e2B myZcNi0MKjBEOfejWTDaaGolYraxOURrOHEGe5xGYdox1p/I6+nrpjGrf4/i6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713628491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddWGn1MuhVtsd7GqfsalYS2EaVqwgn6eY5MOnVVJNH0=; b=n2/x78vygGu2yVRlLLOM+dqCB/iSymV6JaTB3Rf4d4QtZGKgZN323geQoMJl+ibdyKm4vD 32sjZNp5UElYxG+mZRJXeBR0e8ZGHWPfsVfUumOTUAs2gQ8UGa4t8MTpDOtIDZaQ22XN6r wkpJpPCK0OlpGhwn900t72Gp8sJdzaavmi8386ZpTfzo7wr2N4cSJyTKMoNpSPNo/eb/y6 SazifBorpL12VMs+33qLnqEDUgnRoHlNeSi2rtGXRdVtPCnRR1BqK42uwXuKEf1RSp3+2x TlN9uf031sJyTQOP/NZcQEEB4PvZUlbi4+Hs+TFF7IMFkJOXQwoxgpZtlwQRhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMGL35pxCzkBn; Sat, 20 Apr 2024 15: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 43KFspRb062238; Sat, 20 Apr 2024 15: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 43KFspOq062235; Sat, 20 Apr 2024 15:54:51 GMT (envelope-from git) Date: Sat, 20 Apr 2024 15:54:51 GMT Message-Id: <202404201554.43KFspOq062235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 278d6950943a - main - libpmc: Import AMD Zen 4 PMU events List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 278d6950943a9fec2bddb037b547c04a847c54ba Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=278d6950943a9fec2bddb037b547c04a847c54ba commit 278d6950943a9fec2bddb037b547c04a847c54ba Author: Alexander Motin AuthorDate: 2024-04-20 15:54:04 +0000 Commit: Alexander Motin CommitDate: 2024-04-20 15:54:04 +0000 libpmc: Import AMD Zen 4 PMU events MFC after: 1 week --- lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json | 82 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json | 828 +++++++++++++++ lib/libpmc/pmu-events/arch/x86/amdzen4/core.json | 122 +++ .../pmu-events/arch/x86/amdzen4/data-fabric.json | 1090 ++++++++++++++++++++ .../arch/x86/amdzen4/floating-point.json | 818 +++++++++++++++ .../arch/x86/amdzen4/memory-controller.json | 101 ++ lib/libpmc/pmu-events/arch/x86/amdzen4/memory.json | 174 ++++ lib/libpmc/pmu-events/arch/x86/amdzen4/other.json | 138 +++ .../pmu-events/arch/x86/amdzen4/pipeline.json | 98 ++ .../pmu-events/arch/x86/amdzen4/recommended.json | 418 ++++++++ lib/libpmc/pmu-events/arch/x86/mapfile.csv | 3 +- 11 files changed, 3871 insertions(+), 1 deletion(-) diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json new file mode 100644 index 000000000000..208c646c59ca --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/branch.json @@ -0,0 +1,82 @@ +[ + { + "EventName": "bp_l2_btb_correct", + "EventCode": "0x8b", + "BriefDescription": "L2 branch prediction overrides existing prediction (speculative)." + }, + { + "EventName": "bp_dyn_ind_pred", + "EventCode": "0x8e", + "BriefDescription": "Dynamic indirect predictions (branch used the indirect predictor to make a prediction)." + }, + { + "EventName": "bp_de_redirect", + "EventCode": "0x91", + "BriefDescription": "Instruction decoder corrects the predicted target and resteers the branch predictor." + }, + { + "EventName": "ex_ret_brn", + "EventCode": "0xc2", + "BriefDescription": "Retired branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_misp", + "EventCode": "0xc3", + "BriefDescription": "Retired branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_tkn", + "EventCode": "0xc4", + "BriefDescription": "Retired taken branch instructions (all types of architectural control flow changes, including exceptions and interrupts)." + }, + { + "EventName": "ex_ret_brn_tkn_misp", + "EventCode": "0xc5", + "BriefDescription": "Retired taken branch instructions mispredicted." + }, + { + "EventName": "ex_ret_brn_far", + "EventCode": "0xc6", + "BriefDescription": "Retired far control transfers (far call/jump/return, IRET, SYSCALL and SYSRET, plus exceptions and interrupts). Far control transfers are not subject to branch prediction." + }, + { + "EventName": "ex_ret_near_ret", + "EventCode": "0xc8", + "BriefDescription": "Retired near returns (RET or RET Iw)." + }, + { + "EventName": "ex_ret_near_ret_mispred", + "EventCode": "0xc9", + "BriefDescription": "Retired near returns mispredicted. Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_brn_ind_misp", + "EventCode": "0xca", + "BriefDescription": "Retired indirect branch instructions mispredicted (only EX mispredicts). Each misprediction incurs the same penalty as a mispredicted conditional branch instruction." + }, + { + "EventName": "ex_ret_ind_brch_instr", + "EventCode": "0xcc", + "BriefDescription": "Retired indirect branch instructions." + }, + { + "EventName": "ex_ret_cond", + "EventCode": "0xd1", + "BriefDescription": "Retired conditional branch instructions." + }, + { + "EventName": "ex_ret_msprd_brnch_instr_dir_msmtch", + "EventCode": "0x1c7", + "BriefDescription": "Retired branch instructions mispredicted due to direction mismatch." + }, + { + "EventName": "ex_ret_uncond_brnch_instr_mispred", + "EventCode": "0x1c8", + "BriefDescription": "Retired unconditional indirect branch instructions mispredicted." + }, + { + "EventName": "ex_ret_uncond_brnch_instr", + "EventCode": "0x1c9", + "BriefDescription": "Retired unconditional branch instructions." + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json new file mode 100644 index 000000000000..e6d710cf3ce2 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/cache.json @@ -0,0 +1,828 @@ +[ + { + "EventName": "ls_mab_alloc.load_store_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for load-store allocations.", + "UMask": "0x3f" + }, + { + "EventName": "ls_mab_alloc.hardware_prefetcher_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for hardware prefetcher allocations.", + "UMask": "0x40" + }, + { + "EventName": "ls_mab_alloc.all_allocations", + "EventCode": "0x41", + "BriefDescription": "Miss Address Buffer (MAB) entries allocated by a Load-Store (LS) pipe for all types of allocations.", + "UMask": "0x7f" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_l2", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_dmnd_fills_from_sys.local_ccx", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_dmnd_fills_from_sys.near_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_near", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_dmnd_fills_from_sys.far_cache", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_dmnd_fills_from_sys.dram_io_far", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_dmnd_fills_from_sys.alternate_memories", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_dmnd_fills_from_sys.all", + "EventCode": "0x43", + "BriefDescription": "Demand data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_any_fills_from_sys.local_l2", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_any_fills_from_sys.local_ccx", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_any_fills_from_sys.local_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from local L2 cache or L3 cache or different L2 cache in the same CCX.", + "UMask": "0x03" + }, + { + "EventName": "ls_any_fills_from_sys.near_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_near", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_any_fills_from_sys.far_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_any_fills_from_sys.remote_cache", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from cache of another CCX when the address was in the same or a different NUMA node.", + "UMask": "0x14" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_far", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_any_fills_from_sys.dram_io_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.far_all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either cache of another CCX, DRAM or MMIO when the address was in a different NUMA node (same or different socket).", + "UMask": "0x50" + }, + { + "EventName": "ls_any_fills_from_sys.all_dram_io", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from either DRAM or MMIO in any NUMA node (same or different socket).", + "UMask": "0x48" + }, + { + "EventName": "ls_any_fills_from_sys.alternate_memories", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_any_fills_from_sys.all", + "EventCode": "0x44", + "BriefDescription": "Any data cache fills from all types of data sources.", + "UMask": "0xff" + }, + { + "EventName": "ls_pref_instr_disp.prefetch", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchT0 (move data to all cache levels), T1 (move data to all cache levels except L1) and T2 (move data to all cache levels except L1 and L2).", + "UMask": "0x01" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_w", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchW (move data to L1 cache and mark it modifiable).", + "UMask": "0x02" + }, + { + "EventName": "ls_pref_instr_disp.prefetch_nta", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of type PrefetchNTA (move data with minimum cache pollution i.e. non-temporal access).", + "UMask": "0x04" + }, + { + "EventName": "ls_pref_instr_disp.all", + "EventCode": "0x4b", + "BriefDescription": "Software prefetch instructions dispatched (speculative) of all types.", + "UMask": "0x07" + }, + { + "EventName": "ls_inef_sw_pref.data_pipe_sw_pf_dc_hit", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a data cache hit.", + "UMask": "0x01" + }, + { + "EventName": "ls_inef_sw_pref.mab_mch_cnt", + "EventCode": "0x52", + "BriefDescription": "Software prefetches that did not fetch data outside of the processor core as the PREFETCH instruction saw a match on an already allocated Miss Address Buffer (MAB).", + "UMask": "0x02" + }, + { + "EventName": "ls_inef_sw_pref.all", + "EventCode": "0x52", + "BriefDescript6ion": "Software prefetches that did not fetch data outside of the processor core for any reason.", + "UMask": "0x03" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_l2", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_sw_pf_dc_fills.local_ccx", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_sw_pf_dc_fills.near_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_near", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_sw_pf_dc_fills.far_cache", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from cache of another CCX in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_sw_pf_dc_fills.dram_io_far", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_sw_pf_dc_fills.alternate_memories", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_sw_pf_dc_fills.all", + "EventCode": "0x59", + "BriefDescription": "Software prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_l2", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from local L2 cache.", + "UMask": "0x01" + }, + { + "EventName": "ls_hw_pf_dc_fills.local_ccx", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from L3 cache or different L2 cache in the same CCX.", + "UMask": "0x02" + }, + { + "EventName": "ls_hw_pf_dc_fills.near_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in the same NUMA node.", + "UMask": "0x04" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_near", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in the same NUMA node.", + "UMask": "0x08" + }, + { + "EventName": "ls_hw_pf_dc_fills.far_cache", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from cache of another CCX when the address was in a different NUMA node.", + "UMask": "0x10" + }, + { + "EventName": "ls_hw_pf_dc_fills.dram_io_far", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from either DRAM or MMIO in a different NUMA node (same or different socket).", + "UMask": "0x40" + }, + { + "EventName": "ls_hw_pf_dc_fills.alternate_memories", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from extension memory.", + "UMask": "0x80" + }, + { + "EventName": "ls_hw_pf_dc_fills.all", + "EventCode": "0x5a", + "BriefDescription": "Hardware prefetch data cache fills from all types of data sources.", + "UMask": "0xdf" + }, + { + "EventName": "ls_alloc_mab_count", + "EventCode": "0x5f", + "BriefDescription": "In-flight L1 data cache misses i.e. Miss Address Buffer (MAB) allocations each cycle." + }, + { + "EventName": "l2_request_g1.group2", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of non-cacheable type (non-cached data and instructions reads, self-modifying code checks).", + "UMask": "0x01" + }, + { + "EventName": "l2_request_g1.l2_hw_pf", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: from hardware prefetchers to prefetch directly into L2 (hit or miss).", + "UMask": "0x02" + }, + { + "EventName": "l2_request_g1.prefetch_l2_cmd", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: prefetch directly into L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_request_g1.change_to_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache state change to writable, check L2 for current state.", + "UMask": "0x08" + }, + { + "EventName": "l2_request_g1.cacheable_ic_read", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: instruction cache reads.", + "UMask": "0x10" + }, + { + "EventName": "l2_request_g1.ls_rd_blk_c_s", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache shared reads.", + "UMask": "0x20" + }, + { + "EventName": "l2_request_g1.rd_blk_x", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache stores.", + "UMask": "0x40" + }, + { + "EventName": "l2_request_g1.rd_blk_l", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests: data cache reads including hardware and software prefetch.", + "UMask": "0x80" + }, + { + "EventName": "l2_request_g1.all_dc", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types from L1 data cache (including prefetches).", + "UMask": "0xe8" + }, + { + "EventName": "l2_request_g1.all_no_prefetch", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of common types not including prefetches.", + "UMask": "0xf9" + }, + { + "EventName": "l2_request_g1.all", + "EventCode": "0x60", + "BriefDescription": "L2 cache requests of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_miss", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache request miss in L2.", + "UMask": "0x01" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit non-modifiable line in L2.", + "UMask": "0x02" + }, + { + "EventName": "l2_cache_req_stat.ic_fill_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: instruction cache hit modifiable line in L2.", + "UMask": "0x04" + }, + { + "EventName": "l2_cache_req_stat.ic_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache hits.", + "UMask": "0x06" + }, + { + "EventName": "l2_cache_req_stat.ic_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for instruction cache access.", + "UMask": "0x07" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_c", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache request miss in L2.", + "UMask": "0x08" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_miss_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache misses.", + "UMask": "0x09" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache store or state change hit in L2.", + "UMask": "0x10" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_s", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit non-modifiable line in L2.", + "UMask": "0x20" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_l_hit_x", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache read hit modifiable line in L2.", + "UMask": "0x40" + }, + { + "EventName": "l2_cache_req_stat.ls_rd_blk_cs", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) with status: data cache shared read hit in L2.", + "UMask": "0x80" + }, + { + "EventName": "l2_cache_req_stat.dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache hits.", + "UMask": "0xf0" + }, + { + "EventName": "l2_cache_req_stat.ic_dc_hit_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache hits.", + "UMask": "0xf6" + }, + { + "EventName": "l2_cache_req_stat.dc_access_in_l2", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data cache access.", + "UMask": "0xf8" + }, + { + "EventName": "l2_cache_req_stat.all", + "EventCode": "0x64", + "BriefDescription": "Core to L2 cache requests (not including L2 prefetch) for data and instruction cache access.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_hit_l2.l2_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_hit_l2.l2_next_line", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_hit_l2.l2_up_down", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_hit_l2.l2_burst", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_hit_l2.l2_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L2Stride (fetch additional lines into L2 cache when each access is at a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_hit_l2.l1_stream", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_hit_l2.l1_stride", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_hit_l2.l1_region", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_hit_l2.all", + "EventCode": "0x70", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which hit in the L2 cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_next_line", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_up_down", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_burst", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l2_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stream", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_stride", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.l1_region", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_hit_l3.all", + "EventCode": "0x71", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 cache and hit in the L3 cache cache of all types.", + "UMask": "0xff" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stream (fetch additional sequential lines into L2 cache).", + "UMask": "0x01" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_next_line", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2NextLine (fetch the next line into L2 cache).", + "UMask": "0x02" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_up_down", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2UpDown (fetch the next or previous line into L2 cache for all memory accesses).", + "UMask": "0x04" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_burst", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Burst (aggressively fetch additional sequential lines into L2 cache).", + "UMask": "0x08" + }, + { + "EventName": "l2_pf_miss_l2_l3.l2_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L2Stride (fetch additional lines into L2 cache when each access is a constant distance from the previous).", + "UMask": "0x10" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stream", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stream (fetch additional sequential lines into L1 cache).", + "UMask": "0x20" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_stride", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Stride (fetch additional lines into L1 cache when each access is a constant distance from the previous).", + "UMask": "0x40" + }, + { + "EventName": "l2_pf_miss_l2_l3.l1_region", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of type L1Region (fetch additional lines into L1 cache when the data access for a given instruction tends to be followed by a consistent pattern of other accesses within a localized region).", + "UMask": "0x80" + }, + { + "EventName": "l2_pf_miss_l2_l3.all", + "EventCode": "0x72", + "BriefDescription": "L2 prefetches accepted by the L2 pipeline which miss the L2 and the L3 caches of all types.", + "UMask": "0xff" + }, + { + "EventName": "ic_cache_fill_l2", + "EventCode": "0x82", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from the L2 cache." + }, + { + "EventName": "ic_cache_fill_sys", + "EventCode": "0x83", + "BriefDescription": "Instruction cache lines (64 bytes) fulfilled from system memory or another cache." + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_hit", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache hits.", + "UMask": "0x07" + }, + { + "EventName": "ic_tag_hit_miss.instruction_cache_miss", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache misses.", + "UMask": "0x18" + }, + { + "EventName": "ic_tag_hit_miss.all_instruction_cache_accesses", + "EventCode": "0x18e", + "BriefDescription": "Instruction cache accesses of all types.", + "UMask": "0x1f" + }, + { + "EventName": "op_cache_hit_miss.op_cache_hit", + "EventCode": "0x28f", + "BriefDescription": "Op cache hits.", + "UMask": "0x03" + }, + { + "EventName": "op_cache_hit_miss.op_cache_miss", + "EventCode": "0x28f", + "BriefDescription": "Op cache misses.", + "UMask": "0x04" + }, + { + "EventName": "op_cache_hit_miss.all_op_cache_accesses", + "EventCode": "0x28f", + "BriefDescription": "Op cache accesses of all types.", + "UMask": "0x07" + }, + { + "EventName": "l3_lookup_state.l3_miss", + "EventCode": "0x04", + "BriefDescription": "L3 cache misses.", + "UMask": "0x01", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.l3_hit", + "EventCode": "0x04", + "BriefDescription": "L3 cache hits.", + "UMask": "0xfe", + "Unit": "L3PMC" + }, + { + "EventName": "l3_lookup_state.all_coherent_accesses_to_l3", + "EventCode": "0x04", + "BriefDescription": "L3 cache requests for all coherent accesses.", + "UMask": "0xff", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.dram_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.near_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.far_cache", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_near", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.ext_far", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency when data is sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency.all", + "EventCode": "0xac", + "BriefDescription": "Average sampled latency from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in the same NUMA node.", + "UMask": "0x01", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.dram_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from DRAM in a different NUMA node.", + "UMask": "0x02", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.near_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in the same NUMA node.", + "UMask": "0x04", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.far_cache", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from another CCX's cache when the address was in a different NUMA node.", + "UMask": "0x08", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_near", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in the same NUMA node.", + "UMask": "0x10", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.ext_far", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from extension memory (CXL) in a different NUMA node.", + "UMask": "0x20", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + }, + { + "EventName": "l3_xi_sampled_latency_requests.all", + "EventCode": "0xad", + "BriefDescription": "L3 cache fill requests sourced from all data sources.", + "UMask": "0x3f", + "EnAllCores": "0x1", + "EnAllSlices": "0x1", + "SliceId": "0x3", + "ThreadMask": "0x3", + "Unit": "L3PMC" + } +] diff --git a/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json new file mode 100644 index 000000000000..a56a41828bd4 --- /dev/null +++ b/lib/libpmc/pmu-events/arch/x86/amdzen4/core.json @@ -0,0 +1,122 @@ +[ + { + "EventName": "ls_locks.bus_lock", + "EventCode": "0x25", + "BriefDescription": "Retired Lock instructions which caused a bus lock.", + "UMask": "0x01" + }, + { + "EventName": "ls_ret_cl_flush", + "EventCode": "0x26", + "BriefDescription": "Retired CLFLUSH instructions." + }, + { + "EventName": "ls_ret_cpuid", + "EventCode": "0x27", + "BriefDescription": "Retired CPUID instructions." + }, + { + "EventName": "ls_smi_rx", + "EventCode": "0x2b", + "BriefDescription": "SMIs received." + }, + { + "EventName": "ls_int_taken", + "EventCode": "0x2c", + "BriefDescription": "Interrupts taken." + }, + { + "EventName": "ls_not_halted_cyc", + "EventCode": "0x76", + "BriefDescription": "Core cycles not in halt." *** 2982 LINES SKIPPED *** From nobody Sat Apr 20 16:05:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMGYt4GNCz5J3H3; Sat, 20 Apr 2024 16:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMGYt3j22z4tgs; Sat, 20 Apr 2024 16:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713629106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hwye/lxjY8kKJSbgh4S/kPiw+YrpPilA1Dy+qyUUIfU=; b=w6YmAwqt+IiNifjKnUy12h0e7BHSeMHqMOkdtRRuC5hbhKIGz0s7AkckPZukJJZtyF1+FO mERvVsPoSwQjFbzPVA7YL0FVlt3uZGqqktQy7wKJD+CgMCQ1Dc3iPjquwrjbm3mTpG63c9 3lnRZwrNQPGZQSjJtzWbwCcpAQTNtwOEju+QSGj9uQxjp/SLoLiHboaqzQPxeoqNeowJJN 4fK5LetAnUzs/XFqkG5/FYRRsh+IN+PfOyr4be5VKRZCxalnjQCQJBo1qk1tDRi8/egf7d nQjIHu/dGiqRe5F1N8cb869YrNKSjlDaBjHvFMlOn8qvGlIwur4S8jbOeMJ/PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713629106; a=rsa-sha256; cv=none; b=LtihLloFTE5ts7MU/pfAzs/mqc0iXSo10WzpbsG8FsfP/RktXhArToa8XsmwlYrui7/sqr HniD67H9fXPbrCool9SCQ+wV4fyXVEuuXF50m9D3rngvfodWIL8N+eppRGBjXKgCkohk3S J71hBkinN0hS3yau6bJKtEexSqzHWudQzAjS2hwdP1ShyYFCVwHX3BPhWVRtUUMAGgCWEq PnZtD+2GU1CsXlmHUlHuDAHzLs6ft5xbD0oxPQdBwfSvcWOsp1HHaK0eE7CLNAoF53XBJL d7PzVYxCUsqVQmrm0aT0HLCWWCel9fhAbAwfCuV3GG+UOWxQ5InOPEgGMrSdGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713629106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hwye/lxjY8kKJSbgh4S/kPiw+YrpPilA1Dy+qyUUIfU=; b=vLjczefDMyGImtHwwBMzQQ3frobBoLQUCFKfN9/DEkdXQnY+aSyyxPazpDf1FqeBGnxHOL 39bGh9+DVpxbfwYeaaEExgt7MDnOEvD2OLcXAwZ6QkEyThWzjZI204YpwADWz0nq67QFP/ +5Xf5o+RStcevZdEAwOg7KoaAOdhzUUyquh/k+CBqBZMKQLPp3ttEqTcIxTrVzUAlnyvhI KaUzTHlEw2HXCh3uOkiM6qIeyQMpXJBkl556cf+dCUKIiFgXAHjVUta5z1pXt1zUa3YzYq rdwiLm1TvHgVX/P4fyH9Voh2IMvr2tUFjclBcD7L91QeO1Amaks4ZEpTJnVM6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMGYt3BJSzkg9; Sat, 20 Apr 2024 16:05: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 43KG5617080223; Sat, 20 Apr 2024 16:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KG564E080220; Sat, 20 Apr 2024 16:05:06 GMT (envelope-from git) Date: Sat, 20 Apr 2024 16:05:06 GMT Message-Id: <202404201605.43KG564E080220@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: bf454ca88bdf - main - wg: Add netmap support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: bf454ca88bdf4acfa873386e876ff5e772e6a830 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bf454ca88bdf4acfa873386e876ff5e772e6a830 commit bf454ca88bdf4acfa873386e876ff5e772e6a830 Author: Mark Johnston AuthorDate: 2024-04-20 16:01:28 +0000 Commit: Mark Johnston CommitDate: 2024-04-20 16:04:42 +0000 wg: Add netmap support When in netmap (emulated) mode, wireguard interfaces prepend or strip a dummy ethernet header when interfacing with netmap. The netmap application thus sees unencrypted, de-encapsulated frames with a fixed header. In this mode, netmap hooks the if_input and if_transmit routines of the ifnet. Packets from the host TX ring are handled by wg_if_input(), which simply hands them to the netisr layer; packets which would otherwise be tunneled are intercepted in wg_output() and placed in the host RX ring. The "physical" TX ring is processed by wg_transmit(), which behaves identically to wg_output() when netmap is not enabled, and packets appear in the "physical" RX ring by hooking wg_deliver_in(). Reviewed by: vmaffione MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Zenarmor Differential Revision: https://reviews.freebsd.org/D43460 --- share/man/man4/wg.4 | 14 +++++ sys/dev/wg/if_wg.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 163 insertions(+), 6 deletions(-) diff --git a/share/man/man4/wg.4 b/share/man/man4/wg.4 index 7682d4c37147..2f758c2a8e11 100644 --- a/share/man/man4/wg.4 +++ b/share/man/man4/wg.4 @@ -121,6 +121,19 @@ as follows: Although a valid Curve25519 key must have 5 bits set to specific values, this is done by the interface and so it will accept any random 32-byte base64 string. +.Sh NETMAP +.Xr netmap 4 +applications may open a WireGuard interface in emulated mode. +The netmap application will receive decrypted, unencapsulated packets prepended +by a dummy Ethernet header. +The Ethertype field will be one of +.Dv ETHERTYPE_IP +or +.Dv ETHERTYPE_IPV6 +depending on the address family of the packet. +Packets transmitted by the application should similarly begin with a dummy +Ethernet header; this header will be stripped before the packet is encrypted +and tunneled. .Sh EXAMPLES Create a .Nm @@ -183,6 +196,7 @@ is not assigned to the allowed IPs of Peer X. .Xr ip 4 , .Xr ipsec 4 , .Xr netintro 4 , +.Xr netmap 4 , .Xr ovpn 4 , .Xr ipf 5 , .Xr pf.conf 5 , diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index d3a5a29e4c08..57caa69bde3b 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -1674,6 +1674,31 @@ error: } } +#ifdef DEV_NETMAP +/* + * Hand a packet to the netmap RX ring, via netmap's + * freebsd_generic_rx_handler(). + */ +static void +wg_deliver_netmap(if_t ifp, struct mbuf *m, int af) +{ + struct ether_header *eh; + + M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT); + if (__predict_false(m == NULL)) { + if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); + return; + } + + eh = mtod(m, struct ether_header *); + eh->ether_type = af == AF_INET ? + htons(ETHERTYPE_IP) : htons(ETHERTYPE_IPV6); + memcpy(eh->ether_shost, "\x02\x02\x02\x02\x02\x02", ETHER_ADDR_LEN); + memcpy(eh->ether_dhost, "\xff\xff\xff\xff\xff\xff", ETHER_ADDR_LEN); + if_input(ifp, m); +} +#endif + static void wg_deliver_in(struct wg_peer *peer) { @@ -1682,6 +1707,7 @@ wg_deliver_in(struct wg_peer *peer) struct wg_packet *pkt; struct mbuf *m; struct epoch_tracker et; + int af; while ((pkt = wg_queue_dequeue_serial(&peer->p_decrypt_serial)) != NULL) { if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) @@ -1707,19 +1733,25 @@ wg_deliver_in(struct wg_peer *peer) if (m->m_pkthdr.len == 0) goto done; - MPASS(pkt->p_af == AF_INET || pkt->p_af == AF_INET6); + af = pkt->p_af; + MPASS(af == AF_INET || af == AF_INET6); pkt->p_mbuf = NULL; m->m_pkthdr.rcvif = ifp; NET_EPOCH_ENTER(et); - BPF_MTAP2_AF(ifp, m, pkt->p_af); + BPF_MTAP2_AF(ifp, m, af); CURVNET_SET(if_getvnet(ifp)); M_SETFIB(m, if_getfib(ifp)); - if (pkt->p_af == AF_INET) +#ifdef DEV_NETMAP + if ((if_getcapenable(ifp) & IFCAP_NETMAP) != 0) + wg_deliver_netmap(ifp, m, af); + else +#endif + if (af == AF_INET) netisr_dispatch(NETISR_IP, m); - if (pkt->p_af == AF_INET6) + else if (af == AF_INET6) netisr_dispatch(NETISR_IPV6, m); CURVNET_RESTORE(); NET_EPOCH_EXIT(et); @@ -2164,13 +2196,36 @@ determine_af_and_pullup(struct mbuf **m, sa_family_t *af) return (0); } +#ifdef DEV_NETMAP +static int +determine_ethertype_and_pullup(struct mbuf **m, int *etp) +{ + struct ether_header *eh; + + *m = m_pullup(*m, sizeof(struct ether_header)); + if (__predict_false(*m == NULL)) + return (ENOBUFS); + eh = mtod(*m, struct ether_header *); + *etp = ntohs(eh->ether_type); + if (*etp != ETHERTYPE_IP && *etp != ETHERTYPE_IPV6) + return (EAFNOSUPPORT); + return (0); +} + +/* + * This should only be invoked by netmap, via nm_os_generic_xmit_frame(), to + * transmit packets from the netmap TX ring. + */ static int wg_transmit(if_t ifp, struct mbuf *m) { sa_family_t af; - int ret; + int et, ret; struct mbuf *defragged; + KASSERT((if_getcapenable(ifp) & IFCAP_NETMAP) != 0, + ("%s: ifp %p is not in netmap mode", __func__, ifp)); + defragged = m_defrag(m, M_NOWAIT); if (defragged) m = defragged; @@ -2180,14 +2235,94 @@ wg_transmit(if_t ifp, struct mbuf *m) return (ENOBUFS); } + ret = determine_ethertype_and_pullup(&m, &et); + if (ret) { + xmit_err(ifp, m, NULL, AF_UNSPEC); + return (ret); + } + m_adj(m, sizeof(struct ether_header)); + ret = determine_af_and_pullup(&m, &af); if (ret) { xmit_err(ifp, m, NULL, AF_UNSPEC); return (ret); } - return (wg_xmit(ifp, m, af, if_getmtu(ifp))); + + /* + * netmap only gets to see transient errors, since it handles errors by + * refusing to advance the transmit ring and retrying later. + */ + ret = wg_xmit(ifp, m, af, if_getmtu(ifp)); + if (ret == ENOBUFS) + return (ret); + return (0); } +/* + * This should only be invoked by netmap, via nm_os_send_up(), to process + * packets from the host TX ring. + */ +static void +wg_if_input(if_t ifp, struct mbuf *m) +{ + int et; + + KASSERT((if_getcapenable(ifp) & IFCAP_NETMAP) != 0, + ("%s: ifp %p is not in netmap mode", __func__, ifp)); + + if (determine_ethertype_and_pullup(&m, &et) != 0) { + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); + m_freem(m); + return; + } + CURVNET_SET(if_getvnet(ifp)); + switch (et) { + case ETHERTYPE_IP: + m_adj(m, sizeof(struct ether_header)); + netisr_dispatch(NETISR_IP, m); + break; + case ETHERTYPE_IPV6: + m_adj(m, sizeof(struct ether_header)); + netisr_dispatch(NETISR_IPV6, m); + break; + default: + __assert_unreachable(); + } + CURVNET_RESTORE(); +} + +/* + * Deliver a packet to the host RX ring. Because the interface is in netmap + * mode, the if_transmit() call should pass the packet to netmap_transmit(). + */ +static int +wg_xmit_netmap(if_t ifp, struct mbuf *m, int af) +{ + struct ether_header *eh; + + if (__predict_false(if_tunnel_check_nesting(ifp, m, MTAG_WGLOOP, + MAX_LOOPS))) { + printf("%s:%d\n", __func__, __LINE__); + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); + m_freem(m); + return (ELOOP); + } + + M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT); + if (__predict_false(m == NULL)) { + if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); + return (ENOBUFS); + } + + eh = mtod(m, struct ether_header *); + eh->ether_type = af == AF_INET ? + htons(ETHERTYPE_IP) : htons(ETHERTYPE_IPV6); + memcpy(eh->ether_shost, "\x06\x06\x06\x06\x06\x06", ETHER_ADDR_LEN); + memcpy(eh->ether_dhost, "\xff\xff\xff\xff\xff\xff", ETHER_ADDR_LEN); + return (if_transmit(ifp, m)); +} +#endif /* DEV_NETMAP */ + static int wg_output(if_t ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro) { @@ -2206,6 +2341,11 @@ wg_output(if_t ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro return (EAFNOSUPPORT); } +#ifdef DEV_NETMAP + if ((if_getcapenable(ifp) & IFCAP_NETMAP) != 0) + return (wg_xmit_netmap(ifp, m, af)); +#endif + defragged = m_defrag(m, M_NOWAIT); if (defragged) m = defragged; @@ -2781,7 +2921,10 @@ wg_clone_create(struct if_clone *ifc, char *name, size_t len, if_setinitfn(ifp, wg_init); if_setreassignfn(ifp, wg_reassign); if_setqflushfn(ifp, wg_qflush); +#ifdef DEV_NETMAP if_settransmitfn(ifp, wg_transmit); + if_setinputfn(ifp, wg_if_input); +#endif if_setoutputfn(ifp, wg_output); if_setioctlfn(ifp, wg_ioctl); if_attach(ifp); From nobody Sat Apr 20 16:05:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMGYv6Zjdz5J3HF; Sat, 20 Apr 2024 16:05: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 4VMGYv4hdwz4tph; Sat, 20 Apr 2024 16:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713629107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BdfI67cOlZbzrFpad2PSqf8l8AeFWoujmzrtj01XD+Q=; b=c8+McWxxj184W9aAEKwFSDIt5Zl5IBNCeo1Co09Xno3qCcjXs2/7GPr+onVMtvusVSjsHB EuBr+JDVaJqDgxaoj9+0gsQHVfzm4wbiN2fgEzod/iJ2QXRqCRg1jqpMC+BC9Vg0klJ9xE YByzUjP+ukAmEd2IvKHHH4R89A5S3Doi7N41OCY0szEX1ibBW+lGx90kHnxZtmtjjBt9KK +J+NWvDyRsi1RYTOgbL4s6JBe7QdYLWi7U+MTT3/KamC+jCp1ezaNK468EmYIrxBeob7/y eFJDoq53onk90Ra5hajQwHGu0fz49U23nOT+tQjCfsX0J2Um1QTUiPGSQJLxfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713629107; a=rsa-sha256; cv=none; b=HDkBTqO3cVIN8Fgl8X8gfk9lr4cFZd2I7a+NoetQOPjocmON6pNLZEL1CMHFR2TP25D4C1 mC8bmWSyISxqy9XQ+KQcrxUxqS0Pm7wGJvNUusXM71BQBFMvIvX/iOnf9W5j1OQfeNeX3r Bqbk5UpPomwACChvkhFB8FZmbjpi1Zk447MdpuRrgY8MhAqzHoMXg5L3yjgnpFkjUNbHFY ioofYOlqkuIpxBWk9rdFCPE8BHMHdIZ7d0QyzyQJt82Kwqupy/t2wkrqPVIgEVpBCPkXO3 F+XR/UiuFfKU9lI6sIITSCIQV92Dly5/YOYO4F5pQf4hroezsMLq07oBWLM5Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713629107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BdfI67cOlZbzrFpad2PSqf8l8AeFWoujmzrtj01XD+Q=; b=qLlEKK6ixsXrc8si3qsVkTq3Y+zDJpS2wsOA02ZNq54kjxjfZpcU/aCBGrD7FqBh5dzJn+ ClIqxOsDXu7yzQWV2CpQH9rc4Zl8dgh4zCFTFSDmbaksb4/l0ibDxysMs2Kl1aHZScUODa 3wfkQEU3gB1GQ90Ss0oU3/CvkQ0HmhdNKY61h9LTI+pYVEKzhJjup2v67hxLycrDDicir3 IGJnv5/W7sMA8WWbOObNMH7zUtaaGR8coAwJR477R56wgJjaCampmX7RkQofQ3/wKR+s0/ qon5+eSpJR65VGUPMvLFthhSPU/Z7PkoWeGZ2HsNlsWlXLOHPfhVyycE4obeHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMGYv4J7qzkQn; Sat, 20 Apr 2024 16:05: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 43KG57KA080283; Sat, 20 Apr 2024 16:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KG57wm080280; Sat, 20 Apr 2024 16:05:07 GMT (envelope-from git) Date: Sat, 20 Apr 2024 16:05:07 GMT Message-Id: <202404201605.43KG57wm080280@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: c0f13232410c - main - wg tests: Add a simple regression test case for netmap support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: c0f13232410cf881475d6e4dbd0ec28ab3476c59 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c0f13232410cf881475d6e4dbd0ec28ab3476c59 commit c0f13232410cf881475d6e4dbd0ec28ab3476c59 Author: Mark Johnston AuthorDate: 2024-04-20 16:01:53 +0000 Commit: Mark Johnston CommitDate: 2024-04-20 16:04:42 +0000 wg tests: Add a simple regression test case for netmap support MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Zenarmor --- tests/sys/net/Makefile | 6 +++- tests/sys/net/if_wg.sh | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile index 75596028688b..95ab86156a0a 100644 --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/net @@ -19,6 +18,11 @@ ATF_TESTS_SH+= if_wg TESTS_SUBDIRS+= if_ovpn TESTS_SUBDIRS+= routing +# The netmap bridge application is used by if_wg tests. +.PATH: ${SRCTOP}/tools/tools/netmap +PROGS+= bridge +LIBADD.bridge+= netmap + # The tests are written to be run in parallel, but doing so leads to random # panics. I think it's because the kernel's list of interfaces isn't properly # locked. diff --git a/tests/sys/net/if_wg.sh b/tests/sys/net/if_wg.sh index 1f2ea308853a..b43b40f25018 100644 --- a/tests/sys/net/if_wg.sh +++ b/tests/sys/net/if_wg.sh @@ -92,6 +92,97 @@ wg_basic_cleanup() vnet_cleanup } +atf_test_case "wg_basic_netmap" "cleanup" +wg_basic_netmap_head() +{ + atf_set descr 'Create a wg(4) tunnel over an epair and pass traffic between jails with netmap' + atf_set require.user root +} + +wg_basic_netmap_body() +{ + local epair pri1 pri2 pub1 pub2 wg1 wg2 + local endpoint1 endpoint2 tunnel1 tunnel2 tunnel3 tunnel4 + local pid status + + kldload -n if_wg || atf_skip "This test requires if_wg and could not load it" + kldload -n netmap || atf_skip "This test requires netmap and could not load it" + + pri1=$(wg genkey) + pri2=$(wg genkey) + + endpoint1=192.168.2.1 + endpoint2=192.168.2.2 + tunnel1=192.168.3.1 + tunnel2=192.168.3.2 + tunnel3=192.168.3.3 + tunnel4=192.168.3.4 + + epair=$(vnet_mkepair) + + vnet_init + + vnet_mkjail wgtest1 ${epair}a + vnet_mkjail wgtest2 ${epair}b + + jexec wgtest1 ifconfig ${epair}a ${endpoint1}/24 up + jexec wgtest2 ifconfig ${epair}b ${endpoint2}/24 up + + wg1=$(jexec wgtest1 ifconfig wg create) + echo "$pri1" | jexec wgtest1 wg set $wg1 listen-port 12345 \ + private-key /dev/stdin + pub1=$(jexec wgtest1 wg show $wg1 public-key) + wg2=$(jexec wgtest2 ifconfig wg create) + echo "$pri2" | jexec wgtest2 wg set $wg2 listen-port 12345 \ + private-key /dev/stdin + pub2=$(jexec wgtest2 wg show $wg2 public-key) + + atf_check -s exit:0 -o ignore \ + jexec wgtest1 wg set $wg1 peer "$pub2" \ + endpoint ${endpoint2}:12345 allowed-ips ${tunnel2}/32,${tunnel4}/32 + atf_check -s exit:0 \ + jexec wgtest1 ifconfig $wg1 inet ${tunnel1}/24 up + + atf_check -s exit:0 -o ignore \ + jexec wgtest2 wg set $wg2 peer "$pub1" \ + endpoint ${endpoint1}:12345 allowed-ips ${tunnel1}/32,${tunnel3}/32 + atf_check -s exit:0 \ + jexec wgtest2 ifconfig $wg2 inet ${tunnel2}/24 up + + atf_check -s exit:0 -o ignore \ + jexec wgtest1 sysctl net.inet.ip.forwarding=1 + atf_check -s exit:0 -o ignore \ + jexec wgtest2 sysctl net.inet.ip.forwarding=1 + + jexec wgtest1 $(atf_get_srcdir)/bridge -w 0 -i netmap:wg0 -i netmap:wg0^ & + pid=$! + + # Generous timeout since the handshake takes some time. + atf_check -s exit:0 -o ignore jexec wgtest1 ping -c 1 -t 5 $tunnel2 + atf_check -s exit:0 -o ignore jexec wgtest2 ping -c 1 $tunnel1 + + # Verify that we cannot ping non-existent tunnel addresses. In general + # the remote side should respond with an ICMP message. + atf_check -s exit:2 -o ignore jexec wgtest1 ping -c 1 -t 2 $tunnel4 + atf_check -s exit:2 -o ignore jexec wgtest2 ping -c 1 -t 2 $tunnel3 + + # Make sure that the bridge is still functional. + atf_check -s exit:0 -o ignore jexec wgtest1 ping -c 1 $tunnel2 + atf_check -s exit:0 -o ignore jexec wgtest2 ping -c 1 $tunnel1 + + atf_check -s exit:0 kill -TERM $pid + wait $pid + status=$? + + # Make sure that SIGTERM was received and handled. + atf_check_equal $status 143 +} + +wg_basic_netmap_cleanup() +{ + vnet_cleanup +} + # The kernel is expected to silently ignore any attempt to add a peer with a # public key identical to the host's. atf_test_case "wg_key_peerdev_shared" "cleanup" @@ -258,6 +349,7 @@ wg_vnet_parent_routing_cleanup() atf_init_test_cases() { atf_add_test_case "wg_basic" + atf_add_test_case "wg_basic_netmap" atf_add_test_case "wg_key_peerdev_shared" atf_add_test_case "wg_key_peerdev_makeshared" atf_add_test_case "wg_vnet_parent_routing" From nobody Sat Apr 20 16:05:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMGYw71Jkz5J35W; Sat, 20 Apr 2024 16:05: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 4VMGYw5mGkz4tMX; Sat, 20 Apr 2024 16:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713629108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qF1DEfjhf45DyK4lU3W6Hrb+N0ejM1LLel8SdD46RMQ=; b=Hwk54YrlvRI1WOPrxND3YhvpbwzVB5fW0Ozms7/UowIKj7ULIxnz8Ww720IfHObpJ5lxw5 GF0NrLyAEm5Ft41xfVBMeuz49ofp08HAaT+u3sWRjUN/eX2Ek+C2SYgRIBcdn8tsdvuQim FwF8woqmGVPPkT+uoMMoibswCXUdQ9ByVLqQuGrffgWfTBhdN4EIKOTNs34XIZk6ZTpio2 7AKg8cuIMHvl4P9L5GojtDU01SwU/hJZl0mvvRnofWev7G4cF+TO1iPjaJomMuvMTFK570 PZbraOkunXNcjEzYD8U55BwPWuXEYoFPTGLFc/SqtjOP7lzDpdThMg3mhR2V4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713629108; a=rsa-sha256; cv=none; b=yIfc0x1CASPZYone/e4HgoyphuT3Sg2XvpKkUhBvldOgfBTVHzQ7CwbBBxiynkEgNHGcyo zLPZit6a3qTURosQnv9qYo7jY7fsuwAsAtCb1BFH19jsfHTcjrdmHm9PfOEnwB59+uQDZ+ hU2YDIjS423l9bQFrLD26P1uUWtcGJmM4R2aFuW2zHeqX2lmg/7n17Q4x/6r09klmW4Tnb i+TPX2yLH3yH65bk+NVyb6k1iIbMQ1o+r7K2eTQY0nGiP+ESSSC+BhKkPVFuLz21TcW3O6 QRbEVFZvSIovdJ810TYErxMKZNZ3npUbVrCxgexow46WafloOYUi8BiR+IxGMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713629108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qF1DEfjhf45DyK4lU3W6Hrb+N0ejM1LLel8SdD46RMQ=; b=aGUDLyeW0Oej4Ypo5BPMR747RQNiOZylUWCUehNmtLwCQTUHrkbp7TqkOzK5qrX4H2aEcm yYVXP5a09KEFM1UZvDfM5krDJucQvhi5Rx3hh4Meus4S9bVb5oUs9HE1Xq6Hv5BH0l+LSu psyZaogcbx5lV+B6id/yE2vJ0IR3Ked+uJOg55jjeI8l+y8Cd8FLuKS5CPJjMA7Kg0Jd0Q wCGIw9nwLNu9MeahOsKfofrc/Yl6ju4zQTa9f33I5zffg6wxDrReCG/gIL19phEAPvZVvN nc883l3nAfRvi0fTCnFV3SGlDGoN523roEn/6IDNWIV3UJnqoCC98DbY2m3Bjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMGYw5HQbzkQp; Sat, 20 Apr 2024 16:05: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 43KG58ZT080333; Sat, 20 Apr 2024 16:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KG582x080331; Sat, 20 Apr 2024 16:05:08 GMT (envelope-from git) Date: Sat, 20 Apr 2024 16:05:08 GMT Message-Id: <202404201605.43KG582x080331@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: 955f213fa2f1 - main - graid3: Fix teardown in g_raid3_try_destroy() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 955f213fa2f14d5b5e9b655d8922e28315eb9fa3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=955f213fa2f14d5b5e9b655d8922e28315eb9fa3 commit 955f213fa2f14d5b5e9b655d8922e28315eb9fa3 Author: Mark Johnston AuthorDate: 2024-04-20 16:02:06 +0000 Commit: Mark Johnston CommitDate: 2024-04-20 16:04:57 +0000 graid3: Fix teardown in g_raid3_try_destroy() Commit 33cb9b3c3a22 replaced a g_raid3_destroy_device() call with a g_raid3_free_device() call, which was incorrect and could lead to a panic if a RAID3 GEOM failed to start (e.g., due to missing disks). Reported by: graid3 tests Fixes: 33cb9b3c3a22 ("graid3: Fix teardown races") MFC after: 3 days Sponsored by: Klara, Inc. --- sys/geom/raid3/g_raid3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 721610cefbec..c2d05b48d80d 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -2033,7 +2033,7 @@ g_raid3_try_destroy(struct g_raid3_softc *sc) sc->sc_worker = NULL; } else { g_topology_unlock(); - g_raid3_free_device(sc); + g_raid3_destroy_device(sc); } return (1); } From nobody Sat Apr 20 17:55:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMK1Q0jZNz5JCD3; Sat, 20 Apr 2024 17:55: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 4VMK1Q06ttz468Z; Sat, 20 Apr 2024 17:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713635738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RD569cwi2haS4VsiPHrOA+X28KC+adQT6cZYkOYs5EQ=; b=PMb6EGnTvX15I58FIn+QfjzS/IB6tVp23uBSl+tsRklGrWhS9K/ihjxjqggoZ8wi/UGocI o2OD65crra20hBIZ9fJnzEufFl0vkiaN47yc+cFgtffKtvz37TOycS0WqxCQBS6EaVLRka dtHNJl+ACOtJ79sMJk3DveJH8KAt8y8otOQr5lLnVfjRprpKdn2Ug4n6fMcil0iJKVkL27 VHfMY0o/MXeUGhOIuEnX+gysh2x1k5M30m7W1jlhF4+aJ5+a6IgJ1crc9j9Knb0ttEoVZF 9gNi3kMxpW+rdRzpuvNyJI1WbUTRFEA2JzknTS6ztNDxYl0HIu/2G5yIogCfNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713635738; a=rsa-sha256; cv=none; b=Qp+wVrkVtS+Db0GJgYuZ+rB2hbvuk6bfArUXOuufSpL2L2j+aSxy8A3S5Dpwhd72gWqLEL jMIXHBmERhPJNgsgmbpTcvbK/BUZLJJ22outTs0OXOI+IcGorxdHymaJ1SNcd3ubGkQzyu +y8W3IX1G3DrNqimsYFWFgKx+EytmjS1ZgqQKQMOnnzucXHE1/iXL0ODPFDVJ2Il9yszJ6 zAZmLF00w0U9Af40levIs42BPK7UkzzV+PIrLNQ2hT1VXdmOAOSeXDWQe9gmrn/v5kPX7t A8oIpsZP/GbxByMQVMvFSTvPvocvEKVTooroMCjuEbKhMl+wxCsC7I5u1Up+mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713635738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RD569cwi2haS4VsiPHrOA+X28KC+adQT6cZYkOYs5EQ=; b=yIUmeaXxFRyp8xs7esidYBiZ37tAdr/BOWulycI7iRPkHpxvH0Ir9KxYgGGv92ouDs1sDG 3FM1CTRUUuDd9PSud26rNQ4jLS21MRgtQG2bclK9e+CkYKbOnCK70Ym9oOsjUfzshgLVv1 MT5aCNEgIaY3mdMgeQnsWsic+lXLKndrTH5Ewf6vGfyepvA81MxMjwCjC+TN8QkZyAf16F eKu5HdPCG5w6KiuWJukfmOv8IMQiV7g6rlGGbDFiFJlKUM22v6w5glWWDV0RfYPq5aR0q4 YeGj/a48UoGHBbIjQ3Zd/qQl/CeLdV1vgWmjVWuYa8Ch8K4JJK2jEz1ZA0fvGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMK1P6kq2zn5R; Sat, 20 Apr 2024 17:55: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 43KHtb4I065747; Sat, 20 Apr 2024 17:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KHtbxp065744; Sat, 20 Apr 2024 17:55:37 GMT (envelope-from git) Date: Sat, 20 Apr 2024 17:55:37 GMT Message-Id: <202404201755.43KHtbxp065744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 6815606c827a - main - ldconfig: fix man-page - duplicate dot at end of sentence List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6815606c827a321cfa12e2e026bcffeace8b9d14 Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=6815606c827a321cfa12e2e026bcffeace8b9d14 commit 6815606c827a321cfa12e2e026bcffeace8b9d14 Author: Stefan Eßer AuthorDate: 2024-04-20 17:49:10 +0000 Commit: Stefan Eßer CommitDate: 2024-04-20 17:49:10 +0000 ldconfig: fix man-page - duplicate dot at end of sentence Reported by: gbe --- sbin/ldconfig/ldconfig.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8 index e3cb2c00a353..fd36540b48d6 100644 --- a/sbin/ldconfig/ldconfig.8 +++ b/sbin/ldconfig/ldconfig.8 @@ -108,7 +108,7 @@ Ignored for backwards compatibility. .It Fl B Force writing big-endian binary data to the hints file. The default is to create hints files in little-endian byte-order on all -architectures.. +architectures. Reading of and merging into hints files preserves the endianness of the existing hints file. .It Fl R From nobody Sat Apr 20 19:35:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMMF54WHyz5JLSB; Sat, 20 Apr 2024 19:35: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 4VMMF52cY1z4NvJ; Sat, 20 Apr 2024 19:35:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713641753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHlJ85zwP262V+Q08Gc+LnioRuh5m7PPqHTWUw7TLFE=; b=f0ahbLbTzGezDrscli/u1VeqOyh2rsLEOC+P4l2fLX0hrRVHrwSCMhunIiHQC5hwZotty2 dQXn6fj13TKXMH3v3IkTh1tp0vrLRAu5KsgcYhIjgkBAHAk2a/UpEQucFJf4xuuBzo5OUV yKv2vPR/PhmVCQ8r1DmtVioYIuB1IqepcuXiea3uXwm9t1s8SR3EknK4YI/EE81T9KOVZN pwhWSs5u0rug+EgjVx4BFM/gJIUeV6O1QFvAgws+cuQM0gs4gnSYhfabPZbvmAYpndVjaq CbVzUoxOT7Jyq9H5wtUKW5v3Z4Z8BGsH2rWZtqlyAVwHKWF4Ik8aOy32OwiSWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713641753; a=rsa-sha256; cv=none; b=l5tlqfsMpuMwlaBs2DqtPZVy/lwVQ8cMUMOi/rDPkAKoFYSKnuUCNewEffYQmRaoI/SCKR JB3fKXKriYsMLKyrRxDjthmhJF4cwJCD54G247JL3ozfQy2H6jxflV5hcHA7RdTQcaQ9KU mKnKvviLS6e9BbDXgnYdgIIWF5D2+aCJrgPbU/ZqDNKF+B/XuH7eeuptMxDshsM7HsYKTK YpUqLzurUUdUASDNcOkmbMyXhKwAyNOsnm4pKeJkISs1y7runxpqJYOrlAtm4YVutN1Pho /pCj0v5ntEz2PKmjikarIwtTSjA7ZlwQcRR2Cu2lbCMYP6PUtLDSz6OvQoVLuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713641753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHlJ85zwP262V+Q08Gc+LnioRuh5m7PPqHTWUw7TLFE=; b=D82zo9tsJ+MdoIENrIFlgA8upEHxObz3chndY1rrwrILumtas43Jqw5uI3BKjwtfwZN0GY ivmKoitInygn3q0XhAVsjMMukZ62RYkcNrOd2eCozFkyveyQ0/9EV/Zah6DxWMEprnmQyp U7vuHgdB39HHyT1XnTfAoIsCzBCvlEPiXGPsspWX2AeIq6etHaXnLpv3r0HVbJPBt6HPUu ELOANE7N2O/zT67/0vXZamzs90t92hj67EWydkiQgUA7f0OSILzjmtTmFucarJo0Bws2Yw N69yvmRvd+jlYj10bjPu7OQok1FQN8i5ICLVIaeFeDm0e00Th/RMHMbQ0/H0Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMMF52CyVzqGv; Sat, 20 Apr 2024 19:35: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 43KJZrAS038806; Sat, 20 Apr 2024 19:35:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KJZrmj038803; Sat, 20 Apr 2024 19:35:53 GMT (envelope-from git) Date: Sat, 20 Apr 2024 19:35:53 GMT Message-Id: <202404201935.43KJZrmj038803@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: b37333899bd2 - main - adduser: A few more improvements. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b37333899bd27a74bdef34b7f34eb41bc6bd51bd Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b37333899bd27a74bdef34b7f34eb41bc6bd51bd commit b37333899bd27a74bdef34b7f34eb41bc6bd51bd Author: Dag-Erling Smørgrav AuthorDate: 2024-04-20 19:35:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-20 19:35:32 +0000 adduser: A few more improvements. MFC after: 1 week Reviewed by: jrm Differential Revision: https://reviews.freebsd.org/D44871 --- usr.sbin/adduser/adduser.sh | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 692b54bebf78..d1c9e12098f7 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -59,12 +59,11 @@ get_nextuid () { _nextuid="$(${PWCMD} usernext | cut -f1 -d:)" else while : ; do - ${PWCMD} usershow $_uid > /dev/null 2>&1 - if [ ! "$?" -eq 0 ]; then + if ! ${PWCMD} usershow $_uid > /dev/null 2>&1; then _nextuid=$_uid break fi - _uid=$(($_uid + 1)) + _uid=$((_uid + 1)) done fi echo $_nextuid @@ -262,8 +261,7 @@ add_user() { if [ -n "$BSDINSTALL_CHROOT" ]; then create_zfs_chrooted_dataset else - create_zfs_dataset - if [ "$?" -ne 0 ]; then + if ! create_zfs_dataset; then err "There was an error adding user ($username)." return 1 fi @@ -354,8 +352,7 @@ get_user() { err "You must enter a username!" [ -z "$fflag" ] && continue fi - ${PWCMD} usershow "$_input" > /dev/null 2>&1 - if [ "$?" -eq 0 ]; then + if ${PWCMD} usershow "$_input" > /dev/null 2>&1; then err "User exists!" [ -z "$fflag" ] && continue fi @@ -476,19 +473,20 @@ get_homeperm() { # so, enable ZFS home dataset creation. # get_zfs_home() { + local _prefix + # check if zfs kernel module is loaded before attempting to run zfs to # prevent loading the kernel module on systems that don't use ZFS - if ! "$KLDSTATCMD" -q -m zfs; then + if ! "$KLDSTATCMD" -q -m zfs || Zcreate="no" return fi - zfs_homeprefix=$(${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null) - if [ "$?" -ne 0 ]; then - Zcreate="no" - elif [ -z "${zfs_homeprefix}" ]; then + if ! _prefix=$(${ZFSCMD} list -Ho name "${homeprefix}" 2>/dev/null) || + [ -z "${_prefix}" ]; then Zcreate="no" + return fi - zhome="${zfs_homeprefix}/${username}" + zhome="${_prefix}/${username}" } # get_uid From nobody Sat Apr 20 19:40:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMMLN31Gxz5JLZp; Sat, 20 Apr 2024 19:40:28 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMMLN1hrTz4Pmx; Sat, 20 Apr 2024 19:40:28 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713642028; 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=fhgiJLiprb7PKXPZo74LJ7T8ppUoRiMosgckS71LRK8=; b=F/FPO3K62nt1jb81fkqhPnKLz0Ca7CpmbbAmzyGYE40XN0i+WexvX13v2R6mAr+t6KVCtN nxRkzGKLnXgUgehxS185IEaVqVqnCKCvvXNqrXtfEq2lHxgoCQNixC3SwVRkedmZEtSKbb etsi38TK6z3hW/MfJKP8fs1X9qojoqfjRUyU0p0WfvX2Do+tTel0zzDrY3YpR+20eWXOhj jdLOqNM8dX63NPeqM1/fdM70f7y1w6OyFuIItgG1D62NkuxN6teYWW2/GxstqTYDLD57SM NSrGrbMT0o17aKeC9zo27oHAaaQoNPejSkhywq/OEI4U8Cei6FP2klYxSTD8+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713642028; a=rsa-sha256; cv=none; b=bAmPkEr9elK0A9ROioR6in68/WuWGpdPKyFMGo8Poi/LrJ3QvWlDihiCGYBwpCW2snL7hr jf8zNsgqrxRl7xeqLoXMj9vT7SO+hngpLA+cm0QNMSLy4uf5g+ldEtAfvc9HfQXVbFi0iG 3rIcr72Jubt3mFG3omPTPng4gK6fwxEya06ooqxv2+MNKYeAylk86fh2tWL2mt7MGzhFXj UXsOTserPFrKLzIIdB+a8QcYSj2LVms4TI3TXTqA6wVckcIv37i24rz3PLWTgq+RF5LxcN MGEOjX+od2TNZvRiieiBASXfh6RVy3NZ0CjcSU4C2aJ961nejLBH+7gtxjOSCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713642028; 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=fhgiJLiprb7PKXPZo74LJ7T8ppUoRiMosgckS71LRK8=; b=DQkONP3NR7F9hVwRD8OXaYWreC3qf2+qUdBL9SIQHf+VYRQYKWfShPpcT8P7uVL5NyU5s7 ccF3OFIH9GhNhegwFM6yLfHuKIT56LVLpJ34txg/RdE0HqjZ5banhfQLCtoIekfeVljS2E k5bjcpp322+J5Sgt2Z0IVwGFcxzMEhMc/9H3WvYRLv6gU8BgkWF7eIgf1UmCsmmLpxLaO5 B4DGovQxLxDtLI2qmTp3teC7EftIEoevM2LE0KZ+nFQxpaLehHlvRL+WsUcQDqe2Jt/YRO xEqoevVBe8diNidhcqeU8rWKLdnzhOvC6MRvC6BAJyFsJ7LbfBKqzCT2JeTBBw== Received: from ltc.des.dev (163.23.65.37.rev.sfr.net [37.65.23.163]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VMMLN0ZSJzF8g; Sat, 20 Apr 2024 19:40:28 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id D87481E7D6; Sat, 20 Apr 2024 21:40:26 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Gordon Bergling Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8993d785a261 - main - expand.1: Fix markup for the '-t' option In-Reply-To: <202404191540.43JFeDXd088443@gitrepo.freebsd.org> (Gordon Bergling's message of "Fri, 19 Apr 2024 15:40:13 GMT") References: <202404191540.43JFeDXd088443@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 20 Apr 2024 21:40:26 +0200 Message-ID: <86plujaklx.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gordon Bergling writes: > expand.1: Fix markup for the '-t' option >=20=20=20=20=20 > When viewing the manpage the '-t' option is shown as follows >=20=20=20=20=20 > -t -Sm tab1, tab2, ..., tabn Sm >=20=20=20=20=20 > with the markup '\&Sm' included within '.It Fl t', which doesn't > makes any sense. >=20=20=20=20=20 > So just remove it. You can't just remove the Sm, you need to add Ns before and after each comma to do what the Sm was intended to do. This is why we have a patch review system, please use it. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sun Apr 21 03:04:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMYBR6Lhmz5HGpd; Sun, 21 Apr 2024 03:04: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 4VMYBR5nHdz4BGJ; Sun, 21 Apr 2024 03:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713668655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=za32YJ/WgBzJoc1FugMF1QAyVnKyo5UtOQFyX4LK0zQ=; b=ocwrb3yuDS5dr7S92Ki9S9lqClOiVe7XlxRojrM9SSst3hH3kWTrX2w7D/XrpWRCfCDDPT Z/yGsBZu9B97vWFjly5nxhUTvRgnUoPebgEQzCaVPjCowm/ZSu1WD57im9z0UqUIbq/dGW 1sc2FAmOUn2y/mVVlWptGbJW8TXpTMstnwKam+IZDMjdF3yh3znBuEvdH44s9iJxJBbAAp mnc/vMrLXfTuQjTCWflGpceU56CEivL9mzQuHFxah3JPT3gr/X2y5l89ngNtNmiZCKTC/6 6F4LSKRAQwy6n1grjA1P0OZCATH2A2E6rOV85zuG26cWajIrEjLr964B8dB68Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713668655; a=rsa-sha256; cv=none; b=Vk7a8Ctkfb1W0CocGyQlXnTSYVcsQ1kzlY1EbFKYHzJv10lRFeB7OxfgieiZimT8K2ua0S CJ8m5Dxt13xGfJ51OLMlR0KA85nIMVWhXAFWKPprkWXuFQu1nChPFEUxwh7IchdZ5VQA0h HcKufDsKLhhibXi7gWTScZkSwFv7wDMOCoq0vhQp8XgCzZeb8C/e5Sho17v3XotE1JcBTK r86slqK5+2Mb6ysk9BoZvXh/oQ5m63Va/6xKsDFlrfN71gnrF/kf/BTXe9eBPzB2l+e6Yo XTP5o+IuWpZSzgoIcXnsy0PHbCWFK/vISFlYUempzrWwIvXMKXscbITBJWf4Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713668655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=za32YJ/WgBzJoc1FugMF1QAyVnKyo5UtOQFyX4LK0zQ=; b=kP4MbAVdsZDQbPVUmnuAKaopIne7D+QXy1X0WXb0AdjgKDkgSZMP4nZ9GZq4pktR3Ek13S Cxriq7GJybD4iK/3vMIfpZsFExOZeGTIP4fLdr4Sr+fCGHv++D1w3UKWFRpHaKA6CQrFco uBuonChNeApok0Z7CXcGurFL7uddSDjMRSUuZr9tr/HWOBTqSB2yTNMH+NakPees3b1iD3 1EnjYKSbHH8Z1p3wDXtedj48nulD5qKZokspRs8+/oiQp9q/TKd0e9cneNYh7WyCHOzEy5 sX9mHcFpx/xMAL+Qd3J6b3T9308TGAI0iagnHwZDvFM3UfbJ4VJkF04O7vnnvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMYBR5Nbrz13cb; Sun, 21 Apr 2024 03:04: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 43L34FfC097651; Sun, 21 Apr 2024 03:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L34FfY097648; Sun, 21 Apr 2024 03:04:15 GMT (envelope-from git) Date: Sun, 21 Apr 2024 03:04:15 GMT Message-Id: <202404210304.43L34FfY097648@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: b5e0cc2fa44f - main - ahc(4): resolve some minor nits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b5e0cc2fa44f52f16fc0b9c3f1709bc0f43fe2d0 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b5e0cc2fa44f52f16fc0b9c3f1709bc0f43fe2d0 commit b5e0cc2fa44f52f16fc0b9c3f1709bc0f43fe2d0 Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-21 03:04:04 +0000 ahc(4): resolve some minor nits In ahc_init(), qoutfifo is already assigned to effectively the same value a couple lines up, except in the first assignment it uses the proper definition; keep the more descriptive assignment. ahc_targetcmd_offset() gets the offset wrong entirely; as per the area of ahc_init() this diff also touches, targetcmds is laid out first in the shared map and it's followed by the qoutfifo. As a result, we'd generally be getting negative offsets here. We can't actually do a partial sync anyways, so there was no consequence to getting this wrong. Reviewed by: imp, mav Differential Revision: https://reviews.freebsd.org/D44859 --- sys/dev/aic7xxx/aic7xxx.c | 1 - sys/dev/aic7xxx/aic7xxx_inline.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 9934fbcc41bb..4d97d8ee6367 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -4931,7 +4931,6 @@ ahc_init(struct ahc_softc *ahc) for (i = 0; i < AHC_TMODE_CMDS; i++) ahc->targetcmds[i].cmd_valid = 0; ahc_sync_tqinfifo(ahc, BUS_DMASYNC_PREREAD); - ahc->qoutfifo = (uint8_t *)&ahc->targetcmds[256]; } ahc->qinfifo = &ahc->qoutfifo[256]; diff --git a/sys/dev/aic7xxx/aic7xxx_inline.h b/sys/dev/aic7xxx/aic7xxx_inline.h index ac043ddb8bbd..6a6501b72c13 100644 --- a/sys/dev/aic7xxx/aic7xxx_inline.h +++ b/sys/dev/aic7xxx/aic7xxx_inline.h @@ -217,7 +217,7 @@ ahc_sync_sglist(struct ahc_softc *ahc, struct scb *scb, int op) static __inline uint32_t ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index) { - return (((uint8_t *)&ahc->targetcmds[index]) - ahc->qoutfifo); + return (((uint8_t *)&ahc->targetcmds[index]) - (uint8_t *)ahc->targetcmds); } /******************************** Debugging ***********************************/ From nobody Sun Apr 21 03:04:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMYBT0fkTz5HGQ2; Sun, 21 Apr 2024 03:04: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 4VMYBT00PKz4Bfp; Sun, 21 Apr 2024 03:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713668657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sMKrgOEF+JS7E/7OGIF97bBKP5Ckht0lWiNSMeP6sjM=; b=ygN9GCLeq1U1ddO2+CN1TpNLHU5d53qM87+IDzn6qhUnMf+ZDMz6qhVGB4nCIyKb2GpMaC YQCcjR6+tiwpwc0z3WvDsXsOnDym2Tablg9sZiBqmKVjA3rE+/xtuDUShvUmRSWc5R/V3q m0HAgM5D2JbmYZcMp96aet0rozbezQ3BSBgkeL7rmEWs4Bc1mc17xOPFQLX3O+jr41BeHw JxpLEa8E18XVfJqq1Q84OMAUT/qquwt6k6aScaPtTcPtVwQvg1EhizQfg7P+5PEHJaeCOG t5Su8Nf32A9wFkEVScJiCPHu1c8Sq1yqHpTER6ZADFi46/wojF1bhNRgcZDdQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713668657; a=rsa-sha256; cv=none; b=XZDehT3J2AaFoeg7lR3dWHnDYL10J09SbpD7zYbRdptgWFA5LR9KgW2N/3P2YB54bxFK2V kfpEZ6GLuzt6r/mvVlvWmEGod4vL5pFWpF15h1pZD09j6Rkh1cpiRI2oIH8OH6rjw9+CWX 5uj7UEZ38cfXuXv2L8xgJQiVl13C12a6nob7sq0z0DnxJxLTomgisx94G1j13mWbdDmqgj KvNuFVDlmMpNf+D2IPruXdSvCdCHBi9BHOO9OsVjUAFNfhG6xgBUDgRiOSWHUGFhUOytHM Sh1HpNJxsawHFXsPkbvjRygtvoMutZjk5ML3/Vm36OZjqXU4ppIYjf/kU0WYlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713668657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sMKrgOEF+JS7E/7OGIF97bBKP5Ckht0lWiNSMeP6sjM=; b=a30VoWzvRjSv7ypk/Dmr8rCjpG82YvrevH6Ux5zLXjPEv/5M5wyEjTdOZsUbuF+DgQh/+d /Dsl0s0m2frhFBB5O/40I1kBXY+wOvs994tPzZl1rOKofsGCtsD1ixbCGD3pjQT/J21pAU 0EEMpqfz5SR5qWDmwTd7IaUJLjDUc9tHCBLbbr1bE5VzYIm8vlDJu9FiQRvOzJECRM9R1z pSKBNPObBOl5niWE+x86zznjLo2HxQNeU1VezdXg6DNMxPDewswiOCFmsyldQJc1fIs2C2 LgtM8QfMjhOx4Y2LwM1gG/l7m67rYlMGclCKhRUpdIqpHAVv28FrN1aJ7YJa3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMYBS6Pz6z13v1; Sun, 21 Apr 2024 03:04: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 43L34G8c097697; Sun, 21 Apr 2024 03:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L34GOC097694; Sun, 21 Apr 2024 03:04:16 GMT (envelope-from git) Date: Sun, 21 Apr 2024 03:04:16 GMT Message-Id: <202404210304.43L34GOC097694@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: 9dcf39575efb - main - ahc(4)/ahd(4): fix target mode on ARM List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9dcf39575efb2ff32f955d9e04e04af28d45d798 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9dcf39575efb2ff32f955d9e04e04af28d45d798 commit 9dcf39575efb2ff32f955d9e04e04af28d45d798 Author: Kyle Evans AuthorDate: 2024-04-21 03:04:04 +0000 Commit: Kyle Evans CommitDate: 2024-04-21 03:04:04 +0000 ahc(4)/ahd(4): fix target mode on ARM One of the comments in ahc_execute_scb() notes that the CAM direction is actually w.r.t. the initiator. As a consequence, all of our sync ops end up being wrong because the direction is flipped from that of the transfer. Fix it to do proper invalidation and avoid spewing random garbage out on the SCSI bus. Reported and tested by: HP van Braam Reviewed by: imp, mav Differential Revision: https://reviews.freebsd.org/D44860 --- sys/dev/aic7xxx/aic79xx_osm.c | 35 +++++++++++++++++++++-------------- sys/dev/aic7xxx/aic7xxx_osm.c | 35 +++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c index df73b3fadfa4..4a1e3336fe5f 100644 --- a/sys/dev/aic7xxx/aic79xx_osm.c +++ b/sys/dev/aic7xxx/aic79xx_osm.c @@ -303,6 +303,25 @@ ahd_platform_intr(void *arg) ahd_unlock(ahd); } +static void +ahd_sync_ccb(struct ahd_softc *ahd, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -324,13 +343,7 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, true); bus_dmamap_unload(ahd->buffer_dmat, scb->dmamap); } @@ -961,7 +974,6 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, scb->sg_count = 0; if (nsegments != 0) { void *sg; - bus_dmasync_op_t op; u_int i; /* Copy the segments into our SG list */ @@ -971,13 +983,8 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, /*last*/i == 1); dm_segs++; } - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - bus_dmamap_sync(ahd->buffer_dmat, scb->dmamap, op); + ahd_sync_ccb(ahd, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index 46c87defa3a5..04037773c528 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -302,6 +302,25 @@ ahc_platform_intr(void *arg) ahc_unlock(ahc); } +static void +ahc_sync_ccb(struct ahc_softc *ahc, struct scb *scb, union ccb *ccb, bool post) +{ + bus_dmasync_op_t op; + uint32_t rdmask; + + if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) + rdmask = CAM_DIR_OUT; + else + rdmask = CAM_DIR_IN; + + if ((ccb->ccb_h.flags & CAM_DIR_MASK) == rdmask) + op = post ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_PREREAD; + else + op = post ? BUS_DMASYNC_POSTWRITE : BUS_DMASYNC_PREWRITE; + + bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); +} + /* * We have an scb which has been processed by the * adaptor, now we look to see how the operation @@ -333,13 +352,7 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb) callout_stop(&scb->io_timer); if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - bus_dmasync_op_t op; - - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_POSTREAD; - else - op = BUS_DMASYNC_POSTWRITE; - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, true); bus_dmamap_unload(ahc->buffer_dmat, scb->dmamap); } @@ -943,7 +956,6 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, if (nsegments != 0) { struct ahc_dma_seg *sg; bus_dma_segment_t *end_seg; - bus_dmasync_op_t op; end_seg = dm_segs + nsegments; @@ -968,12 +980,7 @@ ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments, */ scb->hscb->sgptr = aic_htole32(scb->sg_list_phys|SG_FULL_RESID); - if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - op = BUS_DMASYNC_PREREAD; - else - op = BUS_DMASYNC_PREWRITE; - - bus_dmamap_sync(ahc->buffer_dmat, scb->dmamap, op); + ahc_sync_ccb(ahc, scb, ccb, false); if (ccb->ccb_h.func_code == XPT_CONT_TARGET_IO) { struct target_data *tdata; From nobody Sun Apr 21 07:44:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMgQ53dRbz5HjYn; Sun, 21 Apr 2024 07:44: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 4VMgQ535Byz4fpv; Sun, 21 Apr 2024 07:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VGG5JqiPMSugtWpIHcuc6lR13zghXbdDEGwT/7wnBM8=; b=mrCv8Y3/fgSxTwSaFaAo/ivgZ5SkBsul7EjcnG0MxS+1jXWIH1M+PXIAO5fvGQRUD9aNTH Cf59rHpctM6AjAhwBhZmsIch04YGh9wyno/+Hgai3xWn1aSXkg3shHJxdiYfJSGBDxaE6F WcDjHzD2BVyAdTmLE5IUbbHN6cLY7Ad55vzgmkW0kF8XwxIQX5ndm3vXXut7H2vdF6maMb oB9e/c4WMG8o/JKw7/A2ZWtirPr61FSTCVUjeTtfWns7mxwsuayD9S7qG2CQVjY/KfbcjZ St7S3zNbEV/PcYjUjkGKtzvDa7+tZDzZ0WSR36Lb3s+ArCfP1T0FYhgYOAMwnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713685485; a=rsa-sha256; cv=none; b=uNc4DSq+mjZfLEvyGRCXQ+FDyZ+FY+hiaurbjEctqFDF6fgkPyJakDpbN06fIag7rIWERj iWTMl6AIfVf5hpNI1m24alFxSfHxXqmQGXh9ph2FY5qiz7ufqK3ChBhD/+8LUAjuKChBMj 1TYL7UEHgbONcSItf8tTDawMczMlD3DnB/ynMG9ZX+fvzg8K37fl0jUZdQGgjEPtxErRgJ /q7ey/tOTsM46F+BXyWkOccicqBRTWYvWl60GorKez7h1KEHO6s7aEYUI4bmuL35JUuJz1 50hBrNMQe8Vi7Jmz3qbmZfCIjahy2YEmP6IpUXhuhlQAPsti1ero+/f0RWNmZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VGG5JqiPMSugtWpIHcuc6lR13zghXbdDEGwT/7wnBM8=; b=rqwVyViWbNAHQqA7bMQt6tCIporKkm4O+KeicicnlNXkj1+MKnA0WvK2KXh7yDbrk4px87 XmK7hmrtM83UpWXy6Z3p1AN4Xl49NO22X6RcYDdn2rdnh2Krv7Ploe3OKHoCsgzvX4Jnxv UKgb6PzDvLhuPX729MV7Joq9JDUxmt3TzTpwgBS6f6JhioN1Il1v+n+EHndpbSzEmc8F+3 kkKDihb/a2c/1+PkuB7OeeDvx3xOPZL7JvugKFNdoEO5Id39mLrAkYW8iz7sUfEagQ/1a6 d/3DgT1w8J6px3fTAjOiHvUb7+7Y4rvF5nrKxqAbC87yTl2tJEvpqrPBnL1g/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMgQ52ZBJz1Bl9; Sun, 21 Apr 2024 07:44: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 43L7ijca072489; Sun, 21 Apr 2024 07:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L7ijxA072486; Sun, 21 Apr 2024 07:44:45 GMT (envelope-from git) Date: Sun, 21 Apr 2024 07:44:45 GMT Message-Id: <202404210744.43L7ijxA072486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8b5c5cae92d5 - main - vmm(4): Fix a typo in a kernel message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b5c5cae92d5b44f03636540a787fd6e994ce816 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8b5c5cae92d5b44f03636540a787fd6e994ce816 commit 8b5c5cae92d5b44f03636540a787fd6e994ce816 Author: Gordon Bergling AuthorDate: 2024-04-21 07:44:18 +0000 Commit: Gordon Bergling CommitDate: 2024-04-21 07:44:18 +0000 vmm(4): Fix a typo in a kernel message - s/cant/can't/ MFC after: 1 week --- sys/amd64/vmm/amd/ivrs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index 7dd68d8aea95..34aebc62fed4 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -416,7 +416,7 @@ ivhd_identify(driver_t *driver, device_t parent) if (ivhd_devs[i] == NULL) { ivhd_devs[i] = device_find_child(parent, "ivhd", i); if (ivhd_devs[i] == NULL) { - printf("AMD-Vi: cant find ivhd%d\n", i); + printf("AMD-Vi: can't find ivhd%d\n", i); break; } } From nobody Sun Apr 21 07:47:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMgTd2K45z5HjXF; Sun, 21 Apr 2024 07:47: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 4VMgTd1V90z4g9v; Sun, 21 Apr 2024 07:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wkoFcPCpMeNNjtb9f3TEcjopDduKFVT2j2WinY3Pg5I=; b=AzmoCOmRBLIyGHEEUwd4dYak6YNcJxCJptWyAkPKTem7aSKdCpyYlRyaUIrqGf37sdm6qp OKcsHC3jyTSaHKsb/ZvdXbjdDp+RSfu4CCJVB3RblFrOWJlS9Yhn69RR7OudR7uFYTgmqi /1cWrat3Rw1wy8sIsU/Z/05DnphsP5UoLUchC0fJweTkMUH03nGX6wm4VcIYvp7DIEMDiW 29T0FNcl3sUlhL9iHR+yXXeO05LJhAkw9IlfVNkf5hV5GPjIfgQXEvsfVfRbfrpY9gOhnl k1M5xd+PtEoelIZePi9ksdaOqltKQa/9oLnCDZqFiLPxM46C32z5FL9fxiCjUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713685669; a=rsa-sha256; cv=none; b=a0afxhqvX+jglgr2ouFI4HG4WRdOac6J5SPxgbq69ysAzohwZ+01aqICBoHjMjJUYoNntz w/LfyW9I+OXlGZxpjljluid/Dd9F1VtgXiyHlxNVLABI6uCP1mDUJcuRP05ETIamg4U3DJ C/ulfgy1jq85hhs51G0tFJrfuxP8mqvyfaFOp1Y0iQYryIJJ+/norqPKGUABM14+dl98Ia X/rR7/CYI5m06XwBsNZZOxcAkHyaT4/lL7P7IACtqNMAwQ3q59pZuRroxQahlT/Rc1nkoh 8HsUJqRLw6afR+ZZVYc/hiPjy402gMdRqHKqfKxkGjk5gq/SOh9k/tTG7agQZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wkoFcPCpMeNNjtb9f3TEcjopDduKFVT2j2WinY3Pg5I=; b=vkNWwtSYNjER30Lw8ssPbinFKZht3VJLZl3YpNPlQAeWeCtzoSJrVkFP/oYfgy4SSAUd14 bomQM3reM8FYCbdTlFPU5Yi0DrYxqN76VHtSmeB5oz9RY2TJTjuxVUapmglzem/hIbQAvu GGjFcKDfY+uGflIvtKEGjP8cPkBTvDmDaVcgA6LIKhdfucMBw7GPl8AFAKlEj2qMT+vW2w Wrj4OvBj/OZipAMP2J2atipDYIE3G1dRuwjyRWDSAJcdp10bfjRixWLAKgkF5Mrtf08l19 L8s8mvWUHfwQeJ+5c9teJqSuE+NpeWeVs6yRo7OJ0wEnWnjJasOt4l+ooF9www== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMgTd159cz1Bjw; Sun, 21 Apr 2024 07:47: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 43L7ln4v073277; Sun, 21 Apr 2024 07:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L7lnpA073274; Sun, 21 Apr 2024 07:47:49 GMT (envelope-from git) Date: Sun, 21 Apr 2024 07:47:49 GMT Message-Id: <202404210747.43L7lnpA073274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 026520a5f2d2 - main - wtap: Fix typos in kernel messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 026520a5f2d2ec01e19494c37b87448df86ef21a Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=026520a5f2d2ec01e19494c37b87448df86ef21a commit 026520a5f2d2ec01e19494c37b87448df86ef21a Author: Gordon Bergling AuthorDate: 2024-04-21 07:47:24 +0000 Commit: Gordon Bergling CommitDate: 2024-04-21 07:47:24 +0000 wtap: Fix typos in kernel messages - s/cant/can't/ MFC after: 1 week --- sys/dev/wtap/if_wtap.c | 2 +- sys/dev/wtap/wtap_hal/hal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 040fc340cb13..f9e0c2a7e5c4 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -595,7 +595,7 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m) struct wtap_vap *avp = WTAP_VAP(vap); if(ni == NULL){ - printf("m->m_pkthdr.rcvif is NULL we cant radiotap_tx\n"); + printf("m->m_pkthdr.rcvif is NULL we can't radiotap_tx\n"); }else{ if (ieee80211_radiotap_active_vap(vap)) ieee80211_radiotap_tx(vap, m); diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c index 422def943d34..1e23b99bc272 100644 --- a/sys/dev/wtap/wtap_hal/hal.c +++ b/sys/dev/wtap/wtap_hal/hal.c @@ -190,7 +190,7 @@ new_wtap(struct wtap_hal *hal, int32_t id) MTX_DEF | MTX_RECURSE); if(wtap_attach(hal->hal_devs[id], macaddr)){ - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); return -1; } @@ -208,7 +208,7 @@ free_wtap(struct wtap_hal *hal, int32_t id) } if(wtap_detach(hal->hal_devs[id])) - printf("%s, cant alloc new wtap\n", __func__); + printf("%s, can't alloc new wtap\n", __func__); mtx_destroy(&hal->hal_devs[id]->sc_mtx); free(hal->hal_devs[id], M_WTAP); hal->hal_devs[id] = NULL; From nobody Sun Apr 21 07:50:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMgXJ12b5z5HjdZ; Sun, 21 Apr 2024 07: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 4VMgXJ0VQ4z4gNP; Sun, 21 Apr 2024 07: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=1713685808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zg9/IeN0EeriVs8S3C28aWzo7+9GNWGtSFzCZg/ZYgI=; b=F2htBPudp4g83S3UZDJfabZ+tLEXR37KXKEJ9nUXqipTe9v7fA6BOz/zAxgltKP/GHfchf yqBr75a8Xx7wTGiSN2TY7LXmXVvz9ciWREf5ZaCZpyC+mS7x0aDO++dFoqjbUkg6ku7UAK WgReN4ytlqlRJdldKubxhhgVm5FqsigawZA4ikH9+pHHVJ7Saniy0OqY+C2WqnD4x44Eop DXQblZBn+HUj5mn7JXk2DrWe02PIXaFAE8a6bhhgWt1g1Roj1g8qm7YNiETtKavKuSgflR 9q2J7p6XQlsHpAbfH09BRC4JbdxKkEneAF1nnOCDo4yN157fL+fORbbHxXXaHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713685808; a=rsa-sha256; cv=none; b=edT7HncrCchruJXfP7VtCvDE9ynENV8li/NaTpBPTAlqcgG8eFNGclLt2C8RfP2tuD//5I lMjMqTdnDMJHrE0yXFlOZujnns6vKO36YQRWp0joVDqm8cPyRKLbEDp88lUEovCgQxm0td VOAXNxUk6ViQCmEXfOoaNViyzsqey/g4+Nf0ex21rdibLN1r6RmZ3voE7J6SY8fi1ZrFcb YWyGSs1va68Rhe4jFZ7vVSc6jCE8tLBYDFISnJ+odO9Zv8D+IfYUu31JAVFd45EiaDe+ha OHwCmyOBw7iL7wYBP955v5Ko+evFJJmGPKPGR29zzvd1g0hV2uBDGzTdPCre1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zg9/IeN0EeriVs8S3C28aWzo7+9GNWGtSFzCZg/ZYgI=; b=BKbIhp0jyFbKA/OPhUAxzq8cJXBmamp3EYYHoPWnDLJhdLwH4gKeyarIGBQAFMtF8A/pxV 2dEg+F7oFURWB0yqTZVNBZfzisbzW5cLAzYhSJpaOJmhnyIFZbKY6Le7AP6xfVTqG+Fpn6 IfD2DMLhAt0hbCjKKm/vorZusBxp0+RBW/wO8A92ciC97C+WawAt5xuSrOssyNSk1uMZb/ oAG70gtpP8XR2XW1L95fNWwnnR3cssDR3NKQpWzTAVW/hYlzYRPcK+QtZhy5hJVGexQFha 8+4ecfWun5kEywv5QUvGP6z+j4P1Ymae3TCDIFIQI62OHC3Mi5XrB5LFAisjyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMgXJ064fz1BrV; Sun, 21 Apr 2024 07: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 43L7o7j6076937; Sun, 21 Apr 2024 07: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 43L7o70U076932; Sun, 21 Apr 2024 07:50:07 GMT (envelope-from git) Date: Sun, 21 Apr 2024 07:50:07 GMT Message-Id: <202404210750.43L7o70U076932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: c0a01ee83d3d - main - geom(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0a01ee83d3d4749ac9e7e46d8d47b991c65537f Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=c0a01ee83d3d4749ac9e7e46d8d47b991c65537f commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f Author: Gordon Bergling AuthorDate: 2024-04-21 07:49:44 +0000 Commit: Gordon Bergling CommitDate: 2024-04-21 07:49:44 +0000 geom(4): Fix a typo in a source code comment - s/cant/can't/ MFC after: 3 days --- sys/geom/geom_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 6aa7ded19537..3fef8a918530 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -475,7 +475,7 @@ g_wither_geom_close(struct g_geom *gp, int error) } /* - * This function is called (repeatedly) until we cant wash away more + * This function is called (repeatedly) until we can't wash away more * withered bits at present. */ void From nobody Sun Apr 21 07:51:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMgZ81Ggkz5HjqG; Sun, 21 Apr 2024 07:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMgZ80pDNz4gsj; Sun, 21 Apr 2024 07:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKFo55cYOLNRd7f+5CHXDJ74QVHz2fZ2/OWJ3cZU+w8=; b=Uu2cRzgcs1Q7GxYcYLIqsQ0rkXNeS5aZOSsz5v5ee5SxEPnnL8wjdjea7OpprokVnaq0Oy fh1Vaj/VnfZneVdM69MMXBIjSx0gyg+97C/0qvG6Wuaya9e242nGdVe6WxX1Fc/2/WE7F0 x1t2MYqgS3JS0X8fOQHVGEAzv+yDIqO3IxEYwziwrhDjzL7GG05B0cDMB4RIuLk82qx6r1 VZIlgZ6cJNIcWqB9R187syQcPkjsBXVhQ2qGQTE4R5zCME4rdsOIKDSGZP9F+H3kXuHY6x aTUEiyiUlhnz6eaJ+cy8U7iX8dyux7Pl03Y9SNoD9Mok3jKtiDtE6FP3B/AmpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713685904; a=rsa-sha256; cv=none; b=Zi2eA7nBZ6dyA9qAeuYvOidABgyQ0T4EIW4LxLmINEkMxhyXhKDkxRMecFZqWTHEpdt4w9 2icDF53yPpwPZE8WdIub96h/HN6blO1lUcq10JfmvEJw28meTFdOTavRNcefK1pVoWQOSQ OtZwkeGjQBX8EgwY93yZ3GVt6vAmX5PlzBO+iRaWx7Amqek6Gvsq2ejr6bJnixYMgrUcsg 994pZ7EwRkl53WJD2Mro8JykHkWMlABenIe2morUO4D6n5QI0grVcTStm7A4Ou9Fuvtnqp PMcWArco1tDke6UyM5i1WzYpegZuuUaABPIJ8vq9gxy0P26OrQ/UJSHxa63/uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UKFo55cYOLNRd7f+5CHXDJ74QVHz2fZ2/OWJ3cZU+w8=; b=t7jcVMrnQcPQUhjSyeOuWMdl2J9aA6UIXpIRbQKdc0/BO1LEIf20nVAClBwrGZ9B61IR3a oUIksCLzUb9OM0wetB7NXtNIjXsDW0p4Duw6nzlsvdVOtLX6pLE4rUjLJDPWtbwgZw741d 92H8dFD93bGxzoHiVeklZlouW6aAIRIwAB4GIE9WeiISUTCFKGeuDYGhEm+5DaVQs0g2Tp 65mTCC20QSBDtplZOZpIA9fLY7uFQty9oPBjggMJGTQ/WdxCNu08OG2VP+IdSMwQvXT6is ImfAUbtDMulIvaHx0jkwIgWBcjVAsmnH4+7psTgzEiPVNaQyHt/VAqYUT3l0gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMgZ80PgLz1Brr; Sun, 21 Apr 2024 07:51: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 43L7phb4089050; Sun, 21 Apr 2024 07:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L7phl7089048; Sun, 21 Apr 2024 07:51:43 GMT (envelope-from git) Date: Sun, 21 Apr 2024 07:51:43 GMT Message-Id: <202404210751.43L7phl7089048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 9576fc16ca6c - main - uipc_domain: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9576fc16ca6cb360e085735dfaf891ae6d7f6181 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9576fc16ca6cb360e085735dfaf891ae6d7f6181 commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181 Author: Gordon Bergling AuthorDate: 2024-04-21 07:51:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-21 07:51:14 +0000 uipc_domain: Fix a typo in a source code comment - s/cant/can't/ MFC after: 3 days --- sys/kern/uipc_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index ab00bf2bc71f..43bdd44a09bf 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -223,7 +223,7 @@ pr_init(struct domain *dom, struct protosw *pr) /* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you can't unload it again because a socket may be using it. * XXX can't fail at this time. */ void From nobody Sun Apr 21 07:52:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMgb334VJz5Hk18; Sun, 21 Apr 2024 07:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMgb32b9tz4hPZ; Sun, 21 Apr 2024 07:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ceAAdt/qvd207a25jgpfxZSAIw2zNB1chCk2Q6hzRiM=; b=MEzgt23fBP8ZmHUhvLDTY1lA7MxYpYgx+mKZO2w/OR+Q039ogjDPaqzsW/PP/NEwhDB8oE qoA7TVJMRlef9hMeqlQJ2xcsKYHIcrq2bVEuD/duzRhKBbFlVxf7eu6+bjsXl0TOivoEg0 OCz46LFpUwtET2lL8bZ/fZVnkqfbtsOiPiyGU6LEwiMDLXDq81xcDk03COI3da2Qo+3Iwd ltbdtnhhrNPi0WxCVNMCgV5Pxlp9+BCF9L4QvCUpSnlYho+jwfv3WYDa3HHoaffc9vvQAJ 4hqcvpjzbu12Qgj8UxUZhTO+rOsc57vkneJNOn0x9i3qgNOcu5XYiPVtlvybfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713685951; a=rsa-sha256; cv=none; b=KHUyJof65sQ31iQzFEhD3XvK9zD9Uow0aaV/gzKzpVfyFbo2OKS2QYX+tUCPgOf9ipvNeT O2lKrsgbdIjDN6BHcVHARF51DfxPtdlYnTqoRJ5y/rKq6wKG8QWmpdngFHUc2Tfvs/VoGD 6LszHwoH2LEXSyRfkVIGUmuBAOqRngeJXuB6rjYoheDbEwIyOg1BT0mDGyh1ErnCM+ydxW DCn4EEBmxeOjhqynFvMN8Uayf39j3oI7EyZ+ziI4doL9GXB0vJR0VNbaTQcc+F0dZZ58ch BqB5M/sHa7JToM6A7ts/lYkmE1d42FQ/UrzFsI0JAtqP/44aTfw8h6gUUsTXhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713685951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ceAAdt/qvd207a25jgpfxZSAIw2zNB1chCk2Q6hzRiM=; b=p/rAJ5gEnBXKAElCJ6scmI0pDM+2p/T4URRYtsVSVBRRA94INDT9tyllCOSjmtZ1jTQrXF 1P/9bN5FhaWjCdW2qZwEia25IY0wxOruR60awg/j/+i+3XfuWg6SvPmLLnDPIEvEgf30X8 f9hDhOKvM7Iq9ibWOiKiSdu9A+eoeX+99//ibmFe+8Vuu5QmwhKacPoRyognbEEGqAFM31 GLk8JXf7kCDW4sp1KUMWtRkVBigbLr6vvn2YLj02IhO8XQfP/RwkZHd840t+zMu7HkZXIT LK32BzyqmcFgVPW4dOma6XEcIRY3NLGpnS791W0owTJtwZfOWG46akT+FsKymg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMgb32BbMz1BsG; Sun, 21 Apr 2024 07:52: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 43L7qVG4089281; Sun, 21 Apr 2024 07:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L7qVN1089278; Sun, 21 Apr 2024 07:52:31 GMT (envelope-from git) Date: Sun, 21 Apr 2024 07:52:31 GMT Message-Id: <202404210752.43L7qVN1089278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 26f6c148bce2 - main - freescale: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26f6c148bce2d6734a07ea621616724f1e76e4fd Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=26f6c148bce2d6734a07ea621616724f1e76e4fd commit 26f6c148bce2d6734a07ea621616724f1e76e4fd Author: Gordon Bergling AuthorDate: 2024-04-21 07:52:14 +0000 Commit: Gordon Bergling CommitDate: 2024-04-21 07:52:14 +0000 freescale: Fix a typo in a source code comment - s/cant/can't/ MFC after: 3 days --- sys/arm/freescale/vybrid/vf_sai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 7cb533f0ddbb..6a36ddc3c057 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -461,7 +461,7 @@ find_edma_controller(struct sc_info *sc) sc->edma_chnum = edma_sc->channel_configure(edma_sc, edma_mux_group, edma_src_transmit); if (sc->edma_chnum < 0) { - /* cant setup eDMA */ + /* can't setup eDMA */ return (ENXIO); } From nobody Sun Apr 21 12:25:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMndz02XDz5J77f; Sun, 21 Apr 2024 12:25: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 4VMndy6TlTz56s5; Sun, 21 Apr 2024 12:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713702326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5QEuhM4+wmrlvTmZWmjBneH4ii6OIC7D1wbKhJlnWI=; b=daS8nkCvbvHZ69V2NPoCBn5FdU+BcPVgSV2QGxldmlLjAZNFTO4+eA97A2kDk8W6R06hoC 7os4X68pPUSAqwIEsb6XWYaqgGhHXWoXhr9NCtft22hpb+oEHhIYEnv/5hRDSv7if9ykY7 k2rYdOfMS/Gu9mgmbxZa7IsAlwo6sTGIabFiIHqbtu9yq6sgXn2qZSLUI1Gi0PxFgcP8B0 oW+AORbU+4S9Zs72Y0k/4Qc1KfZEw9v7E1lYclqk0N0U6VyhIvcQ6c471FZqr4rMTB9jrB m2mJ35VEDeELtXR3MkA4v2CWKjT/XAz2BztTMESwaLCBuEvbcs2AILT1DaqtLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713702326; a=rsa-sha256; cv=none; b=osbbMWdY33xHm8ZMTs2AAeVu2Zuhcm3LPeRANYn/BPKcVwDoNB4Dr5hHh7EHDyaxoAuBVR SYLlaWYJxt0LILoW9JIQlfZlAXg3jRKfeLKSJ/+V/1zyDwkJOKsTbqGaETp3vsgqATNHXj WwhScXfE8WZXoBYDlsn7sR4iqXzPBqpqU7xkc60IGcvPb8SH+523pyq9MYw5RuJ7P17Fsc Q+bBpCBBcndCIywJVnMd8suP31uRcZ7ZW/IaWc29GYDgjXYF0utRkP0mdnaKPpVOV1ywK2 ndlqHp0CXq4HsMY+jj7upfiquXFiLiBnNTQwYR4VOstjfz1YeGPeIsOi35D8Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713702326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X5QEuhM4+wmrlvTmZWmjBneH4ii6OIC7D1wbKhJlnWI=; b=KnoAom+eF97QVmilHQP/TKHzGTh4BKgmx4/Es2Jbtvszd22POnlWUKEWbH/Us4IYdhyJ2l H9Ubam3ZinzS9r3UfeBBSo6CotKRSMmyxo+Bbpc3LHECt6uziTnuGSzdpfQg5lRwANV5GZ GYbYieGSdzPTlB8lvtp5DbIWgI9essMMtl/J5vjhhjA5ceCfnnJH/uLYc9JHex+eL3XAmC ELU1OILNSdB13JnqhOjRt1v83q8wwEQHz6winpbz2xwyS1NO9PN4TDfNa29p1WLgP2ks6I JJUaCg3pc/onEgOIgGJ+KNPwoBjJKeNxKQjf/0hKy6amIkttH1Z/4411xwHMvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMndy65rQz1JVQ; Sun, 21 Apr 2024 12:25: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 43LCPQq4049600; Sun, 21 Apr 2024 12:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LCPQHp049597; Sun, 21 Apr 2024 12:25:26 GMT (envelope-from git) Date: Sun, 21 Apr 2024 12:25:26 GMT Message-Id: <202404211225.43LCPQHp049597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: b9827c007a7a - main - Revert "dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9827c007a7a39c7aeef73f8efc217b7b0099464 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=b9827c007a7a39c7aeef73f8efc217b7b0099464 commit b9827c007a7a39c7aeef73f8efc217b7b0099464 Author: Andriy Gapon AuthorDate: 2024-04-21 10:07:36 +0000 Commit: Andriy Gapon CommitDate: 2024-04-21 12:17:08 +0000 Revert "dtrace: make 'ring' and 'fill' policies imply 'noswitch' flag" This reverts commit e92491d95ff3500e140eafa614e88ca84ffb0d26. The general idea looked good to me. In particular, it allowed to save some memory and avoid memory allocation failures when a large buffer size was requested along with ring and fill policies. But I didn't take into account that the second, supposedly unused buffer, was actually used as the scratch buffer. The scratch buffer is used as a temporary space for DTrace subroutines like copyin, copyinstr, and alloca. I think that the change can be fixed by allocating a separate smaller buffer for the scratch buffer, but that fix would require more work than I am able to do now. Hence the revert. Reported by: Domagoj Stolfa Diagnosed by: Domagoj Stolfa, markj MFC after: immediately --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 83c0648b23b1..ce02676e0dc1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -12058,6 +12058,7 @@ dtrace_buffer_switch(dtrace_buffer_t *buf) hrtime_t now; ASSERT(!(buf->dtb_flags & DTRACEBUF_NOSWITCH)); + ASSERT(!(buf->dtb_flags & DTRACEBUF_RING)); cookie = dtrace_interrupt_disable(); now = dtrace_gethrtime(); @@ -14865,10 +14866,10 @@ dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which) if (which == DTRACEOPT_BUFSIZE) { if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_RING) - flags |= DTRACEBUF_RING | DTRACEBUF_NOSWITCH; + flags |= DTRACEBUF_RING; if (opt[DTRACEOPT_BUFPOLICY] == DTRACEOPT_BUFPOLICY_FILL) - flags |= DTRACEBUF_FILL | DTRACEBUF_NOSWITCH; + flags |= DTRACEBUF_FILL; if (state != dtrace_anon.dta_state || state->dts_activity != DTRACE_ACTIVITY_ACTIVE) From nobody Sun Apr 21 14:11:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMr0j2BTFz5H3T1; Sun, 21 Apr 2024 14:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMr0j0Fdkz49Wk; Sun, 21 Apr 2024 14:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713708709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIY/AKDrAyGiGjGbSbvCJeIa+F5ykUls3JEoMZSqo0E=; b=LEm/S5jpdK4/vNfJAgfprJ5rSpEeR/rKL1W5BT1oXtHO2U4LkzymU3tPs6bNEDibiZrwhc THTnxBeFV5JerPm4eETc8YDzR2t439FHD3sGB6H2iHkrBbbKyuRKk+LRzp4Sii21sd+J8b jNKlncfczSILGXW7RE2gZeWJj1ggOXHL/iujyln92Qz1geZ1THwcRcWPMe73PFJXViE8wD q4rga3mDyBwNiXgIXSOvGinTsVIWgpJV9r1FzD+sOejmBYyYprJdj1Eos7eFO+q3Pvs4aN G4pykWW1hQwQ5owaAW7jA58iE+bLoVl24zwrpX9YriOYlkIz8q8Un3A8qphCrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713708709; a=rsa-sha256; cv=none; b=eBK0l0yB6HPVn2AbmtK3nu+RgJVaP7UjFRSeUmaXN91pme8Ql892gRoeDeRKXX3dZAeFrn 0Eo/HMps2Ns0DN9rglerIG1NkrHLZVOT9aO2IQcmskKk2O7zm8auldXjC+5Q8DX+cOknpV rlnJcNqIaf/SWl4uAbmAqFcol85WjkqvESBLUx9p2NL7ntlpvl7sCQMIAr8gNdztdgVrZY HUEwurObtAtDiYlHfAyOoFJ+0uFtVR3ia+fdx2e2WkGnanlZsZ92Tbz4mhEv9mOi1IFgFo GE23C5U57cFXQFNc4tro2DPy8J2yF68+GCxeNYDz1y8PjVlWNsFH0p87/XFG1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713708709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIY/AKDrAyGiGjGbSbvCJeIa+F5ykUls3JEoMZSqo0E=; b=M29f9+6Z7lj8TSb0rrK95aourlvX4i0Rp4Oc7jqtXNhrRHUoNMm5XIEIAB1YJFOOImn1UE NrJdex2Z47RoJFo3uM1YdGuJNjy46Os87YyIpAwMecxkvM+GGSG8U2EbF4NQBM74s+iTle LZMvPYHyOAovpjBX5HVqSscdVc/FksE2VHwS/94m/RHGc0rRVt4Cpw4RGc7RwQrx5JhcW+ 328vz4VmfGUrvcs0RD3hXvCIyXT002n8SO9nwS9r7TLzKutEoTCTpMiFlRbrBPN/RAG1Sz bof6AQP8V0UHj3PhO7wKB0MI4JVN9bDr61V47SmtIX9PJ5nalbUSzWwK0udxdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMr0h6xMqz1N5y; Sun, 21 Apr 2024 14:11: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 43LEBmqO033877; Sun, 21 Apr 2024 14:11:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LEBm7U033874; Sun, 21 Apr 2024 14:11:48 GMT (envelope-from git) Date: Sun, 21 Apr 2024 14:11:48 GMT Message-Id: <202404211411.43LEBm7U033874@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: 793745fad866 - main - mfc-candidates: move pretty printing into lua List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 793745fad866f65863ab3b16a17bdf18dc779efd Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=793745fad866f65863ab3b16a17bdf18dc779efd commit 793745fad866f65863ab3b16a17bdf18dc779efd Author: Ed Maste AuthorDate: 2024-04-16 16:49:05 +0000 Commit: Ed Maste CommitDate: 2024-04-21 14:10:57 +0000 mfc-candidates: move pretty printing into lua d51c59002367 moved the MFC hash matching logic into a lua utility script but left the output formatting in the shell script. Simplify this slightly by just printing the formatted output from lua. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44836 --- tools/tools/git/candidatematch.lua | 10 +++++++++- tools/tools/git/mfc-candidates.sh | 7 +------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/tools/git/candidatematch.lua b/tools/tools/git/candidatematch.lua index 98c247fca339..481c1f38fea1 100755 --- a/tools/tools/git/candidatematch.lua +++ b/tools/tools/git/candidatematch.lua @@ -36,6 +36,14 @@ local function set_difference(set1, set2) return result end +-- Execute a command and print to stdout +local function exec_command(command) + local handle = io.popen(command) + local output = handle:read("a") + handle:close() + io.write(output) +end + -- Main function local function main() local from_file = arg[1] @@ -59,7 +67,7 @@ local function main() -- Print the result for _, hash in ipairs(result_hashes) do - print(hash) + exec_command("git show --pretty='%h %s' --no-patch " .. hash) end end diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh index 0787e1278991..cf71c314cb95 100644 --- a/tools/tools/git/mfc-candidates.sh +++ b/tools/tools/git/mfc-candidates.sh @@ -152,7 +152,6 @@ canonicalize_hashes() workdir=$(mktemp -d /tmp/find-mfc.XXXXXXXXXX) from_list=$workdir/commits-from to_list=$workdir/commits-to -candidate_list=$workdir/candidates if [ -n "$exclude_file" ]; then exclude_list=$workdir/commits-exclude @@ -163,10 +162,6 @@ commits_from "$@" > $from_list commits_to "$@" > $to_list /usr/libexec/flua $(dirname $0)/candidatematch.lua \ - $from_list $to_list $exclude_list > $candidate_list - -while read hash; do - git show --pretty='%h %s' --no-patch $hash -done < $candidate_list + $from_list $to_list $exclude_list rm -rf "$workdir" From nobody Sun Apr 21 16:33:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMv7m60ykz5HHQP; Sun, 21 Apr 2024 16:33: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 4VMv7m5HDQz4N87; Sun, 21 Apr 2024 16:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713717188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oxU4IMBbQTAGo85EdojjgZl5dN/pySUp6HjX9XRNlz8=; b=aUm95DzoeNJAm1QQvrU4O5KQcWEu1PA355/lLYF4AyWvB0UzKD9nYa+tC2RT5K7qc3bwYl vJrNMlH/bkfVQrPPgwC1cvcCq+fYi3DpRq58gXXbRZv23d5fDCfLSe8wP7H/12uqgP3Krs HTFf77eqolv95vQD3ZCyq70TlgpKa1251qp0JV8Zt4potyBba4RgmKsPOFUjDS0sNqS6FQ JqJAoU8c3kXXF9/zSR33if08EKc4Mu2hEpdRnn3BJYlwo7QNsvwo9dCAEmj68biWiM27zK cdb/z8k8Ugax3M2odJoR7h8DE/ZB6k49DWCcHD+T9ejPp1Vz/eh0eqSMON6IdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713717188; a=rsa-sha256; cv=none; b=F6usDAAvXATiiJdiH5rFrQM/2Ges7fkQFYBc4PbFAVnzYpYI//0hMYvtrwxM4o8rtuXzuK iduFBj0YkmROSVxSFajk15Rm4Bb2v2ZP+7DnKbseJSSp7pIWWLGLUTBHspqutXBaabYS8b 2NG2vPfTV2GQ4DoiyoJR3ifcbRrL5ZONwtWtHLhkYe8/+PQ5a9CQINF0utruSuPaMipJBv J4jv/mw/aQGfjo1YzSr3PwJMb2l26O6IBojD8PiJP91i8iy8RDk8mcV20aagpJWOFH3jAU ecJTmfBkyq+P8AmZQfDFoGqQc+ewhzG3ImrgNykOOjCK4ZiUlJB4nKhq8slJSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713717188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oxU4IMBbQTAGo85EdojjgZl5dN/pySUp6HjX9XRNlz8=; b=rvaFP0vC9UT6IuFb3fbhMw5BeKHM3GR2Gxjm4nU7t0t5KL+dbuUn6zzfVqgYuKal6NeKoY pZsG7uiY1RvKSUSYmIvNucd03N1aCsBHqtPyhO2HW0zdQbRWyshLWw3tgW6w/t8Y/iO91c H44o9RsfxAP9uXoWE2w7dSDwgUXt1E8ts3xPKL8Y7nPI9wCV86hHlNtM2GAxqr1/HSVWRL QZHDF3hcJyKiLKht1eaL2suL1nfEZvEx2mQSVjuXJZvPp+mcbhwzsJeydZkbRIVLb+pX6i ODBUAY+myiUA+E6TzBzhxYtXS71ZNOweUYxmyJAYQm26Gae6paJxENe20iGSWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMv7m4sYfz1RgY; Sun, 21 Apr 2024 16:33: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 43LGX8rx071645; Sun, 21 Apr 2024 16:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LGX8Uv071642; Sun, 21 Apr 2024 16:33:08 GMT (envelope-from git) Date: Sun, 21 Apr 2024 16:33:08 GMT Message-Id: <202404211633.43LGX8Uv071642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: b571bcea5495 - main - bsd.subdir.mk: improve `SUBDIR.${MK_FOO}` advice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b571bcea5495327fd210378109b0b2aed08bebc3 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=b571bcea5495327fd210378109b0b2aed08bebc3 commit b571bcea5495327fd210378109b0b2aed08bebc3 Author: Enji Cooper AuthorDate: 2024-04-21 16:27:48 +0000 Commit: Enji Cooper CommitDate: 2024-04-21 16:30:09 +0000 bsd.subdir.mk: improve `SUBDIR.${MK_FOO}` advice - Remove superfluous whitespace by removing trailing whitespace before `\` (line continuation character) - Quote `SUBDIR.` to clarify the fact that this is a variable reference--not the end of a sentence. --- share/mk/bsd.subdir.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 95a178c04907..565af41602c0 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -125,8 +125,8 @@ SUBDIR:=${SUBDIR:u} .endif .if defined(SUBDIR.) -.error ${.CURDIR}: Found variable SUBDIR. with value "${SUBDIR.}". This was \ - probably caused by using SUBDIR.$${MK_FOO} without including \ +.error ${.CURDIR}: Found variable 'SUBDIR.' with value "${SUBDIR.}". This was\ + probably caused by using SUBDIR.$${MK_FOO} without including\ or by using an invalid $${MK_FOO} option. .endif From nobody Sun Apr 21 16:58:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMvjT3BRNz5HKZd; Sun, 21 Apr 2024 16:58: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 4VMvjT2VmHz4SHM; Sun, 21 Apr 2024 16:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713718733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CLUz7KmVPNnJ9ALqcx4yGCX2CtE0+GzgIN9elPn7juA=; b=iY708m1+bt0u27Todui8nMyr8Z29N9rFzxq1V7D0BX7+c2j3wI607O8N/kH+n43nIVrhwO hj0QF0YgTrpGPNzHAeKKkyP6AEDA53bnu2CPy3assQqD+W5PqjeHVAHDXFdsMOzpnltZ8L nUNnpBB9SHBJINyusbUN9oDtrZdRWx961qrUi8//nngwLtX6NQGuOHSeua5oU7dPN5RwUg wUnmXJZg5JpK8gYilW6H8vpPx31ItMG/PEKgqkvd0BFxLy1bYXe+ET+XrZIefJzo8ysweO TOc5+alYnvWb0V/NtfX9ziRQRDpUF+83cF4SUrk1CNPUf2hQKqxDmCuLOJCZqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713718733; a=rsa-sha256; cv=none; b=s4jzJ6F2j5Oa0Nw6YN4+W2b7Oq2ZsjUO5DoZ8M39yRTGqYiHdoBHihJfawR8qAjvMSSo+3 lNcX2oplRJZuMTSHL8rz62cqZ0M/GCjemdLkZ26nfLcON4lf+bCGpTzjsaC0QF7q/lNDbG vbNULtGf/KrmvfE9xnvue3I1oDAsOrkRBTh5HNPwBvPdUyrdHYdmNoSUoM9oKJb27e2aKn a+VSPm9vm1BVZ+WqsBto54i3OwyWGLOKLHsh6q5HsG2KOgr/oePejXuOiKKoTSVsgizN/L KOl00dVgXJkkZOQISfb0QLzvrgxQ2VFxCfs+HjYZyPKSOdBcCLnHz46ZBVeNxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713718733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CLUz7KmVPNnJ9ALqcx4yGCX2CtE0+GzgIN9elPn7juA=; b=QhbS2i0c9qtJ1CYYeaMb9ycevex8egULp6A91ykCmq3oXaTfFXHyCIGSVw5d3acPoJHqh9 imZiSq8X0C48zRSHybl0m6T46gqUI9fLGiHMt9DEiQPtlXGzkKT89xrYB3sbWs55+2oDFK wMZLzjlpicfQra0/BEwwiy+Sj++XpcvtrlVHVJcqadyuMkL6GXgFzRJj9/6vb943uCNKKl Upkq9d8632gQbQ9z0WyndARqVfELF7FFnxPbVudnBfxG7YKFjHG3ZHCuNqdj63WqJmGJUO rDWGUX96O1F73plfEzuVTSgeq6Brgx8vSXF2nPjSSs9Qg2vsulmtWMcJmd8EFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMvjT1qNRz1SBb; Sun, 21 Apr 2024 16:58: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 43LGwrCF006865; Sun, 21 Apr 2024 16:58:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LGwr5o006862; Sun, 21 Apr 2024 16:58:53 GMT (envelope-from git) Date: Sun, 21 Apr 2024 16:58:53 GMT Message-Id: <202404211658.43LGwr5o006862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 42ce242e3530 - main - OpenSSL: use the upstream provided version.map files for the fips/legacy providers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42ce242e353065dfbaa248955f6657005a395a95 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=42ce242e353065dfbaa248955f6657005a395a95 commit 42ce242e353065dfbaa248955f6657005a395a95 Author: Enji Cooper AuthorDate: 2024-04-20 19:12:50 +0000 Commit: Enji Cooper CommitDate: 2024-04-21 16:35:19 +0000 OpenSSL: use the upstream provided version.map files for the fips/legacy providers This change introduces a static copy of the fips and legacy linker version maps generated by the OpenSSL 3.0.13 build process. This unbreaks the fips and legacy providers by not exposing unnecessary symbols from the fips/legacy provider shared objects shared with other providers (base, default) and libcrypto. More discussion: Prior to this change, loading the fips provider indirectly from a FreeBSD 14.0-CURRENT and 15.0-CURRENT host would result in a process-wide deadlock when invoking select OpenSSL APIs (CONF_modules_load* in this particular example). Speaking with the upstream maintainers [1], it became obvious that the FreeBSD base system was incorrectly building/linking the fips provider, resulting in a symbol collision at runtime, and thus a process-wide deadlock in specific circumstances. The fips provider would deadlock when trying to acquire a write lock on internal structures which should have only been available to the base and default providers, as certain preprocessor ifdefs only allow specific internal calls to be made with the base and default providers. 1. https://github.com/openssl/openssl/issues/24202 Differential Revision: https://reviews.freebsd.org/D44892 --- crypto/openssl/providers/fips.ld | 5 +++++ crypto/openssl/providers/legacy.ld | 5 +++++ secure/lib/libcrypto/modules/fips/Makefile | 2 ++ secure/lib/libcrypto/modules/legacy/Makefile | 2 ++ 4 files changed, 14 insertions(+) diff --git a/crypto/openssl/providers/fips.ld b/crypto/openssl/providers/fips.ld new file mode 100644 index 000000000000..1debaaa7ff65 --- /dev/null +++ b/crypto/openssl/providers/fips.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/crypto/openssl/providers/legacy.ld b/crypto/openssl/providers/legacy.ld new file mode 100644 index 000000000000..1debaaa7ff65 --- /dev/null +++ b/crypto/openssl/providers/legacy.ld @@ -0,0 +1,5 @@ +{ + global: + OSSL_provider_init; + local: *; +}; diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile index 8843cb9717c9..ceaa57ab066e 100644 --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -1,6 +1,8 @@ SHLIB_NAME?= fips.so +VERSION_MAP= ${SRCTOP}/crypto/openssl/providers/fips.ld + CFLAGS+= -DFIPS_MODULE SRCS+= fips_entry.c fipsprov.c self_test.c self_test_kats.c diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index a285d0b1148b..e435c5aa2c41 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -2,6 +2,8 @@ SHLIB_NAME?= legacy.so LIBADD= crypto +VERSION_MAP= ${SRCTOP}/crypto/openssl/providers/legacy.ld + SRCS+= legacyprov.c prov_running.c # ciphers From nobody Sun Apr 21 16:58:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMvjV50Slz5HKPY; Sun, 21 Apr 2024 16:58: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 4VMvjV2hyTz4Ry1; Sun, 21 Apr 2024 16:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713718734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NGcbN3uIlj5Dhxz4fkeFyIub5t4ktMRpXBZYBS4pxyo=; b=U/fWqGm9FNM5LCcbLRpeyqr+Jupg/7XyhajfdtUQGbd5o2R+YYj4fgg+Z14+OWXiUN91LS RjfmaKcf3MxEGxeLo6zMgkwMpq2exaJtdiLOibmZ5R2a/moaS0UF6nD+gJwjJTf+zhdl0X o6fMar5jdTReU/ZToJhZdq4fAjAJSoK4JpzY7iYp4hGoBSO9Gi0PLElRrA7o891ragPZf5 8hWEK+c4T0Yk8wQn9ulD03FPAlmte4n57IvWKyA3BiwXrHwmO6zWC1Q+mp4PNvpsypq7Lf bDSHaqLRavt3FxjtYHohw6vdzlSMEbYArsQsWAu8CcvA/NzGISBggbE4uKFyiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713718734; a=rsa-sha256; cv=none; b=L9zOUDm5vi5xvJHfDU2fGJEY2rjsMI1goCdQCm4iNlrC+EzrvYbFA2HynOfsWhQzq77HSx 9II7iM048kAk02q1+4HCTZNaJAl/VYbfWJE6gg5KyOFTl0mmKp7S/qT4E0k+sdRVpJxeM5 2a5Ig3FeEVQZcv1MCZal7NeJAKdvAd7FCdB29n71UD1z0+qwIj9suAfUB19R+SVXFJevYd z61YM045Wk1lrg64kMTeajBYv2SUBemk+WBY0iuIUzHuYyAb6NeYW8V5ghk1yMvsbr3eCM cF8WKjQpy+SPSKNhT5GywBEulQBPOrvQ2qU9K0D5u8QHQP7+kW52eeyku7yLiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713718734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NGcbN3uIlj5Dhxz4fkeFyIub5t4ktMRpXBZYBS4pxyo=; b=SMzEgierGv0Y4iTl+giOSnIvMmBcidjwUZ0sht6zKUpJ5R7+WRfDvw6D53S+xAL6rPDn1H emI1dN54Q5pnFRqs0QKziqs0cRfLUGcpDGx3LXJd82wAnEEl9dozPr7cZgvzc/WLrjggRw 1JhLughbJzxZ/5l5S8in2mwzFgIjsUtQJY7/K+uy1SXnRtj9n4mTPQn2vMq4r2YxglOghn p3nN6mUClOHzcYXfiye78ibrJ7VgjOxCGSrsHyE4EHbcvaLJJbX4ZY4Km6YQeRLClaQCmV X49f9FQWYrMIBuR5HM67EARs3F+ckl/EXhGmvspghZloM71tqIa1xhyahQ2OCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMvjV2JFsz1SBc; Sun, 21 Apr 2024 16:58: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 43LGwssM006928; Sun, 21 Apr 2024 16:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LGwsNG006925; Sun, 21 Apr 2024 16:58:54 GMT (envelope-from git) Date: Sun, 21 Apr 2024 16:58:54 GMT Message-Id: <202404211658.43LGwsNG006925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 572948d00ddf - main - Revert "OpenSSL: use the upstream provided version.map files for the fips/legacy providers" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 572948d00ddfea1dbd2cba9117b36fc3c47ca444 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=572948d00ddfea1dbd2cba9117b36fc3c47ca444 commit 572948d00ddfea1dbd2cba9117b36fc3c47ca444 Author: Enji Cooper AuthorDate: 2024-04-21 16:55:01 +0000 Commit: Enji Cooper CommitDate: 2024-04-21 16:58:31 +0000 Revert "OpenSSL: use the upstream provided version.map files for the fips/legacy providers" This change is still under review and should not have been merged directly to main (yet). This is a case and point for using `push.default` to nothing instead of matching or simple. This reverts commit 42ce242e353065dfbaa248955f6657005a395a95. --- crypto/openssl/providers/fips.ld | 5 ----- crypto/openssl/providers/legacy.ld | 5 ----- secure/lib/libcrypto/modules/fips/Makefile | 2 -- secure/lib/libcrypto/modules/legacy/Makefile | 2 -- 4 files changed, 14 deletions(-) diff --git a/crypto/openssl/providers/fips.ld b/crypto/openssl/providers/fips.ld deleted file mode 100644 index 1debaaa7ff65..000000000000 --- a/crypto/openssl/providers/fips.ld +++ /dev/null @@ -1,5 +0,0 @@ -{ - global: - OSSL_provider_init; - local: *; -}; diff --git a/crypto/openssl/providers/legacy.ld b/crypto/openssl/providers/legacy.ld deleted file mode 100644 index 1debaaa7ff65..000000000000 --- a/crypto/openssl/providers/legacy.ld +++ /dev/null @@ -1,5 +0,0 @@ -{ - global: - OSSL_provider_init; - local: *; -}; diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile index ceaa57ab066e..8843cb9717c9 100644 --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -1,8 +1,6 @@ SHLIB_NAME?= fips.so -VERSION_MAP= ${SRCTOP}/crypto/openssl/providers/fips.ld - CFLAGS+= -DFIPS_MODULE SRCS+= fips_entry.c fipsprov.c self_test.c self_test_kats.c diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index e435c5aa2c41..a285d0b1148b 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -2,8 +2,6 @@ SHLIB_NAME?= legacy.so LIBADD= crypto -VERSION_MAP= ${SRCTOP}/crypto/openssl/providers/legacy.ld - SRCS+= legacyprov.c prov_running.c # ciphers From nobody Sun Apr 21 21:34:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VN1px0755z5Hq2g; Sun, 21 Apr 2024 21:34: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 4VN1pw6jFFz46pk; Sun, 21 Apr 2024 21:34:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713735240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=My0EjCYj8BTKqoKECksQUc9/zAsy39LSbgrb8GLJy0E=; b=u6jS7VQNBGA2H+JfAaWPDeWMuYE40C34f88iQIcqpLywidYYL1mHg2xbvaJfVgZOBu+kje viPyPSWh1oKGNYIOFi9i87mossOYHuIsnqo/867nwkRdP7+nmbt35gybwHOtSElG46GW+y L3J4P4SqW/r9QFpi/fwggIDncjdRnH4y6gXk+weaPZkLc9WY+A/LfYykD1cD1bguiMVx+g 4gfE56ZDixeTeZnPrkdKnRd0xtqkbGU3YRNAVqPShnL5SkZ0qpR/mS1S4cw9/v5+CSNCrX +2WXQg+Hcfbcy1TbXXSdVu2aAMNsdg5FGNT4+DdxsJkcXmrAgGJ/n8XjFSxe4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713735240; a=rsa-sha256; cv=none; b=n1BIbtQVhu/VDxEn6c2FASGXJJwMiZE3UIzZ1oxyqMQvNmfgiYJcS10X4WMHyMw3yeYY/R m0JpD8hcByPmBdeKx8qcMaASHvxAeVPf6tDYRfPtCFJUjXlGwR4f1GF8uwT82PReTdOxa+ vKuiz4l8yIgL8wHjBzbUlhc2CXYZ4J14DlMrvm7TY6Ey5x7H/k5LnzhoeVKy6EppmLUkYH QkWEX5LzoK4UatrQxUGIQrF43JMTeCJEwOqAbWv5WY0rtueAL3xqGRuL3znR3JFqYnq5ek PnxuOtlM6q+A9NZYW0j6BiskjhC8wDW8QIVxmKBxmaBEjVd4EwO6FyUfdn7UHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713735240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=My0EjCYj8BTKqoKECksQUc9/zAsy39LSbgrb8GLJy0E=; b=iEqH3DrRabctGEJlM+R1a0G6VCp/Bej4TZkpeJFujtaL9QHcvIVY9ft+sslS2da7EKmnS4 3pkXAi7m8xzmlW/h7r6cE3tDdqbFY98CJDmtuTR3mS78Yh+uZdyi1QFsg2qDeMdkz1HUet JRBs3xz3G3c3sCs2Cp7rpRWgsGLpmyd3ypLhDuxEo7R+ILiiAtI1X0wrAocqboyvEt0Ov4 tmbcDlGYbxOlesxFUl+XlklLFWOnRiwacqE9c3lPFlv1u32WUQpFA5YI1mauUnG9T81czE JeO1fYxClJ9/f4xexiJINoh62MXJarqa9ZzQRTQeepZeZ0W83CTAfA7HDUnZRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VN1pw6JrwzLnr; Sun, 21 Apr 2024 21:34: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 43LLY0nH081224; Sun, 21 Apr 2024 21:34:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LLY0JY081221; Sun, 21 Apr 2024 21:34:00 GMT (envelope-from git) Date: Sun, 21 Apr 2024 21:34:00 GMT Message-Id: <202404212134.43LLY0JY081221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 0ab121e9f9a3 - main - Add a few missed libclang_rt files to ObsoleteFiles.inc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ab121e9f9a33dde06b292df02ec2eee03033e1f Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0ab121e9f9a33dde06b292df02ec2eee03033e1f commit 0ab121e9f9a33dde06b292df02ec2eee03033e1f Author: Dimitry Andric AuthorDate: 2024-04-21 21:32:22 +0000 Commit: Dimitry Andric CommitDate: 2024-04-21 21:32:22 +0000 Add a few missed libclang_rt files to ObsoleteFiles.inc PR: 276104 Reported by: Mark Millard MFC after: 3 days --- ObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 50f426085eff..8a9cf20beef5 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -328,6 +328,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64le.a @@ -346,6 +347,7 @@ OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-x86_64.a +OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a From nobody Sun Apr 21 22:50:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VN3Vc4ljjz5Hxry; Sun, 21 Apr 2024 22:50: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 4VN3Vc4GsYz4HFL; Sun, 21 Apr 2024 22: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=1713739800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+hM6nqKcmKPWKRhhkRwdyqMsspo82CD8i4KQB8eWNjM=; b=lukNhvH8zk5sqO+ESuLmahpmky/2++GQEy+mxbdb9MINLzmXCviQhsS9VXNWAGoNlf0MCA RvpOkzOUE2GSASf6zzEucOByJWW2TfCOuhrF5pKawZLO3EFcnuRWt8OP5/FZCsFfiPc2kI axjmWr+Bxd9KKPiim0b1qYBKjf94urdnzU7CH/fzLptFs4NP+Kt1LgAPtm4yKmUNyTONcP LvBDzUg8Ogx1xDql/VW3YLodmSASI5jqE6IMHDMz/VsGuj5WvKGkzpWHIBiQI18PqqTZNA gl5GATDud0p2EiSKvqHvjsnU1Y49UfcVJ0zw26+0jBnhZNn80zjRvQIEKwaHNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713739800; a=rsa-sha256; cv=none; b=F+HokaUFXk/NMfEqSeC0V3wwWF+xKUhXjXDGdOoIZ7JhsKIackbnuJzYWhVBeUjec5wLEd IpDc7Ys0qjf4/+NXRJubKsWwBstP8YI327X6syJK4mtV6fD4yXwhUUt1+pF/T7bhfrp2Ys pLmx89zvAipvooNp2lSka7fOvi7cdQjIrlFSjaSvy2C848xhTErhInS4GDUBSQCYJGyl6Q f5wa8YgVyYYkbteUVa4UpBqjM7Vx7cS3Vuot30B8kx6sgT/tQltPDTQ955cCq/hiTEkVPL ffhUwoWhEmYhrpCjWdcIBT/lE2//3QOn0ZJrRoE/YTEMYTO4QBePlI43Dw6dbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713739800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+hM6nqKcmKPWKRhhkRwdyqMsspo82CD8i4KQB8eWNjM=; b=Eydlhs+uet9h+//4ecK7fMs0ZBXOaPux7U43y4BMi0vWaLkWYfiq055dX8pNXrlRefziuS 2KDNg1eZTziM7VkHfiKkChXNhzRQL45QYhb5Ew3ii/jDfgiCORPuw8tCUTGL+cyqmEJnn5 SEqWCMesK16uRgnWnHzL3PCDZlDBYWZLABVC7e+uq7clpatmI9Jkqixy8gSHoiMlsLcIkB 7sn+UHrRXG+NNGzeSzUSB6f+ONSeVyWEFtGe26vQLjSsHYRVlSPRwgY5hyv5lA585fAOEP eQ9CjM7UvL1zqYtLS7iS7epXcTMKo+39v6uApc1ioOpdZLogx+0n3a9zklaclw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VN3Vc3st5zP0y; Sun, 21 Apr 2024 22: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 43LMo0g6001192; Sun, 21 Apr 2024 22: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 43LMo0pg001170; Sun, 21 Apr 2024 22:50:00 GMT (envelope-from git) Date: Sun, 21 Apr 2024 22:50:00 GMT Message-Id: <202404212250.43LMo0pg001170@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: 10e0c34bf842 - main - Enable L1SS handling on RPI4 pcib List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 10e0c34bf842885b4bd78adbbdbd7fb00f133cb5 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10e0c34bf842885b4bd78adbbdbd7fb00f133cb5 commit 10e0c34bf842885b4bd78adbbdbd7fb00f133cb5 Author: HP van Braam AuthorDate: 2024-04-16 23:01:20 +0000 Commit: Ed Maste CommitDate: 2024-04-21 22:34:05 +0000 Enable L1SS handling on RPI4 pcib Thanks to @kevans91 for pointing me in the right direction. FreeBSD had the same bug as Linux (see https://bugzilla.kernel.org/show_bug.cgi?id=217276) where the ultimate solution was to honor the brcm,enable-l1ss FDT property. In current versions of the dtb files this property has been added by default. Without this on many, many pcie addin cards the pcib will Serror when trying to assert the clreq# pin on the pcie bus. Many cards do not have these hooked up. PR: 260131, 277638, 277605 Reviewed-by: emaste Signed-off-by: HP van Braam Pull-request: https://github.com/freebsd/freebsd-src/pull/1179 --- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c index 921d675aae4d..f5304525a6fb 100644 --- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c +++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c @@ -60,7 +60,7 @@ #define REG_BRIDGE_CTRL 0x9210 #define BRIDGE_DISABLE_FLAG 0x1 #define BRIDGE_RESET_FLAG 0x2 -#define REG_BRIDGE_SERDES_MODE 0x4204 +#define REG_PCIE_HARD_DEBUG 0x4204 #define REG_DMA_CONFIG 0x4008 #define REG_DMA_WINDOW_LOW 0x4034 #define REG_DMA_WINDOW_HIGH 0x4038 @@ -86,6 +86,9 @@ #define REG_EP_CONFIG_CHOICE 0x9000 #define REG_EP_CONFIG_DATA 0x8000 +#define L1SS_ENABLE 0x00200000 +#define CLKREQ_ENABLE 0x2 + /* * The system memory controller can address up to 16 GiB of physical memory * (although at time of writing the largest memory size available for purchase @@ -190,7 +193,7 @@ bcm_pcib_reset_controller(struct bcm_pcib_softc *sc) DELAY(100); - bcm_pcib_set_reg(sc, REG_BRIDGE_SERDES_MODE, 0); + bcm_pcib_set_reg(sc, REG_PCIE_HARD_DEBUG, 0); DELAY(100); } @@ -613,7 +616,7 @@ bcm_pcib_attach(device_t dev) struct bcm_pcib_softc *sc; pci_addr_t phys_base, pci_base; bus_size_t size; - uint32_t hardware_rev, bridge_state, link_state; + uint32_t hardware_rev, bridge_state, link_state, tmp; int error, tries; sc = device_get_softc(dev); @@ -719,7 +722,18 @@ bcm_pcib_attach(device_t dev) bcm_pcib_set_reg(sc, PCI_ID_VAL3, PCIC_BRIDGE << CLASS_SHIFT | PCIS_BRIDGE_PCI << SUBCLASS_SHIFT); - bcm_pcib_set_reg(sc, REG_BRIDGE_SERDES_MODE, 0x2); + tmp = bcm_pcib_read_reg(sc, REG_PCIE_HARD_DEBUG); + tmp |= CLKREQ_ENABLE; + + if (ofw_bus_has_prop(dev, "brcm,enable-l1ss")) { + if (bootverbose) + device_printf(dev, "note: enabling L1SS due to OF " + "property brcm,enable-l1ss\n"); + + tmp |= L1SS_ENABLE; + } + + bcm_pcib_set_reg(sc, REG_PCIE_HARD_DEBUG, tmp); DELAY(100); bcm_pcib_relocate_bridge_window(dev);