From nobody Mon Feb 12 00:18: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 4TY4nN1MFbz591kc; Mon, 12 Feb 2024 00:18:48 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4TY4nM4rzhz4jh8; Mon, 12 Feb 2024 00:18:47 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 41C0IcQL020223; Mon, 12 Feb 2024 02:18:41 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 41C0IcQL020223 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 41C0IcVq020222; Mon, 12 Feb 2024 02:18:38 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 12 Feb 2024 02:18:38 +0200 From: Konstantin Belousov To: Alan Somers Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8dfc788b8480 - main - aio_read2/aio_write2: add AIO_OP2_VECTORED Message-ID: References: <202402110154.41B1scZ9090228@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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4TY4nM4rzhz4jh8 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Sun, Feb 11, 2024 at 07:28:17AM -0700, Alan Somers wrote: > What's the difference between this symbol and the existing > LIO_VECTORED symbol ? They seem redundant to me. Same relation as between LIO_FOFFSET and AIO_OP2_FOFFSET. aio_read2/aio_write2 are simpler to use when a single op is needed. > > On Sat, Feb 10, 2024 at 6:54 PM Konstantin Belousov wrote: > > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8dfc788b8480a13f1f945f0a94d8b1e327af5c6f > > > > commit 8dfc788b8480a13f1f945f0a94d8b1e327af5c6f > > Author: Konstantin Belousov > > AuthorDate: 2024-02-03 18:09:36 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2024-02-11 01:54:11 +0000 > > > > aio_read2/aio_write2: add AIO_OP2_VECTORED > > > > Suggested by: Vinícius dos Santos Oliveira > > Reviewed by: jhb > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D43448 > > --- > > lib/libc/gen/aio_read2.c | 4 +++- > > lib/libc/gen/aio_write2.c | 4 +++- > > sys/sys/aio.h | 1 + > > 3 files changed, 7 insertions(+), 2 deletions(-) > > > > diff --git a/lib/libc/gen/aio_read2.c b/lib/libc/gen/aio_read2.c > > index 3a783e1b1b15..a5186d509b26 100644 > > --- a/lib/libc/gen/aio_read2.c > > +++ b/lib/libc/gen/aio_read2.c > > @@ -37,13 +37,15 @@ aio_read2(struct aiocb *iocb, int flags) > > { > > int error; > > > > - if ((flags & ~(AIO_OP2_FOFFSET)) != 0) { > > + if ((flags & ~(AIO_OP2_FOFFSET | AIO_OP2_VECTORED)) != 0) { > > errno = EINVAL; > > return (-1); > > } > > iocb->aio_lio_opcode = LIO_READ; > > if ((flags & AIO_OP2_FOFFSET) != 0) > > iocb->aio_lio_opcode |= LIO_FOFFSET; > > + if ((flags & AIO_OP2_VECTORED) != 0) > > + iocb->aio_lio_opcode |= LIO_VECTORED; > > > > error = lio_listio(LIO_NOWAIT, &iocb, 1, NULL); > > if (error == -1 && errno == EIO) { > > diff --git a/lib/libc/gen/aio_write2.c b/lib/libc/gen/aio_write2.c > > index 8b5d4a38a6c5..8f4f6a35fd4d 100644 > > --- a/lib/libc/gen/aio_write2.c > > +++ b/lib/libc/gen/aio_write2.c > > @@ -37,13 +37,15 @@ aio_write2(struct aiocb *iocb, int flags) > > { > > int error; > > > > - if ((flags & ~(AIO_OP2_FOFFSET)) != 0) { > > + if ((flags & ~(AIO_OP2_FOFFSET | AIO_OP2_VECTORED)) != 0) { > > errno = EINVAL; > > return (-1); > > } > > iocb->aio_lio_opcode = LIO_WRITE; > > if ((flags & AIO_OP2_FOFFSET) != 0) > > iocb->aio_lio_opcode |= LIO_FOFFSET; > > + if ((flags & AIO_OP2_VECTORED) != 0) > > + iocb->aio_lio_opcode |= LIO_VECTORED; > > > > error = lio_listio(LIO_NOWAIT, &iocb, 1, NULL); > > if (error == -1 && errno == EIO) { > > diff --git a/sys/sys/aio.h b/sys/sys/aio.h > > index 6680f9fed3fa..919a6180b130 100644 > > --- a/sys/sys/aio.h > > +++ b/sys/sys/aio.h > > @@ -58,6 +58,7 @@ > > /* aio_read2/aio_write2 flags */ > > #if __BSD_VISIBLE > > #define AIO_OP2_FOFFSET 0x00000001 > > +#define AIO_OP2_VECTORED 0x00000002 > > #endif > > > > /* From nobody Mon Feb 12 08:02:03 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 4TYH3w0llnz59m6S; Mon, 12 Feb 2024 08:02: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 4TYH3v5BlJz46kP; Mon, 12 Feb 2024 08:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707724923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXz/LWHiouEfSP8rxIkvmIj01fPJzb2gnfzz2mF0oSk=; b=AlyUht6YUNAqf913g+4mqFbrUX8oW/+M8ba43PuuAHOGfZyp6KPCZZzeycfh4yfVAxH4dA Ut4F9OrGGaCVx4u/TVZFWYO9GJ+MnF2e5zRwUF8oPPYzaLEBVvda3W7/CHf9urN92SGzUM jGN8WgkImB2JWOw0N4IKcDY84HGrgRp7CLAoJqJfHjkKvwVNfFSL56tcPNRy1T7qRXVHaD GyT3LoJX99QNlyqQZlEwRY65VrnNE2L32rOam/4B50wQ4oXUXCo31Wk+jKPOKH4zSpefkN 3UnSp/b2RxjEBRMCygttE6wSOj2SdSTNFoXvbTDatErrg4Nd76WFWIV7VPG5RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707724923; a=rsa-sha256; cv=none; b=Ratba8Qm7xvtmpNcEjOkiZIeADmOShFBkZdCaa9syoKekyPA20FiZH7SRM88/epHjYd/GX HpqDI1JWFTUV50VpY2stcH13Pjd9fF0FMQETa7bD8cThJ9eOya5Ru3dq6dnEyFtMBoD0BY eP0d+Dy5rKl+omP0BKQAoHgbUvCusemAFBWtCOTajqihk3udASNSiy/cdGgcEefLrOcwnW RDz1qvbB7laVNngpV2oznQJytrQpPpbndLnZdWXT2STfeDibKB9o/mRWzsgcCr4LKw7IcS 8/CajC4qxz/AHYk5Q0adoriKERwgJ6tBol3orzFMusYduUmTVRqOY++IQNBJHA== 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=1707724923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXz/LWHiouEfSP8rxIkvmIj01fPJzb2gnfzz2mF0oSk=; b=vbhUnnif2wQYfBJw2ZHBI6skXNmDaq8fY14IYe41/d1GcDpY0QZF7GeQVeAtIyKAqeiR0z tDeLfC7NYLyOUM/Lful8F1hGaIOcnt6O0g7YQLrIIxJFY9dQZqhdRSRatbojnEWkIpf/b+ bIZD8Na9iuzrC60fTLRSf3RgCeOEELc0rLYNrWUevMlkTWoRkNHrgM2DFT3lGoFQjm5NUF rFcKkPBu0UNlH45NjVBsJi4Lk3gF/qb4vlolPiYYiPXfmOaA8bcBma2h8k/5ozdNjPY4kB zgV9xtFpRCtWWNJjtCJYRSTScYSkYDeuRUsqxJhMpF/gXiYzg3XcY3G07+uXGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYH3v4GCxzJS6; Mon, 12 Feb 2024 08:02: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 41C823Rp037551; Mon, 12 Feb 2024 08:02:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41C823ji037548; Mon, 12 Feb 2024 08:02:03 GMT (envelope-from git) Date: Mon, 12 Feb 2024 08:02:03 GMT Message-Id: <202402120802.41C823ji037548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 81092e92ea51 - main - graid: unbreak Promise RAID1 with 4+ 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: Sender: owner-dev-commits-src-main@freebsd.org 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81092e92ea5184c4eeedad58044d72cfef72dd24 Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=81092e92ea5184c4eeedad58044d72cfef72dd24 commit 81092e92ea5184c4eeedad58044d72cfef72dd24 Author: Eugene Grosbein AuthorDate: 2024-02-12 07:24:28 +0000 Commit: Eugene Grosbein CommitDate: 2024-02-12 07:33:43 +0000 graid: unbreak Promise RAID1 with 4+ providers Fix a problem in graid implementation of Promise RAID1 created with 4+ disks. Such an array generally works fine until reboot only due to a bug in metadata writing code. Before the fix, next taste erronously created RAID1E (kind of RAID10) instead of RAID1, hence graid used wrong offsets for I/O operations. The bug did not affect Promise RAID1 arrays with 2 or 3 disks only. Reviewed by: mav MFC after: 3 days --- sys/geom/raid/md_promise.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c index ba7a4d2b1cc4..d0d041e027c2 100644 --- a/sys/geom/raid/md_promise.c +++ b/sys/geom/raid/md_promise.c @@ -1762,8 +1762,9 @@ g_raid_md_write_promise(struct g_raid_md_object *md, struct g_raid_volume *tvol, meta->total_disks = vol->v_disks_count; meta->stripe_shift = ffs(vol->v_strip_size / 1024); meta->array_width = vol->v_disks_count; - if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1 || - vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) + if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1) + meta->array_width = 1; + else if (vol->v_raid_level == G_RAID_VOLUME_RL_RAID1E) meta->array_width /= 2; meta->array_number = vol->v_global_id; meta->total_sectors = vol->v_mediasize / 512; From nobody Mon Feb 12 08:31: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 4TYHk45m4pz59JqH; Mon, 12 Feb 2024 08:31:40 +0000 (UTC) (envelope-from dch@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 4TYHk453fyz4CMq; Mon, 12 Feb 2024 08:31:40 +0000 (UTC) (envelope-from dch@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707726700; 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=BlV+vUNbnHhDiGMyFJZ9zTZgFAtYQORigf+CMXNt4rc=; b=AqdC0tYzBrcxIUxTz8p6LB4cdfJlTa1ZuLKaDfEbzdjhu61t1U+buK1ZUCtWmEbaNcOdOz njYKZvyMwOf+vNBdk/8BFmrrNl3/Luv7XaFqI3q7jQY+2CF984l9C2u2oauEmtu5pCdZE+ fw6L6OMy77h6tZ7JjgqE8etJ7LdY0s+6n9f+fHYY/KqTgXYR942wlCUEZc9X344VQAbXXL RcfccYnbMvXl7ehU3hhIIxD/RHMdXVlzpHRhKATSXJ4b2pDge58ktu8F8nh8Dyb1P9tRUq z381DtqCGflD6mVe5v+9n7pQO2dYMvw7an2aLoDNElUFMQZ7ZFtvKz6pIsDjhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707726700; a=rsa-sha256; cv=none; b=fxQI8GXxZq7j4N6Y6sAVqs0gpQidpkq2gVgbE3ibIWbqWAHl9jz31kJlKyzRsmAhQdjKjs J2x8KqHb+28Y9P4/qpsDLt0pxp/++sIRyaroUJSFELYPt+plNX6ULB9putATsVPV4QNmQm UMPViORubGyJuzCsD5PVx9m4dnkgYVgz1ewG20+kzcIEJwNwSL0uU4ZIejiCL+UVGgecOX HwQbEPB9QhonxWAfLblr+mKQ2P8CKSQkr6kRjwoMnyndSAwRGltierCu4EBj51IaQCYSrF KV9CkCtGQe8tUW1ziPamOUXoBmq/hAs5r3h1qM1/uOOmxt32vB2xwZPfQxokpA== 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=1707726700; 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=BlV+vUNbnHhDiGMyFJZ9zTZgFAtYQORigf+CMXNt4rc=; b=FrAzPTfE0FBXRNAoRzWJh+88hewfRiwADVqzepQ7cZtfSRBbbO5td5JP1iqPpJ0KQjiH3a k01lgLz7U+ba6XY3uO4cJq2ww7/UUHtSFbNZgC2IQHQighG3HSAWqqHFQBV+aEPXyr10vu V3pkN69Fy/VLruIw+TQNRp+IfdPe1Ln4pqNl5NVT9M/SYR5oENdLgI/iGs+4gsZ0pXhvPv l3lRco3HZsyj3hD4OCkfGa7CFRDeONHCm+CfsIhpn4ikUJ5f2Gmj5YW9F5PZP3xQthktLY V4QXkVJI8sfk5gUtCZoUET5uByqVk2tRdXGnXIqGOUUr4qsOqUnwX3q00BwmWA== Received: from fauth2-smtp.messagingengine.com (fauth2-smtp.messagingengine.com [103.168.172.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dch/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TYHk43jQCzHKl; Mon, 12 Feb 2024 08:31:40 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfauth.nyi.internal (Postfix) with ESMTP id 957FE1200043; Mon, 12 Feb 2024 03:31:39 -0500 (EST) Received: from imap44 ([10.202.2.94]) by compute2.internal (MEProxy); Mon, 12 Feb 2024 03:31:39 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvgdduvdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvfevufgtgfesthhqredtreerjeenucfhrhhomhepfdff rghvvgcuvehothhtlhgvhhhusggvrhdfuceouggthheshfhrvggvuefuffdrohhrgheqne cuggftrfgrthhtvghrnhepteektdelveeitdektdeifeefueffudeukedtfeegvdetkeeu heefgfeiudelgfdtnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepuggthhdomhgvshhmthhp rghuthhhphgvrhhsohhnrghlihhthidquddvgeeluddtfeeguddquddvudefuddujeejqd gutghhpeephfhrvggvuefuffdrohhrghesfhgrshhtmhgrihhlrdhfmh X-ME-Proxy: Feedback-ID: icedc46df:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 5C49436A0077; Mon, 12 Feb 2024 03:31:39 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-144-ge5821d614e-fm-20240125.002-ge5821d61 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Message-Id: In-Reply-To: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> References: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> Date: Mon, 12 Feb 2024 08:31:19 +0000 From: "Dave Cottlehuber" To: "Richard Scheffenegger" Cc: transport@freebsd.org, dev-commits-src-main@freebsd.org Subject: hitting Assertion !callout_active(&tp->t_callout) failed at /usr/src/sys/netinet/tcp_subr.c:2386 after 62d47d7 Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable On Sat, 10 Feb 2024, at 09:34, Richard Scheffenegger wrote: > The branch main has been updated by rscheff: > > URL:=20 > https://cgit.FreeBSD.org/src/commit/?id=3D62d47d73b7eb01f3b0a37541df5e= 7aaa36f54335 > > commit 62d47d73b7eb01f3b0a37541df5e7aaa36f54335 > Author: Richard Scheffenegger > AuthorDate: 2024-02-10 09:28:42 +0000 > Commit: Richard Scheffenegger > CommitDate: 2024-02-10 09:30:00 +0000 > > tcp: stop timers and clean scoreboard in tcp_close() > =20 > Stop timers when in tcp_close() instead of doing that in tcp_disca= rdcb(). > A connection in CLOSED state shall not need any timers. Assert tha= t no > timer is rescheduled after that in tcp_timer_activate() and verfiy= that > this is also the expected state in tcp_discardcb(). > =20 > PR: 276761 > Reviewed By: glebius, tuexen, #transport > Sponsored by: NetApp, Inc. > Differential Revision: https://reviews.freebsd.org/D43792 > --- > sys/netinet/tcp_subr.c | 4 ++-- > sys/netinet/tcp_timer.c | 1 + > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c > index 6043a3d458e5..90e1496a822c 100644 > --- a/sys/netinet/tcp_subr.c > +++ b/sys/netinet/tcp_subr.c > @@ -2383,10 +2383,9 @@ tcp_discardcb(struct tcpcb *tp) > #endif >=20 > INP_WLOCK_ASSERT(inp); > + MPASS(!callout_active(&tp->t_callout)); I'm repeatedly hitting this assert soon after boot on my ryzen desktop. = I've a coredump. Panic String: Assertion !callout_active(&tp->t_callout) failed at /usr/s= rc/sys/netinet/tcp_subr.c:2386 I'll apply your latest patch in https://bugs.freebsd.org/bugzilla/show_b= ug.cgi?id=3D276761#c16 and report back.. __curthread () at /usr/src/sys/amd64/include/pcpu_aux.h:57 57 __asm("movq %%gs:%P1,%0" : "=3Dr" (td) : "n" (offsetof(s= truct pcpu, (kgdb) #0 __curthread () at /usr/src/sys/amd64/include/pcpu_aux.h:57 #1 doadump (textdump=3Dtextdump@entry=3D0) at /usr/src/sys/kern/kern_shutdown.c:403 #2 0xffffffff804a39da in db_dump (dummy=3D, dummy2=3D, dummy3=3D, dummy4=3D) at /usr/src/sys/ddb/db_command.c:590 #3 0xffffffff804a37e0 in db_command (last_cmdp=3D, cmd_table=3D, dopager=3Dfalse) at /usr/src/sys/ddb/db_command.c:503 #4 0xffffffff804a3926 in db_command_script ( command=3Dcommand@entry=3D0xffffffff817b9724 = "dump") at /usr/src/sys/ddb/db_command.c:568 #5 0xffffffff804a8c88 in db_script_exec ( scriptname=3Dscriptname@entry=3D0xfffffe0346e96680 "kdb.enter.panic", warnifnotfound=3Dwarnifnotfound@entry=3D0) at /usr/src/sys/ddb/db_sc= ript.c:301 #6 0xffffffff804a8ab2 in db_script_kdbenter (eventname=3D) at /usr/src/sys/ddb/db_script.c:323 #7 0xffffffff804a6b81 in db_trap (type=3D, code=3D) at /usr/src/sys/ddb/db_main.c:266 #8 0xffffffff80ba2aa2 in kdb_trap (type=3Dtype@entry=3D3, code=3Dcode@e= ntry=3D0, tf=3Dtf@entry=3D0xfffffe0346e969c0) at /usr/src/sys/kern/subr_kdb.c:= 790 #9 0xffffffff81057fd6 in trap (frame=3D0xfffffe0346e969c0) at /usr/src/sys/amd64/amd64/trap.c:606 #10 #11 kdb_enter (why=3D, msg=3D) at /usr/src/sys/kern/subr_kdb.c:556 #12 0xffffffff80b532d6 in vpanic ( fmt=3D0xffffffff8120a0cb "Assertion %s failed at %s:%d", ap=3Dap@entry=3D0xfffffe0346e96bf0) at /usr/src/sys/kern/kern_shutdo= wn.c:961 #13 0xffffffff80b53163 in panic ( fmt=3D0xffffffff81980440 "\202\221\024\201\377\377\377\= 377") at /usr/src/sys/kern/kern_shutdown.c:889 #14 0xffffffff80d585e1 in tcp_discardcb (tp=3Dtp@entry=3D0xfffff808d767c= a80) at /usr/src/sys/netinet/tcp_subr.c:2386 #15 0xffffffff80d64e81 in tcp_usr_detach (so=3D0xfffff8012ccd0780) at /usr/src/sys/netinet/tcp_usrreq.c:214 #16 0xffffffff80c05151 in sofree (so=3D0xfffff8012ccd0780) at /usr/src/sys/kern/uipc_socket.c:1205 #17 sorele_locked (so=3Dso@entry=3D0xfffff8012ccd0780) at /usr/src/sys/kern/uipc_socket.c:1232 #18 0xffffffff80c05fad in soclose (so=3D0xfffff8012ccd0780) at /usr/src/sys/kern/uipc_socket.c:1302 #19 0xffffffff80aed71b in fo_close (fp=3D0xfffff8064b7362d0, td=3D0x80) at /usr/src/sys/sys/file.h:390 #20 _fdrop (fp=3Dfp@entry=3D0xfffff8064b7362d0, td=3D0x80, td@entry=3D0xfffff8012cc91000) at /usr/src/sys/kern/kern_descrip.c:3= 666 #21 0xffffffff80af0f83 in closef (fp=3Dfp@entry=3D0xfffff8064b7362d0, td=3Dtd@entry=3D0xfffff8012cc91000) at /usr/src/sys/kern/kern_descri= p.c:2839 #22 0xffffffff80af4ea6 in closefp_impl (fdp=3D0xfffffe02e1a24430, fd=3D9= 5, fp=3D0xfffff8064b7362d0, td=3D0xfffff8012cc91000, audit=3Dtrue) at /usr/src/sys/kern/kern_descrip.c:1315 #23 0xffffffff81059473 in syscallenter (td=3D0xfffff8012cc91000) at /usr/src/sys/amd64/amd64/../../kern/subr_syscall.c:186 #24 amd64_syscall (td=3D0xfffff8012cc91000, traced=3D0) at /usr/src/sys/amd64/amd64/trap.c:1192 #25 #26 0x00003069693b76da in ?? () Backtrace stopped: Cannot access memory at address 0x30696c9b9818 (kgdb) (END) A+ Dave =E2=80=94=E2=80=94=E2=80=94 O for a muse of fire, that would ascend the brightest heaven of inventio= n! From nobody Mon Feb 12 08:50: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 4TYJ7t32zVz59LqN; Mon, 12 Feb 2024 08:50:34 +0000 (UTC) (envelope-from dch@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 4TYJ7t2Zm0z4DYN; Mon, 12 Feb 2024 08:50:34 +0000 (UTC) (envelope-from dch@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707727834; 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=EWprKCxP5AA2BjXSzskswEvZc195rOOU9mzKWGPi+Yg=; b=DJ/12eI0pOGPOjutbTPwIE1ZndCVzzWGEVWMHkSeyut00KMtJUl07AXOTk7k4l2Fi+YAIu 1458ARUzqqpD9rTOPVm6YrFFXSXLwynDKdoVO3UuUrawgjK/ceQZiWgPm+CYsOkutNqnvE KsQS37T+SBK4UcQaqaHdcROs3dAkWeicydFBi773Wjaq1T/buES2QFbW+0TFLKdVDx4pKL ZZ+DLO8HV1qWIwBjBWs1AgpzLzDuKB+4/kMGXlTtLA5FVYFuQkCoTV7BQjoMthGk1T6R4L PRz/GEzGYWtsUnj5DHcNXSqyDOAkIh+aeo1S8AQQFzdPVH6oRYPFGWJUxlx64A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707727834; a=rsa-sha256; cv=none; b=kBgq+spD1Ehjmv+/6AS+Za667IXZHAMF/GZx41NCTulEYX3ELWKRIivCHzVH/d0Vrt4S5/ JPCmElfsBfuxtiS/oykVLWDmsaTsbUrLK8Sqvz5EgbSPeQL9byNh8WXCJPN/lMSnCTNCC+ uvHMUhevW6WIBFAc2/Dgkp01Co2g69Aep0/HxQSZwlSV9kfSCPaYziNaX7WOh45JHTMde5 YW3t1bBTsqasIlITesQKXPtKOXgy+ZLAqyHuT7gLVN7fQRD7he5LQNAeuaok/Jzomzn53+ 4RcHqYOthp2VMcZQ8L4RTstbjaDPQ9LW+gJl8Q+oQ33kr8qTJOYvQ+Osqmsb3g== 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=1707727834; 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=EWprKCxP5AA2BjXSzskswEvZc195rOOU9mzKWGPi+Yg=; b=fmSrMwq0vldvsO7DkcFtl2UutlG4TZ/NFUdSNAZo1cNiVqCdo2emK29kPcCIDqhEh1ZitQ 6rJZrmoA/mxLah4ekj8F7f1qTYuL4Ji2SrBNCUunEoAlz6mTMIapyPEQpflgdmBObpfigR urioMEH77lJmLUAWZt1fIr6pLpirQHJMFVOyIIziZGAJBGYziYPLPBOjYtBVfN9h2fdcbz +fCqhn3MdK3yeVryhKd8aKNh/Y5CdfKYwZC5hgeGaFhoAl7XZFWA6JIALHsEHH36x0UvT2 dMz8RbU91uffMEUMHldh1SsoMzLgMMOEREdpzjicDF/96FvV3MWOG1KUmF7O+Q== Received: from fauth2-smtp.messagingengine.com (fauth2-smtp.messagingengine.com [103.168.172.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dch/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TYJ7t168rzJZ6; Mon, 12 Feb 2024 08:50:34 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfauth.nyi.internal (Postfix) with ESMTP id C61201200043; Mon, 12 Feb 2024 03:50:33 -0500 (EST) Received: from imap44 ([10.202.2.94]) by compute2.internal (MEProxy); Mon, 12 Feb 2024 03:50:33 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvgdduvdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvfevufgtgfesthhqredtreerjeenucfhrhhomhepfdff rghvvgcuvehothhtlhgvhhhusggvrhdfuceouggthheshfhrvggvuefuffdrohhrgheqne cuggftrfgrthhtvghrnhepteektdelveeitdektdeifeefueffudeukedtfeegvdetkeeu heefgfeiudelgfdtnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepuggthhdomhgvshhmthhp rghuthhhphgvrhhsohhnrghlihhthidquddvgeeluddtfeeguddquddvudefuddujeejqd gutghhpeephfhrvggvuefuffdrohhrghesfhgrshhtmhgrihhlrdhfmh X-ME-Proxy: Feedback-ID: icedc46df:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 9045B36A0076; Mon, 12 Feb 2024 03:50:33 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-144-ge5821d614e-fm-20240125.002-ge5821d61 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Message-Id: In-Reply-To: References: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> Date: Mon, 12 Feb 2024 08:50:12 +0000 From: "Dave Cottlehuber" To: "Richard Scheffenegger" Cc: transport@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: hitting Assertion !callout_active(&tp->t_callout) failed at /usr/src/sys/netinet/tcp_subr.c:2386 after 62d47d7 Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, 12 Feb 2024, at 08:31, Dave Cottlehuber wrote: > I'm repeatedly hitting this assert soon after boot on my ryzen desktop= .=20 > I've a coredump. > > Panic String: Assertion !callout_active(&tp->t_callout) failed at=20 > /usr/src/sys/netinet/tcp_subr.c:2386 > > I'll apply your latest patch in=20 > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D276761#c16 and rep= ort=20 > back.. Reporting back, insta-panic on boot at: Panic String: Assertion !tcp_timer_active(tp, TT_REXMT) failed at /usr= /src/sys/netinet/tcp_subr.c:2387 Does that help any? A+ Dave =E2=80=94=E2=80=94=E2=80=94 O for a muse of fire, that would ascend the brightest heaven of inventio= n! From nobody Mon Feb 12 09:28: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 4TYJzY14GZz59QM6; Mon, 12 Feb 2024 09:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYJzY0XP2z4HWV; Mon, 12 Feb 2024 09:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707730105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZmaWsRcqyfUhgAhdF4PkR2SVbdghLAP+acmh/QoAYs=; b=pHiNl5Xt39awJJr71DPnQ+wnBjO3hjaOaT4vxdpYESXNd5OA10aAq3Yr9Cl5v8VRrLvgB6 67C1nHJuJNLcAoVC3HkEUnT9uLIg6l+5oyn+P1CwSVmXvXxHEUcuPDz9UnoxA3OZk0eqUH RSLeM0t1F2KnrFPW0MzdUjr+tO0CxYWPleq/bqeU+ugieBnqvUYujqgGnwGY1Kd8PEEu1b gEY7lKLbierSAa+u/wSj1Le++z+jzpaWYeuLQ5TimkliVD4nwTaiEPs5H4kZY8Rm4D5Z+v cTeS0S2rReIGFsdCxu7jGbVONTsWhnsS4p4hybDrpp8OiW+tklh7s6kIUiuj9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707730105; a=rsa-sha256; cv=none; b=aEU+ZARHu56lyOqhEWE7DrhtaFHnoicKScXKYW2I6giw1QF37b6IKsV0CIBq0uItdZFZZ6 VLfoX/Shmk5VYtZYRodCpGU/9ulZH2tiqhtKSsvrFi0NLr3SZ/uJldjBLZ4sdifUARRF9E xmeA5yRFEW4c20lMD+en9FfKkt5duchRY5vzdAQ6G/Rs0ljdwqn6+3MpXdTnQVpAm70lOO wXOwdDdRStOzYbBC8nHR6XkceHd7MdKOjBvflXHdZ6nh+PoqupSkVIPjLSbYIHVVhNzUlN r5+i4Hqzk5afvu/nHh4GmDCgaoCkCyq+5uUa7PUrb7Yy+opH8WpapQWEribM/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=1707730105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZmaWsRcqyfUhgAhdF4PkR2SVbdghLAP+acmh/QoAYs=; b=QAJ7tdRuAuzICkEBqS3dq/zdvAVnpRCD3uKi7neXQ0ZGw8FNppe42nmRFv82htC4Sqt8jI FegjRiCQVM1kaMoZ6xl6n1pAUhDyCdDNT/QY2DpCmFBezV3KdJk9OUmeqN2JrHb1B93/Sy c0QYD5ugVvbS7J/tjXV3sfySTlHs9uzqMIWadcU0fKnLe6AluGpf+IHiJxvzuYqh2ZqIHv vVIiIMqUPSpdCLi9Zsc3zmCi7N3/kkxG8ZfoliRjU8mMos846/rjYeWmb33R0lOIxm7JDx n2R74W2NIn7yRNW7P7hxEorSWazPlOesXqPjwO/WR2FrUiWsfAuhGryokWYujw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYJzX6jkxzLlJ; Mon, 12 Feb 2024 09:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41C9SOcu073528; Mon, 12 Feb 2024 09:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41C9SO01073525; Mon, 12 Feb 2024 09:28:24 GMT (envelope-from git) Date: Mon, 12 Feb 2024 09:28:24 GMT Message-Id: <202402120928.41C9SO01073525@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: d9c0e2e16660 - main - Revert "Build clang and other llvm executables as PIE" 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: Sender: owner-dev-commits-src-main@freebsd.org 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9c0e2e16660ecbe33e780821e95508a1d7870b1 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d9c0e2e16660ecbe33e780821e95508a1d7870b1 commit d9c0e2e16660ecbe33e780821e95508a1d7870b1 Author: Dimitry Andric AuthorDate: 2024-02-12 09:27:00 +0000 Commit: Dimitry Andric CommitDate: 2024-02-12 09:27:00 +0000 Revert "Build clang and other llvm executables as PIE" This reverts commit 470f9f13de10e47e6d45721c15af6b4abe7aad55. I need more time to figure out how to make this work correctly with incremental builds, which it currently miserably fails on. --- lib/clang/Makefile.inc | 6 +----- usr.bin/clang/Makefile.inc | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc index 5a8ead5292c6..2dfc966726b0 100644 --- a/lib/clang/Makefile.inc +++ b/lib/clang/Makefile.inc @@ -2,11 +2,7 @@ .include PACKAGE= clang - -# Build only PIE static libraries; bsd.lib.mk does support this directly. -MK_PIE:= no -CFLAGS+= ${PIEFLAG} ${SHARED_CFLAGS} -CXXFLAGS+= ${PIEFLAG} ${SHARED_CXXFLAGS} +MK_PIE:= no # Explicit libXXX.a references .if ${COMPILER_TYPE} == "clang" DEBUG_FILES_CFLAGS= -gline-tables-only diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 8f812e24fcdb..831cd56a8c25 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -3,6 +3,8 @@ WARNS?= 0 .include +MK_PIE:= no # Explicit libXXX.a references + .if ${COMPILER_TYPE} == "clang" DEBUG_FILES_CFLAGS= -gline-tables-only .else From nobody Mon Feb 12 10:25: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 4TYLFV5BcTz59WZV; Mon, 12 Feb 2024 10:25:34 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYLFV3dwCz4SKb; Mon, 12 Feb 2024 10:25:34 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:2000:826:171b:5496]) (Authenticated sender: micmac) by drew.franken.de (Postfix) with ESMTPSA id 3356C721E2806; Mon, 12 Feb 2024 11:25:31 +0100 (CET) Content-Type: multipart/signed; boundary="Apple-Mail=_3284E061-10A5-4CC5-929F-9C43F63145B7"; protocol="application/pkcs7-signature"; micalg=sha-256 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.400.31\)) Subject: Re: hitting Assertion !callout_active(&tp->t_callout) failed at /usr/src/sys/netinet/tcp_subr.c:2386 after 62d47d7 From: tuexen@fh-muenster.de In-Reply-To: Date: Mon, 12 Feb 2024 11:25:30 +0100 Cc: Richard Scheffenegger , transport@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <315341AE-5D85-49AE-B815-714A6BEFE027@fh-muenster.de> References: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> To: Dave Cottlehuber X-Mailer: Apple Mail (2.3774.400.31) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:2001:638::/32, country:DE] X-Rspamd-Queue-Id: 4TYLFV3dwCz4SKb X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --Apple-Mail=_3284E061-10A5-4CC5-929F-9C43F63145B7 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Feb 12, 2024, at 09:50, Dave Cottlehuber wrote: >=20 > On Mon, 12 Feb 2024, at 08:31, Dave Cottlehuber wrote: >> I'm repeatedly hitting this assert soon after boot on my ryzen = desktop=20 >> I've a coredump. >>=20 >> Panic String: Assertion !callout_active(&tp->t_callout) failed at=20 >> /usr/src/sys/netinet/tcp_subr.c:2386 >>=20 >> I'll apply your latest patch in=20 >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D276761#c16 and = report=20 >> back.. >=20 > Reporting back, insta-panic on boot at: >=20 > Panic String: Assertion !tcp_timer_active(tp, TT_REXMT) failed at = /usr/src/sys/netinet/tcp_subr.c:2387 >=20 > Does that help any? Sure! Could you provide any hints how to reproduce it? Best regards Michael >=20 > A+ > Dave > =E2=80=94=E2=80=94=E2=80=94 > O for a muse of fire, that would ascend the brightest heaven of = invention! >=20 --Apple-Mail=_3284E061-10A5-4CC5-929F-9C43F63145B7 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCEfMw ggUSMIID+qADAgECAgkA4wvV+K8l2YEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkRFMSsw KQYDVQQKDCJULVN5c3RlbXMgRW50ZXJwcmlzZSBTZXJ2aWNlcyBHbWJIMR8wHQYDVQQLDBZULVN5 c3RlbXMgVHJ1c3QgQ2VudGVyMSUwIwYDVQQDDBxULVRlbGVTZWMgR2xvYmFsUm9vdCBDbGFzcyAy MB4XDTE2MDIyMjEzMzgyMloXDTMxMDIyMjIzNTk1OVowgZUxCzAJBgNVBAYTAkRFMUUwQwYDVQQK EzxWZXJlaW4genVyIEZvZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMg ZS4gVi4xEDAOBgNVBAsTB0RGTi1QS0kxLTArBgNVBAMTJERGTi1WZXJlaW4gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtg1/9moUHN0vqH l4pzq5lN6mc5WqFggEcVToyVsuXPztNXS43O+FZsFVV2B+pG/cgDRWM+cNSrVICxI5y+NyipCf8F XRgPxJiZN7Mg9mZ4F4fCnQ7MSjLnFp2uDo0peQcAIFTcFV9Kltd4tjTTwXS1nem/wHdN6r1ZB+Ba L2w8pQDcNb1lDY9/Mm3yWmpLYgHurDg0WUU2SQXaeMpqbVvAgWsRzNI8qIv4cRrKO+KA3Ra0Z3qL NupOkSk9s1FcragMvp0049ENF4N1xDkesJQLEvHVaY4l9Lg9K7/AjsMeO6W/VRCrKq4Xl14zzsjz 9AkH4wKGMUZrAcUQDBHHWekCAwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU k+PYMiba1fFKpZFK4OpL4qIMz+EwHwYDVR0jBBgwFoAUv1kgNgB5oKAia4zV8mHSuCzLgkowEgYD VR0TAQH/BAgwBgEB/wIBAjAzBgNVHSAELDAqMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC LB4wCAYGZ4EMAQICMEwGA1UdHwRFMEMwQaA/oD2GO2h0dHA6Ly9wa2kwMzM2LnRlbGVzZWMuZGUv cmwvVGVsZVNlY19HbG9iYWxSb290X0NsYXNzXzIuY3JsMIGGBggrBgEFBQcBAQR6MHgwLAYIKwYB BQUHMAGGIGh0dHA6Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL29jc3ByMEgGCCsGAQUFBzAChjxodHRw Oi8vcGtpMDMzNi50ZWxlc2VjLmRlL2NydC9UZWxlU2VjX0dsb2JhbFJvb3RfQ2xhc3NfMi5jZXIw DQYJKoZIhvcNAQELBQADggEBAIcL/z4Cm2XIVi3WO5qYi3FP2ropqiH5Ri71sqQPrhE4eTizDnS6 dl2e6BiClmLbTDPo3flq3zK9LExHYFV/53RrtCyD2HlrtrdNUAtmB7Xts5et6u5/MOaZ/SLick0+ hFvu+c+Z6n/XUjkurJgARH5pO7917tALOxrN5fcPImxHhPalR6D90Bo0fa3SPXez7vTXTf/D6OWS T1k+kEcQSrCFWMBvf/iu7QhCnh7U3xQuTY+8npTD5+32GPg8SecmqKc22CzeIs2LgtjZeOJVEqM7 h0S2EQvVDFKvaYwPBt/QolOLV5h7z/0HJPT8vcP9SpIClxvyt7bPZYoaorVyGTkwggWsMIIElKAD AgECAgcbY7rQHiw9MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVy ZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYu MRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IDIwHhcNMTYwNTI0MTEzODQwWhcNMzEwMjIyMjM1OTU5WjCBjTELMAkGA1UEBhMCREUx RTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5lcyBEZXV0c2NoZW4gRm9yc2NodW5n c25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMGA1UEAwwcREZOLVZlcmVpbiBHbG9i YWwgSXNzdWluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ07eRxH3h+Gy8Zp 1xCeOdfZojDbchwFfylfS2jxrRnWTOFrG7ELf6Gr4HuLi9gtzm6IOhDuV+UefwRRNuu6cG1joL6W LkDh0YNMZj0cZGnlm6Stcq5oOVGHecwX064vXWNxSzl660Knl5BpBb+Q/6RAcL0D57+eGIgfn5mI TQ5HjUhfZZkQ0tkqSe3BuS0dnxLLFdM/fx5ULzquk1enfnjK1UriGuXtQX1TX8izKvWKMKztFwUk P7agCwf9TRqaA1KgNpzeJIdl5Of6x5ZzJBTN0OgbaJ4YWa52fvfRCng8h0uwN89Tyjo4EPPLR22M ZD08WkVKusqAfLjz56dMTM0CAwEAAaOCAgUwggIBMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P AQH/BAQDAgEGMCkGA1UdIAQiMCAwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAdBgNV HQ4EFgQUazqYi/nyU4na4K2yMh4JH+iqO3QwHwYDVR0jBBgwFoAUk+PYMiba1fFKpZFK4OpL4qIM z+EwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9v dC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9n bG9iYWwtcm9vdC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYI KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEF BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1nMi1jYS9wdWIvY2FjZXJ0 L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJv b3QtZzItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCBeEWkTqR/ DlXwCbFqPnjMaDWpHPOVnj/z+N9rOHeJLI21rT7H8pTNoAauusyosa0zCLYkhmI2THhuUPDVbmCN T1IxQ5dGdfBi5G5mUcFCMWdQ5UnnOR7Ln8qGSN4IFP8VSytmm6A4nwDO/afr0X9XLchMX9wQEZc+ lgQCXISoKTlslPwQkgZ7nu7YRrQbtQMMONncsKk/cQYLsgMHM8KNSGMlJTx6e1du94oFOO+4oK4v 9NsH1VuEGMGpuEvObJAaguS5Pfp38dIfMwK/U+d2+dwmJUFvL6Yb+qQTkPp8ftkLYF3sv8pBoGH7 EUkp2KgtdRXYShjqFu9VNCIaE40GMIIHKTCCBhGgAwIBAgIMJrRClNKRzetB0jc/MA0GCSqGSIb3 DQEBCwUAMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVp bmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUw IwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTIyMDUzMDEzMjIxNVoXDTI1 MDUyOTEzMjIxNVowgcQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIDBNOb3JkcmhlaW4tV2VzdGZhbGVu MREwDwYDVQQHDAhNdWVuc3RlcjEUMBIGA1UECgwLRkggTXVlbnN0ZXIxMjAwBgNVBAsMKUZhY2hi ZXJlaWNoIEVsZWt0cm90ZWNobmlrIHVuZCBJbmZvcm1hdGlrMQ8wDQYDVQQEDAZUdWV4ZW4xEDAO BgNVBCoMB01pY2hhZWwxFzAVBgNVBAMMDk1pY2hhZWwgVHVleGVuMIICIjANBgkqhkiG9w0BAQEF AAOCAg8AMIICCgKCAgEA2QZ7Uheto325SEnX2BTxBvYnz7u/BVmzxKlogaR4K0MA8ZcfNIdQkiJU efjL6imq21BSFsr/tXcODFZmPrvx9aIxjntCxmEFr7qFaw3e3mUIxJyj5n6BxjzZ/hyJte8LBDbj zj+e8WPUzXmYbSxtrh9kgw8NMx3+bo3Hslic+PkKEGx9JJp2I2TEs88xD0rHC2Ljwcfk6bS9jC+/ BAuY/TsbJoq+8d64DYSLGiIYbvMMuxM2C8BlpHLIOLx2FaH+uMqdH2dLVvCacZJ9YzHvvZY8O2nQ OBFCG1UMpX5YLHN8g/t02a+IBt+oe97JMdJ/kZsPjolI98dcRdzz0hTXZql2xvp6zlocm9iGTRcv dCSxy+0x4CIZD1EkVX9zCPGpzdTXnrU+zvnz14Uq3Wbfl3GiVgK0Avr1enfZepruAxAy7KGIm2zi /qY3XSkN8fvWJmYnomOjCRjaPtqS/azmnyeodsxlVhqQKbES65u/PbOXjOlhiYAvemS0IbK4iR76 3iSmkpwSNpJt6BCtFJN+w3Y8tztCP66KPPC1Fri1oj27KPaf04J66MkSjlQdpI7POS6lDyN7X2Hw tgZKRVA94h/JvZp4ld7mTzXTEW2tdO5azPILsL9xOYjSS5VIyUFF4MoxSbfZtXWaZFsMC1fXDNNL uRDrISotdwADuU75Fe0CAwEAAaOCAk4wggJKMD4GA1UdIAQ3MDUwDwYNKwYBBAGBrSGCLAEBBDAQ Bg4rBgEEAYGtIYIsAQEECjAQBg4rBgEEAYGtIYIsAgEECjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQE AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFDbROYIxDr3fvlX tkXqx7T8lihxMB8GA1UdIwQYMBaAFGs6mIv58lOJ2uCtsjIeCR/oqjt0MCAGA1UdEQQZMBeBFXR1 ZXhlbkBmaC1tdWVuc3Rlci5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu ZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9j ZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYB BQUHAQEEgc4wgcswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2 ZXIvT0NTUDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFs LWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRm bi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF AAOCAQEALubmL854icQMxKxOxQK+deXTjC6CLYnUDwB8MvnDC+BSeh3tUHT37fSgsK1ShNUSNJX0 YF0VYLfZ6+lPyaFYLArVrAIHqvDiVURaulB9NA+3gck/VSuRz4ILYBy61XbcGQQ8Wx+g6TcqsjsF oOhqEBycj5QuITj+EFmX8nvfo0dJtVa2OPDk1N9beLfQBcLhspJ/nv0pKhpNWv5YETG26YqYfsC7 FA/ZNGvRcoOPkjkDhBTtG+qq9DDD75XtGEBZhYXbnG15tn4/UV07B+UyK4/cqQSA+My5FML3YsQw EYrV9klVD/mLMOdZV5+95xt7O8IdYeHrBapVlhANH5bFazGCBJ0wggSZAgEBMIGeMIGNMQswCQYD VQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBG b3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVy ZWluIEdsb2JhbCBJc3N1aW5nIENBAgwmtEKU0pHN60HSNz8wDQYJYIZIAWUDBAIBBQCgggHPMBgG CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTI0MDIxMjEwMjUzMFowLwYJ KoZIhvcNAQkEMSIEIP39WuUAreGHn22WLuRFtjSFxuim8jByNnsvX0roiH6SMIGvBgkrBgEEAYI3 EAQxgaEwgZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZvZXJkZXJ1bmcg ZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsMB0RGTi1QS0kx JTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3rQdI3PzCBsQYL KoZIhvcNAQkQAgsxgaGggZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZv ZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsM B0RGTi1QS0kxJTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3r QdI3PzANBgkqhkiG9w0BAQsFAASCAgADyLF+B3xQC0oGc8xTPePfZgwQ+fwXjV2nuP+EF445FhUE oM8MrxSsq+ZqsBSsLgyArk98A6Y61DOIK91J9+iFBwuGGN6vTppKQDgW18QQRafI6ZyhBxX6Xk2Y oi5c/lUMW4xpyQVS1cAwNHcCXybHMgZNfaFUrWk4JHv9DmXUNEx/UaCwa6tx3U1+EGYif/R9K+zH vpW8P9g+a0GS6+TCWEM/XpYQ8C1xcD7usQztB1Cu6aEM5VWod5mIHHO2mtjZZM1BdqxP2cUZGyAC 5kJf/PMiSYBCCC/OY3LzeXPVMoTKw/cQPLWxnP4ytm3sPUPMMXu6BlrTHnOjiKOexaKPrFG31dIX +786s4aeKwynL/mhC91+3M7ZbtYyf73tRgLYz9/6pNJP4VlnkKzzZrxH0p0wS33tlf3sEOeVd/Sm OGb3plVeUMdWSxbTGbtN6/4YZmnULXcepvnr6p7sw5hwTbA0xAHCkFR8Ua7BRuyzq06iUdRklPkU xAR8VmYyj+QtnC4u4M8V9JRfeafvAPuOCBH61UX2oeBBaq4dqHfK7fNkqiSpfD90RwJTPlIh9bUL VbL2j1NI+79l/U1v6SRyNrPjCsj2XNZjSENb3q5KlZCEyg5NH0rgHv8irYu3XeFEdv4lzavMiNni 7BI1eSKUw9rb3Qx504FCMpSSBry0iAAAAAAAAA== --Apple-Mail=_3284E061-10A5-4CC5-929F-9C43F63145B7-- From nobody Mon Feb 12 10:26: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 4TYLGY0NJhz59WZb; Mon, 12 Feb 2024 10:26:29 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYLGX6jzqz4SN8; Mon, 12 Feb 2024 10:26:28 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:2000:826:171b:5496]) (Authenticated sender: micmac) by drew.franken.de (Postfix) with ESMTPSA id A1E63721E2806; Mon, 12 Feb 2024 11:26:26 +0100 (CET) Content-Type: text/plain; charset=utf-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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.400.31\)) Subject: Re: hitting Assertion !callout_active(&tp->t_callout) failed at /usr/src/sys/netinet/tcp_subr.c:2386 after 62d47d7 From: tuexen@freebsd.org In-Reply-To: Date: Mon, 12 Feb 2024 11:26:26 +0100 Cc: Richard Scheffenegger , transport@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> To: Dave Cottlehuber X-Mailer: Apple Mail (2.3774.400.31) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:2001:638::/32, country:DE] X-Rspamd-Queue-Id: 4TYLGX6jzqz4SN8 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated > On Feb 12, 2024, at 09:50, Dave Cottlehuber wrote: >=20 > On Mon, 12 Feb 2024, at 08:31, Dave Cottlehuber wrote: >> I'm repeatedly hitting this assert soon after boot on my ryzen = desktop=20 >> I've a coredump. >>=20 >> Panic String: Assertion !callout_active(&tp->t_callout) failed at=20 >> /usr/src/sys/netinet/tcp_subr.c:2386 >>=20 >> I'll apply your latest patch in=20 >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D276761#c16 and = report=20 >> back.. >=20 > Reporting back, insta-panic on boot at: >=20 > Panic String: Assertion !tcp_timer_active(tp, TT_REXMT) failed at = /usr/src/sys/netinet/tcp_subr.c:2387 >=20 > Does that help any? Sure! Could you provide any hints how to reproduce it? Best regards Michael >=20 > A+ > Dave > =E2=80=94=E2=80=94=E2=80=94 > O for a muse of fire, that would ascend the brightest heaven of = invention! >=20 From nobody Mon Feb 12 11:00: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 4TYM1b3wXXz59ZSh; Mon, 12 Feb 2024 11:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYM1b3QNgz4VY4; Mon, 12 Feb 2024 11:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707735619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZAlAlJeb2JQ/exs1zCcjDtd5kGZon1SuUjLiQOVI39M=; b=oHcW6ywqC2QelqxNwK7Iu8vphRDNwAwcow4H/CT4VM00fkkbcbSx/DzS4T2JfW8XDf6AMb yWMiWIZuxDd67Cl74Tgd84DzAB7Zi2hP0pAt11U9ya55G+6RJP7lhYWSg4gGBhfywE0ufT u8+d/t3ahqUFC/1DXfWeY7Br1vV2eStoZAi/HMqmN8vXpZbBNDG9MYDhxVxfS+SFIzULUS y+H8z7T9hcPNSPZ0HJhiZ2QeAwTsgWizuZy2nw8hB5QH5u2XoCZcnehYYVfNmyBlE+QlyB bJET611hv2VXhfamYcMP7Q65c43nWkgYKqclPj8UmRaCG5bAVUo/2D4ANkessw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707735619; a=rsa-sha256; cv=none; b=HgrRt51vpKKk/LLuqGI5k9ArUMq8+nZEQwI9aFcse+gvv9orafGTLezo511R8P42CdCqku Jy2pDE/JMWBSeCkR7K71ZQBQbsPxcyA0pMZEs/HUG43gRujlPXDEZn7opnFtHKmTl4hbPq HaO1jzDlasOob6NOVPTDYcirVElWkfY9V1ArTeidSDqU6ZdK0S7ldVe+G4dK5arTiVD8um XyQu22+n9H0aDSt6f9jI0sRwm7o+dNzGzskwBuitg4DOwX7fZVmexoYnkxmbVa4U7dEINK AJpwVD8mwBbzc8HWJ029RmKnP++UOLQb0aRn+Ob7dfjIfdHRgQJ8wwMJpyv4og== 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=1707735619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZAlAlJeb2JQ/exs1zCcjDtd5kGZon1SuUjLiQOVI39M=; b=qbw1QipCQUp+79wsoBEtnFr0kG2djQS72sKkueACOc1txnuBU4lXLjPuMmS6m6+5rOlG61 sStw/ArlhniOfTJ0VsdPjCKkueC3LZqyToNRL7Bsk+rOjWuSxEp1G0q7Db69VYx64ozUmW wSsd01jTXBl8XIdk+b8DClauEzniLVKh7W11h04JODzc8ImrFsT7Lh+j6/R482YmiNW2Ze 42vl9ojiFgRUKWaNloO3PGTYkZFGOMHCe6u4T3qQbmFG3bEqq+i2YvIwp/TdD0Z5o1fLpD Bbfd8MnsbSYB9ApGmTPhjZ03JvzpgJhQ/RgRpj+DFJ8eFUXAVLv33+jzKWGgGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYM1b2T0zzNnC; Mon, 12 Feb 2024 11:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CB0JTT033178; Mon, 12 Feb 2024 11:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB0JSF033175; Mon, 12 Feb 2024 11:00:19 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:00:19 GMT Message-Id: <202402121100.41CB0JSF033175@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: 09ba07011a62 - main - mixer(8): Improve error messsages and 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09ba07011a627e3ea05e0be8ee6db76fd2371540 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=09ba07011a627e3ea05e0be8ee6db76fd2371540 commit 09ba07011a627e3ea05e0be8ee6db76fd2371540 Author: Christos Margiolis AuthorDate: 2024-02-12 10:58:55 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 10:59:58 +0000 mixer(8): Improve error messsages and warnings No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, imp Differential Revision: https://reviews.freebsd.org/D43793 --- usr.sbin/mixer/mixer.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index bb868fb5ca9b..043c8c412857 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -66,9 +66,10 @@ main(int argc, char *argv[]) aflag = 1; break; case 'd': + errno = 0; dunit = strtol(optarg, NULL, 10); if (errno == EINVAL || errno == ERANGE) - err(1, "strtol"); + err(1, "strtol(%s)", optarg); dflag = 1; break; case 'f': @@ -92,11 +93,11 @@ main(int argc, char *argv[]) /* Print all mixers and exit. */ if (aflag) { if ((n = mixer_get_nmixers()) < 0) - err(1, "mixer_get_nmixers"); + errx(1, "no mixers present in the system"); for (i = 0; i < n; i++) { (void)snprintf(buf, sizeof(buf), "/dev/mixer%d", i); if ((m = mixer_open(buf)) == NULL) - err(1, "mixer_open: %s", buf); + errx(1, "%s: no such mixer", buf); initctls(m); if (sflag) printrecsrc(m, oflag); @@ -111,7 +112,7 @@ main(int argc, char *argv[]) } if ((m = mixer_open(name)) == NULL) - err(1, "mixer_open: %s", name); + errx(1, "%s: no such mixer", name); initctls(m); @@ -212,7 +213,7 @@ initctls(struct mixer *m) } if (rc) { (void)mixer_close(m); - err(1, "cannot make controls"); + errx(1, "cannot make mixer controls"); } } @@ -315,7 +316,7 @@ set_dunit(struct mixer *m, int dunit) return (-1); } if (mixer_set_dunit(m, dunit) < 0) { - warn("cannot set default unit to: %d", dunit); + warn("cannot set default unit to %d", dunit); return (-1); } printf("default_unit: %d -> %d\n", n, dunit); From nobody Mon Feb 12 11:00: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 4TYM1c4xvjz59ZSn; Mon, 12 Feb 2024 11:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYM1c4Nwzz4VGx; Mon, 12 Feb 2024 11:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707735620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GpBcbkpSKR3+qLhsUi6FUk3SL/5wbL/Mb4aITLW94+U=; b=t93wul6I1Nz47/mu/KFP/LEg/Sb044poaWRC6/pZn7Lga50M79FBCKW5KkXilZwsOPADtw GLiz+prJjGjgSSxYFcylyIq0Be1kanrNhnkbFO8zxtFib9cK0TIp9sCd7t4pCn46m6I1QV Tq0jZASuO5dvdy6BUmRSFJHE55Q8L5yf0m64cWdW/ObQzxd/FuRSjz6xTaXgP41mfqCTEq NfyNyGv2a+OTkxpoyY3IlCWijXwAmMIcUlu8coGsPqjlI2nF12nF/xpyqmBzVlEQ3Bjwwd 7n6DiL+XwyqjsPiEWr71nXGYjsX2gIZshscPqiKGBSUlcIg5ADPfMKSen1hG2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707735620; a=rsa-sha256; cv=none; b=jCKvYHwdZrEMbQz4+3IlvenP5UbrQ/d4EKbD0QXDbpH3jCG/IJSH+PL0lr2+qh2WdQhZiO JuuBq9iap+LefVwmUSmA87wtwjNJ/fmNhP5soLvzZZk5g/q4311q2i6R5x52SZOv932J3x KekkhHcMJrqsCJKUVGR2XAzm6vpcsxdt/on0afuM/a+0Y15/3KqLArEIHp9aflHXFjf/3O YyMdXqPXPaSyGFf9vjWhGdcM/UuCHzyTVjWJE/i1uKqatxQbx4qo1gTf/u5M30w7tzxTyQ 5RuItjpsp3sTqs00kt2VIvVD/PPhtnmZdJvD5ePk5ruBzpE008k9u7alV0R6hw== 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=1707735620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GpBcbkpSKR3+qLhsUi6FUk3SL/5wbL/Mb4aITLW94+U=; b=nLcVC9AmcQ7xi2UbYbFgYm70T9eHqjFiiz6MaIBDXsMm7UaHQRI1oGitUOxm84/6C7sAh1 hz+Fp4Udd9+30u41PigaMyIHismtjaGlB1ULtbXhjdPZAst4YR0WzXTFcCe2HMZbADECXg ghXI55lzRR4st8ZX0Vj/U+KBUgxQ4F7BG3bmEFUdsHzgk/R1L+E+aEazff6HLPI7DoQNkA VTrm51HJ7Xmt6MG0JnWFp9M+RlqZrJnvZA9MUMjqJ2wmcVlpzDmmqovrHw2I4xUpQt4ljn EhKiI9JA1u6pSC3exCcuOuwX26IAsZ27yDNrPZkk/k3FP6zjyu7AedJeOvNHRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYM1c3VvhzNpw; Mon, 12 Feb 2024 11:00: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 41CB0KGH033241; Mon, 12 Feb 2024 11:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB0K7h033239; Mon, 12 Feb 2024 11:00:20 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:00:20 GMT Message-Id: <202402121100.41CB0K7h033239@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: 75be886e58dc - main - mixer(8): Allow full PCM device names as input for the -d 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75be886e58dc237b633104fc9cf8d7d1285e4003 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=75be886e58dc237b633104fc9cf8d7d1285e4003 commit 75be886e58dc237b633104fc9cf8d7d1285e4003 Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:02 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:00:05 +0000 mixer(8): Allow full PCM device names as input for the -d option The -d option is a wrapper around hw.snd.default_unit. Currently mixer(8) expects the option argument to be just the unit's number (e.g pcm0 -> 0). To avoid confusion, allow full device names of the form "pcmN" as well. While here, improve the -d option's description in the man page. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, imp Differential Revision: https://reviews.freebsd.org/D43794 --- usr.sbin/mixer/mixer.8 | 23 ++++++++++++++--------- usr.sbin/mixer/mixer.c | 6 ++++-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index 10a461d91693..5750b81c98c5 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -19,7 +19,7 @@ .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN .\" THE SOFTWARE. .\" -.Dd January 12, 2024 +.Dd February 8, 2024 .Dt MIXER 8 .Os .Sh NAME @@ -28,12 +28,11 @@ .Sh SYNOPSIS .Nm .Op Fl f Ar device -.Op Fl d Ar unit +.Op Fl d Ar pcmN | N .Op Fl os .Op Ar dev Ns Op Cm \&. Ns Ar control Ns Op Cm \&= Ns Ar value .Ar ... .Nm -.Op Fl d Ar unit .Op Fl os .Fl a .Nm @@ -44,16 +43,17 @@ The utility is used to set and display soundcard mixer device controls. .Pp The options are as follows: -.Bl -tag -width "-f device" +.Bl -tag -width "-d pcmN | N" .It Fl a Print the values for all mixer devices available in the system .Pq see Sx FILES . -.It Fl d Ar unit +.It Fl d Ar pcmN | N Change the default audio card to -.Ar unit . -The unit has to be an integer value. -To see what unit values are available, look at the number each mixer device has by running -.Nm . +.Ar pcmN , +where N is the unit number (e.g for pcm0, the unit number is 0). +See +.Sx EXAMPLES +on how to list all available audio devices in the system. .It Fl f Ar device Open .Ar device @@ -218,6 +218,11 @@ opens when the option has not been specified. .El .Sh EXAMPLES +List all available audio devices in the system: +.Bd -literal -offset indent +$ mixer -a | grep ^pcm +.Ed +.Pp Increase the volume for the .Cm vol device of the first mixer found by 5%: diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 043c8c412857..0c0c37ccb2bc 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -66,6 +66,8 @@ main(int argc, char *argv[]) aflag = 1; break; case 'd': + if (strncmp(optarg, "pcm", 3) == 0) + optarg += 3; errno = 0; dunit = strtol(optarg, NULL, 10); if (errno == EINVAL || errno == ERANGE) @@ -194,8 +196,8 @@ next: static void __dead2 usage(void) { - fprintf(stderr, "usage: %1$s [-f device] [-d unit] [-os] [dev[.control[=value]]] ...\n" - " %1$s [-d unit] [-os] -a\n" + fprintf(stderr, "usage: %1$s [-f device] [-d pcmN | N] [-os] [dev[.control[=value]]] ...\n" + " %1$s [-os] -a\n" " %1$s -h\n", getprogname()); exit(1); } From nobody Mon Feb 12 11:00: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 4TYM1f0lFcz59ZSq; Mon, 12 Feb 2024 11:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYM1d5QSMz4Vdc; Mon, 12 Feb 2024 11:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707735621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S4dW34hU4kO0nr/hKSKBNb4Y/TtP0yFmsBX9vVy52Tk=; b=AZ/h8pWPJ6Nff5upot1Wr/2P3NA7e1WfYUqHP0XNXz6h4Rdv/+rZNnOItvNWG9NnHqk0pC tZTgLlAUuDullmEpUOjrsrNtdzUFr7uds0mhadKKXiS9jaEYYIkjZ8oOS3GJG4eM1gAugF +/RsX9KoyhLFrHooDvVAHoC88L8qGMLdTFj1FE9hQNZTnivzX95DeIQt9kEtSLCn4pULHb Pc5DzKiy+Jsrd/L12wu6qBLqR6jaYBEtKJ/qlmavXeWClYXH/6yLlOkUxQ7WwMmPqts/QP 5Q1dy4IFEFIIabqXC28qmhkl9HqFXIo+BeH2AxhQ66veqxosrCF7DgN8oSFPhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707735621; a=rsa-sha256; cv=none; b=r8IqQM7AE92J0A9J6V0AmjZGwT3yD1lHRlYk1EI1/6gKfnlglEveWO/8bF3UXoJ8GvfaDi TreQPQzjAKYnMAd/k4XS5OFFkxW/vnpbNRw9blGkJUDfuyAT7eCMTmtrHsr23JRIgzOiE7 THiyNLVMKAdq/IfQwrSSYj5S1P4BDl9WF44FaJZ12/8AwPd42LO2IK6eXUzKIun0N7r+uH lcE7QZyKPZZYAi3Q8EIEH0WzHNppkrAOavmHDlfdRra8n7umQfVVxzf93it60YUSdRSIom wfMcxDoHyVjv39cA7mT48AIJoEqAewXwL2I8/m2gMAlp3UUOcJJlC1sW/qfPOA== 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=1707735621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S4dW34hU4kO0nr/hKSKBNb4Y/TtP0yFmsBX9vVy52Tk=; b=YFV9yLsENJxZ7ujQAQ13Elfva5Uiri04bhtUhmJVDqEwd+nrXHb1vybzIh9XKuvyYAeAG3 XXuFgRn0W9kEitOVEC86mN8sytYlcY+DAyJ5iWkfxaVD51ghKcRguvej1DwY6RcF2cNkyd ipXNr9mMkHwDQUZCEHCyRPSzDA9cM2+TdWdZN8UQ9z7zK7v3ooRMu7P2cyVzBYj3+ADBk5 6E5uJa9NZU5CYF4p5V8QX08bbVhvaEifHwdR89oJpsAuKsbs2RE7DK/oEka4vtzCKhfMcA qgzQLu4+GvtjS8k4bwbnUFN3ZNOMvZhQKlnlLkB8jqLYRcGZawHGZAgreLX6PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYM1d4VJxzNRT; Mon, 12 Feb 2024 11:00: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 41CB0L5u033280; Mon, 12 Feb 2024 11:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB0L0X033277; Mon, 12 Feb 2024 11:00:21 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:00:21 GMT Message-Id: <202402121100.41CB0L0X033277@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: 7bd14d09a92a - main - mixer.8: Fix wrong 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bd14d09a92a63f217ccee92e7fc9a1d6d60b387 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7bd14d09a92a63f217ccee92e7fc9a1d6d60b387 commit 7bd14d09a92a63f217ccee92e7fc9a1d6d60b387 Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:16 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:00:05 +0000 mixer.8: Fix wrong sentence 246e0457d93071ffd901c78e3ee7badc5f51bd4c ("mixer.8: Add terse example for increasing volume") mentions that the example changes the volume of the "first mixer found", while the example shows how the change the volume of the current mixer's "vol" device. Re-phrease sentence to reflect the actual behavior of the command. Also, improve the example by using the % operator, instead of hardcoding 0.05. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D43795 --- usr.sbin/mixer/mixer.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index 5750b81c98c5..db0ec5f23a0c 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -223,11 +223,11 @@ List all available audio devices in the system: $ mixer -a | grep ^pcm .Ed .Pp -Increase the volume for the +Increase the .Cm vol -device of the first mixer found by 5%: +device's volume by 5%: .Bd -literal -offset indent -$ mixer vol=+0.05 +$ mixer vol=+5% .Ed .Pp Change the volume for the From nobody Mon Feb 12 11:00: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 4TYM1g10R0z59ZLp; Mon, 12 Feb 2024 11:00: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 4TYM1f6RCPz4VHZ; Mon, 12 Feb 2024 11:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707735622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fd0oGpjmEM+fAQQy9KeMYwSLIG3SKArAAchGCNiFzCg=; b=YF10GsyjGfC87gsxLnuyui+wC+1+SKdft0usXm0MV3XfGFXI52czDqrosyx9H/T1bNaxQm IcL80+zuor0IprbMjCZG6ti4vHDJjW+ZmcQ7bjWp4A9bH+0r9MFbhh7m6nE/qC2pHsofV0 /dDj+E6gJgOKaoubZebftEvO5waeVo0G5Dkc7XuNWQtUOw8SUSCxwVj1qVINZm1sOg/ZW1 tLTsnWVsAaKLEcPtPzYGwVHERkWJLjmqKs5oWrzqKUEHhbLkQbqQvLYS0a9l+zPEmCy6s0 uYx5Fad6dV+btnXD7Yz2ucG20VS5FF1ENdrNcAF8Alvsm+MTMSmzHediOlfFTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707735622; a=rsa-sha256; cv=none; b=ICQiWAAMRMRVNtH1NtEwNd8yesy1ZAadQObN+JKp1aJU5a0Myn/D+3fKq6eqnXLiwZTlqp DwvMdNud++QMBcuqk8BmYuy5jn0zp8JYtI3q6wSwVcpT1KejsZOOkUiz2SHEWXunSSGM1i 7tVdT2/E4skhHz6vZKti45Olg5Yptsbq+y6n5CmLHN3JEMGDYbwY+GDZeV8HMPDJ6grBFi Y8Czgp8mkDCewUH36nP76SeIolM57mSSzIIHUXuO0IJmZHCX+dXhpbFEiVOwTbXCYjskXf Kx7CjZ7TWzXUMkY5YP94J/jovvfjeHzYSWrtNAY8zEOdR3CXuB+lZE5pj94YHA== 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=1707735622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fd0oGpjmEM+fAQQy9KeMYwSLIG3SKArAAchGCNiFzCg=; b=oJvt+utIjsq/Ls+oBbYInvKguvWKH/M1ZbSHAtEZqQaFtqdUYtZlQoEqx1Ce9gRZ0UWi47 zQieMF/6lytMl5KsVLPDI4h6WBnSt8T4kGeiHxYFr8m4iuhIrhPTCP/vG0GnvR2KjxK10E X4TPwwVIep6xVFESzXh7NxLQXfei3vYo/3NMJXuSSAnMiCu+oMimi/BIZuh3nImGb/E+dD fSiqxXmW7gSyOJvwT9SWQNwgXK9RzBPmUfTYhhLw7DBCNj9xFDWA2gjhRMHX7X6dCf13vx CrMFDWxKcsC1SnQZgvK9z7fkCq4ISGqL3W5BTK7jacTW9Uqpzs4z7pXFVYR6eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYM1f5TyzzNRV; Mon, 12 Feb 2024 11:00: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 41CB0MUD033325; Mon, 12 Feb 2024 11:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB0M4G033322; Mon, 12 Feb 2024 11:00:22 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:00:22 GMT Message-Id: <202402121100.41CB0M4G033322@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: cc7479d7dc9b - main - mixer(8): Improve mute and recsrc controls 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc7479d7dc9b895c0a2f4d3805315437e03d0cf6 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cc7479d7dc9b895c0a2f4d3805315437e03d0cf6 commit cc7479d7dc9b895c0a2f4d3805315437e03d0cf6 Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:22 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:00:05 +0000 mixer(8): Improve mute and recsrc controls The input options of "dev.mute" (+, -, ^) and "dev.recsrc" (+, -, ^, =) are quite cryptic. Allow the input to also be an actual description of what these options do. + -> add (recsrc) - -> remove (recsrc) ^ -> toggle (recsrc, mute) = -> set (recsrc) 0 -> off (mute) 1 -> on (mute) Also, deprecate the use of the symbol options in the EXAMPLES section of the man page, by using the new descriptive options. In the future, we might want to get rid of the symbol options altogether, but preserve backwards compatibility for now. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, imp Differential Revision: https://reviews.freebsd.org/D43796 --- usr.sbin/mixer/mixer.8 | 33 +++++++++++++++++--------------- usr.sbin/mixer/mixer.c | 52 +++++++++++++++++++++++--------------------------- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index db0ec5f23a0c..75c6a81e3a55 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -114,7 +114,9 @@ with one of the available devices): .Oo Cm \&: Oo Cm \&+ | Cm \&- Oc Ar rvol Oo % Oc Oc .Xc .It Ar dev Cm .mute Ta Cm 0 | 1 | ^ +.It Ar dev Cm .mute Ta Cm off | on | toggle .It Ar dev Cm .recsrc Ta Cm ^ | + | - | = +.It Ar dev Cm .recsrc Ta Cm toggle | add | remove | set .El .Sm on .Pp @@ -150,14 +152,14 @@ The .Ar dev Ns Cm .mute control (un)mutes a device. The following values are available: -.Bl -tag -width = -offset indent -.It Cm 0 +.Bl -tag -width "xxxxxxxxxx" -offset indent +.It Cm 0 | off unmutes .Ar dev -.It Cm 1 +.It Cm 1 | on mutes .Ar dev -.It Cm ^ +.It Cm ^ | toggle toggles the mute of .Ar dev .El @@ -174,22 +176,23 @@ To modify the recording source you can use one of the following modifiers on a .Sy rec device: -.Bl -tag -width = -offset indent -.It Cm ^ +.Bl -tag -width "xxxxxxxxxx" -offset indent +.It Cm ^ | toggle toggles .Ar dev of possible recording devices -.It Cm + +.It Cm + | add adds .Ar dev to possible recording devices -.It Cm - +.It Cm - | remove removes .Ar dev from possible recording devices -.It Cm = -sets the recording device to +.It Cm = | set +makes .Ar dev +the only recording device. .El .Sh FILES .Bl -tag -width /dev/mixerN -compact @@ -250,16 +253,16 @@ $ mixer mic.volume=+0.10:-0.05 Toggle the mute for .Cm vol : .Bd -literal -offset indent -$ mixer vol.mute=^ +$ mixer vol.mute=toggle .Ed .Pp -Set +Add .Cm mic -and toggle +and remove .Cm line -recording sources: +from the recording devices: .Bd -literal -offset indent -$ mixer mic.recsrc=+ line.recsrc=^ +$ mixer mic.recsrc=add line.recsrc=remove .Ed .Pp Dump diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 0c0c37ccb2bc..83e97df19116 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -413,26 +413,24 @@ mod_mute(struct mix_dev *d, void *p) m = d->parent_mixer; cp = mixer_get_ctl(m->dev, C_MUT); val = p; - switch (*val) { - case '0': + if (strncmp(val, "off", strlen(val)) == 0 || *val == '0') opt = MIX_UNMUTE; - break; - case '1': + else if (strncmp(val, "on", strlen(val)) == 0 || *val == '1') opt = MIX_MUTE; - break; - case '^': + else if (strncmp(val, "toggle", strlen(val)) == 0 || *val == '^') opt = MIX_TOGGLEMUTE; - break; - default: - warnx("%c: no such modifier", *val); + else { + warnx("%s: no such modifier", val); return (-1); } n = MIX_ISMUTE(m, m->dev->devno); if (mixer_set_mute(m, opt) < 0) - warn("%s.%s=%c", m->dev->name, cp->name, *val); + warn("%s.%s=%s", m->dev->name, cp->name, val); else - printf("%s.%s: %d -> %d\n", - m->dev->name, cp->name, n, MIX_ISMUTE(m, m->dev->devno)); + printf("%s.%s: %s -> %s\n", + m->dev->name, cp->name, + n ? "on" : "off", + MIX_ISMUTE(m, m->dev->devno) ? "on" : "off"); return (0); } @@ -448,29 +446,26 @@ mod_recsrc(struct mix_dev *d, void *p) m = d->parent_mixer; cp = mixer_get_ctl(m->dev, C_SRC); val = p; - switch (*val) { - case '+': + if (strncmp(val, "add", strlen(val)) == 0 || *val == '+') opt = MIX_ADDRECSRC; - break; - case '-': + else if (strncmp(val, "remove", strlen(val)) == 0 || *val == '-') opt = MIX_REMOVERECSRC; - break; - case '=': + else if (strncmp(val, "set", strlen(val)) == 0 || *val == '=') opt = MIX_SETRECSRC; - break; - case '^': + else if (strncmp(val, "toggle", strlen(val)) == 0 || *val == '^') opt = MIX_TOGGLERECSRC; - break; - default: - warnx("%c: no such modifier", *val); + else { + warnx("%s: no such modifier", val); return (-1); } n = MIX_ISRECSRC(m, m->dev->devno); if (mixer_mod_recsrc(m, opt) < 0) - warn("%s.%s=%c", m->dev->name, cp->name, *val); + warn("%s.%s=%s", m->dev->name, cp->name, val); else - printf("%s.%s: %d -> %d\n", - m->dev->name, cp->name, n, MIX_ISRECSRC(m, m->dev->devno)); + printf("%s.%s: %s -> %s\n", + m->dev->name, cp->name, + n ? "add" : "remove", + MIX_ISRECSRC(m, m->dev->devno) ? "add" : "remove"); return (0); } @@ -493,7 +488,8 @@ print_mute(struct mix_dev *d, void *p) struct mixer *m = d->parent_mixer; const char *ctl_name = p; - printf("%s.%s=%d\n", m->dev->name, ctl_name, MIX_ISMUTE(m, m->dev->devno)); + printf("%s.%s=%s\n", m->dev->name, ctl_name, + MIX_ISMUTE(m, m->dev->devno) ? "on" : "off"); return (0); } @@ -506,7 +502,7 @@ print_recsrc(struct mix_dev *d, void *p) if (!MIX_ISRECSRC(m, m->dev->devno)) return (-1); - printf("%s.%s=+\n", m->dev->name, ctl_name); + printf("%s.%s=add\n", m->dev->name, ctl_name); return (0); } From nobody Mon Feb 12 11:00: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 4TYM1h2b3vz59ZYl; Mon, 12 Feb 2024 11:00: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 4TYM1h0LLSz4Vn0; Mon, 12 Feb 2024 11:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707735624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQrOaTQMMuj6xCyGIxaGjyP9QLQKb3zUGAeq0+RanRo=; b=VxckLDQy5CTDdFEG1i/u5ShGDX3YlcwgCGpWOrjS8fatJjE+Z5Ukr4Mp/tQS+DeoGvdrn4 burVYPYD84OY+yBkab/w45LTlf+r4WBgIy9h+F4u1lThXFBTbAZ8LK4rrDZ5MXpGE6mx3s bU25+kVo6PLTENM3QAtrc/EREM7bnCRy0TRyZROwzEez6MvwE6ueF8QiEzJgqFJaNITwnS JPdD1Q6vvterjCTL6MGg62zAlOONtExeEg4R1qqwbpeySeEwuaTztweoyj8u48q+etwb2V udmndrHk1MUXtQvRtFwJ98aljLe89OVvnded7ZhPV95X4Tjc+9DUPxYZiWy1zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707735624; a=rsa-sha256; cv=none; b=KhID5WSf23yTLA7TyU+iOZ7yit3/E5kb9Kdo8pfpf5rzjIYeGwx1XGh4iGS2pieHJxhb1a cxb+ZZaQFIxqwvj+ba3AOjz65vtyEGScCUMuuFe4YVJWJ1y/ZidWcLYXGfiZVdmZE16pS9 7+mjgGZdfMYLPZ3FFkeHTH7TWLj9LN0IpJgQ+FAXVN32hEB+QxgnryOzPNi8Wx1YcYb674 yhz5ZAhRy1fJW2ywsPlSTYPRSUPMo+ZwPKo6yjiKHOW2uWKMVnGdQva+4xc7saQX5E1UZ4 t6MlPFG+78+xKJ72FCQAnYBULwkPCaHiwlgrdPRMMMu+hNV8FtcHCWc/7+ic1g== 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=1707735624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQrOaTQMMuj6xCyGIxaGjyP9QLQKb3zUGAeq0+RanRo=; b=W79tQ1Orz2VCCcy+pNNyR/nYrRU1eL7dQf6FLuISUpcibsOyqoAnUVaFVL7Ya07fIFk/TH VvyK8I6M1NUMUiuPHiCzR7QDPEwKxk7PL3LA9v/G16PrCvAqzpskjNiKne24aejgspAuYx g1rI6C4r1uTayi0ylKtsQvvXfTHTlxosHk19Sw1r9njlOU3grXEPuY0+elywkvX3WktDjI ruqmu8+35stG5HWUw/LHBVsVAqlls/u6T0ul7zh88fuWgXo3KVUuEhq1Ma38J4fuoIuZHI Xkb0NGTBERQSGqjgVVYPuzfKqBNUscdBr1LEy2fgYkA3b8BndWr0xEQOkgljqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYM1g6XTGzPDQ; Mon, 12 Feb 2024 11:00: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 41CB0NGV033388; Mon, 12 Feb 2024 11:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB0N7s033386; Mon, 12 Feb 2024 11:00:23 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:00:23 GMT Message-Id: <202402121100.41CB0N7s033386@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: 5daa7cf42f45 - main - mixer(8): Use new mixer if we change the default unit 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5daa7cf42f4551cb2f4a452fd038807925320eac Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5daa7cf42f4551cb2f4a452fd038807925320eac commit 5daa7cf42f4551cb2f4a452fd038807925320eac Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:28 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:00:05 +0000 mixer(8): Use new mixer if we change the default unit If we use the -d option to change the default unit, close the current mixer and open the one we set as the default to avoid printing and applying changes (if any) to the old one. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D43809 --- usr.sbin/mixer/mixer.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 83e97df19116..47d8e6359b73 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -118,8 +118,21 @@ main(int argc, char *argv[]) initctls(m); - if (dflag && set_dunit(m, dunit) < 0) - goto parse; + if (dflag) { + if (set_dunit(m, dunit) < 0) + goto parse; + else { + /* + * Open current mixer since we changed the default + * unit, otherwise we'll print and apply changes to the + * old one. + */ + (void)mixer_close(m); + if ((m = mixer_open(NULL)) == NULL) + errx(1, "cannot open default mixer"); + initctls(m); + } + } if (sflag) { printrecsrc(m, oflag); (void)mixer_close(m); From nobody Mon Feb 12 11:00: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 4TYM1j1nfsz59ZYq; Mon, 12 Feb 2024 11:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYM1j15khz4VZD; Mon, 12 Feb 2024 11:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707735625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X32RC32XxwTTI5KevtY0Y4mAMmUzYJ4q/PlbNLPH8yg=; b=G17sVmmofiw3ppid+yxxUiiy2MPHalZrfzCAWXYwvEmBHwan+oumiNpIJJ8ob6zGorQru5 1Th3YA9bbbK8sTXZf1Rbyhg/WUuDTJHuyxM6W+PQPLHT/2Cw65/O6Hgnde3QEFUfI6UPaz 20jNVI1f8yvKJIm52PkAiNUpgAyodqMINyj8bzRiEwKvp6Z5eGLm1ArFiNQkrDq8w3EhVw 4wOWAoM0K66wQeTidOi6eqtXAnmeFdOlcgne2NLdi3TRJi3CZ88Sj/kzgrvZSVH6kh6Ksg ke1VtuE0MA3BEhPPYxA1bTk2oW77I5bLeMv3KcmSFflHPOF2bBf+c/Qb9u2s4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707735625; a=rsa-sha256; cv=none; b=Dy0BtmEb3ZF491s/xWhbY45D/8rJ2hMNUEpLY2imAoEYhQNl1UhVTkDuNr+9ksbmZGuwmp 8KWvqGvGtLyzfqpME8rU4n5EZO1i10idtel7OXofZHVh2s3mJLUVdI24AfTBNfWIOGF1Hl zuGgqvGyqtQJxHbHVzc9t6PMxqLQZsfuBB72k2Q47/9FMe1aNnAGQ9TSqyAWulR6lfBec3 JRSDv5L81re5REwh8OZAH05wy0z98ak7W8X1v1VHEXBsmgIa0bf0KY+mVJwhJ8uxruQzUp +vFiADl7um+xmVVZthlfXygsy0eMDRDgjfbw5ZQWby9IZ0kWyvHZDJ4tj501vw== 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=1707735625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X32RC32XxwTTI5KevtY0Y4mAMmUzYJ4q/PlbNLPH8yg=; b=kTDlPbQPep4wWlV0ah+VAdAMBSjMLSXJV77rJqnfw4xJGo3p007KsDjKa12ERcPYLJfwmG pPAyv1cVyj+etcJJemhVoQdVW3dDYmIKWx4l88b7zxjh/B508lDlC5Wp8Lnk8EiCtW1IaS xl+abvXzNqJHRFs4vfPhFe/Dc0NSVvFfYQQD39HRKGcdm6srDdZ8026FFB0q+QxL6g313L orqrPtxTO1IN3I19P2g5I7Kzd6m6PIwImg//l+19U/cm0nT0rPSl/1LB2ZrzVwnNNB7jlP qlGRIbeDLpEuzcXUlJoMYoaO7Ayakj+UjX4yvWEatP+d59fQoD6+8TQ5HYRRYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYM1j0CHxzNnD; Mon, 12 Feb 2024 11:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CB0OJd033431; Mon, 12 Feb 2024 11:00:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB0Oeb033428; Mon, 12 Feb 2024 11:00:24 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:00:24 GMT Message-Id: <202402121100.41CB0Oeb033428@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: 53c768e6836a - main - mixer(3): Do not hardcode "/dev/mixer" 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53c768e6836a32c8dcd0b0b422a169ef7a82a3ab Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=53c768e6836a32c8dcd0b0b422a169ef7a82a3ab commit 53c768e6836a32c8dcd0b0b422a169ef7a82a3ab Author: Christos Margiolis AuthorDate: 2024-02-12 10:59:32 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:00:05 +0000 mixer(3): Do not hardcode "/dev/mixer" We have BASEPATH defined. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D43812 --- lib/libmixer/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libmixer/mixer.c b/lib/libmixer/mixer.c index d78ca6e0fc87..93ace1d0c69b 100644 --- a/lib/libmixer/mixer.c +++ b/lib/libmixer/mixer.c @@ -87,7 +87,7 @@ mixer_open(const char *name) dunit: if ((m->unit = mixer_get_dunit()) < 0) goto fail; - (void)snprintf(m->name, sizeof(m->name), "/dev/mixer%d", m->unit); + (void)snprintf(m->name, sizeof(m->name), BASEPATH "%d", m->unit); } if ((m->fd = open(m->name, O_RDWR)) < 0) From nobody Mon Feb 12 11:08: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 4TYMCL35hZz59bDV; Mon, 12 Feb 2024 11:08: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 4TYMCL0ftKz4Y3g; Mon, 12 Feb 2024 11:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=249hNd4P0OXZHjvJwM+ORSaqkw9gTESp+HGidM7NOg8=; b=T28EzHgtLvF3uNmss9OkSt9kAiCVH1RFXKIkPW8g416BlntFug4DKs5wwAyPYc3YpdRqbE YchpOn6RJabVDd9vyIqZEwPBjXHXEyQ21n+AnPNajGIabfj9STc4ZMAEf+F/gJmlrjaE6p 3KPUIOnmQV1Y0p3/WN9AsdnqA9IL4P6kwIOs11ER47gVTNj+AT6P4vmg96zTqpHXHeQ3f5 oPqOzbXRWDhZcRGxSUN/6DB06lcrB4Ymg7eGSDcrHOHZyRxt6TEyWsEfRi0M9uxTb5+8LY b0zpkkjVfB5Wh/U0/b2YeJz7luLefyEsFhbXvMcIy6EYzIrr/b0bHfoNUhvSew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736126; a=rsa-sha256; cv=none; b=T7GNaxnDyJjU2F48ffvQuAHX267uUe4PBi40YCnbttPeLXteFcnVHMN71kt60dSfoinF25 GX4WV3ENKoUH81zHwg1N8xc7+xZjfco8juqVLFyBdvlCmi3rutN6zhvHDpr7xP+tR9CV5z ZcLD0kIC3+OxNyhhmwLDvsDgiTjrEoABgtu5o3+adWCBFp4UcweZQh8cFV+NH478QC7K63 r64i8vuToIcEODnrPQG5CJ3TFpGAdDvbbeqggf9X2P9W+CiQUs8qt9u1HphzyykEhP5/8D csiA9xBtNs18vv6uyRMDXWNyocjMISKLJVoNqCPc1pupKtaK5hJ4WAn8147tjg== 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=1707736126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=249hNd4P0OXZHjvJwM+ORSaqkw9gTESp+HGidM7NOg8=; b=yf7OqHnV909UPne1WKJSR3sq/4GkaUYIZ2FUbTOxBVTq5HYNlLq2qhdPwhKTH3JucLP9LD 9fPxlIipQ4ap+7rkHJUw4UoKtaONr8hevRwJNkoj3/HnLx3VdJNQIbmChWFC4iEvhRaPdL bBDXi4D5Xe+2hrk11I38buPHUqN/IIxfnUg8GRnjGf1nHzZcupyJYf+ztBqxxpfsX3Qsvr 7jhIn9xBJy7GfeCkS3mCDJivohx7IpFc4rGDZJFtBGnTa2nWZxAnTa4Fb/U0cCdVqP0p3d E/3ft05UvJTbCPBHwqw2912E8nCrNTI0U9LeHBLQDTZUPt9i7jqfLME4lAlP4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCK6qvkzPDl; Mon, 12 Feb 2024 11:08: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 41CB8j67041220; Mon, 12 Feb 2024 11:08:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB8jHD041217; Mon, 12 Feb 2024 11:08:45 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:45 GMT Message-Id: <202402121108.41CB8jHD041217@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: b2e97edffdab - main - snd_uaudio(4): Adapt buffer length to buffer_ms tunable. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2e97edffdab6ad1e9103a6bbe90300d78a961ed Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b2e97edffdab6ad1e9103a6bbe90300d78a961ed commit b2e97edffdab6ad1e9103a6bbe90300d78a961ed Author: Florian Walpen AuthorDate: 2024-02-12 11:04:57 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:06:19 +0000 snd_uaudio(4): Adapt buffer length to buffer_ms tunable. Adapt the length of the driver side audio buffer to the USB transfer interval, which is adjustable through the buffer_ms tunable. This eliminates unnecessary latency in USB audio playback. To reduce power consumption caused by frequent CPU wakeups, increase the default buffer_ms value to 4ms. In combination with adaptive buffer length, this still results in less roundtrip latency compared to the previous 2ms default. Extend the buffer_ms value range to 1ms for low latency applications. MFC after: 2 weeks Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D41942 --- sys/dev/sound/usb/uaudio.c | 70 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 917b6bd3f238..b0bf815f7797 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -96,7 +96,7 @@ static int uaudio_default_rate = 0; /* use rate list */ static int uaudio_default_bits = 32; static int uaudio_default_channels = 0; /* use default */ -static int uaudio_buffer_ms = 2; +static int uaudio_buffer_ms = 4; static bool uaudio_handle_hid = true; static SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, @@ -110,6 +110,9 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_bits, CTLFLAG_RWTUN, SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_channels, CTLFLAG_RWTUN, &uaudio_default_channels, 0, "uaudio default sample channels"); +#define UAUDIO_BUFFER_MS_MIN 1 +#define UAUDIO_BUFFER_MS_MAX 8 + static int uaudio_buffer_ms_sysctl(SYSCTL_HANDLER_ARGS) { @@ -121,10 +124,10 @@ uaudio_buffer_ms_sysctl(SYSCTL_HANDLER_ARGS) if (err != 0 || req->newptr == NULL || val == uaudio_buffer_ms) return (err); - if (val > 8) - val = 8; - else if (val < 2) - val = 2; + if (val > UAUDIO_BUFFER_MS_MAX) + val = UAUDIO_BUFFER_MS_MAX; + else if (val < UAUDIO_BUFFER_MS_MIN) + val = UAUDIO_BUFFER_MS_MIN; uaudio_buffer_ms = val; @@ -133,7 +136,7 @@ uaudio_buffer_ms_sysctl(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_hw_usb_uaudio, OID_AUTO, buffer_ms, CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, 0, sizeof(int), uaudio_buffer_ms_sysctl, "I", - "uaudio buffering delay from 2ms to 8ms"); + "uaudio buffering delay in milliseconds, from 1 to 8"); #ifdef USB_DEBUG static int uaudio_debug; @@ -1310,13 +1313,60 @@ uaudio_detach(device_t dev) return (0); } +static uint32_t +uaudio_get_interval_frames(const usb_endpoint_descriptor_audio_t *ed) +{ + uint32_t frames = 1; + /* Isochronous transfer interval is 2^(bInterval - 1) frames. */ + if (ed->bInterval >= 1 && ed->bInterval <= 16) + frames = (1 << (ed->bInterval - 1)); + /* Limit transfer interval to maximum number of frames. */ + if (frames > UAUDIO_NFRAMES) + frames = UAUDIO_NFRAMES; + return (frames); +} + +static uint32_t +uaudio_get_buffer_ms(struct uaudio_softc *sc, uint32_t int_frames) +{ + uint32_t ms = 1; + uint32_t fps = usbd_get_isoc_fps(sc->sc_udev); + /* Make sure a whole USB transfer interval fits into the buffer. */ + if (fps >= 1000 && int_frames > 0 && int_frames <= UAUDIO_NFRAMES) { + /* Convert interval frames to milliseconds. */ + ms = ((int_frames * 1000) / fps); + } + /* Respect minimum buffer length set through buffer_ms tunable. */ + if (ms < uaudio_buffer_ms) + ms = uaudio_buffer_ms; + /* Limit buffer length to 8 milliseconds. */ + if (ms > UAUDIO_BUFFER_MS_MAX) + ms = UAUDIO_BUFFER_MS_MAX; + return (ms); +} + static uint32_t uaudio_get_buffer_size(struct uaudio_chan *ch, uint8_t alt) { struct uaudio_chan_alt *chan_alt = &ch->usb_alt[alt]; - /* We use 2 times 8ms of buffer */ - uint32_t buf_size = chan_alt->sample_size * - howmany(chan_alt->sample_rate * (UAUDIO_NFRAMES / 8), 1000); + uint32_t int_frames, ms, buf_size; + /* USB transfer interval in frames, from endpoint descriptor. */ + int_frames = uaudio_get_interval_frames(chan_alt->p_ed1); + /* Buffer length in milliseconds, and in bytes of audio data. */ + ms = uaudio_get_buffer_ms(ch->priv_sc, int_frames); + buf_size = chan_alt->sample_size * + howmany(chan_alt->sample_rate * ms, 1000); + return (buf_size); +} + +static uint32_t +uaudio_max_buffer_size(struct uaudio_chan *ch, uint8_t alt) +{ + struct uaudio_chan_alt *chan_alt = &ch->usb_alt[alt]; + uint32_t buf_size; + /* Maximum buffer length is 8 milliseconds. */ + buf_size = chan_alt->sample_size * + howmany(chan_alt->sample_rate * UAUDIO_BUFFER_MS_MAX, 1000); return (buf_size); } @@ -2626,7 +2676,7 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, buf_size = 0; for (x = 0; x != ch->num_alt; x++) { - uint32_t temp = uaudio_get_buffer_size(ch, x); + uint32_t temp = uaudio_max_buffer_size(ch, x); if (temp > buf_size) buf_size = temp; } From nobody Mon Feb 12 11:08: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 4TYMCM3BKHz59b7Y; Mon, 12 Feb 2024 11:08: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 4TYMCM1G1Vz4Y1J; Mon, 12 Feb 2024 11:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vXonqPs42ua0ZXs0sLXzID14CtNuiTyRfuJaCpKNPys=; b=gWwCZPONzybuSDbWgMmuncUS41mjr9GpZxBCY11EoKGXJaPw/fFhXNtwbJl1vMag3ToHOd +oClkvJ1RPL8iddIRt0TOsZd/p7XW/3yv/u9NUDMsgi31Rl83GB+R+bhEAe5VDaYcAbJiW RZw7eVR+nnb7WvN/eD+Oo6mK5kJGLu6nVjWyAqplliIi/BJDH3cVUmuD10ot6mhxqJ5vce 6iRo6KF44Pohw70bmVxpdRjfMpjAqmtvUsKqmQVYjHMU3trXEL4DV1BBcsG5eVNqEb+40E i/UHV8FU3PamWhYZtbwHkac/C9/Z+K21k9JWiqv4BjXxvBo4z73SM5k3sQyuuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736127; a=rsa-sha256; cv=none; b=kcA5MJ52rBTt9/mRBsMtO3ALn6f7ONXYDcWgxfadj/plH2VAb9jP7Y+aTiMVF0z5zK+Tve 3Pb3gT4zHosmiwknnYnL71tURosTmwkaaBVh4+TGC6xqg1jXxj7bQO8QRXits8fehI/n0B Kib8+eN7PiG4UoLDfjXMRewFQtEuS4jJoAXN8L+ao8D3AOHQVHMnsKe0BUZSnAfPbzIYO7 SDe0fu3+OYUG/rmrrh6aagq96SCvou3sv6xtUhoNQHwWHZIZ6Egl08TEf1fgNBWTTL51tT 89+V0mIzwahOOHlZS41sCzRMrE8Y/PRENc5QXztUV9KgNm6sBGXUWfYLeh5zNw== 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=1707736127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vXonqPs42ua0ZXs0sLXzID14CtNuiTyRfuJaCpKNPys=; b=kX6DuTelQQzxnZeDqNIKT43g/VgQRFZrcbDXgWtx/dM2Jts5oTjGXdolKMZPOf2XxaB3xu WM05bWR7QVtYDb+xmvlJQEsUHHvnFNmiMc6hrxtGY69iLd0TnKpkNFC/gWxeduzmy59LYi dfZLMyArXqxcR4O/l/XFjqfEwgPMwwjSchoA6imKWM7h5PHD0xS5Vszg46uR+Ez6l7Tu/F z0u7oiVyLY1OXaxTsQ7dCcu42GiluTFrrmUfnu8tdJOMQuOh2eBEaEi2HieDkI27ZzdMly u7s4chUklQjk664eVK/FagJ8SmHlkQQ6EoYi6M+Hsj1nODaaXHtN4BrVyuDPnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCM0LFJzP0Z; Mon, 12 Feb 2024 11:08: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 41CB8k40041274; Mon, 12 Feb 2024 11:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB8kAP041271; Mon, 12 Feb 2024 11:08:46 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:46 GMT Message-Id: <202402121108.41CB8kAP041271@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: 42fdcd9fd917 - main - snd_uaudio(4): Fix config detection with defaults set. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42fdcd9fd917764d84edcc43e252a90cade78f80 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=42fdcd9fd917764d84edcc43e252a90cade78f80 commit 42fdcd9fd917764d84edcc43e252a90cade78f80 Author: Florian Walpen AuthorDate: 2024-02-12 11:05:27 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:07:21 +0000 snd_uaudio(4): Fix config detection with defaults set. Let the USB audio descriptor iteration detect configurations with more channels and larger sample size, even when the following global sysctl tunables are set to a lower value: hw.usb.uaudio.default_channels hw.usb.uaudio.default_bits This improves utility and is closer to the meaning of default. Also, do not create duplicate sample rate entries. MFC after: 2 weeks Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D43679 --- sys/dev/sound/usb/uaudio.c | 68 +++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index b0bf815f7797..eb4b676d5e7d 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -94,7 +94,7 @@ #include "feeder_if.h" static int uaudio_default_rate = 0; /* use rate list */ -static int uaudio_default_bits = 32; +static int uaudio_default_bits = 0; /* use default sample size */ static int uaudio_default_channels = 0; /* use default */ static int uaudio_buffer_ms = 4; static bool uaudio_handle_hid = true; @@ -150,6 +150,7 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RWTUN, #define UAUDIO_NFRAMES 64 /* must be factor of 8 due HS-USB */ #define UAUDIO_NCHANBUFS 2 /* number of outstanding request */ #define UAUDIO_RECURSE_LIMIT 255 /* rounds */ +#define UAUDIO_BITS_MAX 32 /* maximum sample size in bits */ #define UAUDIO_CHANNELS_MAX MIN(64, AFMT_CHANNEL_MAX) #define UAUDIO_MATRIX_MAX 8 /* channels */ @@ -2203,31 +2204,37 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) uint8_t bits = uaudio_default_bits; uint8_t y; uint8_t channels = uaudio_default_channels; + uint8_t channels_max; uint8_t x; bits -= (bits % 8); - if ((bits == 0) || (bits > 32)) { + if ((bits == 0) || (bits > UAUDIO_BITS_MAX)) { /* set a valid value */ - bits = 32; + bits = UAUDIO_BITS_MAX; } - if (channels == 0) { - switch (usbd_get_speed(udev)) { - case USB_SPEED_LOW: - case USB_SPEED_FULL: - /* - * Due to high bandwidth usage and problems - * with HIGH-speed split transactions we - * disable surround setups on FULL-speed USB - * by default - */ - channels = 4; - break; - default: - channels = UAUDIO_CHANNELS_MAX; - break; - } - } else if (channels > UAUDIO_CHANNELS_MAX) + + if (channels > UAUDIO_CHANNELS_MAX) channels = UAUDIO_CHANNELS_MAX; + switch (usbd_get_speed(udev)) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + /* + * Due to high bandwidth usage and problems + * with HIGH-speed split transactions we + * disable surround setups on FULL-speed USB + * by default + */ + channels_max = 4; + /* more channels on request */ + if (channels > channels_max) + channels_max = channels; + break; + default: + channels_max = UAUDIO_CHANNELS_MAX; + break; + } + if (channels == 0) + channels = channels_max; if (sbuf_new(&sc->sc_sndstat, NULL, 4096, SBUF_AUTOEXTEND)) sc->sc_sndstat_valid = 1; @@ -2241,9 +2248,26 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) uaudio_chan_fill_info_sub(sc, udev, rate, x, y); /* try find a matching rate, if any */ - for (z = 0; uaudio_rate_list[z]; z++) - uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); + for (z = 0; uaudio_rate_list[z]; z++) { + if (uaudio_rate_list[z] != rate) + uaudio_chan_fill_info_sub(sc, udev, + uaudio_rate_list[z], x, y); + } + + /* after default value in first round, proceed with max bits */ + if (y == bits) + y = UAUDIO_BITS_MAX + 8; + /* skip default value subsequently */ + if (y == (bits + 8)) + y -= 8; } + + /* after default value in first round, proceed with max channels */ + if (x == channels) + x = channels_max + 1; + /* skip default value subsequently */ + if (x == (channels + 1)) + x--; } if (sc->sc_sndstat_valid) sbuf_finish(&sc->sc_sndstat); From nobody Mon Feb 12 11:08: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 4TYMCN38FNz59bDZ; Mon, 12 Feb 2024 11:08: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 4TYMCN2WRFz4Xyk; Mon, 12 Feb 2024 11:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9B5EhbRzLOm+xGgZPwoQP5kadiPxpQNdQg9UCNwWDCA=; b=SPOEDoj3Or8F3SWc97fvBkrzmMfgq9IiZvprnLxXlIGNa01q/DFqVcFuMnOW7357y7Qnis p2AvDuYCeR6L0SrcayKkvAcgXvE/wHNuWEEwyPvgge8m/9hSJME3SlQfiPFHYXfoQr9x0u Q57VpcguIP7iGTBVAnESA6TSO/jBl2sADMGNqr4S1/tubm+Xxf0RqusanNnMmhG36Txako XMHHiEQFRyaTA/nGE/6IMfZJFaWlc4+xFsLsfBhQt+tCM0iarwxYXh/7+y1hXxkjI4XJ+o LluSUCaeypBw/edG4ckHCZMQP7QxZ7y1F4msAghgYdr93Sy5jpvOgp7LAINgcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736128; a=rsa-sha256; cv=none; b=IVryrrpcan1uj67rKpcRNgPMyUkDD+FjYqPzPc0MR3e9i9berASWrwlLnKNhAlWL4t1QQ4 bzumGDmlYsO/cfYiB5b2NeqGSefFzVCq2m/PlBR16Ljj/aCZnMkN5i3gMo0GWQsTcylhOG xwWt9LuQPXsnpUaUDWpzzPMTnvTud1La6lLWSDyOU9tWCLKKt2ey4PGHmiUuyG6f6l1yXz wQBfD0+nMnY8Sh7Q3Kv7FspHqXG1fu7fCB3uI61BZSKxlg9/V2UYNp6e4HdkBTJZReD8kQ vlFERBXRM1uIS00ChCs6RAEgREuVqxo4ThUbqPNrViQRbJ9hbf+Fgprh1xk+4g== 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=1707736128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9B5EhbRzLOm+xGgZPwoQP5kadiPxpQNdQg9UCNwWDCA=; b=xNB+XasVhp+FJSb9caXMuCI5xxwlFUKgw+2XXxzTW3LGP81ks3Aho4d5+L2sdixEWdP2NU 3hXDcAvrkg9hrEohAC4sv4GNgVUm5k2fOaRW8TBIWovwLhq1pkBTvK3vw7NrYhGwMb9xDi nh1/jTmW9HV6KfYC8+HTnV3k1RmXHdajjrFV5U/24ryxDbbhxQBxqs/niJnQdbcdkvzPOh HOe46LLmkJ3SShO+tVQRBQ1QbHDNzb4eYmkE1Z9t73vC11Foiy/yfhp0Oxr+50q3Uy1XGp 6iPhnTxHnTtPD/7bOzMRR81Qh3eoDJfSYfe/S5PdtCTcwLpet+60Ni9MpRVLxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCN1bn0zP21; Mon, 12 Feb 2024 11:08: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 41CB8mju041317; Mon, 12 Feb 2024 11:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB8mNm041314; Mon, 12 Feb 2024 11:08:48 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:48 GMT Message-Id: <202402121108.41CB8mNm041314@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: 883b8ed582eb - main - sound: remove snddev_info->inprog and pcm_inprog() 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 883b8ed582eb3e9e98c62c471228ff3c3a25377d Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=883b8ed582eb3e9e98c62c471228ff3c3a25377d commit 883b8ed582eb3e9e98c62c471228ff3c3a25377d Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:33 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:07:50 +0000 sound: remove snddev_info->inprog and pcm_inprog() No longer used. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43737 --- sys/dev/sound/pcm/sound.c | 17 ----------------- sys/dev/sound/pcm/sound.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index b23a28d3af08..186e7b194f27 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -392,16 +392,6 @@ pcm_chnref(struct pcm_channel *c, int ref) return (c->refcount); } -int -pcm_inprog(struct snddev_info *d, int delta) -{ - PCM_LOCKASSERT(d); - - d->inprog += delta; - - return (d->inprog); -} - static void pcm_setmaxautovchans(struct snddev_info *d, int num) { @@ -1127,7 +1117,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) d->pvchanformat = 0; d->rvchanrate = 0; d->rvchanformat = 0; - d->inprog = 0; /* * Create clone manager, disabled by default. Cloning will be @@ -1182,12 +1171,6 @@ pcm_unregister(device_t dev) d->flags |= SD_F_DETACHING; - if (d->inprog != 0) { - device_printf(dev, "unregister: operation in progress\n"); - PCM_UNLOCK(d); - return (EBUSY); - } - PCM_ACQUIRE(d); PCM_UNLOCK(d); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 5b366a62630c..4af56a2c411a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -320,7 +320,6 @@ int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, pid_t pid, char *comm, int devunit); int pcm_chnrelease(struct pcm_channel *c); int pcm_chnref(struct pcm_channel *c, int ref); -int pcm_inprog(struct snddev_info *d, int delta); struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, int num, void *devinfo); int pcm_chn_destroy(struct pcm_channel *ch); @@ -379,7 +378,6 @@ struct snddev_info { struct snd_clone *clones; unsigned devcount, playcount, reccount, pvchancount, rvchancount ; unsigned flags; - int inprog; unsigned int bufsz; void *devinfo; device_t dev; From nobody Mon Feb 12 11: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 4TYMCQ177yz59b59; Mon, 12 Feb 2024 11: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 4TYMCP3gT6z4YCC; Mon, 12 Feb 2024 11:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NviqJ3qPGQ5NV6zCIMAKcwUpMYbEUB4+uB3/0hQrgKw=; b=GMahIPrH736tzFc4JLida77iIg3Aj8RTuRpmVQmIyoN4HcNZbDmY4oVnEiSNhhvLNBAmb7 ECoko5P5ok5GRhD7h5OYz2KexYLgpBff4jIP+ZP5/QH45v64DVoPteoYplp3hVj+eidHkB nKsyr1TB/Ea+XAD74O4+rYhR1GwntyVcAxzVrxebj4MLySSTG0MLbbjCUQBnBo9ieEPRLt 4i14Repo2W6O4nJuiVBvFPGXZBXxekc0muQJUyxaTBNM+WCQL+8ovRuZKZAGtpQajSH3NI mNFqWCiNTxr2zJiwHFOi72G/tg25eQzY6dyNtkQyYg+svlQxP6Pt3s+buFhTUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736129; a=rsa-sha256; cv=none; b=Vw56V7lKmbonw2eCrLmK+lRluQEqNJhDe2HRmH8UyWbKekTMAoAlkT2MVipZN0+QoZ18pQ EYWhSZAdGwUC0WZz0VNqgoM1ZyaZmGIcDX5nfobGVI3egz5XrRqqxSqbCuMWIkXkNTfA+u 3UXuYpOOS1sbs5TYBm1zhGaHo5/wOqPyhyYR4fPQGCC3MG6zXhGmJhzgUc6wT4Aa/Bm8pD 9Tk6v2JMAlPmU0AlL4eqqaQfoZiP4p1gdp2k6+fBuEqaPryeFS99Dws42dkidqySYJNORM DuHKzMTXUVu+XykhdjMZ4HJEaxovBxaCMYX71FTp/kBRvVSiAEMKlyi71quGJA== 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=1707736129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NviqJ3qPGQ5NV6zCIMAKcwUpMYbEUB4+uB3/0hQrgKw=; b=UNdjhUPljT84Z/MHeVJi++MPs3o4semDPeF3lXs0kfJ6Dhn5yhh/HTU0xwbsyLjc8t8X05 XR+aDPtKmGvFamjjpXiewNumDKd1ot+sZi/q+Dt4EvWS8umC6rE6ldSvOCT7TMYu/DwCqY KwEOBOqiMbF8qqG4YVABnHlpVEb862DBokuROQNhR+EeBWGIFIOaCgtaURcLs12UErFywW Xuxh/xRNAFlbkz52kwdnbm4jSzd3NaeyGdTPmQtdERYyrnJ0X6FNzOGuwZwhg8ywyYBpe+ UFLLQzKeoSkQ6cm9ymj48W4fm/C8UpnnTgpvJpDutI+dkeABXXortbg914ZgHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCP2brJzPJJ; Mon, 12 Feb 2024 11:08: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 41CB8n8Z041357; Mon, 12 Feb 2024 11: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 41CB8nhK041354; Mon, 12 Feb 2024 11:08:49 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:49 GMT Message-Id: <202402121108.41CB8nhK041354@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: f60e99f45e81 - main - snd_uaudio: mark selected configurations 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f60e99f45e8197de2bc0970c7dd7f87148fdaf30 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f60e99f45e8197de2bc0970c7dd7f87148fdaf30 commit f60e99f45e8197de2bc0970c7dd7f87148fdaf30 Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:47 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:07:50 +0000 snd_uaudio: mark selected configurations snd_uaudio(4) selects the first maching rate/channel/bit/format/buffer configuration for use during attach, even though it will print the rest of the supported configurations detected. To make this clear, mark the selected playback and recording configurations with a "selected" string. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D43766 --- sys/dev/sound/usb/uaudio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index eb4b676d5e7d..26d95bf3ee9f 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1051,11 +1051,12 @@ uaudio_attach(device_t dev) for (x = 0; x != sc->sc_play_chan[i].num_alt; x++) { device_printf(dev, "Play[%u]: %d Hz, %d ch, %s format, " - "2x%dms buffer.\n", i, + "2x%dms buffer.%s\n", i, sc->sc_play_chan[i].usb_alt[x].sample_rate, sc->sc_play_chan[i].usb_alt[x].channels, sc->sc_play_chan[i].usb_alt[x].p_fmt->description, - uaudio_buffer_ms); + uaudio_buffer_ms, + (x == 0) ? " (selected)" : ""); } } if (i == 0) @@ -1081,11 +1082,12 @@ uaudio_attach(device_t dev) for (x = 0; x != sc->sc_rec_chan[i].num_alt; x++) { device_printf(dev, "Record[%u]: %d Hz, %d ch, %s format, " - "2x%dms buffer.\n", i, + "2x%dms buffer.%s\n", i, sc->sc_rec_chan[i].usb_alt[x].sample_rate, sc->sc_rec_chan[i].usb_alt[x].channels, sc->sc_rec_chan[i].usb_alt[x].p_fmt->description, - uaudio_buffer_ms); + uaudio_buffer_ms, + (x == 0) ? " (selected)" : ""); } } if (i == 0) From nobody Mon Feb 12 11:08: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 4TYMCQ70cjz59bLr; Mon, 12 Feb 2024 11: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 4TYMCQ4XKtz4Y0F; Mon, 12 Feb 2024 11: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=1707736130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qi2XFVwLJH3r1PTGYjwFpzyTrvOhde0c4gSv3D8aLnE=; b=fk2e7s1KPjWHf9u3BMkdwhzX3RfHr4CkjsEJ15xWrdbXnTjtHNJ3jD42UNNb2tMlWGQkAB Cj7K7Rky0Ng0BcpSvXPojEImmwN9bQLDRC2rEgaoQJRBS3lcMgtl+r3hL6pcgv1mrgFjD0 oHNvQloH7MZeQvQCtcQPOJff0YCmp8NNTO6bqc8bobeCMF9P5OnwXIsFdzkN+zfKYvCHT4 FtEO8v+qqukV9NNGkYvkgyFsDkbS1HZMyN2CPBNJY+8ZZsBv41B4D8iN+KEucgCXSyU5zw 67uz7BG2UAbk4N31APaCMUP3bCKfxuzAkgo7/4D56/vITGAZ7pjX5YKyyKAKlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736130; a=rsa-sha256; cv=none; b=pAeuZmSuXYKcgz/SrOtefKZYbA7mBMtOsf/RGHfeRXhdU5WUxBV9nyqrpkrh0NnSSZPjd/ gq4IWlQ1tYyDv6uQrVnLQxp+dBJCTFLjELvuAmiYeHz545NOLLbu7HLpwQlFuHyO34/GKJ PadasBo8k8m0inl/K558OfQ4nc+mWBhYb+xSsOjMy6UZFo/4hdoMoG4qJhUp1RtivP24UY 0wFcyY2wJoj0m65QHWXTTjPjMYv6dVDmNaoFi+boz3hTaf/iu+5Srqdi09KH4Iu6A73SqG YkqHQFM/mg/6f86RShvlJC6fHgoUa4xmrFFbpc9YQLrsisT/09FbcsQWlvY7/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=1707736130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qi2XFVwLJH3r1PTGYjwFpzyTrvOhde0c4gSv3D8aLnE=; b=VISdTI4FcInI95HfwNpUJ5+SYUWN6vJV/fuhbOcBK6nTg0tbAJBOcqyBQbndvn5P9GJb2H tGl91AVorxjb27JUtp+8iHl3pXCfj9ZTv+Uid+W5yh2aeIsnF9r+ua6y9Mcr1zsZYeBPHS SmMdz3RpNemvn1cpURAPaSwFisZcpOOmRmdEwdnxAaKziqm66xE5RKO1dCBJDmiEDrOmA3 Txqx9QRtDC6T9z5QPsmwA1zALY4P/mv5sGloMDc/LVO0wC83SOr3sSlKxo2MPIU+J2JzYK 25dAZcDOi4pKnJQpBfHMWrtc0/zmxGvIIVdnAekvv8XcIl9X80CWQivJT/dT3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCQ3d9vzPJK; Mon, 12 Feb 2024 11: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 41CB8oFb041400; Mon, 12 Feb 2024 11:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB8oSM041397; Mon, 12 Feb 2024 11:08:50 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:50 GMT Message-Id: <202402121108.41CB8oSM041397@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: dcc47cd49e19 - main - snd_uaudio.4: remove useless .Tn macro 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcc47cd49e19df4af987cd094e5a313935f4cd86 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=dcc47cd49e19df4af987cd094e5a313935f4cd86 commit dcc47cd49e19df4af987cd094e5a313935f4cd86 Author: Christos Margiolis AuthorDate: 2024-02-12 11:05:55 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:07:51 +0000 snd_uaudio.4: remove useless .Tn macro Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43651 --- share/man/man4/snd_uaudio.4 | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4 index df2c74b886c3..04dc10ccaa25 100644 --- a/share/man/man4/snd_uaudio.4 +++ b/share/man/man4/snd_uaudio.4 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 12, 2016 +.Dd January 29, 2024 .Dt SND_UAUDIO 4 .Os .Sh NAME @@ -51,17 +51,11 @@ snd_uaudio_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for -.Tn USB -audio class devices and -.Tn USB -MIDI class devices. +driver provides support for USB audio class devices and USB MIDI class devices. .Pp -A -.Tn USB -audio device consists of a number of components: -input terminals (e.g.\& USB digital input), output terminals (e.g.\& -speakers), and a number of units in between (e.g.\& volume control). +A USB audio device consists of a number of components: input terminals (e.g.\& +USB digital input), output terminals (e.g.\& speakers), and a number of units +in between (e.g.\& volume control). .Pp Refer to the .Ql USB Audio Class Specification @@ -86,9 +80,7 @@ and modified for by .An Hiten Pandya Aq Mt hmp@FreeBSD.org . .Sh BUGS -The -.Tn PCM -framework in +The PCM framework in .Fx only supports synchronous device detach. That means all mixer and DSP character devices belonging to a given @@ -104,9 +96,7 @@ See the .Va dev.pcm.%d.[play|rec].vchanrate sysctls. .Pp -The -.Tn PCM -framework in +The PCM framework in .Fx currently doesn't support the full set of USB audio mixer controls. From nobody Mon Feb 12 11:08: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 4TYMCS01mwz59bKK; Mon, 12 Feb 2024 11:08: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 4TYMCR5WHGz4Y0b; Mon, 12 Feb 2024 11:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o8mT/T7bW3CZprL9dBAREb3rTnmHHG5ZtVjMlwTqkPs=; b=MAgt6mFYrT1zx+sQs2I+KcwOhAHMLcwRxZjpY5//UAoliky52nuKp9YMC+2kC2kHdf8iRj 7iN1LtKZ3a2zPGgd2DImY73ZPiZmNFZpznqukAISH59oRkFOU2eU0HkxN39eY9cxFNKuzs 8cJjyplfii9ZxNmM2Cxn0QnH4oa8+DXW8N5pCRtjViK9MhUyS9uekd685Rt3DM78EgREpP JeHV5KSRsb6Kwrp9h/9acW13+IeDRAgddiCIHTnukSlH6kdIsOxLum5AXgypMxhtQ3ieIx VsVgOVADsIgdaeYHdwE/RIw5p4Dv9OopUpUv2prvFq6lCzYRS4dR7d+Hi7XWtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736131; a=rsa-sha256; cv=none; b=o1zmajYDbSMNcvaVoMQS+1V7Brs6a3/4+jrog+FQ8R0Q6ExVr2EfsrEAu7RHylsaJGsGD/ ESqIrAJV4AUS65yiJj97uiqRiCIjDgQGZBt11KsMQlpLX9q0RA2DnaxG4WC2yaDg7m3c2+ fSEyMSclXigx1leIGu01e2Pi+30PPfikKTwMjGdFzI0ZFQAOqjssM4Ws//HFDjbWLolpjZ rz6NgmJVvLZ/wpEbyb+WCmytSk83BK/tP/NWax8WSfYGoBE9RKMN0hseHFXQGRYUaApST+ Fb2YtGdvxivmLc/dd0L4ya4weyayb2L5qdMxv3yczBQu9RE6hGCbo9hbhVLWBw== 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=1707736131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o8mT/T7bW3CZprL9dBAREb3rTnmHHG5ZtVjMlwTqkPs=; b=Z/F+dGpki0cfhD7LLWe/8tjl5tZCoM8zDCG5QQGS3JxecQ9l0jw5Eri0KfTw5nePSjEjx8 v+UoBNCqX7ZAM4WLhaBwV8Sf1MFtH8Qfp0XAn3895wopMTbI4kNz6OyfPtvxPVPn/Zp2N3 npYOsKMDBawV+ST771vAJ+iXAIt1LH5JMZGYbRy3SNjk2/NMWkAv7MWHaq4g2CnDC+0s/Q 8L+dujg0krCNGUFAEV4kuOd2wyl0CFjtLE+QFK2j33vykUQ1tAXcG8mMLDsLldghRDqk35 zSiOr8L4zgtLz9ed+cCSt7c1lEhMXGORJsJkvT9IuKhLD32dhI6LJOC5WtFw5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCR4dPRzP0b; Mon, 12 Feb 2024 11:08: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 41CB8piZ041437; Mon, 12 Feb 2024 11:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB8pau041434; Mon, 12 Feb 2024 11:08:51 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:51 GMT Message-Id: <202402121108.41CB8pau041434@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: 5960ab73d865 - main - snd_uaudio.4: document sysctls 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5960ab73d865b59bfa7d7fd3bd49a6f7d730ef83 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5960ab73d865b59bfa7d7fd3bd49a6f7d730ef83 commit 5960ab73d865b59bfa7d7fd3bd49a6f7d730ef83 Author: Christos Margiolis AuthorDate: 2024-02-12 11:06:00 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:07:51 +0000 snd_uaudio.4: document sysctls Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D43649 --- share/man/man4/snd_uaudio.4 | 81 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4 index 04dc10ccaa25..b6a6c06a2312 100644 --- a/share/man/man4/snd_uaudio.4 +++ b/share/man/man4/snd_uaudio.4 @@ -57,12 +57,88 @@ A USB audio device consists of a number of components: input terminals (e.g.\& USB digital input), output terminals (e.g.\& speakers), and a number of units in between (e.g.\& volume control). .Pp +If the device supports multiple configurations, and there have been no +user-supplied values specified through the +.Xr sysctl 8 +interface, the driver will select the best matching configuration supported by +the device during attach. +"Best" means the configuration with the most channels and highest quality in +sample rate and sample size. +.Pp Refer to the .Ql USB Audio Class Specification for more information. +.Sh SYSCTL VARIABLES +The following settings can be entered at the +.Xr loader 8 +prompt or in +.Xr loader.conf 5 +and can also be changed at runtime with the +.Xr sysctl 8 +command. +For a change to take effect during runtime, the device has to be re-attached. +.Bl -tag -width indent +.It Va hw.usb.uaudio.buffer_ms +Period of audio data processed at once, in milliseconds, from 1 to 8 (default +is 4). +Lower values mean less latency, but this can result in audible gaps due to +frequent CPU wakeups. +.It Va hw.usb.uaudio.default_bits +Preferred sample size in bits, from 0 to 32 (default is 0). +A value of 0 sets the sample size to the maximum supported sample size. +.Pp +Set this to select a smaller sample size if the device supports multiple sample +sizes. +.It Va hw.usb.uaudio.default_channels +Preferred number of sample channels, from 0 to 64 (default is 0). +USB 1.1 devices are limited to 4 channels due to bandwidth constraints, unless +a higher value is explicitly requested. +A value of 0 sets the sample channels to the maximum supported channel number. +.Pp +Set this to select a smaller channel number if the device supports multiple +channel configurations. +.It Va hw.usb.uaudio.default_rate +Preferred sample rate in Hz (default is 0). +If set to 0, the device's highest supported sample rate will be used. +.Pp +Note that if VCHANs are enabled, the sample rate will be overridden by +.Pa dev.pcm.%d.[play|rec].vchanrate +(see +.Xr sound 4 ) , +which can also be used to adjust the sample rate during runtime. +.Pp +If +.Pa hw.usb.uaudio.default_rate +is non-zero, +.Pa dev.pcm.%d.[play|rec].vchanrate +will use it as its maximum allowed value. +.It Va hw.usb.uaudio.handle_hid +Let +.Nm +handle HID volume keys, if any (default is 1). +.Bl -tag -width 2n +.It 0 +Disabled. +.It 1 +Enabled. +.El +.El +.Pp +If +.Xr usb 4 +has been compiled with +.Va USB_DEBUG +on, the following setting is also available: +.Bl -tag -width indent +.It Va hw.usb.uaudio.debug +Debug output level (default is 0). +.El .Sh SEE ALSO .Xr sound 4 , -.Xr usb 4 +.Xr usb 4 , +.Xr loader.conf 5 , +.Xr loader 8 , +.Xr sysctl 8 .Rs .%T "USB Audio Class Specifications" .%U http://www.usb.org/developers/docs/devclass_docs/ @@ -98,8 +174,7 @@ sysctls. .Pp The PCM framework in .Fx -currently doesn't support the full set of USB audio mixer -controls. +currently does not support the full set of USB audio mixer controls. Some mixer controls are only available as .Va dev.pcm.%d.mixer sysctls. From nobody Mon Feb 12 11:41: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 4TYMxJ2j1fz59dsm; Mon, 12 Feb 2024 11:41:40 +0000 (UTC) (envelope-from dch@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 4TYMxJ2Dzrz4cSM; Mon, 12 Feb 2024 11:41:40 +0000 (UTC) (envelope-from dch@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707738100; 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=vLYU9Fok+AUGKGhRGMuasxoVWCY76uUsHSE2aD1FjSc=; b=M4FDMLrDEQZxcKdr457EhXGe2EjDgLBx4ArhsNaHxuxlVqAeEgexBUo8E05dXz6NM+4bW0 vd2Or//q+kO2fho7HpMDvYg0Y33Dag/r777LG46QSkH3VumhelFPASKdnFaoTQVmcHdYP7 0Hb60IbRwsct9mErVnJSaIO1iTh5wUUjv/S/NMaVXKHIMO806+HM7HFw6bttb8dliYYYe8 uvXTEv6SjPy4nhcW4LsWbPmOgYFglP/cLfbwSS3XjKFh7VLPVk5RBJ4alzsItdQTJXBh/Y n5g4A8yEY+LA6KdtpPEd3bFy2sCbXWVpDn/kS07eijM9r7XuLzAXrL6lk3n5ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707738100; a=rsa-sha256; cv=none; b=fk5JvJ6FkLE/MleMiheOax+QCUKO08UQbCJKwQ1AHC6eRMJdaRdGmHlv/bbMc3aqmCtCiB pje5p2px5djLAac0uTUCEW0hHEnCww0RPLtunBRAjt2aH6jVgB4zFdAWsIvi9pmaZTKihy gpLmYBCsynK7skSLf4hDkV+4vwyh3awE/jNvnlfg5YbzAWnT1/dt69lNofBDSCZTF5Ar1w qhN75g+Uz45eVrGrVyzBccad0OKTFGpGv32iTEUVSC/IMA2iQ5brUDMgFpSWlZHbK+Slbq COKwxloW26j4t+QN4LAOagYQs+OORkAS+Zvs5tziC2orjzWosZ5YpmH2tCYZqA== 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=1707738100; 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=vLYU9Fok+AUGKGhRGMuasxoVWCY76uUsHSE2aD1FjSc=; b=NCUV2bEX04eSl+m2A6fRJw6ree+yNdVWBlhLJ34j5FczSKOFjmkbOMTZFBTtDy2sz5IMO4 o/+N62Yqexc0PT7PHk7Y19n2BmUw9v30zPrJpOioDEQHsqHu7mt7S5xrpaP3jn/OH8+myf nnrk0CTNVfWu2HmOej5LnU+0gi2hkgF7dH5o0lcQ3F75RyPqOX/moLBcABeatWdP9HjiZO svMZQWAhqg7eQo+JQIgcNglRaGIkeQ1pqw0PxXfZBPLbXU7BFTuzli6Z+M2uIum2ifvQnJ 6ZraBiZH8crOGoDbV9rGcJBU30mhgk0KyIEgjGm9f2pPflY5wYo9kMUcSU3AsQ== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.3 with cipher TLS_AES_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: dch/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TYMxJ12j0zM1Q; Mon, 12 Feb 2024 11:41:40 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailauth.nyi.internal (Postfix) with ESMTP id E6D0C27C005B; Mon, 12 Feb 2024 06:41:39 -0500 (EST) Received: from imap44 ([10.202.2.94]) by compute2.internal (MEProxy); Mon, 12 Feb 2024 06:41:39 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefgddvlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefofgggkfgjfhffhffvvefutgfgsehtqhertderreejnecuhfhrohhmpedfffgr vhgvucevohhtthhlvghhuhgsvghrfdcuoegutghhsefhrhgvvgeuufffrdhorhhgqeenuc ggtffrrghtthgvrhhnpeetkedtleeviedtkedtieeffeeuffduueektdefgedvteekueeh fefgiedulefgtdenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegutghhodhmvghsmhhtphgr uhhthhhpvghrshhonhgrlhhithihqdduvdegledutdefgeduqdduvddufeduudejjedqug gthheppefhrhgvvgeuufffrdhorhhgsehfrghsthhmrghilhdrfhhm X-ME-Proxy: Feedback-ID: icedc46df:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id A4DCE36A0076; Mon, 12 Feb 2024 06:41:39 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-144-ge5821d614e-fm-20240125.002-ge5821d61 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Message-Id: In-Reply-To: References: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> Date: Mon, 12 Feb 2024 11:41:18 +0000 From: "Dave Cottlehuber" To: "Michael Tuexen" Cc: "Richard Scheffenegger" , transport@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: hitting Assertion !callout_active(&tp->t_callout) failed at /usr/src/sys/netinet/tcp_subr.c:2386 after 62d47d7 Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, 12 Feb 2024, at 10:26, tuexen@freebsd.org wrote: >> On Feb 12, 2024, at 09:50, Dave Cottlehuber wrote: >>=20 >> On Mon, 12 Feb 2024, at 08:31, Dave Cottlehuber wrote: >>> I'm repeatedly hitting this assert soon after boot on my ryzen deskt= op=20 >>> I've a coredump. >>>=20 >>> Panic String: Assertion !callout_active(&tp->t_callout) failed at=20 >>> /usr/src/sys/netinet/tcp_subr.c:2386 This one "just happens" while I'm sitting at the PC hacking in the termi= nal, I don't get much incoming data here so it's presumably clean local traff= ic. >>> I'll apply your latest patch in=20 >>> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D276761#c16 and r= eport=20 >>> back.. >>=20 >> Reporting back, insta-panic on boot at: >>=20 >> Panic String: Assertion !tcp_timer_active(tp, TT_REXMT) failed at /us= r/src/sys/netinet/tcp_subr.c:2387 >>=20 >> Does that help any? > Sure! Could you provide any hints how to reproduce it? this one happens during boot very early, I have a coredump handy if that= helps. I will try with all sysctls disabled, and without zerotier (overlay netw= ork) too, see if that makes a difference. A+ Dave =E2=80=94=E2=80=94=E2=80=94 O for a muse of fire, that would ascend the brightest heaven of inventio= n! From nobody Mon Feb 12 14:20: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 4TYRSH1Cn4z59tns for ; Mon, 12 Feb 2024 14:20:15 +0000 (UTC) (envelope-from Emma.Conner@USbIZinfodata.onmicrosoft.com) Received: from IND01-MAX-obe.outbound.protection.outlook.com (mail-maxind01on2107.outbound.protection.outlook.com [40.107.222.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYRSC5lKCz4rSN for ; Mon, 12 Feb 2024 14:20:11 +0000 (UTC) (envelope-from Emma.Conner@USbIZinfodata.onmicrosoft.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (mx1.freebsd.org: domain of Emma.Conner@USbIZinfodata.onmicrosoft.com designates 40.107.222.107 as permitted sender) smtp.mailfrom=Emma.Conner@USbIZinfodata.onmicrosoft.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ei5shhaQMyzBA1D60WP1tgS2qmk5mlj0TR+9OigGyDzG93MjIEUqmkL7v96Cnyt12a41M6zQuWWNyAhKpSJ4uMf8+73lk7AiI52AEbP09kJnPWIQlwD8x5BFgtcFlZceAPqoyo1q2Rj0xQMUnmANzYGmWPadJM6uzNu8+JP9qAq1RbYhZbOtKTTKFP/PiVwsVnBQNt4MiLIrNRcT76mKQdOpIe0KbuF14xqgVxo41P/AKtW6nfJaXAAe9WuH/EXkVbp12olyIzTVWZMlryX7KO9UZ/XSEHThXHLZVoGK1dtMz3VGsW8HGelhPgHX/uRgnUfR1ZTWQ3y1+ug0xIrw5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JZgrdmoV1z3Ab3olGw7PKS1e4apVbScS9aJbVw9mytY=; b=lgfQc33/NCSP8tAqRMVIdf81w/IjTbJ2go/bLychd/EQ2Nl/gUJ/HWfCEVRlJ8Wnu2f9arTx6mNI75DeHPMxLhGWnkaxgigPS7JPrmdxFsr0SJqUFrLfA7jgKBmmr9ktwhzfT+rjKqX5QC/KwLk0kGy6t9/XJQoxji0MBFl7LTwOzkjevp6B3yC1XP75ki+arhBvNFrhvIV49NtMkqxSwfweWaeT0WfGiRItpwZYvB9Hz0YMlQ7zyWNmC6roIXO3QBq051EglkY157BfHJcC/9wAuOHvQmNOb+TNpu5pT8ak8PsLXRvQgsPKf2fCc5vko0SK4XFYR+zid2IEIXZ7TQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=usbizinfodata.onmicrosoft.com; dmarc=pass action=none header.from=usbizinfodata.onmicrosoft.com; dkim=pass header.d=usbizinfodata.onmicrosoft.com; arc=none Received: from PN3P287MB2559.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:208::9) by PN2P287MB2431.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1c1::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25; Mon, 12 Feb 2024 14:20:07 +0000 Received: from PN3P287MB2559.INDP287.PROD.OUTLOOK.COM ([fe80::d2ef:b83c:14b9:f325]) by PN3P287MB2559.INDP287.PROD.OUTLOOK.COM ([fe80::d2ef:b83c:14b9:f325%6]) with mapi id 15.20.7292.012; Mon, 12 Feb 2024 14:20:07 +0000 From: Emma Conner To: "dev-commits-src-main@freebsd.org" Subject: RE: freebsd Facilities Management Contacts Thread-Topic: freebsd Facilities Management Contacts Thread-Index: AQHaXb6U8oaPcir5hkewJBax3mii7w== Date: Mon, 12 Feb 2024 14:20:06 +0000 Message-ID: <126b05a7-5c1e-cca1-0c3f-1f55970ae59e@USbIZinfodata.onmicrosoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3P287MB2559:EE_|PN2P287MB2431:EE_ x-ms-office365-filtering-correlation-id: 0ed4af19-ea24-484a-7abc-08dc2bd5b689 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: bjKXBnfP3qaaAL3SvKwAqvnJjQmwh5t6NAGyz86emWWdde/E701KZxjKSmNZKyXqZO+8JZTGsEItKgsL4dDR2TeSB9Yk56WpfI17hvbwxW1pQbr5HVVENcXu9vsAcnmIvlyeVWK3JvOBkei4hmHdcUacJ81ayw/3NAw+Gw3fjaNSL0qqcZ+VtRdD0n6Zhw2RnCPZo/HTb4bFKbKKRhmZK3JZfCJ1Mw+3q9J6zFOOX7QnTFhrqw/XF9YII8gwSRIPvV8RYoz8qa391WiBO5WLa4PkmRmzf77uzkPiwKSmfKUIkKfgG2lIBwtxnOQs4H1MXTnj6Fr66dG5EmgF+0oAuCVJFauBCZcmEz4w8Hp1ko95qsTMIwAxZemx9fl2wA712S+a21b7LIOho0oQWIhGL6QIqG7wndZar7DA3upLUKJfeiOix+wQH2MeReVzyncyrFXF2ros7/NWS9LizBYT1YSXIZOS1dlJTVVbz5B9gffpNJgy4kMl6aOjxlrNh5ZLqJRFPqWyVdqDW3vK2gucjRFWsebKkO24AWsNATdWS+gtgRB2UzRGqb3GOa80/9jAB0c0WmVkBY9rhBtyvLed/I3IjdFS57JOOwkfnDyp0ChkEDdrr7XN6hmJ/Vvh6yY4 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3P287MB2559.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(376002)(366004)(346002)(396003)(39850400004)(136003)(230922051799003)(64100799003)(451199024)(1800799012)(186009)(41300700001)(31686004)(6506007)(53546011)(71200400001)(478600001)(6486002)(38070700009)(2906002)(64756008)(66446008)(66476007)(91956017)(66946007)(76116006)(66556008)(5660300002)(26005)(6512007)(2616005)(38100700002)(66899024)(86362001)(8676002)(8936002)(6916009)(316002)(3480700007)(122000001)(31696002)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?cm5uSUk3NGQxMERualFMdUR4V3N6MnQxdjVkcDJ4a2JVbXgzN1dGN1VQTTNi?= =?utf-8?B?c2pSY2g3SmJBckN3cHJBOVdTYnZ2OXk1VGVLazdFUXg4YzNDQ0pvcGRRUXZD?= =?utf-8?B?THNlVkFoVHV5Zm1ocXc3dHZSMGhEQ0pVVzFERy8wMlFHb0Z6U3EyWEp2Tks3?= =?utf-8?B?QkFDNnVPaDB1bmtkWlFSVTVPK2RRWU5JT3JDVXJoQU1xVnRGZWswblBaSU5Q?= =?utf-8?B?YkNsN3VTaDR2YmI4UThZbTVpK1F4M2VKbkxoZUtPTmVWSmwxSmhZUVpkT2t3?= =?utf-8?B?L295WGFIZDZUNDBGdjZiL1dxTk11aHo3dTdsZ1JwTlhHRDFMejZ0UDJZTFhG?= =?utf-8?B?V2VacDhKdU9NNC96cXlUcmRMZFNWelNtbjVXYXZVL0lsOVVCRUNWVjd0bVk1?= =?utf-8?B?TmlOeUt3UGg4ems1OHdMdzdMaU10SmoxdUI5Vy9kV1pWWm1Nb1Mzd1kwYU5j?= =?utf-8?B?b09yUFNZWUduL2RwUkRObXJwNmZsRTYvVU1YZFhsR094MTBYd0N4cWZ6MlJs?= =?utf-8?B?c040eGVyb0hzdjJCcXlZNHdONUZDNXNYOXVjTjFVcVFRNkhhZ3FOUTUyajRS?= =?utf-8?B?NmU0MGNJUlBmbWxQTWxkQ0l1OGNmYTB3V0w4TGMySzJqZjdjL0R2SlpFOTRO?= =?utf-8?B?VlJpRkFHMVBFNG5iNVg1OHJiSzROUjFSNUNvRGx2UjZmRzJJZlZSVnlVTGVC?= =?utf-8?B?YXpMTjhHUFp5OEFGdncrOFE5blc5ZXZUQ2hKSU9rSlpCVWJjMjFOaVVscEla?= =?utf-8?B?MUhkVnNvWlRyeXI1dnR6Q2V2WHBmcjEvQ3h2NG85TkJRWk9nNVdEV0lNd1JT?= =?utf-8?B?WGx6VGtyeVdoazZ3cnVzQnIwSW1pd004eVp4ZWtZeDkrVUMyeCtpM01FMDFN?= =?utf-8?B?Z1JNazNLYjJCODdsSndXQkVad0x5UUhsMUNRblpxVUR1Z1BJOWdyRGtUR3Qr?= =?utf-8?B?eEtkb3BmS1lrdXE0MUthNmJVYjdiaWhYTmtZT1JnM2hCQzJydDQzMGRlRHBs?= =?utf-8?B?QVhtbVFuR2hoSmhpTzBweEhWdU04VnBRUkREcmlKS3liU2k0QVdUcFZWOWNz?= =?utf-8?B?Y0ZPRk9JdTJVNGVmRmFyTFNxaTdTMDlHZExqYkpXWElDZzFzclRScVZDMEhs?= =?utf-8?B?MXFDN3M3NGlhTmhVK1NqQ05YNU12aFJHZmhSeDVjM3c2YUZFcVMraThtUTht?= =?utf-8?B?Y2tVYWZ4L0NQV2piWjF0QU44bnc5NWhiOWowYUhBNW9yWWlUVTlia0xkcWp2?= =?utf-8?B?TVpaL0Y1cjJ1TVV2U1RneVdxZHVnUHRQV1ZuVEd0RGJUbndKSU1paVU2bjU5?= =?utf-8?B?c1Vvb1pmZWJ3OUh1WitZQW9xR3orVHc3NUJsWUY4UmRVakF0SlVmNEVvRCtK?= =?utf-8?B?TTI0b09HSjN4U2RpdXhDRWFyYktNY0N5ZExkQ0d5TDhWMm1EdjRLZklhSEU3?= =?utf-8?B?dnRISHRFWHhORDNYMldyZFBxMDdMY01sUHFnTlFZVlV5czRHL013aEF0dGlI?= =?utf-8?B?Q25wNytSY0Y1YUcxdm1Kc3lNUkdiREJJb0lWb0lWS0FqY3ZFK2JLcVB3UmVB?= =?utf-8?B?ZGQ2K3RKWmFVVXN2ZldiYStyR1JBOTNsQ2laSkJaNUxJM0FqYlIyVVJEZEo4?= =?utf-8?B?ZlUxbHRIWlFzb0hsWHh6bXh6YTJOUVNndmFUQXgycVlyd3d2L2I0cnRmdmJn?= =?utf-8?B?WFlobkpaVkZYVW1wY21lTTQyTDBVYWVjRllsMDR6c3dMR1J3T2FYVFBGRm5J?= =?utf-8?B?MXdGb2hUVDNVRzJTOHNaWVdhYVNYcWFnRXZVbUpKa1NnNGhaMElaeHZTNUJF?= =?utf-8?B?VFIwejBVNE96MHd1WU5Ka0dUQkFBY1ZPVkgzV09udk1PRGxzYjVxb2RMRk90?= =?utf-8?B?ZWNyb3Z0ZVFOaVNML2wvTUpic2RRaTUzV1NablphWWhSMkg1SERKRWV1YlVL?= =?utf-8?B?WmFOZVYrUzFzbWhpVlZyL1YvSzV1b3FFVFZZRC94VE9PYlVGcmdDVjZWTTVI?= =?utf-8?B?WWNuMVhQV2JMSVFWak8zNzVYcEt0ZDVaTWJNVTdEZDlSRVNHSEt0U0kwMVk2?= =?utf-8?B?OTdURnZ3QVhjbGx4YUVraVhNdG1tN3o4cWdLbURBNUdIZXFFYVR4eG1qcUFN?= =?utf-8?B?ZzdjQ2hzZmpocGdjQU9KNGhVV0tCSWpmeEtiUmw3d2JHdTNRaDIwQWxWeVNS?= =?utf-8?Q?ZqbmXGSAUjoFFMiNrwlb6aw=3D?= Content-Type: text/plain; charset="utf-8" Content-ID: <22DACB1F19179946A5C4510CAE97D89E@INDP287.PROD.OUTLOOK.COM> Content-Transfer-Encoding: base64 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: USbIZinfodata.onmicrosoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3P287MB2559.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 0ed4af19-ea24-484a-7abc-08dc2bd5b689 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Feb 2024 14:20:06.9995 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: c8985d2c-274e-4d2e-b47a-e4113825a86d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: tNb1PZf4QgUQoVd3uou1facfQsscJE9dRCChg/vaejaU4XcdUTkX47M+Nj7dbm5eqMtiTbwT5T6wsqUoDjTyV3gUOZ7uOsToxAMFSs8k7qRP56zF68apQsXmxeSqk3BMRBrJ9m80K5JQXE83avUtMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2P287MB2431 X-Spamd-Bar: / X-Spamd-Result: default: False [-0.93 / 15.00]; FAKE_REPLY(1.00)[]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_LONG(-0.85)[-0.855]; NEURAL_SPAM_MEDIUM(0.54)[0.538]; NEURAL_HAM_SHORT(-0.41)[-0.411]; R_SPF_ALLOW(-0.20)[+ip4:40.107.0.0/16]; MIME_BASE64_TEXT(0.10)[]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; MISSING_XM_UA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.222.107:from]; R_DKIM_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[40.107.222.107:from]; TO_DN_EQ_ADDR_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[onmicrosoft.com]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_HAS_DN(0.00)[] X-Rspamd-Queue-Id: 4TYRSC5lKCz4rSN SGksDQoNCkp1c3Qgd2FudGVkIHRvIG1ha2Ugc3VyZSB5b3UgcmVjZWl2ZWQgbXkgbGFzdCBlbWFp bCByZWdhcmRpbmcgYSANCmN1c3RvbWl6ZWQgbGlzdCBvZiBSZWFsIEVzdGF0ZSBkZWNpc2lvbiBt YWtlcnMgYmVsb3cuIEnigJltIGxvb2tpbmcgdG8gDQpmaW5kIHRoZSByaWdodCBwZXJzb24gd2hv IGxvb2tzIGFmdGVyIHlvdXIgbWFya2V0aW5nIGFuZCBsZWFkIGdlbmVyYXRpb24uDQoNCldlIGhl bHAgY29tcGFuaWVzIGdyb3cgc2FsZXMgcmV2ZW51ZSB3aXRoIG91ciBoaWdobHkgdGFyZ2V0ZWQg ZW1haWwgDQpsaXN0cyBkaXJlY3RseSBzb3VyY2VkLg0KDQpQbGVhc2UgbGV0IHVzIGtub3cgeW91 ciB0YXJnZXQgaW5kdXN0cmllcyBhbmQgam9iIHRpdGxlcyBzbyB3ZSBjYW4gc2VuZCANCnlvdSB0 aGUgbnVtYmVycyBvZiBjb250YWN0cy4NCg0KUmVnYXJkcywNCkVtbWENCg0KRW1tYSBDb25uZXJ8 IE1hcmtldGluZyBDb25zdWx0YW50DQoNCk9uIDA4LTAyLTIwMjMgMTE6NDMsIEVtbWEgQ29ubmVy IHdyb3RlOg0KDQpIaSwNCg0KV291bGQgeW91IGJlIGludGVyZXN0ZWQgaW4gYW4gdXBkYXRlZCBG YWNpbGl0aWVzIE1hbmFnZW1lbnQgZW1haWwgbGlzdD8NCg0KT3duZXJzLCBQcmVzaWRlbnRzDQpG YWNpbGl0aWVzIERpcmVjdG9yDQpNYWludGVuYW5jZSBEaXJlY3Rvcg0KSGVhbHRoIGFuZCBzYWZl dHkNCldvcmtwbGFjZSBNYW5hZ2VyDQpCdWlsZGluZyBNYW5hZ2VyDQpQbGFudCBEaXJlY3Rvcg0K RGlyZWN0b3IgU2FmZXR5IGFuZCBTZWN1cml0eQ0KSGVhZCBvZiBSZWFsIEVzdGF0ZSBhbmQgRmFj aWxpdGllcw0KRmFjaWxpdGllcyBFbmdpbmVlcg0KU2l0ZSBNYW5hZ2VyDQoNCldlIGNhbiBwcm92 aWRlIGNvbnRhY3RzIG9mIHZhcmlvdXMgam9iIHRpdGxlcyBmcm9tIHNldmVyYWwgbGV2ZWxzIC0g Zm9yIA0KZS5nLjogQyBTdWl0LCBWUHMsIERpcmVjdG9ycywgTWFuYWdlcnMgYW5kIHN0YWZmIGxl dmVsIGNvbnRhY3RzDQoNCldlIGNhbiBjdXN0b21pemUgeW91ciBsaXN0IGFjY29yZGluZ2x5IGZv ciBhbnkgb3RoZXIgcmVxdWlyZW1lbnRzIHRoYXQgDQp5b3UgaGF2ZS4NCg0KTGV0IHVzIGtub3cg dGhlIGpvYiB0aXRsZXMgYW5kIHlvdXIgdGFyZ2V0IGF1ZGllbmNlIHNvIHdlIHByb2Nlc3MgYW5k IA0Kc2VuZCB0aGUgY291bnRzLg0KDQpBcHByZWNpYXRlIHlvdXIgcmVzcG9uc2UuDQoNClJlZ2Fy ZHMsDQpFbW1hIENvbm5lciB8IE1hcmtldGluZyBDb25zdWx0YW50DQoNClJlcGx5IG9ubHkgb3B0 LW91dCBpbiB0aGUgc3ViamVjdCBsaW5lIHRvIHJlbW92ZSBmcm9tIHRoZSBtYWlsaW5nIGxpc3Qu DQo= From nobody Mon Feb 12 14: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 4TYRZj121Sz59vTk; Mon, 12 Feb 2024 14: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 4TYRZj0XGcz4sGt; Mon, 12 Feb 2024 14: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=1707747949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3Og0CyA1lhgd2mOix88+458GFWAeBe6R95f8Z4g1pU=; b=XnFupVha4qGWTl86gpRMwiPx1+zj/xk4HjhxFTYpjEd+h5CGMaZBxzlJRdncqEfG1hNzg3 Q27tQ5eLJgWRNAbiWFm7D4leMcRvZzCgOma10yYu+056uDcb/nH2cn6yzLSldkuslF7ylU vOqpyso95nYqWPLqU+sxo8mA5QGqHY+xMDJs4WyZF7OhidcIQfOVggPZ+IQs6e3PyspT7h Ac02CaSgtwbV2aMs4GnuO+ZyxcWIu787YzWNUlsPFZztmbx3bA5jsOABhCwvrhxQ0hl9Qn 7vqCyp9i8MyPnGztQlZAPGcLzAkIcqNCReFL+bKvkvzR2e4rTDullcL1W3BLJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707747949; a=rsa-sha256; cv=none; b=gowrOwOLHYJZ+ETMuxFKu9OxpJ6MVTjUflW7N8gxnDwI9FQ85VrajuRe3j11Ixh15LPHte qmdK3PuwyOJdmUyxIqFs/pWXeYweGfcehSgkFU4S7YDXknFzrswRgn3sLSmZY98WcpU5ft o0YjeUnwKNQpeU4rydD77DWZ+Vzfv7gXBZ1+/51eyQxY2s9fd3yFf0JzLuKiDLH5D9pk+L hMhPDUTuFkX1Y8IzH3cZvytOyFdyAPyKHWbW0HoJHRkXVZxOK0iuUpJHZEhQZEme0G8FZU sMHjjg6L9aaa24Gf5MGfRbCD2TvgPpvoxslRtr48AIiNZpxyxwSnXX/MtfQHwg== 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=1707747949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t3Og0CyA1lhgd2mOix88+458GFWAeBe6R95f8Z4g1pU=; b=YQr3tC+ylkZUh16IsOUU59jvojbhxSLNIkjzUiuVYcHGVf7lNfiukBsaEly/EQ2VnC0cso BMNWLHVQIGxJV0sNoQgnARRd68pIhRAM5/7YjoJdGq76RZQcku3K7OZI4oFh5pvBzLK6Ka k0zRtLiFrXIW9AEkeMQ4gP40axxRZRKRy7v5tuhzkCDkxd+Njs2y0NJMt0Hpsm007rHiq4 arPrivSpFI84gZIspNdMB+Dv3Jb+4Qki9bEsBdQCtOJzEGu4kw33re6/Voe+MtUbMHRbwI 9oWO1AzQnfcf7hcUzhQDucSYgBw/f5XpM7MsGj/pXZn7kZiaIJ8jPFx7Ml/lwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYRZh6hfBzVwb; Mon, 12 Feb 2024 14: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 41CEPmxV075186; Mon, 12 Feb 2024 14: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 41CEPmxI075183; Mon, 12 Feb 2024 14:25:48 GMT (envelope-from git) Date: Mon, 12 Feb 2024 14:25:48 GMT Message-Id: <202402121425.41CEPmxI075183@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: fd1066bed67f - main - .profile: Don't bother checking for /home symlink 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd1066bed67f642ed01f5dd62b7b6cfb0a45fd4c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fd1066bed67f642ed01f5dd62b7b6cfb0a45fd4c commit fd1066bed67f642ed01f5dd62b7b6cfb0a45fd4c Author: Collin Funk AuthorDate: 2024-02-04 12:04:52 +0000 Commit: Ed Maste CommitDate: 2024-02-12 14:24:49 +0000 .profile: Don't bother checking for /home symlink Since FreeBSD 14.0, user directories are created directly under /home. This check should no longer be needed. This reverts commit 4cea05a273c875b5d5d4c41bfa6f2f0a60fa4a66. Signed-off-by: Collin Funk Pull-request: https://github.com/freebsd/freebsd-src/pull/1102 --- share/skel/dot.profile | 3 --- 1 file changed, 3 deletions(-) diff --git a/share/skel/dot.profile b/share/skel/dot.profile index 40dfa58f4e84..7b9aa96c834a 100644 --- a/share/skel/dot.profile +++ b/share/skel/dot.profile @@ -19,9 +19,6 @@ PAGER=less; export PAGER # set ENV to a file invoked each time sh is started for interactive use. ENV=$HOME/.shrc; export ENV -# Let sh(1) know it's at home, despite /home being a symlink. -if [ "$PWD" != "$HOME" ] && [ "$PWD" -ef "$HOME" ] ; then cd ; fi - # Query terminal size; useful for serial lines. if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi From nobody Mon Feb 12 15:40: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 4TYTDt1W4xz5B2Cd; Mon, 12 Feb 2024 15:40: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 4TYTDt0zt9z42gG; Mon, 12 Feb 2024 15:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707752430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPiDd55bwUL5HzaJWvyHTX3gcI4e3NT4RL1VLFnWldg=; b=tV8JPzviqxqWGvTdTmoDauhXR4XvGEVQPHg7xu5un5U39bDZGFltKlFcHHQ+m4znQfBR8s +eU14eydYjHwoxgHBHDbeq6GnlNm/a+ps9x7xkR89+jgMHu95hRlWDE1d7crTuiz8wp0is ajUInOaoM51ZWNCREaeIrO3hpZwl/9/Qej7LN1/GGNnW1x/QgIi30K8vm0jAZsAjfsrDK/ qmQKPoNmo7ffMJynjyw0FPQdr1LdmDUeuHtgAyrx58B2+T84rCNheAY8Vsr3CLKHZ6l+ml KESbx3W9Dckb3CCb8T+823+qZ5a02HePZ6xmrwUlhiXOYM/R+w/mET056t8KUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707752430; a=rsa-sha256; cv=none; b=m+fhM8U7b3UGM2aZEgWLTsp+4d7nUaJ22WQGdZxuJ4r8xJBDABp5Cf45Ri+gQwev7CW4wD chvy2uaZSVhT0vzRH3FIgakFoxrdXZjyixHEYs6ODIQohELKskb6wjzgclHhJLjLJVWv2X YfFfflJokdyWpOmBR+QpVZErd5nWI3C1PtdmN+57fMsEO/czjNWKXC4UOxMHEPEO6Hps1v A/zNgMrXdXrki1pcMWSaXj3cIRVKhN2XTqtSQA7De1TaVjjd738EzXE5v/62WHsULVvxFq vSLtu4CQcpsKazxMkEmpJpmAxE5jTXD7WtIiUl7a2mJpFOIxOrNKXOWriPvntw== 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=1707752430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPiDd55bwUL5HzaJWvyHTX3gcI4e3NT4RL1VLFnWldg=; b=fL+2YsHxVO9/usKhp4Jgr9Kx20kD65ONgrgzpF3cVFjf/VeRmf+l0LbsmSCzACYvkJ0zWO xJXvLE/Pm8mZkXFNCwuCyh1u5SHa+8IjSBKOjsIpsIFQuvyrArhEyrbfh37Bb67FZ4lwgZ o5FbffXWscl2lEwRqYdcrNvOiDKw/8rYHv5xAaWaHX68oVeeO/mT/WcUrVf2+FVpbbK93O bjpONoyKEf4Za57SZn7Ptr7hTpPARluEX3oxK2jUp2sX2m3ZP4mzDz46qdgzuWpRibTMll 728Er9p/XyEOeFBqop18KPvWNHJy4e/1XxjIbe4rGLBhgAHD5wrpTKFAp/x/Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYTDt02j3zXxd; Mon, 12 Feb 2024 15:40: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 41CFeTXW001731; Mon, 12 Feb 2024 15:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CFeT0N001728; Mon, 12 Feb 2024 15:40:29 GMT (envelope-from git) Date: Mon, 12 Feb 2024 15:40:29 GMT Message-Id: <202402121540.41CFeT0N001728@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: f1bd7311fbd5 - main - style.lua.9: remove mention of $FreeBSD$ 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1bd7311fbd576a387042c0d81945b701c7459a3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f1bd7311fbd576a387042c0d81945b701c7459a3 commit f1bd7311fbd576a387042c0d81945b701c7459a3 Author: Ed Maste AuthorDate: 2024-02-12 15:36:36 +0000 Commit: Ed Maste CommitDate: 2024-02-12 15:38:40 +0000 style.lua.9: remove mention of $FreeBSD$ Also restore a comment line in an example which previously started with -- $FreeBSD$ but was removed in 6ef644f5889a. The example shows the of a module require statement block following the license header. --- share/man/man9/style.lua.9 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/man/man9/style.lua.9 b/share/man/man9/style.lua.9 index 0417efc83c45..991a6f96b01b 100644 --- a/share/man/man9/style.lua.9 +++ b/share/man/man9/style.lua.9 @@ -44,14 +44,13 @@ is silent on an issue. The copyright header should be a series of single-line comments. Use the single-line comment style for every line in a multi-line comment. .Pp -After any copyright header, there is a blank line, and the -.Li $\&FreeBSD$ -comment for non-C/C++ source files. +After any copyright header there is a blank line. .Pp The preferred method of including other files and modules is with .Fn require name , such as: .Bd -literal +-- License block config = require("config"); menu = require("menu"); From nobody Mon Feb 12 16:14: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 4TYTzq1YQzz5B4w4; Mon, 12 Feb 2024 16:14:15 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) 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) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYTzp20hNz46bL; Mon, 12 Feb 2024 16:14:14 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=freebsd.org (policy=none); spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id BBF873C019A; Mon, 12 Feb 2024 16:14:07 +0000 (UTC) Date: Mon, 12 Feb 2024 16:14:07 +0000 From: Brooks Davis To: Don Lewis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 49d684369c66 - main - libthr: filter rather than link with libsys Message-ID: References: <202402071951.417JpRgf034979@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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.59 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.99)[-0.991]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : No valid SPF, No valid DKIM,none]; ONCE_RECEIVED(0.10)[]; MIME_GOOD(-0.10)[text/plain]; FREEFALL_USER(0.00)[brooks]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ONE(0.00)[1]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4TYTzp20hNz46bL On Sat, Feb 10, 2024 at 01:36:19PM -0800, Don Lewis wrote: > On 7 Feb, Brooks Davis wrote: > > The branch main has been updated by brooks: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=49d684369c6682eebca325c55a6c96b7c03f5aeb > > > > commit 49d684369c6682eebca325c55a6c96b7c03f5aeb > > Author: Brooks Davis > > AuthorDate: 2024-02-07 19:38:16 +0000 > > Commit: Brooks Davis > > CommitDate: 2024-02-07 19:50:47 +0000 > > > > libthr: filter rather than link with libsys > > > > The allows gcc + GNU ld to link programs with -m32 -pthread without > > erroring out due to _umtx_op_err being undefined (unless -lsys is added > > to the link command. > > > > We now always link _umtx_op_err into libthr (not just when it's static) > > and filter it with libsys so we call that implementation. The dynamic > > implementations (at least the assembly ones) should likely become stubs > > as a further refinement. > > Thanks! I ran into this problem early this week when lang/gcc12 stopped > bulding and I spent a bunch of time bisecting. Sorry about that. We (mostly antone) did a number of exp-runs, but I made a last minute change to fix (somewhat ironically) buildworld with GCC 12 and that broke the GCC MULTILIB option... I'm not convinced there isn't an underlying bug in GNU ld's -m32 support, but even if there is we need this to work with past versions so I've not put more effort into this. -- Brooks From nobody Mon Feb 12 17:19: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 4TYWQZ5czBz5BB5D; Mon, 12 Feb 2024 17:19: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 4TYWQZ32Yrz4Kss; Mon, 12 Feb 2024 17:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707758342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cw4CZnFYh7VPrk0/00x1dOpmGonxXhN98dPwBCZstMI=; b=boC1P8omPyMYMl5z3s2gDwQFIoRZUQLA3oe04rW1I5WtYTrSpNEpWBvqWUtdMyrorfdd9b GFkmk4RFxiZahBtQ61KLNghZFZHSR3A6u31MEul43rILlkLthAc+E60R+cl29nt7OJ4Cyi ytd1aGCFCYLIOtpp7Q3w81MXX6l+843FvPHzBSxHzbhbn613LfsVQGO+aBTt6JpM42ZUsc Zi+2mwQpkrECODCH2S4v00txw2buaubIAOuizRF4YM8OArAK2D1HZdcbMFUHPRGdyZ86FO gYVAgmNS4ZS5cIpPiat1RPIyihBQx3/Xiw/mC4OqcvJV91ESPNtDXtpkCRpsSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707758342; a=rsa-sha256; cv=none; b=L5qhSEuXfPJTSQOYkoUNHm0mIiFJLi6EuH6GrPV4JlPMTFG4D/G4G7kdtBKWct3UqO4u++ s0stACI/x05eVGACPOTdUk/00mZLwL8tC4nCIyUF0iL0QNU4FxmB3dZYWETzFWZ71gYy5O +Fg5H9jz3zjUJmcYEOXvOXP4EwJ7VbXfCPhKIz/WINKYejMwIDR9T52ndVAbL0o39Pi4ls D0cGvn+Tq55JI4hXnQafrgSu/hR7gv2v8bfMTUtotgNAuog7QehdrN7FQcxJKKPkGyXMbE bce0MQ/4jBp/3r34H/ZkIzd+ymcmvG34HwTEUBHEHqEG9kA1j5GDg5z3H9s/Lw== 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=1707758342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cw4CZnFYh7VPrk0/00x1dOpmGonxXhN98dPwBCZstMI=; b=uL5Nav7WcVywUfuiAWvyOccLJdJBKEBs0Xbs9KmU+pQiJLXATfAXCZVCtu3qoFgfgKTGYz ZEgDmW+IBBPIBltUPad0jWmd/wXnVC1PWrKykRZl/i1ep2nKG74n2a36Ln6Iw1wR6a9Mqm h9B+yIV9WhIw7mKwIAm6179Si3DrobxIhGLxNoP8+cEi6jCky4X0O/eRwJhkSPs03KUE4K e4fqey3ldDkxe+reSq61ZrIfQu+GiVZh5ZGiuGaGROVw5TGVIq4dRDT2cVeR0QqQsjxL1M BSmsruHwEIqnoLtcljH/IkXdRxvmxP8yaF72ns9MC3pmqD2vReBfH10vCGWY/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 4TYWQZ1nkbzb1X; Mon, 12 Feb 2024 17:19: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 41CHJ294062688; Mon, 12 Feb 2024 17:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CHJ2kC062685; Mon, 12 Feb 2024 17:19:02 GMT (envelope-from git) Date: Mon, 12 Feb 2024 17:19:02 GMT Message-Id: <202402121719.41CHJ2kC062685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 114ab149e23e - main - files: make uart_bus_puc.c not depend on puc 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: Sender: owner-dev-commits-src-main@freebsd.org 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 114ab149e23e11760a2a41a773a786b97980616a Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=114ab149e23e11760a2a41a773a786b97980616a commit 114ab149e23e11760a2a41a773a786b97980616a Author: Emmanuel Vadot AuthorDate: 2024-02-12 17:18:20 +0000 Commit: Emmanuel Vadot CommitDate: 2024-02-12 17:18:20 +0000 files: make uart_bus_puc.c not depend on puc If one wants to have puc working as a module we need the bus in the kernel otherwise we won't be able to find any child to attach. Reviewed by: imp Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D43846 --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index c91b1f89f921..b5f28b848800 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3174,7 +3174,7 @@ dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_fdt.c optional uart fdt dev/uart/uart_bus_isa.c optional uart isa dev/uart/uart_bus_pci.c optional uart pci -dev/uart/uart_bus_puc.c optional uart puc +dev/uart/uart_bus_puc.c optional uart pci dev/uart/uart_bus_scc.c optional uart scc dev/uart/uart_core.c optional uart dev/uart/uart_cpu_acpi.c optional uart acpi From nobody Mon Feb 12 17:57: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 4TYXGb32Sfz5BG1X; Mon, 12 Feb 2024 17:57:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYXGb2JQfz4YlK; Mon, 12 Feb 2024 17:57:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707760631; h=from:from:reply-to:subject: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=Kgu6v6rrRQ4GRYPpo9Bb87xpl5NX2u/vdszDreL8q3o=; b=Is27GAQ1m2Z5quk2O/9av53a3acreJazvbll5TY14QEtMWiyu3zrdQiwA+YA4LqifthDGL gTEBPc8tv16hU6FcCiD9Ejxm1nR2VcKTgL4f9wEvv3W54V1S4hVvOcb0nlHWzLyJ0d8SuU dp+PziUoeaO5679owQrGTXVMVK0a3f24nCoCeHf/+Qeq5jE6616FV0RwUt4qimyoAyHYuj rIhARW50ZP6RTBaIcVnk7Wi6V/n2cOZ84CAH8k/l6PHzfjkXyC2MFNl0lYUKEK82ESYhHo bkczvo4pZ9YJUBy7j3wbVk8DolUisLc/tY+fbtSsMFdYavQsHiSo81o1SLtimQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707760631; a=rsa-sha256; cv=none; b=mZTbFCm/NCpAB4ChXhy+Y9JqgE6nW5jeAGjmFEkTP+Rlii+5d6y0vkQvx/hB+BUAuSYleR d4/e5Mg4FQ4SPIQ5WFxdzgekNwiY7m8g43l/QLiha1EvWq8ljEFqUAQvabDY7BGJcuoLAG mTLShQOwzW0KYCDUYPtFspX/bSV9rz39vRANFqctFIbFiE475a7GoF0VbdyCWZCsutRWG9 sx+tW9yXeVQ2nQczy+sIJkd1SruXn3eIp2cCxq5d3RRgE3opkvXNCUxgcateAwvx/hBrOI 0FB2Iwd0o1jSn4+uFZVB8JiYfRTigQypOkYUaqGfwl7PpRh5EDLtmVBjYk2CRw== 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=1707760631; h=from:from:reply-to:subject: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=Kgu6v6rrRQ4GRYPpo9Bb87xpl5NX2u/vdszDreL8q3o=; b=byz6vRg3F7c+zDIeH+1M7xLpqlbo6EseNIZOqoWesZ3I2AloF9UKkeyeDLcbhZewIGDQmq 0icimYCiwPAtEnc8k/+AZ8aCZ6Sdk0SHCJmmnQPktiMZoHp1nU2jQEfRB4nMT6346FlYNF WMde8I0NNWD/RO+A3ANlI1sZ1XeCMKUiD1O1vMLfjv1/ZoQdq/j6nn2I1OL6mVOog/DayX XGbPFmDVK1xbR5TNtHiAMWuV2wHRrtJUzaSKLak/7ZXVtKDPr1k9x4sw7/ORu8WOqrI/pU 03TuJ7N9HJhSCeUkenpQvWZTglXSinoetF0LFbFg3cOqnGRoDxiNep1kJ/9BMQ== Received: from [IPV6:2601:644:937c:5920:4c63:23c7:5c22:d7ba] (unknown [IPv6:2601:644:937c:5920:4c63:23c7:5c22:d7ba]) (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 4TYXGZ5NhTzTqn; Mon, 12 Feb 2024 17:57:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 12 Feb 2024 09:57:09 -0800 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c0b8047bdc13 - main - LinuxKPI: Allow kmalloc to be called when FPU protection is enabled Content-Language: en-US To: Vladimir Kondratyev , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202402102203.41AM3NGb006023@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202402102203.41AM3NGb006023@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/10/24 2:03 PM, Vladimir Kondratyev wrote: > The branch main has been updated by wulf: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c0b8047bdc13040eafb162c4b7b5dba11034ff4b > > commit c0b8047bdc13040eafb162c4b7b5dba11034ff4b > Author: Vladimir Kondratyev > AuthorDate: 2024-02-10 22:01:50 +0000 > Commit: Vladimir Kondratyev > CommitDate: 2024-02-10 22:01:50 +0000 > > LinuxKPI: Allow kmalloc to be called when FPU protection is enabled > > Amdgpu driver does a lot of memory allocations in FPU-protected sections > of code for certain display cores, e.g. for DCN30. This does not work > on FreeBSD as its malloc function can not be run within a critical > section. Check this condition and temporally exit from FPU-protected > context to workaround issue and reduce source code patching. > > Sponsored by: Serenity Cyber Security, LLC > Reviewed by: manu (previous version) > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D42822 Thanks! -- John Baldwin From nobody Mon Feb 12 18:26: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 4TYXwQ3Nbyz5BJVY; Mon, 12 Feb 2024 18:26: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 4TYXwQ2tHnz4f6W; Mon, 12 Feb 2024 18:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707762390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ge1rP8SwCNIalu/PIVYdxVs9H358A8BdBYrOCZf3k78=; b=fs1WKaxBcFtCMU2Pl79BTcS4DLx3DlBMkhrnxWhOMc921dnTxo8xMuMJC11DBEu0rF8IGq 0GkrzVKZgC0F32xBz2z7aLZGCz7kYRZf8FP4/NDRv09HwcNVHiyx93MHTCIbMZaxFWzh8Y hx/5aCUshkfYLtcNhmPfLHz1LWg56Zb1WAFLyEZnYXXLP8n1tTrLGlVXvSz4l+Gy0BPjFJ OZKI9BFIaYgQ/am6OaSOHQTHBW2J+l3DGP4xlimoHbJUcEx+rwItu24Ao/Z+B/jGnNJnAA 7I4aIdu+nNnZ6IXXndS59HcaQYDe3xEIxocw+LeoFTVRNHqhEWATTwH46v8hsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707762390; a=rsa-sha256; cv=none; b=cEDSBsw0ywBThJQiwLwGpsr/ohX0hPFHneYABerg0pwWJy7QdQp3/3HtH+au4M5ilOlaBR IE8CUOPB2B2RbssTpI7ewLpqIRW239Ab10v5tSrTs0bn/2VNdbH/IgF3YUnX1gLSASXDaW FLzGr7xIuRHECVJKKONxz4bVRue6XtScsE52CK+M9oiCms35XgHVVP3haeY3I9mUhQGELu d4ZQWOGUHOUMn9F1OOXQinFxytZXfoBl7kLZh0V9RSxQyc5Pd386LmDLPz5BMfv8afb2yx YII6ZeL6E2gl5/FNOiXGIaarcy2/vzK1ndMuKBPwJZRwfDeH5MWXHJxrBXNsQw== 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=1707762390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ge1rP8SwCNIalu/PIVYdxVs9H358A8BdBYrOCZf3k78=; b=R8SZ9Ca+shog1jePHVlhV5F747tS2PqFNCCefdZyGgeCMGOeoyp7W/RQA5sQEcxaYDiLLW /0XFuMZPo3/JlAYWUt7TeHHy0VlNdwztOOQJNSzeTIfGdjWo+O9T4tkKerTj/8jf/VGSP7 7JWM5x5IX4w/QJx0jl1rkESQv8AVDCBaZKhEsvNSFLpVRYIxz5iylarBUY9H0NztqS1wkd WTCTeFlNDxp2SWPehAZgnJxkLt3DyY+LfeQwiAZweWugjRthoD9OICcLTD0JBZBaNB+88S 77KZIAfkMluy3llbUzfRTxPDTU2kR0Q3wTaZNoTsJaMHROszxIjkL+DX6b6SxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYXwQ1xfJzjHS; Mon, 12 Feb 2024 18:26: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 41CIQUpd080393; Mon, 12 Feb 2024 18:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIQUk5080390; Mon, 12 Feb 2024 18:26:30 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:26:30 GMT Message-Id: <202402121826.41CIQUk5080390@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: 851a9da38f07 - main - patch: Support long context lines. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 851a9da38f070675c42a6d69c41c47a5d29ee3d0 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=851a9da38f070675c42a6d69c41c47a5d29ee3d0 commit 851a9da38f070675c42a6d69c41c47a5d29ee3d0 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-12 18:26:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-12 18:26:13 +0000 patch: Support long context lines. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D43850 --- usr.bin/patch/patch.c | 2 +- usr.bin/patch/pch.c | 10 +++++----- usr.bin/patch/pch.h | 2 +- usr.bin/patch/tests/unified_patch_test.sh | 19 +++++++++++++++++++ 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c index 403189bc92b1..838c721841ea 100644 --- a/usr.bin/patch/patch.c +++ b/usr.bin/patch/patch.c @@ -1085,7 +1085,7 @@ patch_match(LINENUM base, LINENUM offset, LINENUM fuzz) LINENUM pat_lines = pch_ptrn_lines() - fuzz; const char *ilineptr; const char *plineptr; - unsigned short plinelen; + size_t plinelen; /* Patch does not match if we don't have any more context to use */ if (pline > pat_lines) diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index d528f06235bf..fb53ff86f9ef 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -55,7 +55,7 @@ static LINENUM p_max; /* max allowed value of p_end */ static LINENUM p_context = 3; /* # of context lines */ static LINENUM p_input_line = 0; /* current line # from patch file */ static char **p_line = NULL;/* the text of the hunk */ -static unsigned short *p_len = NULL; /* length of each line */ +static size_t *p_len = NULL; /* length of each line */ static char *p_char = NULL; /* +, -, and ! */ static int hunkmax = INITHUNKMAX; /* size of above arrays to begin with */ static int p_indent; /* indent to patch */ @@ -137,7 +137,7 @@ set_hunkmax(void) if (p_line == NULL) p_line = malloc(hunkmax * sizeof(char *)); if (p_len == NULL) - p_len = malloc(hunkmax * sizeof(unsigned short)); + p_len = malloc(hunkmax * sizeof(size_t)); if (p_char == NULL) p_char = malloc(hunkmax * sizeof(char)); } @@ -154,7 +154,7 @@ grow_hunkmax(void) fatal("Internal memory allocation error\n"); p_line = reallocf(p_line, new_hunkmax * sizeof(char *)); - p_len = reallocf(p_len, new_hunkmax * sizeof(unsigned short)); + p_len = reallocf(p_len, new_hunkmax * sizeof(size_t)); p_char = reallocf(p_char, new_hunkmax * sizeof(char)); if (p_line != NULL && p_len != NULL && p_char != NULL) { @@ -1251,7 +1251,7 @@ bool pch_swap(void) { char **tp_line; /* the text of the hunk */ - unsigned short *tp_len;/* length of each line */ + size_t *tp_len; /* length of each line */ char *tp_char; /* +, -, and ! */ LINENUM i; LINENUM n; @@ -1408,7 +1408,7 @@ pch_context(void) /* * Return the length of a particular patch line. */ -unsigned short +size_t pch_line_len(LINENUM line) { return p_len[line]; diff --git a/usr.bin/patch/pch.h b/usr.bin/patch/pch.h index 5ce4f72497c7..b6c6363155a5 100644 --- a/usr.bin/patch/pch.h +++ b/usr.bin/patch/pch.h @@ -45,7 +45,7 @@ bool there_is_another_patch(void); bool another_hunk(void); bool pch_swap(void); char *pfetch(LINENUM); -unsigned short pch_line_len(LINENUM); +size_t pch_line_len(LINENUM); LINENUM pch_first(void); LINENUM pch_ptrn_lines(void); LINENUM pch_newfirst(void); diff --git a/usr.bin/patch/tests/unified_patch_test.sh b/usr.bin/patch/tests/unified_patch_test.sh index 43b0d8373cfa..7d4b74182c41 100755 --- a/usr.bin/patch/tests/unified_patch_test.sh +++ b/usr.bin/patch/tests/unified_patch_test.sh @@ -141,6 +141,24 @@ file_removal_body() atf_check -o inline:"y\n" cat foo } +atf_test_case plinelen +plinelen_body() +{ + hello="$(jot -b hello -s, 20000 | tee foo.txt)" + cp foo.txt bar.txt + echo "world" >>bar.txt + cat >foo.diff < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9622dc05ae11 - main - zfsbootcfg: Remove bogus CFLAGS 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9622dc05ae11b145f1602fd0bb1fd6509c074b00 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9622dc05ae11b145f1602fd0bb1fd6509c074b00 commit 9622dc05ae11b145f1602fd0bb1fd6509c074b00 Author: Warner Losh AuthorDate: 2024-02-12 18:44:22 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:44:22 +0000 zfsbootcfg: Remove bogus CFLAGS When using the zfsbootcfg library, we're talking only to it, not to the rest of ZFS, nor are we using anything that needs access to the ZFS compilation environment. Remove all the compiling OpenZFS itself flags. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D43823 --- sbin/zfsbootcfg/Makefile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sbin/zfsbootcfg/Makefile b/sbin/zfsbootcfg/Makefile index 3d5589dcee48..1833fc542ce0 100644 --- a/sbin/zfsbootcfg/Makefile +++ b/sbin/zfsbootcfg/Makefile @@ -1,19 +1,6 @@ - PROG= zfsbootcfg MAN= zfsbootcfg.8 LIBADD+=zfsbootenv -CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID -CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h - .include From nobody Mon Feb 12 18:53: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 4TYYWg5h0nz5BMYy; Mon, 12 Feb 2024 18:53: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 4TYYWg26zpz4mBH; Mon, 12 Feb 2024 18:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5FFaT8uSjvSzH2i+YIkKqcMk0/T+uY4yv0IAI/zKH0=; b=RcHRhrNwxz3EvyA+mPprRJ9MRms5f93wds5HwN3ug90LRGqGdL6wmYY5C16aguDBuChZnu 9hDMZ7uTT7/mBINQaCPELDSEVErxkO1jqBOUg3ERw+hVaqFtdUmqKzUNfTEHDRDbZUwGyp XyvehKpLZgMMojti34fQUM+G7Kt1tdL1I82rabBSgz6STBS9fV+6Zw+UjnNsjj5UXRCEWj 8sREBDbmmozYKcixr5pOEWRwlHBJEwO3NYZtG6jUEIHwlsSOyoENVnJIoqTYpnA6pqvviO ghwQCXxvPVmFZPhH4PX5ejuBCo3q3MF4Fwht6wcvjtK6jjNJijv44XtFLgW3ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764015; a=rsa-sha256; cv=none; b=JgK6iJoUGMkp9S6Z+MDrYHgGHH5H1b8WcJUiOMNt+RBaMkw2o0qqL8HwaOq1fobsbzaJ2v f3X5fe/EzDm1xQ+hzmf0Wu2W8NTRJONuc+PocRbBlIC0MH6FOZbNlVMg54KUb9EXKHS5dt OJ1bnNrFBhTRKDkbwdaX4yiT2HroSdtmk9aCbL8OstzRYnhDXBLG1V5nhNPmKXG8qqJF9+ cPNeILoqSGs3DMo+59JiMYmsIdLwRh2i4JeKuN/mWDJUKklMDg3uDdmyVIKV8uRuCnxuA4 s515MffBirqRdAgXzaKhV4Ug0bjqG9w5xdTunF7nbKaJtSl7YMFXWcS544+Wpw== 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=1707764015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5FFaT8uSjvSzH2i+YIkKqcMk0/T+uY4yv0IAI/zKH0=; b=SS045/UPPryXcXuujpd80bBF4bITej69ix7c5Jh+lLAZ/l9LTBQOFxDaztJo1ytRPsAtSX sODCbodxqs01Rgj2pe5kgIRfcrQ9a9hI5GL1nkZlE80QhFv+k16IgGZO1OnXz0uC7oYGAl 1GU2zBjNHhp/thljFzwU6C4WH/zChgWrhK1VbyviLeoiCKYTPfpf9OY467Tcrxi5XOMVlA tHvD6w0XsEUhqmUwOpPUeYpkRBz/1ww2Ee05x+ZBqtyKvzs6p2qA/P6tXi3oB88KOeAz1h t+EvHGAyI4SP+DgpjbRZvoNKS4tuI16dNx3wZ1wCZCF+wm3ZESlh+OazYEcLpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWg1BBLzjQX; Mon, 12 Feb 2024 18:53: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 41CIrZsU030308; Mon, 12 Feb 2024 18:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrZcr030305; Mon, 12 Feb 2024 18:53:35 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:35 GMT Message-Id: <202402121853.41CIrZcr030305@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: ac4847e6b0e9 - main - rescue: belatedly add zfsbootcfg 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac4847e6b0e9a4ab71c96826afadb06ae78e702a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4847e6b0e9a4ab71c96826afadb06ae78e702a commit ac4847e6b0e9a4ab71c96826afadb06ae78e702a Author: Warner Losh AuthorDate: 2024-02-12 18:44:32 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:44:32 +0000 rescue: belatedly add zfsbootcfg nextboot.sh uses zfsbootcfg to enable nextboot functionality for ZFS, but zfsbootcfg was never added. Add it now since the nextboot binary that replaced the script also uses it via system. Sponsored by: Netflix Reviewed by: kevans, kib, emaste Differential Revision: https://reviews.freebsd.org/D43844 --- rescue/rescue/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 0a8d142ef83a..de3dd8a64575 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -133,6 +133,7 @@ CRUNCH_PROGS_sbin+= routed rtquery .if ${MK_ZFS} != "no" CRUNCH_PROGS_sbin+= bectl CRUNCH_PROGS_sbin+= zfs +CRUNCH_PROGS_sbin+= zfsbootcfg CRUNCH_PROGS_sbin+= zpool CRUNCH_PROGS_usr.sbin+= zdb .endif @@ -154,6 +155,7 @@ CRUNCH_LIBS_zfs+= ${LIBBE} \ CRUNCH_LIBS_bectl+= ${CRUNCH_LIBS_zfs} CRUNCH_LIBS_zpool+= ${CRUNCH_LIBS_zfs} CRUNCH_LIBS_zdb+= ${CRUNCH_LIBS_zfs} ${LIBZDB} +CRUNCH_LIBS_zfsbootcfg+=${LIBZFSBOOTENV} .else # liblzma needs pthread CRUNCH_LIBS+= -lpthread From nobody Mon Feb 12 18:53: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 4TYYWh5KDkz5BM4X; Mon, 12 Feb 2024 18:53: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 4TYYWh39qLz4m2y; Mon, 12 Feb 2024 18:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+gfVE7STb4IDFBixMypTacmQVsHX6P1kugRK5fO0jQ=; b=nKJumsO7sJNleRPqRLx8PwYf0AabwzKP6g8BQrMX4z6kGvtR0/73+DNxiL5qpRSzYOcSUk tV+UkEPzODDxSsJTDWtOW8YDiWbccG6D+ZySrWNiVFdk21tXPiyAPQZNkKvkb7OEOhke7o OfUGL29nqis/6r23+zmoGtocA4Jtx5gLBO/xjUeAy5RPrhB1iXswBmhuJl6Tq6/X8Ckza1 Y3y2nCOAG49OFY9603Nt52yfBmMU+8sAVLTBlcHIFaWwQ8Ke264wuyrxRoFqo3+CtJI8L1 Q1gx/NCSvQk4Z4IquXDmJdCpuH4EcX3LKwxbxZYh8secssP9w3SoyWPMxzZ8vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764016; a=rsa-sha256; cv=none; b=cSEG3C5ZvhzzxQsHtQEUSRB8S2gB8w3dGuwFvKNMq9mmV2eEMLPotmLTkJCUGugZ8kMadl hZc2uetcGzevNgJwI2/YmK5EnuF2vwgrFqdVwN+NfKijJrKI5H4q1agAH1izManb1bbhJ9 7bf4nEyN5SzLzO2evnjm1fuT7Tio6iixrzUxi55Nf6+85zLNdHWUFakayGvDh9o4R33Xce zKVrWU1S3vHB6/4D3yeEMRBlQYvMb8jVHEJA1lB2ZLtRZKe1XYfir4kwncB7H/4VQVgUEP srQEKSjqjzBM35qN49JRuUOG1PsBGldXkq7mAN9WLIAcW2hLHAoD3k+gJ62MAQ== 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=1707764016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+gfVE7STb4IDFBixMypTacmQVsHX6P1kugRK5fO0jQ=; b=TXAkPGdz02DpYpPRTQYu8RH8WcAzt/4F3kMoMpFQFV0DyZygyq2MTuIhxBiFhQpJLjaLiC qYp+91dqHpEFvh0hvrXA+5uWp49eTYjpRYob5+EcbqOXHCBTeK7P0SzdkhtBSOko2N4Lrz 6L5Mr7YtSJ4Ka3jzLqFinikfO6xjQcI8rWvSzN+xW0Hs6Yg+mGmDrKEE+6r0b7HsPhXNp9 dqyLw2x3mlVSAJZNvffw5MgO5u+Yz+MpIoMfGDfKnlNKqiEtnyYZIMzaQAV896GGktd0Wo l3Xs5dz397cTcWEey/4ZE2lOYTjNxXgtmOxwtXTfxNC92R6l9SE0bsEZotoN0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWh2Fwpzjng; Mon, 12 Feb 2024 18:53: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 41CIra5d030365; Mon, 12 Feb 2024 18:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIra1Q030362; Mon, 12 Feb 2024 18:53:36 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:36 GMT Message-Id: <202402121853.41CIra1Q030362@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: a78bc42bcc31 - main - reboot: Disallow -k and -r, it doesn't make sense. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a78bc42bcc31f04fdb3319f7b11c6d8da5a30bee Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a78bc42bcc31f04fdb3319f7b11c6d8da5a30bee commit a78bc42bcc31f04fdb3319f7b11c6d8da5a30bee Author: Warner Losh AuthorDate: 2024-02-12 18:44:43 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:44:43 +0000 reboot: Disallow -k and -r, it doesn't make sense. When we're re-rooting to a new /, there is no next kernel. Error out rather than leaving a timebomb in /boot/nextboot.conf. Sponsored by: Netflix Reviewed by: kevans, kib, emaste Differential Revision: https://reviews.freebsd.org/D43800 --- sbin/reboot/reboot.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 7daf38b88a3e..90c67caf9d07 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -115,6 +115,8 @@ main(int argc, char *argv[]) errx(1, "-c and -p cannot be used together"); if ((howto & RB_REROOT) != 0 && howto != RB_REROOT) errx(1, "-r cannot be used with -c, -d, -n, or -p"); + if ((howto & RB_REROOT) != 0 && kernel != NULL) + errx(1, "-r and -k cannot be used together, there is no next kernel"); if (geteuid()) { errno = EPERM; err(1, NULL); From nobody Mon Feb 12 18:53: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 4TYYWj5Bt2z5BMZ1; Mon, 12 Feb 2024 18:53: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 4TYYWj4Flyz4mTn; Mon, 12 Feb 2024 18:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPtcyehJKKJIsc3vsv9MC0c62+SOSuRCRYUFv/T48qI=; b=X5hlxQwzW5y83IJlqIo5QJRrzskcVCYE+V0NKNScXUdzOVaMXJVUgxPiXs7bu58J+4O3WM ytgwCZdE6rJaPoXRYPHN0t9IObilgb1yVuyn3ur3hAE3B8Vd6g2AkBUm8ft50McD36ZAIr OABzLjRn1GeayEsI6pN3NFveFS3jZhPz14EJfBa2ZSUo1ZK4n+hMXLhZCL52yu4fkQGWjc DyxZdTTlGGOloiwYMwaVB9Z3ovv9MiahANLBV1/CwVCM9bTR5A24g8zm1hB26AUzwhPAY+ +12kBlpr0/1vr4JSo7hRxSW8ozc1fFrwcZux//YUdmI4C1FEbpAWlNCv6vixIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764017; a=rsa-sha256; cv=none; b=LlLv0/pvJnEeE0XfSBeuY4Iz/tQ8snCPzj2Y4rc5qBgAX00GPqiOm0OUAgxRNKARtmKOpl YI9R3+jvqPvNEXNfxVNnlrzliuVxsKm82qO2Y2sJh6kygvYyQzSKObHapAEXskaTFbtm8c UZ4TTYBEamjrwGYH2TbT6HQb6o+ELYpUAD7ZWFfBeTwQyHELIjOhaNzaRG2n6RTn8hP0Pl vpZB3Wpo8bDeLvzvrx7vrdyUlE7P4ap1yv14kNKjfhxBVU55OYmEuuJYN349Hg8YeBW1jQ IxWTTIj6Hb9gnkCpRncDcauzrpIvRyHtMHRmPR/mRj9yJcRbt2vjKtMaGjB0Hw== 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=1707764017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPtcyehJKKJIsc3vsv9MC0c62+SOSuRCRYUFv/T48qI=; b=yxoYZhApczYByBbOohmLWaf7XQukscSEEFuHooL0pekHAktvK+0JaRMh+JSm0fvtPjf0ML +N4/uNPNhpFLIXO7KTbvZD5SfPa2p153fwXl7LloZ8581z67rfzN0MlbOExoOhyt0mma/f +Z7KqddoLGaBdg8Zbbvb7cGN8UBz4IJTDWiHiWYFmClQ5QD6EAsm2IBnN29d4fHR08O521 BtJWm/8xPan2fzXx/Yx7rXsn3DJ1xwz1akvC5SJOan9U33+Hh+LlOSKgn2X5J3rRUImeYY XTHscYDAFhpUkIkOC+JGrzP79rWhLn7E9dPGDRPqiTXGkIy8eKsRSe5SqaFPRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWj31k6zjKD; Mon, 12 Feb 2024 18:53: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 41CIrbLs030409; Mon, 12 Feb 2024 18:53:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrbWV030406; Mon, 12 Feb 2024 18:53:37 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:37 GMT Message-Id: <202402121853.41CIrbWV030406@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: 7a3210f2ac09 - main - reboot: convert flags to bools 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a3210f2ac09c36f46314a98942a29765e99d848 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7a3210f2ac09c36f46314a98942a29765e99d848 commit 7a3210f2ac09c36f46314a98942a29765e99d848 Author: Warner Losh AuthorDate: 2024-02-12 18:44:52 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:44:52 +0000 reboot: convert flags to bools Convert all the command line flags to bools, since that's how we use them. Sort the includes while adding stdbool.h. Sponsored by: Netflix Reviewed by: kevans, kib, emaste Differential Revision: https://reviews.freebsd.org/D43801 --- sbin/reboot/reboot.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 90c67caf9d07..7dcebef69b85 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -35,38 +35,40 @@ #include #include -#include #include #include #include #include -#include +#include +#include #include #include #include +#include #include #include static void usage(void) __dead2; static uint64_t get_pageins(void); -static int dohalt; +static bool dohalt; int main(int argc, char *argv[]) { struct utmpx utx; const struct passwd *pw; - int ch, howto, i, fd, lflag, nflag, qflag, sverrno, Nflag; + int ch, howto, i, fd, sverrno; + bool lflag, nflag, qflag, Nflag; uint64_t pageins; const char *user, *kernel = NULL; if (strstr(getprogname(), "halt") != NULL) { - dohalt = 1; + dohalt = true; howto = RB_HALT; } else howto = 0; - lflag = nflag = qflag = Nflag = 0; + lflag = nflag = qflag = Nflag = false; while ((ch = getopt(argc, argv, "cdk:lNnpqr")) != -1) switch(ch) { case 'c': @@ -79,21 +81,21 @@ main(int argc, char *argv[]) kernel = optarg; break; case 'l': - lflag = 1; + lflag = true; break; case 'n': - nflag = 1; + nflag = true; howto |= RB_NOSYNC; break; case 'N': - nflag = 1; - Nflag = 1; + nflag = true; + Nflag = true; break; case 'p': howto |= RB_POWEROFF; break; case 'q': - qflag = 1; + qflag = true; break; case 'r': howto |= RB_REROOT; From nobody Mon Feb 12 18:53: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 4TYYWl0vKVz5BMcP; Mon, 12 Feb 2024 18:53: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 4TYYWk5DF8z4mF8; Mon, 12 Feb 2024 18:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9++syLeivXcZyoQ2rrn8xYNTk+vGI88aoJQ+R1tkrFw=; b=mRJI8AxvmFN5dl+TUi2A0tpVayhKQS0m38GK1LmCaK3mGVFvDhs3zXGDLiuQ6RDxr5O/nv Z0MJ3DACLi3l0iIupGaYk7H2KAnyERD1C4TtkgbwEmsSlUUGEaURgYsodOuuwNKi9oriFY 5FuYHGRFuq0zpdoMXId5fzKwG6vIrNKCQBJKkjdQSjw4QOp+V9GfO5phYMe5wDuVIlZ5rN bRGKlEjpfZqauMrHQ0uKGzE9UhfKdnz2IFPK88UR55LgLGceDrNyP/u5tAGSavzlf6cv9C qH0D4/LG+9Tdkk+HQEatE/VlPU8TPYb5GRxH3+CYOZbuLvxjIqtzw4VSnbuwbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764018; a=rsa-sha256; cv=none; b=SI4GgIMzT4dS9CPArabSszFioSN5iQ+Gjtgt/o0MXuG6hMrJw3ibOj/a6oZb2mZ6yxkUK/ HyI3NNdqexFkIamSgRYCy0JPoV32TyyyTDrqJuian+sWk0zOhoQ4gHrn4CnwL0X2gTybL9 +CIJtTmiSPES5Pym7saO95bw6Qhz6oT6qSYPvze61wnfMuzvuzqCqye56d89DJmvbaXe/e qAjMaLlKugqfsbDEUUHRxbPEup9sCzCoqSJMdN4VDw5wcLiltjo7nrNYXzhwKr/4BtXQwl ivKZFdFvMtbCy8UqFELN/kkZVqyoATAewcQewhAaYJ6aHdywNu1FaYAQhVT4Vg== 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=1707764018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9++syLeivXcZyoQ2rrn8xYNTk+vGI88aoJQ+R1tkrFw=; b=U0c/LV1wFKnZRoGMsXb7BXE0IFlMiW0G5ALjNp6lEVqxoG0AFsWR58XWbOK0A6Ven8+3Qc QOygXt60L1sVuWXROF/+84qIhEp42fCRuQ9Kdvh5J3ESGP/LlTe6vq5YwVKbafYb++9bzQ VLfVtjqfmoRHFYJY/PpiEWbhUaryt3wO8caikrq8HGFDbEPDA5LzSCeoacs5tJIhYQFwJg +K07c6Xa59112aA0TFPjXgVBRvl7pOOGUVf53Yw5Ni20NsCLAAW9UYlESYJ9qFbM51hV/M b8Kf5i7LdnT1YfzpFJx4yrq7dAkRNYg7TPkvMRVgVTGeU/ruNSsrvPzy558Dhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWk4KN8zjQY; Mon, 12 Feb 2024 18:53: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 41CIrcQu030465; Mon, 12 Feb 2024 18:53:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrcrj030462; Mon, 12 Feb 2024 18:53:38 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:38 GMT Message-Id: <202402121853.41CIrcrj030462@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: 7cb1a0e6e064 - main - reboot: Don't reboot if the next kernel isn't there 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cb1a0e6e0643cb80308f45e2cce2d127ada3c8f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7cb1a0e6e0643cb80308f45e2cce2d127ada3c8f commit 7cb1a0e6e0643cb80308f45e2cce2d127ada3c8f Author: Warner Losh AuthorDate: 2024-02-12 18:45:01 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:45:01 +0000 reboot: Don't reboot if the next kernel isn't there reboot -k garbage won't boot garbage unless /boot/garbage/kernel is there. Refuse to reboot if it is missing, though allow -f to force it for special-use cases. This is in keeping with nextboot.sh. Sponsored by: Netflix Reviewed by: kevans, kib, markj, emaste Differential Revision: https://reviews.freebsd.org/D43802 --- sbin/reboot/reboot.8 | 33 +++++++++++++++++++-------------- sbin/reboot/reboot.c | 21 +++++++++++++++++++-- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8 index e9a23ef84d69..0a2fb91b6b0b 100644 --- a/sbin/reboot/reboot.8 +++ b/sbin/reboot/reboot.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 20, 2017 +.Dd February 8, 2024 .Dt REBOOT 8 .Os .Sh NAME @@ -36,16 +36,16 @@ .Nd stopping and restarting the system .Sh SYNOPSIS .Nm halt -.Op Fl lNnpq +.Op Fl flNnpq .Op Fl k Ar kernel .Nm -.Op Fl cdlNnpqr +.Op Fl cdflNnpqr .Op Fl k Ar kernel .Nm fasthalt -.Op Fl lNnpq +.Op Fl flNnpq .Op Fl k Ar kernel .Nm fastboot -.Op Fl dlNnpq +.Op Fl dflNnpq .Op Fl k Ar kernel .Sh DESCRIPTION The @@ -83,17 +83,22 @@ This option is supported only when rebooting, and it has no effect unless a dump device has previously been specified with .Xr dumpon 8 . -.It Fl k Ar kernel -Boot the specified -.Ar kernel +.It Fl k Ar kname +Boot the specified kernel +.Ar kname on the next system boot. -If the kernel boots successfully, the +This is a one-shot option, the .Em default -kernel will be booted on successive boots, this is a one-shot option. -If the boot fails, the system will continue attempting to boot -.Ar kernel -until the boot process is interrupted and a valid kernel booted. -This may change in the future. +kernel will be booted on successive boots. +No +.Nm reboot +or +.Nm halt +will be performed if +.Em /boot/kname/kernel +does not exist unless the +.Fl f +flag is specified. .It Fl l The halt or reboot is .Em not diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 7dcebef69b85..4eb5e8590589 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -59,7 +60,7 @@ main(int argc, char *argv[]) struct utmpx utx; const struct passwd *pw; int ch, howto, i, fd, sverrno; - bool lflag, nflag, qflag, Nflag; + bool fflag, lflag, nflag, qflag, Nflag; uint64_t pageins; const char *user, *kernel = NULL; @@ -68,7 +69,7 @@ main(int argc, char *argv[]) howto = RB_HALT; } else howto = 0; - lflag = nflag = qflag = Nflag = false; + fflag = lflag = nflag = qflag = Nflag = false; while ((ch = getopt(argc, argv, "cdk:lNnpqr")) != -1) switch(ch) { case 'c': @@ -77,6 +78,9 @@ main(int argc, char *argv[]) case 'd': howto |= RB_DUMP; break; + case 'f': + fflag = true; + break; case 'k': kernel = optarg; break; @@ -130,6 +134,19 @@ main(int argc, char *argv[]) } if (kernel != NULL) { + if (!fflag) { + char *k; + struct stat sb; + + asprintf(&k, "/boot/%s/kernel", kernel); + if (k == NULL) + errx(1, "No memory to check %s", kernel); + if (stat(k, &sb) != 0) + err(1, "stat %s", k); + if (!S_ISREG(sb.st_mode)) + errx(1, "%s is not a file", k); + free(k); + } fd = open("/boot/nextboot.conf", O_WRONLY | O_CREAT | O_TRUNC, 0444); if (fd > -1) { From nobody Mon Feb 12 18:53: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 4TYYWm06Wdz5BMWk; Mon, 12 Feb 2024 18:53: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 4TYYWl6F6Qz4mFT; Mon, 12 Feb 2024 18:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQ5eyEaHaAOnO9M3xALXtp5jLe9ARdaEMW3DBp/kkgw=; b=t6sZoPQ2qSx0tV2kqdawyN0DVq/bknEDFtE16VuXWmB7/Py+brrlD+w/DEZrddREfOmReG a1yUPHiTCkdLpLph5bY06g7/O9/6VOt1tMXiJpctWprIZziS+lEGYEV1Hp0pbna4KM3oO/ YZXkoPWLMG2N2YrtA42RYe4VCoxs4g47czvXZ4kfyd3r7VltnvhcQOBsknebSobRWNhwlM i7W+QdimA2mRES/3tylk7uEqUA8IskMMMeQBHVZ5hSD267AFqQSwn50r/ul+HCQjNzrb8d YeLPkJ8LjrBctsUem6Q2XSMGrpsim5+NqC6Ny5b1dZ/+Y5fZnNSwzSmnGpBshg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764019; a=rsa-sha256; cv=none; b=hneEEsSetP6yan8HmS6rrD8mPyP8fYcJtJn54c0eMy7+/ZoBKnoUT3kFdaNF7AMwa7Ddm7 0YDSmVlw4W51IA/ueJtgV0v7a+1slyF4D20QfARrSQUTlXlGt8/TtCvuFChAntFIQZ0F+T TTmKfPKjRILcK2vFCONSsHM+DSlyzJXPQvoT2pGkgK7FQ5MrMTntdXs+nhgfm7N65gpko8 7h1umqLa0RiSnskdWKa2OAhY1Agri16hpdkd6mt+POP6fJD+LIGsgrAaGrp0TMoGsDcc9L OaQqOOeD9J6VzUpXZaSqYCF5RlsL0DwRsWJZhZ1XufH5f1DfiYmz6XbbjDx/tg== 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=1707764019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQ5eyEaHaAOnO9M3xALXtp5jLe9ARdaEMW3DBp/kkgw=; b=Jqa8n7bftxnkn5NJlXNqFDCWICLhyS0G/9A5wAjkR6KqH+Na63kDjKwWaNCMl3+QI59/KU 0ktCUaZ2LoERX1xAZgmDCwR2wz0oeFhyDnfDlti9JBR8Lz/dXHPzKLiGCpz2dDQxZ6CUK1 2Nc2DWocbe1V+8fY4Fn3DyV7hJp6Bzc9yeFhGjB7BMEI9giMAiflU1/68gSRfnzYsxQNYo BELtqAcE6G3zsVjhusn6y10+7F2VMO4HUrOkL2vXNd3oRxP7x9ZroXvxcXIf6Y7mnZ5wxF ElbwclSlGtBEHM77KEQlAvYhsenMNiFQHvSOqvrkIBW6pcmKOoEZObno56St4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWl5L27zjqh; Mon, 12 Feb 2024 18:53: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 41CIrd5a030525; Mon, 12 Feb 2024 18:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrdiP030522; Mon, 12 Feb 2024 18:53:39 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:39 GMT Message-Id: <202402121853.41CIrdiP030522@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: cfeedadfbde0 - main - reboot: Add sanity checking of write to nextboot.conf 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfeedadfbde084e25ace99a370f3f417b78f5df7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cfeedadfbde084e25ace99a370f3f417b78f5df7 commit cfeedadfbde084e25ace99a370f3f417b78f5df7 Author: Warner Losh AuthorDate: 2024-02-12 18:45:20 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:45:20 +0000 reboot: Add sanity checking of write to nextboot.conf Add sanity checking to the write to nextboot. Move to separate function and allow force to override all errors. If we can't write nextboot.conf, don't silently fail anymore. Sponsored by: Netflix Reviewed by: kevans, kib, markj, jhb Differential Revision: https://reviews.freebsd.org/D43803 --- sbin/reboot/reboot.c | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 4eb5e8590589..74f8cf01b3b7 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -49,17 +49,52 @@ #include #include +#define PATH_NEXTBOOT "/boot/nextboot.conf" + static void usage(void) __dead2; static uint64_t get_pageins(void); static bool dohalt; +static void +write_nextboot(const char *fn, const char *kernel, bool force) +{ + FILE *fp; + +#define E(...) do { \ + if (force) { \ + warn( __VA_ARGS__ ); \ + return; \ + } \ + err(1, __VA_ARGS__); \ + } while (0) \ + + fp = fopen(fn, "w"); + if (fp == NULL) + E("Can't create %s to boot %s", fn, kernel); + + if (fprintf(fp, + "nextboot_enable=\"YES\"\n" + "kernel=\"%s\"\n", kernel) < 0) { + int e; + + e = errno; + fclose(fp); + if (unlink(fn)) + warn("unlink %s", fn); + errno = e; + E("Can't write %s", fn); + } + fclose(fp); +#undef E +} + int main(int argc, char *argv[]) { struct utmpx utx; const struct passwd *pw; - int ch, howto, i, fd, sverrno; + int ch, howto, i, sverrno; bool fflag, lflag, nflag, qflag, Nflag; uint64_t pageins; const char *user, *kernel = NULL; @@ -147,15 +182,7 @@ main(int argc, char *argv[]) errx(1, "%s is not a file", k); free(k); } - fd = open("/boot/nextboot.conf", O_WRONLY | O_CREAT | O_TRUNC, - 0444); - if (fd > -1) { - (void)write(fd, "nextboot_enable=\"YES\"\n", 22); - (void)write(fd, "kernel=\"", 8L); - (void)write(fd, kernel, strlen(kernel)); - (void)write(fd, "\"\n", 2); - close(fd); - } + write_nextboot(PATH_NEXTBOOT, kernel, fflag); } /* Log the reboot. */ From nobody Mon Feb 12 18:53: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 4TYYWn1ntpz5BMfr; Mon, 12 Feb 2024 18:53: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 4TYYWn0B20z4m3g; Mon, 12 Feb 2024 18:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6Df42PcBBD+Wh0mqmKRIPZuUTJERO8U5or1j2h+rQw=; b=qEL18ZdC1FaNF+YwKmMkBoj4TgKBpNR3eZbdje8L6zZcb3TexkGzz9bOMBSYZAl2/d6LFz LqbQBBAAvjB5ThQPhjDZsMvLONCQfPUKOTqfdQiydVLyyNPbHXQwMLxEkJSqkcpq5TB/dZ 7lApaXpLdSQc3KPltzxS3sOyBhS5BAaAkwvsbJswZfkg2rT0u82JE3442fLByn2urTbgN9 pX15Xidjlod6PP5zsFTkD7TmEX7hK4kZWUmfbPnkgQQ8hjWG0+68xBJxrp28rhJB865Yz4 WCaFrt/XCveqOyL6m0SyIJRoYgv+rRtua3EdjmJHcAUlkPw+q5K3UU/GFNg1Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764021; a=rsa-sha256; cv=none; b=YYcnpO4op2bkRa/1NWqhnidysX0zjzdMoR7sJdSdbUynz4x96O66ykfo8UslC6lXHTbpG6 KHklIDBdt+RsosOlFPXeL9U7qhhcazFrqa6U5ukbHC0DbuNfuuAsDlOrpGHWNsJliF1D9t 3bAUAgUI6N50aAsr0cd9l0ojN+y4cx8fNhGYUi6sCjsFCQRc9hC7KlE95wNipV6d3XUkjn LHxelxacFC1E9IuifDz+DVa7y+zJLNbDDLBnw6y22EG3jj7Y2HJoKSPndpHsPRQ9dpxWhR ALJ6UEFbX2tThjfWdxIOAGvGCFzVWoWdRViGI4y26CvOIeW4+MvAYyaIBc1Giw== 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=1707764021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6Df42PcBBD+Wh0mqmKRIPZuUTJERO8U5or1j2h+rQw=; b=ZAt8aAecNdiVrzOtqfxu/SL5zJrCKuEOfshHavF5puaL8OfpRZAf19sDemaeOGteix+pKg xDf41V0JTlr3W70LyA3brU3FUdIEJK4gYhiTApQPY4IVRhTGIVkgh83uUjxx8uzlK/NJce nLINZNczU0i3LRFzjqDhesqFcArcu3Q5kID3Vm4DCZ9qypx2V/qOexv7zzjVKZnPWQ7Pvy eS92igb7nne0gdJP3mGzvE1LWfhg5mjedCmoC7HFGFPgdpeLwQTy/xbh1JiOBQ4ZW72N+1 I0znSlVbhuI+jlr/WbB6Kh53PH0N0PBoL35GyYUQfrG4b1g6gwvC033UH5Axxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWm666BzjcH; Mon, 12 Feb 2024 18:53: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 41CIres7030568; Mon, 12 Feb 2024 18:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIreLA030565; Mon, 12 Feb 2024 18:53:40 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:40 GMT Message-Id: <202402121853.41CIreLA030565@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: 2c479548119a - main - reboot: Implement -D from nextboot 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c479548119a11058fe8947ba021fd49d4169920 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c479548119a11058fe8947ba021fd49d4169920 commit 2c479548119a11058fe8947ba021fd49d4169920 Author: Warner Losh AuthorDate: 2024-02-12 18:45:29 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:45:29 +0000 reboot: Implement -D from nextboot Implement -D from nextboot.sh which deletes the nextboot.conf file and exists. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43822 --- sbin/reboot/reboot.8 | 12 ++++++++---- sbin/reboot/reboot.c | 17 ++++++++++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8 index 0a2fb91b6b0b..e53de69e97ae 100644 --- a/sbin/reboot/reboot.8 +++ b/sbin/reboot/reboot.8 @@ -36,16 +36,16 @@ .Nd stopping and restarting the system .Sh SYNOPSIS .Nm halt -.Op Fl flNnpq +.Op Fl DflNnpq .Op Fl k Ar kernel .Nm -.Op Fl cdflNnpqr +.Op Fl cDdflNnpqr .Op Fl k Ar kernel .Nm fasthalt -.Op Fl flNnpq +.Op Fl DflNnpq .Op Fl k Ar kernel .Nm fastboot -.Op Fl dflNnpq +.Op Fl dDflNnpq .Op Fl k Ar kernel .Sh DESCRIPTION The @@ -77,6 +77,10 @@ driver implements the power cycle functionality and only on hardware with a BMC that supports power cycling. Unlike power off, the amount of hardware that supports power cycling is small. +.It Fl D +Delete existing +.Nm nextboot +configuration and exit. .It Fl d The system is requested to create a crash dump. This option is diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 74f8cf01b3b7..d91fc6c97b0f 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -95,7 +95,7 @@ main(int argc, char *argv[]) struct utmpx utx; const struct passwd *pw; int ch, howto, i, sverrno; - bool fflag, lflag, nflag, qflag, Nflag; + bool Dflag, fflag, lflag, Nflag, nflag, qflag; uint64_t pageins; const char *user, *kernel = NULL; @@ -104,12 +104,15 @@ main(int argc, char *argv[]) howto = RB_HALT; } else howto = 0; - fflag = lflag = nflag = qflag = Nflag = false; - while ((ch = getopt(argc, argv, "cdk:lNnpqr")) != -1) + Dflag = fflag = lflag = Nflag = nflag = qflag = false; + while ((ch = getopt(argc, argv, "cDdk:lNnpqr")) != -1) switch(ch) { case 'c': howto |= RB_POWERCYCLE; break; + case 'D': + Dflag = true; + break; case 'd': howto |= RB_DUMP; break; @@ -148,6 +151,8 @@ main(int argc, char *argv[]) if (argc != 0) usage(); + if (Dflag && ((howto & ~RB_HALT) != 0 || kernel != NULL)) + errx(1, "cannot delete existing nextboot config and do anything else"); if ((howto & (RB_DUMP | RB_HALT)) == (RB_DUMP | RB_HALT)) errx(1, "cannot dump (-d) when halting; must reboot instead"); if (Nflag && (howto & RB_NOSYNC) != 0) @@ -163,6 +168,12 @@ main(int argc, char *argv[]) err(1, NULL); } + if (Dflag) { + if (unlink(PATH_NEXTBOOT) != 0) + err(1, "unlink %s", PATH_NEXTBOOT); + exit(0); + } + if (qflag) { reboot(howto); err(1, NULL); From nobody Mon Feb 12 18:53: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 4TYYWp3RLBz5BMfs; Mon, 12 Feb 2024 18:53: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 4TYYWp1LjZz4m25; Mon, 12 Feb 2024 18:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v1HmO89g20G9+4/Vx5pTy1LnhgkF6U98iPdED5Zgqp8=; b=HaeveTalokkTBuayvKV1Xa+VcpTNjHnO4DlPuZuke8f36VrMWvjgxHVpZXDTKPcqW6LRR2 J2aENfk+nSE/aKxR6GgTQ3GI0dAY/2pA7wI8YU7Zsh3t454WpO6FFxu2ageag90Oa2Gn/f JNytgBLyWY5s0HiSpc6Ny53nmH2Ql/Cd9X4DV0xBgIlHJ05e3qfqYufpSiZ/QK9yyIx+rF j0TajXOM9mB67OT3NkKeo/V2tGH0GDZao2uLPSrIb+5UCTtNXpI+cZysdEi8dIz9bs6OSF aVB4FHnBvWuKYqYZPXD2cIXj7r9b0Q1Gx2zVLTpOLAlm0xhpSYyZdBhOVzzrHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764022; a=rsa-sha256; cv=none; b=FJ71tbYuUcRhXvabXBSHZNCn9DJyXz+Pp7rUYhoSmW0jAGb4W9mUB2hUTffZYg/BKG/+A9 3TmCK1LRV4bWoywWSOauyzqVLd45cSl6d1z7PSpiVbeWYMXBP6kKiRfyw8GV1wOET1AoEM 7FMsJD+2owo1ZG9kdWhX9M/JHgNu7yKRdf/6IpT4zxwR9W1P+cB9pLNgHQtb3NGETLlbO6 6A+bZ47W+eBgpcqEIq/sSrPtV46C/AmwgqhdWVkIJ+qNBAbLAHNJnIyLKzxF80+5o42yMH 6A/7CXA/qMBFzTapiYWi3NMy3Im4q91150mNn+AjeE8cqjxP4c4PwVhLQd0AfQ== 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=1707764022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v1HmO89g20G9+4/Vx5pTy1LnhgkF6U98iPdED5Zgqp8=; b=AGUih8nIylP8gESuDY1zeb0Xirs2eUeugbwLt8pgRF9vk0ywvw4MrmXTAUXGNBoC3x4T9+ XOhxHCv8JVqBoPyI1W6p+2QFErweJU7LJHk3m9wXEXOVDeRbIjtOJMWEjWK9Ps0BQQYCgB H5aE/5Z1r6vzi54Gi2yJq5uw1xjVyQtLgMaUTDxf1DUBnS6L8S//sQWcpmuJU9ha7cWBv5 HqjBQEzCtScfNNhRQoho9qy9EQJxRqxEd8ghXl4IJUDYyH1aeXR/bXAWkhiaTRIrLv89nU ASf+8hLGM56m9mT+zgvFccX7CPq4fGWkMXhhIFk2hax0B8C/ZqO6+PhaZsQWMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWp0Blwzjqj; Mon, 12 Feb 2024 18:53: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 41CIrfZm030607; Mon, 12 Feb 2024 18:53:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrfdp030604; Mon, 12 Feb 2024 18:53:41 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:41 GMT Message-Id: <202402121853.41CIrfdp030604@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: 0df5f65908dd - main - reboot: Implement zfs 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0df5f65908dd1913212535e6c4dd4c73ce19c305 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0df5f65908dd1913212535e6c4dd4c73ce19c305 commit 0df5f65908dd1913212535e6c4dd4c73ce19c305 Author: Warner Losh AuthorDate: 2024-02-12 18:45:37 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:45:37 +0000 reboot: Implement zfs support Implement full support for ZFS -k support. For ZFS, we have to set a property that gets cleared by the boot loaeder for whether or not to process nextboot.conf. Do this using system("zfsbootcfg..." rather than coding the small subset of that program inline to avoid CDDL contamination of reboot and the complications of disabling CDDL and/or ZFS. The few bytes needed to implement reboot for systems with zfs is not worth saving for systems w/o ZFS. Only set nextboot_enable=YES for UFS filesystems. They are the only one that need that as the first line. Its presence on ZFS can cause the kernel to not be oneshot. Sponsored by: Netflix Reviewed by: kevans, kib Differential Revision: https://reviews.freebsd.org/D43824 --- sbin/reboot/reboot.c | 58 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index d91fc6c97b0f..d598c857d255 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -56,11 +57,6 @@ static uint64_t get_pageins(void); static bool dohalt; -static void -write_nextboot(const char *fn, const char *kernel, bool force) -{ - FILE *fp; - #define E(...) do { \ if (force) { \ warn( __VA_ARGS__ ); \ @@ -69,13 +65,58 @@ write_nextboot(const char *fn, const char *kernel, bool force) err(1, __VA_ARGS__); \ } while (0) \ +static void +zfsbootcfg(const char *pool, bool force) +{ + char *k; + int rv; + + asprintf(&k, + "zfsbootcfg -z %s -n freebsd:nvstore -k nextboot_enable -v YES", + pool); + if (k == NULL) + E("No memory for zfsbootcfg"); + + rv = system(k); + if (rv == 0) + return; + if (rv == -1) + E("system zfsbootcfg"); + if (rv == 127) + E("zfsbootcfg not found in path"); + E("zfsbootcfg returned %d", rv); +} + +static void +write_nextboot(const char *fn, const char *kernel, bool force) +{ + FILE *fp; + struct statfs sfs; + bool supported = false; + bool zfs = false; + + if (statfs("/boot", &sfs) != 0) + err(1, "statfs /boot"); + if (strcmp(sfs.f_fstypename, "ufs") == 0) { + /* + * Only UFS supports the full nextboot protocol. + */ + supported = true; + } else if (strcmp(sfs.f_fstypename, "zfs") == 0) { + zfs = true; + } + + if (zfs) { + zfsbootcfg(sfs.f_mntfromname, force); + } + fp = fopen(fn, "w"); if (fp == NULL) E("Can't create %s to boot %s", fn, kernel); - if (fprintf(fp, - "nextboot_enable=\"YES\"\n" - "kernel=\"%s\"\n", kernel) < 0) { + if (fprintf(fp,"%skernel=\"%s\"\n", + supported ? "nextboot_enable=\"YES\"\n" : "", + kernel) < 0) { int e; e = errno; @@ -86,7 +127,6 @@ write_nextboot(const char *fn, const char *kernel, bool force) E("Can't write %s", fn); } fclose(fp); -#undef E } int From nobody Mon Feb 12 18:53: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 4TYYWq30PQz5BM4f; Mon, 12 Feb 2024 18:53: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 4TYYWq1nzcz4mG7; Mon, 12 Feb 2024 18:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iI0NhWUtTByPPgG0VaSvmMDVMq1dFOh4B7d4YS7abY=; b=woG7qZYg4f7qkbQKeigFCOsyYFpA0dPjM1DhnAUKCelfL//LcoPUkC9sI9aPnOE6uj1LRy tV1K52tcpZmpzw+F7Qhj9Dw+EgtasVai7n66u8gS9lF868VnpHhKZTV+Ea1GM4hE+lTIkO JC+N2MwI3drt9xQf0ALJoWO7xeaPagh2YTT5CyrBI+4FWsLkJeujg/MRkwOpn/QLV38WLc 9KAaMfWi84SN2MkKmXsPjkRe8pm6OJJuhi+bSTJTaFmEwDQqikg7BPRVnn9wyP47XQNC5j P1EiZ98kDazc6yuDwqOTc6MXHiDVHH8Hyv/qJVuu3KPwjgHt4x3/NQfuXvDkuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764023; a=rsa-sha256; cv=none; b=UtjAnrnK3a9L0+eSgyi6dIEILDRoArkiFnu1iIQSGkVxT9NBv9L10WYJyaysMVhywBq9BK Qm2Ko5aR/2HkQtWVI3rAslp7oskYqi/nADQyGuLQQfd1RwedREm/f9+IATb+V8R/2M960q dHdWB6/tDupGvAv9vdb1pzIQdU2qlt4XI0yYS1OWsuvT4PLEmPztXANb2hNJR8zhfCXcNx IXCkwpxKd78soSLIKKuyKR2KQ7S+hSf2sJNaK6w/maQsHenVl9VzQhYAnUCrsZaKEYpj/O vAKMoHPCYhw1ADSYEywM7xLMeUqjxAktnnFkwPW5QAsMhqusAgkmheH4XNUcpA== 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=1707764023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iI0NhWUtTByPPgG0VaSvmMDVMq1dFOh4B7d4YS7abY=; b=BVY5+gQNmUnSAInjL+0n9pZjBI1FfWfkJ0MNj5rB0PpYG3LKmZvEHE/TH28T7TBJ9w7HRn AYgIgIo/lDpCNJpBhdRQae7mWftxycg68kapO6aEwLqnNNzpAVHFI02ZMzQxzrSyQcW6KS 7igYPhJW5sJ4fUD80LmOS1Ys4QJ0LPsI9HjSLkQ3CVfA6ILAi1ENcH9ljd3rJwR9pQnzDs SOXj6wRfezdtEsSer0L29gFs97nogkcNdH4THCfAhypKFADJWbcR4a78wpsbBEj8gQDQty J36XDwgV+LjP6keJBK1bF8D+txIa2/M46zulJfOqpm0LtTsl6HPRale/GI4PiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWq0vLhzjcJ; Mon, 12 Feb 2024 18:53: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 41CIrhV5030649; Mon, 12 Feb 2024 18:53:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrhvE030646; Mon, 12 Feb 2024 18:53:43 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:43 GMT Message-Id: <202402121853.41CIrhvE030646@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: ecc834241fc3 - main - reboot: Implement -e from nextboot 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecc834241fc3ab23990291e7e99fd05a34af05f1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ecc834241fc3ab23990291e7e99fd05a34af05f1 commit ecc834241fc3ab23990291e7e99fd05a34af05f1 Author: Warner Losh AuthorDate: 2024-02-12 18:45:48 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:45:48 +0000 reboot: Implement -e from nextboot Implement -e foo=bar to add loader environment variables to nextboot.conf. bar is enclosed in quotes if it isn't already. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43827 --- sbin/reboot/reboot.8 | 19 +++++++++++++++++++ sbin/reboot/reboot.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8 index e53de69e97ae..a60512fa0c59 100644 --- a/sbin/reboot/reboot.8 +++ b/sbin/reboot/reboot.8 @@ -37,15 +37,19 @@ .Sh SYNOPSIS .Nm halt .Op Fl DflNnpq +.Op Fl e Ar variable=value .Op Fl k Ar kernel .Nm .Op Fl cDdflNnpqr +.Op Fl e Ar variable=value .Op Fl k Ar kernel .Nm fasthalt .Op Fl DflNnpq +.Op Fl e Ar variable=value .Op Fl k Ar kernel .Nm fastboot .Op Fl dDflNnpq +.Op Fl e Ar variable=value .Op Fl k Ar kernel .Sh DESCRIPTION The @@ -87,6 +91,21 @@ This option is supported only when rebooting, and it has no effect unless a dump device has previously been specified with .Xr dumpon 8 . +.It Fl e Ar variable=value +Sets +.Va variable +to +.Va value +in the loader's and kernel's environment. +If +.Va value +is not already enclosed in double quotes, they will be added before writing to the +.Nm nextboot +configuration. +Care should be taken if +.Va value +contains any characters that are special to the shell or loader's configuration +parsing code. .It Fl k Ar kname Boot the specified kernel .Ar kname diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index d598c857d255..875f00c01ef9 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -88,7 +88,7 @@ zfsbootcfg(const char *pool, bool force) } static void -write_nextboot(const char *fn, const char *kernel, bool force) +write_nextboot(const char *fn, const char *env, const char *kernel, bool force) { FILE *fp; struct statfs sfs; @@ -114,8 +114,9 @@ write_nextboot(const char *fn, const char *kernel, bool force) if (fp == NULL) E("Can't create %s to boot %s", fn, kernel); - if (fprintf(fp,"%skernel=\"%s\"\n", + if (fprintf(fp,"%s%skernel=\"%s\"\n", supported ? "nextboot_enable=\"YES\"\n" : "", + env != NULL ? env : "", kernel) < 0) { int e; @@ -129,6 +130,40 @@ write_nextboot(const char *fn, const char *kernel, bool force) fclose(fp); } +static char * +split_kv(char *raw) +{ + char *eq; + int len; + + eq = strchr(raw, '='); + if (eq == NULL) + errx(1, "No = in environment string %s", raw); + *eq++ = '\0'; + len = strlen(eq); + if (len == 0) + errx(1, "Invalid null value %s=", raw); + if (eq[0] == '"') { + if (len < 2 || eq[len - 1] != '"') + errx(1, "Invalid string '%s'", eq); + eq[len - 1] = '\0'; + return (eq + 1); + } + return (eq); +} + +static void +add_env(char **env, const char *key, const char *value) +{ + char *oldenv; + + oldenv = *env; + asprintf(env, "%s%s=\"%s\"\n", oldenv != NULL ? oldenv : "", key, value); + if (env == NULL) + errx(1, "No memory to build env array"); + free(oldenv); +} + int main(int argc, char *argv[]) { @@ -138,6 +173,8 @@ main(int argc, char *argv[]) bool Dflag, fflag, lflag, Nflag, nflag, qflag; uint64_t pageins; const char *user, *kernel = NULL; + char *env = NULL, *v; + if (strstr(getprogname(), "halt") != NULL) { dohalt = true; @@ -145,7 +182,7 @@ main(int argc, char *argv[]) } else howto = 0; Dflag = fflag = lflag = Nflag = nflag = qflag = false; - while ((ch = getopt(argc, argv, "cDdk:lNnpqr")) != -1) + while ((ch = getopt(argc, argv, "cDde:k:lNnpqr")) != -1) switch(ch) { case 'c': howto |= RB_POWERCYCLE; @@ -156,6 +193,10 @@ main(int argc, char *argv[]) case 'd': howto |= RB_DUMP; break; + case 'e': + v = split_kv(optarg); + add_env(&env, optarg, v); + break; case 'f': fflag = true; break; @@ -233,7 +274,7 @@ main(int argc, char *argv[]) errx(1, "%s is not a file", k); free(k); } - write_nextboot(PATH_NEXTBOOT, kernel, fflag); + write_nextboot(PATH_NEXTBOOT, env, kernel, fflag); } /* Log the reboot. */ From nobody Mon Feb 12 18:53: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 4TYYWr3k1lz5BMcf; Mon, 12 Feb 2024 18:53: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 4TYYWr2nNKz4mMD; Mon, 12 Feb 2024 18:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o3Hu14qSKKdc4wTuWbtigmcOLpdu1HtYF7fLO0sUPQw=; b=UdO58/PiPV83WXSzVCiaMyWNrkbuZhBukpKwbvbjNbUxgL6F/i8kfDlcjzSJ8k+Z0OuIc5 ii2yNlh+TtIA5yHaPdxtG6P2BQWOgkb73aT3bqVbjFH3wa74vYyiWaZ7uvNumulSoEylj/ WBN2eQ7hCbtLLMSK8rnRDf0TNrJ5kjjM+Bv+TDxarhs8U4TAE/vkadj7nKT4sIZjeAWgIU Ea/G9e8TJLnT4OEL1hZqGjn3GZN8S8+lgPB891OA52sig0qauYhSoe75NzA6T8Dm5HYRA7 bxSv2DTYyano/SsFlMERIdUBTKc5SpGgp6onY0YUo96XQ8Hegv1cdhDBkz9/Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764024; a=rsa-sha256; cv=none; b=Qrdzv5XUEentADaDj6jcc5IvpvgiFlZx2xuIU3mRzc6v7940GHDYgWEliZA0ixwaFBeJrC 8NEcnsxlDmT1mJmcW1RH7/wnHC31rpuJ8U72SfKb3eDsrTBr7vKw7zVA8ImsqsxoKh1/s/ BIFbtdpz6AQgp0wshXpj2udWruevU49htMSvEY7aKTNUb9fLOzWr4UzF1Z6TPHgPguq9xO Q4u1tDPDmwmZuvX3DBqbt8rK3s4wsK9hpO0SL9EaSDCnjduE6vSuHVwTq2dGf3aBLjiX6D uxe/H43yQKR/ysfbFp22/uXxU9ucUV6dDpyt5IRC8/bprT8WIJYzAv52PvOhDg== 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=1707764024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o3Hu14qSKKdc4wTuWbtigmcOLpdu1HtYF7fLO0sUPQw=; b=WMKWniUnH0SzcotgbPme5Z9Opy57L09/TpSUNBKxQQD7Dn2pRXO5aQLEO6wnTSHLouGdoQ rdKp/a6bRHrYQA3Kpu6/lWXHJvRC9NHkWkfkYZyRgvsF/enDusEySP8aR/M65SVRqxm8QS njPwddRoYp1kTvMdT62XXSLx9b6BHPE9/Cx8e/ta1br96pJR1IpT54lTjdovQIOYgotX0K qanZiq6ufNwPnwFudwg0YyZ3AvkFGTJDDTB2EFJW40Fk6HcYHSKxJgbZUXUhdVGGP1poQB K+K6A76PZR8ia2TS/F9pNfRjh9NMsYqVAJFE7/e2d8KltMBlb8ya+EemfMY8rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWr1tXMzjKF; Mon, 12 Feb 2024 18:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CIri4h030697; Mon, 12 Feb 2024 18:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrixK030694; Mon, 12 Feb 2024 18:53:44 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:44 GMT Message-Id: <202402121853.41CIrixK030694@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: 9dcf6cbd83fd - main - reboot: Implement -k in terms of env 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dcf6cbd83fdbf87feadd56b9e8f494e73fa5c39 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9dcf6cbd83fdbf87feadd56b9e8f494e73fa5c39 commit 9dcf6cbd83fdbf87feadd56b9e8f494e73fa5c39 Author: Warner Losh AuthorDate: 2024-02-12 18:45:54 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:45:54 +0000 reboot: Implement -k in terms of env kernel isn't special, beyond the sanity checks we do. Add it to the env rather than pass it into write_nextboot(). Sponsored by: Netflix Reviewed by: kevans, kib Differential Revision: https://reviews.freebsd.org/D43828 --- sbin/reboot/reboot.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 875f00c01ef9..a4be86a4983f 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -88,7 +88,7 @@ zfsbootcfg(const char *pool, bool force) } static void -write_nextboot(const char *fn, const char *env, const char *kernel, bool force) +write_nextboot(const char *fn, const char *env, bool force) { FILE *fp; struct statfs sfs; @@ -112,12 +112,11 @@ write_nextboot(const char *fn, const char *env, const char *kernel, bool force) fp = fopen(fn, "w"); if (fp == NULL) - E("Can't create %s to boot %s", fn, kernel); + E("Can't create %s", fn); - if (fprintf(fp,"%s%skernel=\"%s\"\n", + if (fprintf(fp,"%s%s", supported ? "nextboot_enable=\"YES\"\n" : "", - env != NULL ? env : "", - kernel) < 0) { + env != NULL ? env : "") < 0) { int e; e = errno; @@ -175,7 +174,6 @@ main(int argc, char *argv[]) const char *user, *kernel = NULL; char *env = NULL, *v; - if (strstr(getprogname(), "halt") != NULL) { dohalt = true; howto = RB_HALT; @@ -274,9 +272,10 @@ main(int argc, char *argv[]) errx(1, "%s is not a file", k); free(k); } - write_nextboot(PATH_NEXTBOOT, env, kernel, fflag); + add_env(&env, "kernel", kernel); } + write_nextboot(PATH_NEXTBOOT, env, fflag); /* Log the reboot. */ if (!lflag) { if ((user = getlogin()) == NULL) From nobody Mon Feb 12 18:53: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 4TYYWs6YYYz5BMg4; Mon, 12 Feb 2024 18:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYYWs45Tpz4mcL; Mon, 12 Feb 2024 18:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P/KwJ+QuV/k2fWc1WOaPcmsEs6V2poO8J4KQnp2Gipw=; b=v684MIP1IbQRSucoP3X/Kltao/PvOOw75V59oDM9Ucxh4RGo7Z62NZIumA4eHaIYpMykgy q61oLyTqp1Nb6jd7NZcIYPv2V0UbF/YhNMIKRKOt0xkq7iWWp8HZGYmyBEeM7+t5KSD5Sw KFpsx5b8l+5OVkHj7awiDOgkTNFgM+3G9jOcbOS1ZNKmorJOPj0+ziz6dVVNOlLqPNfZlj TD7teBzUpXuyytKgNoyi80bAu4ydKzHIqB8Bcn58hD1c1RysoNl0QFBUnlu/g4a+3q9Iyn 9H5Ek3ZJ9JFktPbtjPutNazw4ds3mzqGFRTXzai5hXLPGkOhgUi5P7WVOkiJ6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764025; a=rsa-sha256; cv=none; b=kn7gPS10B2KyLVtiEelxvjABlyIWIUEcp3GKWwCgsSVaMi0MjLo143Cd3LjExbGBzgtwuI 3i+HYLCrTBHO8c1u7PGJjH1vjLgI0rJScgdPAKkL2UjeX/ozW0zBDC1QkfFjYbF8A6BfbG SY8u0ayilbaM3/A3YmvvhS/b9ddiKlE/VeK9U6pqgRuIVoYFiynL66b/lpd1ARRgl2rkf/ nhQcOmtgyv+nPiRQ9VUU4YJMAp7BQ4osEt1QbgU12CgB+nQJGJGyjYTlvYVv8o+GvBB1Ro kiXiCizNU7JqWspm/QhVDnrToB5qW3m4mE6R+6SP3AnWiHRGefn5+i/SFxWQ7w== 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=1707764025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P/KwJ+QuV/k2fWc1WOaPcmsEs6V2poO8J4KQnp2Gipw=; b=AXwAqBWh/X3ZLLeIPH4tkNNnZsXy6uElxVRjIl3t8UyKaYf/3pLbfLA34VFl+tS/rgiOCW wMtF1U32KCizUG4RDb4vbOdBZKrGOHYBVF8P+98182JFx8A5sQSpviYDtUaDjuwdUt1VM3 1Ym6LS17KewRGyV+SSkThv7VLk6Amrrixm1cz1cwHxbPk/ni0CzL2CjheCcN+V7V9jsmEP mYSlhnr7XhDOr70I3ATI9tMr0qTcEraxRd27TzUds1GjQnI0hrt+wXQNHvYbZymg5n+f46 P+QNu4ACapbefW7QoUmY37Qq7cp8HlCgdIU1I8glwcnCqMUA7cKsfJiZBfe6Jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWs2vsKzjY0; Mon, 12 Feb 2024 18:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CIrjhk030764; Mon, 12 Feb 2024 18:53:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrjDZ030761; Mon, 12 Feb 2024 18:53:45 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:45 GMT Message-Id: <202402121853.41CIrjDZ030761@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: 91d24077024f - main - reboot: Implement -o to set kernel options for next boot 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d24077024f5f36069e55b63d237f9034232455 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=91d24077024f5f36069e55b63d237f9034232455 commit 91d24077024f5f36069e55b63d237f9034232455 Author: Warner Losh AuthorDate: 2024-02-12 18:46:03 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:46:03 +0000 reboot: Implement -o to set kernel options for next boot Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D43829 --- sbin/reboot/reboot.8 | 7 +++++++ sbin/reboot/reboot.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8 index a60512fa0c59..ed055327b36a 100644 --- a/sbin/reboot/reboot.8 +++ b/sbin/reboot/reboot.8 @@ -39,18 +39,22 @@ .Op Fl DflNnpq .Op Fl e Ar variable=value .Op Fl k Ar kernel +.Op Fl o Ar options .Nm .Op Fl cDdflNnpqr .Op Fl e Ar variable=value .Op Fl k Ar kernel +.Op Fl o Ar options .Nm fasthalt .Op Fl DflNnpq .Op Fl e Ar variable=value .Op Fl k Ar kernel +.Op Fl o Ar options .Nm fastboot .Op Fl dDflNnpq .Op Fl e Ar variable=value .Op Fl k Ar kernel +.Op Fl o Ar options .Sh DESCRIPTION The .Nm halt @@ -146,6 +150,9 @@ This can happen when devices have been disconnected, such as with .It Fl n The file system cache is not flushed. This option should probably not be used. +.It Fl o Ar options +This option +allows the passing of kernel flags for the next boot. .It Fl p The system will turn off the power if it can. If the power down action fails, the system diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index a4be86a4983f..21acf7514388 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -180,7 +180,7 @@ main(int argc, char *argv[]) } else howto = 0; Dflag = fflag = lflag = Nflag = nflag = qflag = false; - while ((ch = getopt(argc, argv, "cDde:k:lNnpqr")) != -1) + while ((ch = getopt(argc, argv, "cDde:k:lNno:pqr")) != -1) switch(ch) { case 'c': howto |= RB_POWERCYCLE; @@ -212,6 +212,9 @@ main(int argc, char *argv[]) nflag = true; Nflag = true; break; + case 'o': + add_env(&env, "kernel_options", optarg); + break; case 'p': howto |= RB_POWEROFF; break; From nobody Mon Feb 12 18:53: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 4TYYWt6QB6z5BMg7; Mon, 12 Feb 2024 18:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYYWt4rCsz4mXF; Mon, 12 Feb 2024 18:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NlIj1shqCcq5V1/Llk2BCsFjf/+Fw7p6gFLe1OTPP1k=; b=i+4JoQ8M/gAjmEM1/ZnMU+gPFwcBTB41HwxK2sFZIhki+DnJSmVaJw6SvP3BRoTl/yzU5l cb/cv2ks134I5NEYeNdSCo3AeMHvczJSi9ThjPzlO/sJ2DnYVnmXg/vegN0/XWETVmG/BO ybRg/kxmKeBfPOTR0p03ca6PM62o7Lk/HqhJPgMMavCjTcDdZhuEGzDFh+V02vKXfwUsrj tCBPLY+WQC2pluxWO8y9EOk/hsbaCIz/1Zdoa/MMQU3VAIbiPuDkOVCUBFjsRos8m8qIGB YgkxMJj0J6Lw2ufRDFrNrQQUCKuxmgwNoIXoon/L7bIUbiMM238kQ+vacKFK6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764026; a=rsa-sha256; cv=none; b=d1zHUpdM9HW0LDceEyR9IA0MOBQ2Ry7cGivhWDwePzUD+RKOWxc1V4/SAIMMfuOdKI94Tt MzxW/ITUS3Iftj6Vxw/dkivHhTEgy0a+UvMggPf9dOzoAZa2q9LfOKdwxBjSJU82Di8ZjC qA/DTEiwVX832zoUS1QiybgT3YBgAH4kYjxZ26FS+aauO3StSbcSlMHaKPANZrudN7IZh4 QcGw52sO/JNp/zS65EDt1sOTEVwFsQ/L7W5Dw+HXJ4Dh0SCel3vi3uRhld4ovJyDqLWn+M +XdqYm2vcAoA9DaebqbuXILQACgmqA5gRJqd+NiEOjQJEWRLWekys1H2CPKVXA== 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=1707764026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NlIj1shqCcq5V1/Llk2BCsFjf/+Fw7p6gFLe1OTPP1k=; b=BpeN6WfKgsjVJzs4yZlZX8A6UhdaNvRvxy37ORrnTAzdQfLXjsj96tG3QYuR0HQ5tt5URy mcVdQFSDfKM7a4ozt7swStGp44TXQ+uR7uHu6XS86w5WK89GHMbMU9A3PRB7RXIu0WUyTB jHZO25fZ6ALcZ/3C4OzZ9GQxRwDmKdTNsPl38yl8Due9TPbfZ2u9Otx1/Jp5PyQdHFEHEM mvExxGkaI1+cIK7Z+7x5ob+G9alD+8Hz+pJ8uHNZK1mXdd7USXj4yQwPI4qrjGgb8uAv39 Zxmio+9MvJ0IXZM7N2aZl0Zd6r9L4hMqVYKox6ZtMIJgmtHq9hkhrACetCSYTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWt3xhhzjnh; Mon, 12 Feb 2024 18:53: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 41CIrks4030815; Mon, 12 Feb 2024 18:53:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrkbw030812; Mon, 12 Feb 2024 18:53:46 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:46 GMT Message-Id: <202402121853.41CIrkbw030812@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: 994cc8392123 - main - reboot: Allow this to be installed as nextboot 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 994cc839212393cd2e591a6a9908ee9a94fdb18f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=994cc839212393cd2e591a6a9908ee9a94fdb18f commit 994cc839212393cd2e591a6a9908ee9a94fdb18f Author: Warner Losh AuthorDate: 2024-02-12 18:46:11 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:46:11 +0000 reboot: Allow this to be installed as nextboot Allow nextboot to be a symlink link to reboot. It does everything reboot does, except doesn't actually setup the sytem to reboot and reboot. Also, don't accept the reboot args related to rebooting when in nextboot mode. Sponsored by: Netflix Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D43830 --- sbin/reboot/reboot.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 21acf7514388..a31c31892745 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -56,6 +56,7 @@ static void usage(void) __dead2; static uint64_t get_pageins(void); static bool dohalt; +static bool donextboot; #define E(...) do { \ if (force) { \ @@ -163,6 +164,12 @@ add_env(char **env, const char *key, const char *value) free(oldenv); } +/* + * Different options are valid for different programs. + */ +#define GETOPT_REBOOT "cDde:k:lNno:pqr" +#define GETOPT_NEXTBOOT "De:k:o:" + int main(int argc, char *argv[]) { @@ -171,16 +178,20 @@ main(int argc, char *argv[]) int ch, howto, i, sverrno; bool Dflag, fflag, lflag, Nflag, nflag, qflag; uint64_t pageins; - const char *user, *kernel = NULL; + const char *user, *kernel = NULL, *getopts = GETOPT_REBOOT; char *env = NULL, *v; if (strstr(getprogname(), "halt") != NULL) { dohalt = true; howto = RB_HALT; - } else + } else if (strcmp(getprogname(), "nextboot") == 0) { + donextboot = true; + getopts = GETOPT_NEXTBOOT; /* Note: reboot's extra opts return '?' */ + } else { howto = 0; + } Dflag = fflag = lflag = Nflag = nflag = qflag = false; - while ((ch = getopt(argc, argv, "cDde:k:lNno:pqr")) != -1) + while ((ch = getopt(argc, argv, getopts)) != -1) { switch(ch) { case 'c': howto |= RB_POWERCYCLE; @@ -228,6 +239,8 @@ main(int argc, char *argv[]) default: usage(); } + } + argc -= optind; argv += optind; if (argc != 0) @@ -245,10 +258,6 @@ main(int argc, char *argv[]) errx(1, "-r cannot be used with -c, -d, -n, or -p"); if ((howto & RB_REROOT) != 0 && kernel != NULL) errx(1, "-r and -k cannot be used together, there is no next kernel"); - if (geteuid()) { - errno = EPERM; - err(1, NULL); - } if (Dflag) { if (unlink(PATH_NEXTBOOT) != 0) @@ -256,6 +265,11 @@ main(int argc, char *argv[]) exit(0); } + if (!donextboot && geteuid() != 0) { + errno = EPERM; + err(1, NULL); + } + if (qflag) { reboot(howto); err(1, NULL); @@ -278,7 +292,11 @@ main(int argc, char *argv[]) add_env(&env, "kernel", kernel); } - write_nextboot(PATH_NEXTBOOT, env, fflag); + if (env != NULL) + write_nextboot(PATH_NEXTBOOT, env, fflag); + if (donextboot) + exit (0); + /* Log the reboot. */ if (!lflag) { if ((user = getlogin()) == NULL) From nobody Mon Feb 12 18:53: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 4TYYWv6RCtz5BMg9; Mon, 12 Feb 2024 18:53: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 4TYYWv5lKTz4mm1; Mon, 12 Feb 2024 18:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707764027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38F8gFgD23oDutwwlmI8hqYZyIpclI2DuaMtPFJ97yc=; b=ek+Oq01pCnbmRNNIcK4ytwcphjAtmwfCMvVzvTQfSxnWxol5WhGZgbjKEBh9zGHTNgP2Yj Xg9+6zLKFhNCer4Zpugh8jpRrfDTGE0L78nsz17Cd64JCUM5kwVbE/9fgoDYqvPq72Om33 EiDifCjzSUOtGrknfyoU58LgTe4GlLNqijSMexbm7qbRTGnWwisF//7k2ZUN0LNqu235Rg YyrMaJvDnugvLVvaxbuTfqxJlInNFYj83inPW2f3PjQNqTC9F2e5zChtHu8C/qwuHsNnXN BNjwPE3De/qMI33IfnRQDnkh8owxqJdlxv5cKXEE4GxmwerDQ1XG8qIxwbXewQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707764027; a=rsa-sha256; cv=none; b=yPdPFY1I/v2OrovdAPwhJohhx79XLBYAhVlJG3wSgsEyxNzmcwWtMkSA22veM4p3kpAFOX JnEsxeG8V+XzmP4dRf42hwydCbHEdKkL9K3lOHcLKien2rGRC9IcMXJjWcgbwSbNCKFL98 7CwhcY1hU+DJe7r2FxbyXY6jqd5bRNW62kcPs57POfJ83QT+xURTOLOUivl6AxalXE1Ql3 iHoC+GJbdxHG8koonZAYcjeO4+GyeEOv1P0M5/fFTe5Zgh0W94CcfAQCHvHNu+3z25SSxk l2/8ujz5v4kZ7J6H54Yz/ECJCRqrdMxYcVHN0Hkj3Xrl15py58o2iJ2Krxw3fA== 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=1707764027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38F8gFgD23oDutwwlmI8hqYZyIpclI2DuaMtPFJ97yc=; b=VjjJcWHaJOAfJ75rKzEFA1Ef2AgJuRn7i0zDsMGSRxaf2gndlIDL4Gmn0DCcg3cz8yXx1x skHFYJ4jHZ+urk8fJZhWqS1epZ7qVpA/0nlidSqMOxOdqkAMfjndOZOf2ieCZQscGi3GvR t8OqvUV//nzSpFKpvGmdRLrrNnWF7IMR8+0kO8wSBUr1teYxquAh0C+webTpowciST4ddq sSO0AEbpLo+zvWDbJ/yL14vAj9wbWMCjjJ01Vw2vNtpCwYkaI9jNx6rrS4gmFJDMsMzTSM 8yYItl9LukVne9/0gZKCJFWcoRE30z7RIRZqFMz+/k+1/wVOfAz9MMZ5UUZ4lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYYWv4nyWzk2J; Mon, 12 Feb 2024 18:53: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 41CIrlZW030874; Mon, 12 Feb 2024 18:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CIrlYC030871; Mon, 12 Feb 2024 18:53:47 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:53:47 GMT Message-Id: <202402121853.41CIrlYC030871@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: fd6d47375a78 - main - rescue,nextboot: Install nextboot as a link to reboot, rm nextboot.sh 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd6d47375a78fbf0737012b7cc11180291781e8b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd6d47375a78fbf0737012b7cc11180291781e8b commit fd6d47375a78fbf0737012b7cc11180291781e8b Author: Warner Losh AuthorDate: 2024-02-12 18:46:20 +0000 Commit: Warner Losh CommitDate: 2024-02-12 18:46:20 +0000 rescue,nextboot: Install nextboot as a link to reboot, rm nextboot.sh Reboot now emulates the nextboot shell script completely. Retire the nextboot.sh script and install the link. Retain the same manual page, since there's enough differences between nextboot and reboot that talking about nextboot would likely be confusing in nextboot.8 The nextboot.sh script no longer exists, so doesn't need to be fixed up to create rescue. However, now we need a link from nextboot to reboot. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D43831 Differential Revision: https://reviews.freebsd.org/D43843 --- rescue/rescue/Makefile | 9 +--- sbin/reboot/Makefile | 8 +-- sbin/reboot/nextboot.sh | 132 ------------------------------------------------ 3 files changed, 5 insertions(+), 144 deletions(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index de3dd8a64575..4c351e632638 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -21,13 +21,6 @@ LDFLAGS+= -Wl,--allow-multiple-definition PROG= rescue BINDIR?=/rescue -# Shell scripts need #! line to be edited from /bin/sh to /rescue/sh -SCRIPTS= nextboot_FIXED -SCRIPTSNAME_nextboot_FIXED= nextboot -nextboot_FIXED: ../../sbin/reboot/nextboot.sh - sed '1s/\/bin\//\/rescue\//' ${.ALLSRC} > ${.TARGET} -CLEANFILES+= nextboot_FIXED - SCRIPTS+= dhclient_FIXED SCRIPTSNAME_dhclient_FIXED= dhclient-script dhclient_FIXED: ../../sbin/dhclient/dhclient-script @@ -185,7 +178,7 @@ CRUNCH_SRCDIR_zfs= ${SRCTOP}/cddl/sbin/zfs CRUNCH_SRCDIR_zpool= ${SRCTOP}/cddl/sbin/zpool CRUNCH_SRCDIR_zdb= ${SRCTOP}/cddl/usr.sbin/zdb .endif -CRUNCH_ALIAS_reboot= fastboot halt fasthalt +CRUNCH_ALIAS_reboot= fastboot halt fasthalt nextboot CRUNCH_ALIAS_restore= rrestore CRUNCH_ALIAS_dump= rdump CRUNCH_ALIAS_fsck_ffs= fsck_4.2bsd fsck_ufs diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile index 4db6d5589e97..5e7a2fea15bf 100644 --- a/sbin/reboot/Makefile +++ b/sbin/reboot/Makefile @@ -13,9 +13,9 @@ MAN+= boot_i386.8 MLINKS+= boot_i386.8 boot.8 .endif -LINKS= ${BINDIR}/reboot ${BINDIR}/halt ${BINDIR}/reboot ${BINDIR}/fastboot \ - ${BINDIR}/reboot ${BINDIR}/fasthalt - -SCRIPTS= nextboot.sh +LINKS= ${BINDIR}/reboot ${BINDIR}/halt \ + ${BINDIR}/reboot ${BINDIR}/fastboot \ + ${BINDIR}/reboot ${BINDIR}/fasthalt \ + ${BINDIR}/reboot ${BINDIR}/nextboot .include diff --git a/sbin/reboot/nextboot.sh b/sbin/reboot/nextboot.sh deleted file mode 100644 index 0c9cca51eb8d..000000000000 --- a/sbin/reboot/nextboot.sh +++ /dev/null @@ -1,132 +0,0 @@ -#! /bin/sh -# -# SPDX-License-Identifier: BSD-2-Clause -# -# Copyright (c) 2002 Gordon Tetlow. All rights reserved. -# Copyright (c) 2012 Sandvine Incorporated. 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. -# - -append="NO" -delete="NO" -kenv= -force="NO" -nextboot_file="/boot/nextboot.conf" -zfs= - -add_kenv() -{ - local var value - - var=$1 - # strip literal quotes if passed in - value=${2%\"*} - value=${value#*\"} - - if [ -n "${kenv}" ]; then - kenv="${kenv} -" - fi - kenv="${kenv}${var}=\"${value}\"" -} - -display_usage() { - cat <<-EOF - Usage: nextboot [-af] [-e variable=value] [-k kernel] [-o options] - nextboot -D - EOF -} - -while getopts "aDe:fk:o:" argument ; do - case "${argument}" in - a) - append="YES" - ;; - D) - delete="YES" - ;; - e) - var=${OPTARG%%=*} - value=${OPTARG#*=} - if [ -z "$var" -o -z "$value" ]; then - display_usage - exit 1 - fi - add_kenv "$var" "$value" - ;; - f) - force="YES" - ;; - k) - kernel="${OPTARG}" - add_kenv kernel "$kernel" - ;; - o) - add_kenv kernel_options "${OPTARG}" - ;; - *) - display_usage - exit 1 - ;; - esac -done - -if [ ${delete} = "YES" ]; then - rm -f ${nextboot_file} - exit 0 -fi - -if [ -z "${kenv}" ]; then - display_usage - exit 1 -fi - -if [ -n "${kernel}" -a ${force} = "NO" -a ! -d /boot/${kernel} ]; then - echo "Error: /boot/${kernel} doesn't exist. Use -f to override." - exit 1 -fi - -zfs=$(df -Tn "/boot/" 2>/dev/null | while read _fs _type _other ; do - [ "zfs" = "${_type}" ] || continue - echo "${_fs%%/*}" -done) - -set -e - -nextboot_tmp=$(mktemp $(dirname ${nextboot_file})/nextboot.XXXXXX) - -if [ -n "${zfs}" ]; then - zfsbootcfg -z ${zfs} -n freebsd:nvstore -k nextboot_enable -v YES - cat >> ${nextboot_tmp} << EOF -$kenv -EOF -else -cat >> ${nextboot_tmp} << EOF -nextboot_enable="YES" -$kenv -EOF -fi - -fsync ${nextboot_tmp} - -mv ${nextboot_tmp} ${nextboot_file} From nobody Mon Feb 12 19:09: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 4TYYtY5mvNz5BNsj; Mon, 12 Feb 2024 19:09:57 +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 4TYYtX6GZCz4sMd; Mon, 12 Feb 2024 19:09:56 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 3.97.99.32) smtp.mailfrom=cy.schubert@cschubert.com Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id ZUtarkWVKxDxGZbgirnQqM; Mon, 12 Feb 2024 19:09:56 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id Zbggrg8MWWhyfZbghrZ4Mr; Mon, 12 Feb 2024 19:09:55 +0000 X-Authority-Analysis: v=2.4 cv=MenPuI/f c=1 sm=1 tr=0 ts=65ca6d03 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=k7vzHIieQBIA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=3J0l7d3P5gAvw77Of3YA: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 43C6FB2; Mon, 12 Feb 2024 11:09:54 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 11A8BA8; Mon, 12 Feb 2024 11:09:54 -0800 (PST) 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: Richard Scheffenegger cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 62d47d73b7eb - main - tcp: stop timers and clean scoreboard in tcp_close() In-reply-to: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> References: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> Comments: In-reply-to Richard Scheffenegger message dated "Sat, 10 Feb 2024 09:34:01 +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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 12 Feb 2024 11:09:53 -0800 Message-Id: <20240212190954.11A8BA8@slippy.cwsent.com> X-CMAE-Envelope: MS4xfDdRBJVr9KOlsUocOUSUzMAu4ROGNC0axequei6b+/7V8Mzew2yPVD2JYWcYfGLsn+ZEALhgtCDI2gyqUrXUijADE0mXxIDmzxNTcth5FVRSSH2P2GM4 D26d/8qEMQkm6pF/P7xdBS9KFvfSjIeoUFbUa9gvPcc8DWSc2Lf3DpIfGcIi2RMJr/Iz2H63BDEQS5y1E/CuNSE5Xe0D6ts2sf8rFYYvL6lItuUYAJsNNQA/ FrfoCF5lnfwRaWEz8m2yd8+7IIs1R9i25QzPuuewOvHm4y1w05YTiz24TxAvrM0bVKmbwnQxbsfSrBUp0PSz+1m5EqG/mHWLnNwpPlEZpok= X-Spamd-Bar: - X-Spamd-Result: default: False [-1.78 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; AUTH_NA(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.88)[-0.882]; MV_CASE(0.50)[]; RWL_MAILSPIKE_VERYGOOD(-0.20)[3.97.99.32:from]; RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.32:from]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[4]; R_SPF_NA(0.00)[no SPF record]; R_DKIM_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[cschubert.com]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org]; REPLYTO_EQ_FROM(0.00)[] X-Rspamd-Queue-Id: 4TYYtX6GZCz4sMd In message <202402100934.41A9Y11l044213@gitrepo.freebsd.org>, Richard Scheffene gger writes: > The branch main has been updated by rscheff: > > URL: https://cgit.FreeBSD.org/src/commit/?id=62d47d73b7eb01f3b0a37541df5e7aaa > 36f54335 > > commit 62d47d73b7eb01f3b0a37541df5e7aaa36f54335 > Author: Richard Scheffenegger > AuthorDate: 2024-02-10 09:28:42 +0000 > Commit: Richard Scheffenegger > CommitDate: 2024-02-10 09:30:00 +0000 > > tcp: stop timers and clean scoreboard in tcp_close() > > Stop timers when in tcp_close() instead of doing that in tcp_discardcb(). > A connection in CLOSED state shall not need any timers. Assert that no > timer is rescheduled after that in tcp_timer_activate() and verfiy that > this is also the expected state in tcp_discardcb(). > > PR: 276761 > Reviewed By: glebius, tuexen, #transport > Sponsored by: NetApp, Inc. > Differential Revision: https://reviews.freebsd.org/D43792 > --- > sys/netinet/tcp_subr.c | 4 ++-- > sys/netinet/tcp_timer.c | 1 + > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c > index 6043a3d458e5..90e1496a822c 100644 > --- a/sys/netinet/tcp_subr.c > +++ b/sys/netinet/tcp_subr.c > @@ -2383,10 +2383,9 @@ tcp_discardcb(struct tcpcb *tp) > #endif > > INP_WLOCK_ASSERT(inp); > + MPASS(!callout_active(&tp->t_callout)); > MPASS(TAILQ_EMPTY(&tp->snd_holes)); > > - tcp_timer_stop(tp); > - > /* free the reassembly queue, if any */ > tcp_reass_flush(tp); > > @@ -2522,6 +2521,7 @@ tcp_close(struct tcpcb *tp) > tcp_fastopen_decrement_counter(tp->t_tfo_pending); > tp->t_tfo_pending = NULL; > } > + tcp_timer_stop(tp); > if (tp->t_fb->tfb_tcp_timer_stop_all != NULL) > tp->t_fb->tfb_tcp_timer_stop_all(tp); > in_pcbdrop(inp); > diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c > index f0eb3bad33cf..ed50659abf8e 100644 > --- a/sys/netinet/tcp_timer.c > +++ b/sys/netinet/tcp_timer.c > @@ -907,6 +907,7 @@ tcp_timer_activate(struct tcpcb *tp, tt_which which, u_in > t delta) > #endif > > INP_WLOCK_ASSERT(inp); > + MPASS(tp->t_state > TCPS_CLOSED); > > if (delta > 0) { > what = TT_STARTING; > Every machine in my farm is getting kernel page faults as of this revision. #0 __curthread () at /opt/src/git-src/sys/amd64/include/pcpu_aux.h:57 #1 doadump (textdump=textdump@entry=1) at /opt/src/git-src/sys/kern/kern_sh utdown.c:403 #2 0xffffffff806c68b9 in kern_reboot (howto=260) at /opt/src/git-src/sys/kern/kern_shutdown.c:521 #3 0xffffffff806c6dc2 in vpanic (fmt=0xffffffff80ae244b "%s", ap=ap@entry=0xfffffe008304abc0) at /opt/src/git-src/sys/kern/kern_shutdown.c :973 #4 0xffffffff806c6c13 in panic (fmt=) at /opt/src/git-src/sys/kern/kern_shutdown.c:889 #5 0xffffffff80a5b18f in trap_fatal (frame=0xfffffe008304acb0, eva=72) at /opt/src/git-src/sys/amd64/amd64/trap.c:950 #6 0xffffffff80a5b1df in trap_pfault (frame=0xfffffe008304acb0, usermode=false, signo=, ucode=) at /opt/src/git-src/sys/amd64/amd64/trap.c:758 #7 #8 0xffffffff8084dd72 in cc_cong_signal (tp=0xfffff8008d207540, th=0x0, type=2) at /opt/src/git-src/sys/netinet/tcp_input.c:465 #9 0xffffffff8086ba4f in tcp_timer_rexmt (tp=0xfffff8008d207540) at /opt/src/git-src/sys/netinet/tcp_timer.c:803 #10 0xffffffff8086b1fe in tcp_timer_enter (xtp=0xfffff8008d207540) at /opt/src/git-src/sys/netinet/tcp_timer.c:880 #11 0xffffffff806e603e in softclock_call_cc (c=0xfffff8008d2076d8, cc=cc@entry=0xffffffff820b10c0, direct=direct@entry=0) at /opt/src/git-src/sys/kern/kern_timeout.c:714 #12 0xffffffff806e77b8 in softclock_thread (arg=arg@entry=0xffffffff820b10c0 ) at /opt/src/git-src/sys/kern/kern_timeout.c:846 #13 0xffffffff8067f05f in fork_exit (callout=0xffffffff806e76c0 , arg=0xffffffff820b10c0, frame=0xfffffe008304af40) at /opt/src/git-src/sys/kern/kern_fork.c:1157 #14 #15 0x21ffa5a87b4e3f70 in ?? () When rebooting one of my machines, the others panic as above. This is 100% reproducible when one of the machines in my basement are rebooted. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Mon Feb 12 19:53: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 4TYZss1NkWz5BSk0; Mon, 12 Feb 2024 19:54:25 +0000 (UTC) (envelope-from ccfreebsd@gmail.com) Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (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 4TYZsr6RPdz42F6; Mon, 12 Feb 2024 19:54:24 +0000 (UTC) (envelope-from ccfreebsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2d0bc402c8eso37544351fa.1; Mon, 12 Feb 2024 11:54:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707767662; x=1708372462; 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=3hgxPy4pJFA5QlJkwzbYv4+zBEyaAxbc5Jz/ZVowkMs=; b=EupnGMDsxUdw4Yi86n+UAcFxD1t9FajQgkhUZdCZCT6URUBtRNtjNQZq8q0zjaAyGn OX8aBUkIrHgnodD3p1o8ZHOGaRbZRxUwg/mUJzK2HHjj4G1t2LM8tZwkUlKLLEKuo9+o kArIFao/55CqpABhwqVa5jxjD49AMyqbaUCMSsTRV2c5ySRY09qFQp8d/FAHeh9NuF5t VcA5GWGrUyulL3xh5K2oNuIASA2DhA+8v6RUAucD3NGHBorBiXZeMFFokcgNejR4kjgO YEATiMT/pJyYpptUAc+KJ30QzScv/LVdyL7pU4oU1Glcqnm28E4rluBt1nznalK981sE iAvg== X-Forwarded-Encrypted: i=1; AJvYcCVqroNcAO58WmklsCb/wZw8aYX91n9tfCM1mSh2Z4azJFbHSkOMNv3xbZN0DM6P14KSGtgXCINT2qr2QOQVS9HyGos9goV6d57UorfMmE2qAeivzwp3nDnIJxgpA8E1VjN2p/Q9752TiAFMg26SQAnMqSZ3pkL/pVZbYZwW X-Gm-Message-State: AOJu0YwkgbI5E+0rLO+W/CfjidyAr5V6Ex7AnE3SCDqJLKI/B/dGOa0V q8Rk6Dw1NroNscaDrtihgoCWGiA2w10YqKqZIO5UPWO/5sQJpPXodytuf89M X-Google-Smtp-Source: AGHT+IHrJ+BpX1hnW2vvtqsW27vEAOW/fC5IIFccuIvLSQPB3oDwC/cf2E1YWzDXjK6RxIhW5m/pTg== X-Received: by 2002:a2e:bb8d:0:b0:2d0:c101:9fa6 with SMTP id y13-20020a2ebb8d000000b002d0c1019fa6mr147422lje.12.1707767662058; Mon, 12 Feb 2024 11:54:22 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUipMP/1SWpz1bXlQSUiRopvjrotLm4hrVCExVE63Z0W/s3+Q23+mMPHvs7gEmUiUvls7JYDSp7RjBOLkxHU11j3pHGTE4WYRKl86mCRmsZkpU9DbjyI+T47Dcw4mmAmZe4QH+yrf3TGfqir480SbUk05EgrTy4LgTC5Ed6 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com. [209.85.167.53]) by smtp.gmail.com with ESMTPSA id y5-20020a2e7d05000000b002d0aa95176dsm220105ljc.29.2024.02.12.11.54.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Feb 2024 11:54:21 -0800 (PST) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-51182ece606so1612760e87.0; Mon, 12 Feb 2024 11:54:21 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWpUSYo6555TSNqK1tTuEk2v7ssMPgCRAVISbuGwJw9NM4v0GyyDrNnd3Oe8Jn0SUS6AzX1yfvSfzfiC1ZdWqST8zk/fiohgGkx1y5FtZCMd+OCN8CkHdf8tMV4xGFPuRLi468sw3LDRXJy5ruoDKjkDer4h887QZGqo3Ek X-Received: by 2002:ac2:4543:0:b0:511:8cd9:b0eb with SMTP id j3-20020ac24543000000b005118cd9b0ebmr135564lfm.29.1707767661534; Mon, 12 Feb 2024 11:54:21 -0800 (PST) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> In-Reply-To: From: Cheng Cui Date: Mon, 12 Feb 2024 14:53:45 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: hitting Assertion !callout_active(&tp->t_callout) failed at /usr/src/sys/netinet/tcp_subr.c:2386 after 62d47d7 To: Dave Cottlehuber Cc: Michael Tuexen , Richard Scheffenegger , transport@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000d32475061134a40b" X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4TYZsr6RPdz42F6 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --000000000000d32475061134a40b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable I created https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D277009. You m= ay add your findings there. On Mon, Feb 12, 2024 at 6:41=E2=80=AFAM Dave Cottlehuber = wrote: > On Mon, 12 Feb 2024, at 10:26, tuexen@freebsd.org wrote: > >> On Feb 12, 2024, at 09:50, Dave Cottlehuber wrote: > >> > >> On Mon, 12 Feb 2024, at 08:31, Dave Cottlehuber wrote: > >>> I'm repeatedly hitting this assert soon after boot on my ryzen deskto= p > >>> I've a coredump. > >>> > >>> Panic String: Assertion !callout_active(&tp->t_callout) failed at > >>> /usr/src/sys/netinet/tcp_subr.c:2386 > > This one "just happens" while I'm sitting at the PC hacking in the > terminal, > I don't get much incoming data here so it's presumably clean local traffi= c. > > >>> I'll apply your latest patch in > >>> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D276761#c16 and > report > >>> back.. > >> > >> Reporting back, insta-panic on boot at: > >> > >> Panic String: Assertion !tcp_timer_active(tp, TT_REXMT) failed at > /usr/src/sys/netinet/tcp_subr.c:2387 > >> > >> Does that help any? > > Sure! Could you provide any hints how to reproduce it? > > this one happens during boot very early, I have a coredump handy if that > helps. > I will try with all sysctls disabled, and without zerotier (overlay > network) > too, see if that makes a difference. > > A+ > Dave > =E2=80=94=E2=80=94=E2=80=94 > O for a muse of fire, that would ascend the brightest heaven of invention= ! > > --=20 Best Regards, Cheng Cui --000000000000d32475061134a40b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I created=C2=A0https://bugs.freebsd.org/bugzi= lla/show_bug.cgi?id=3D277009. You may add your findings there.
On Mon, F= eb 12, 2024 at 6:41=E2=80=AFAM Dave Cottlehuber <dch@freebsd.org> wrote:
On Mon= , 12 Feb 2024, at 10:26, tuexen@freebsd.org wrote:
>> On Feb 12, 2024, at 09:50, Dave Cottlehuber <dch@freebsd.org> wrote:
>>
>> On Mon, 12 Feb 2024, at 08:31, Dave Cottlehuber wrote:
>>> I'm repeatedly hitting this assert soon after boot on my r= yzen desktop
>>> I've a coredump.
>>>
>>> Panic String: Assertion !callout_active(&tp->t_callout)= failed at
>>> /usr/src/sys/netinet/tcp_subr.c:2386

This one "just happens" while I'm sitting at the PC hacking i= n the terminal,
I don't get much incoming data here so it's presumably clean local = traffic.

>>> I'll apply your latest patch in
>>> https://bugs.freebsd.or= g/bugzilla/show_bug.cgi?id=3D276761#c16 and report
>>> back..
>>
>> Reporting back, insta-panic on boot at:
>>
>> Panic String: Assertion !tcp_timer_active(tp, TT_REXMT) failed at = /usr/src/sys/netinet/tcp_subr.c:2387
>>
>> Does that help any?
> Sure! Could you provide any hints how to reproduce it?

this one happens during boot very early, I have a coredump handy if that he= lps.
I will try with all sysctls disabled, and without zerotier (overlay network= )
too, see if that makes a difference.

A+
Dave
=E2=80=94=E2=80=94=E2=80=94
O for a muse of fire, that would ascend the brightest heaven of invention!<= br>


--
Best Regards,
Cheng Cui
--000000000000d32475061134a40b-- From nobody Mon Feb 12 21:40: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 4TYdDh1dyTz58xqP; Mon, 12 Feb 2024 21:40: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 4TYdDh0ScQz4J92; Mon, 12 Feb 2024 21:40:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707774052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+qJp9dAuoAGeN5ti7A/lbCQaO/rHbZfadIPGS2udVs=; b=RPzmbdl2yFL0VQu09TnqIDSl7pOyZ2T1eWmeYv8juKua95O3pBtyHBCQweMBPfj6nofGTn LP9VQ4r1xfUNyV1Nk6hlpTpClReGBoHU9D3mWXwQ3wyIyX1xrpzFjRNZvswOlAM2P3UL+i DLwSaV05zqQkb368SG0alQh/tQ0ISVlDtW7PoOGjHKMsCzOOiROI1XEjJ95Hq05UPb/5Ig XsEHdXJhwu4dO9ZQPIUdQtccqSAJzKx+18V7PdppRE03hk62evwd6NbfyIwjKfEKHWenPr x2T6kUz9qKwwzb0MPrHjcraDDKvMorOobs3IOZjH3cQz+G6v25snNyTuH/Xw9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707774052; a=rsa-sha256; cv=none; b=Qg/SswYRF82EiFy0aMoGEnbeDFQNGu5qOCaRIDlhzOQODgdFeSo1MW6YadvZm6qeJox9M/ eTve6oWi9/8tleFOU3zCKEDvmau73CR94KJtRWOdFeX0JVpSCG87+sFwqTt/BCoBkjs5Vr uTYNivKjgvNeUcGzmVCgGftDfTaO7MhkdlDl3DL+N+fgjFDeg316qMHQNvJqsJVZCn/pFW Ve8YeZrSsy0eAWWu1LkMeFDWQdeyVfvdrlqXO73qxk2RkAKvtl+e99bDODs3wBuk9RXP6G 4QpEMkhTeV1xNtMUrmsUZ/udiuVUc4dOtzBvrYGJzfL92XvNvBzpFxuSm/QXFQ== 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=1707774052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J+qJp9dAuoAGeN5ti7A/lbCQaO/rHbZfadIPGS2udVs=; b=UlYLYM84IPzmYrkxi+N+fdWAW5BLhM14cNkPwmzGH4WSKXpXIyfLI0c3cSslpVkrqbEFiT j6ILlzgp18oZfkzo99nqr/fwsVJv6+E3hQiK0zHIovajVMXZ1kvuEIU71POzeiKPuel0uM pD8NgUXA+8RbEcED7i0iXjjk5igjfirREuKGmQ92j1gEl+EkrN2B7kuRodSH5aV70GkVtq E520jIywt+NVi81GdVBOrMymKqYfgQLDMNmbFZkXzqce73/V1qYM0G19miqnJxMYbpU2bq MEG7OC9ZEGp0F8je2b3Qv9D919kBts/3MSBv/Qq0jLL9GwIil5B1K4jkqrk3tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYdDg6g0czp6q; Mon, 12 Feb 2024 21:40: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 41CLepIR009844; Mon, 12 Feb 2024 21:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CLepnF009841; Mon, 12 Feb 2024 21:40:51 GMT (envelope-from git) Date: Mon, 12 Feb 2024 21:40:51 GMT Message-Id: <202402122140.41CLepnF009841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 57e27ff07aff - main - tcp: partially undo D43792 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: Sender: owner-dev-commits-src-main@freebsd.org 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57e27ff07aff35289892f79288bebf76a3c31fec Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=57e27ff07aff35289892f79288bebf76a3c31fec commit 57e27ff07aff35289892f79288bebf76a3c31fec Author: Richard Scheffenegger AuthorDate: 2024-02-12 20:43:18 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-12 21:38:11 +0000 tcp: partially undo D43792 At the destruction of the tcpcb, no timers are supposed to be running. However, it turns out that stopping them in the close() / shutdown() call does not have the desired effect under all circumstances. This partially reverts 62d47d73b7eb to reduce the nuisance caused. PR: 277009 Reported-by: syzbot+9a9aa434a14a2b35c3ba@syzkaller.appspotmail.com Reported-by: syzbot+e82856782410e895bae7@syzkaller.appspotmail.com Reviewed By: glebius, tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43855 --- sys/netinet/tcp_subr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 90e1496a822c..97d60ceba24d 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2383,9 +2383,10 @@ tcp_discardcb(struct tcpcb *tp) #endif INP_WLOCK_ASSERT(inp); - MPASS(!callout_active(&tp->t_callout)); MPASS(TAILQ_EMPTY(&tp->snd_holes)); + tcp_timer_stop(tp); + /* free the reassembly queue, if any */ tcp_reass_flush(tp); From nobody Mon Feb 12 22:36: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 4TYfSq3Gysz595Hx; Mon, 12 Feb 2024 22:36: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 4TYfSq32wCz4RPw; Mon, 12 Feb 2024 22:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707777387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8JjOHxSBqbnPfBuvjzcN7ppQa0vfvDXUOg93NKA/Gc=; b=SaGmfEaO6AvYJslmKnkc/XIX/qr0jO/AdkJqy6Thl9rJP/c3QQH0mMODz8k5dkWauglWOQ ifPwRHLB9E4aNn675s+oReM+BiaXqL2+TyC1YROqENUDinP3HdCjY8cxlCYR0/B7WYbPdQ l6vqPGBDbcUXuRcScNfhiAtwae0ppaZp/S7arCzcSjyt4swd6IiqUVNBAAnzwwNnqg9sQC qY/4q6RxUQlV3J1plbOneFUmIchZQWcajxD9DP4kHNMOo5yuxVQuDwLL1ltrX68bEi+QFJ 9ciu+vBvjl2woJErFHGTqxgtQNMG5xe1dQh40uwJwuFA8JRdbNp4VWWzzfX3AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707777387; a=rsa-sha256; cv=none; b=sYsyeVdE4wmZDINQI+FrtaYMWT6p/9SdjGUrvi0Html110wtAcfRR1Tqp5TjVxCuEjM1Et hjVuZb9e1e0cPxtGoPRaNltRf+yRlvn5+PN2AOyrCl8okbzpzL3DOX0HTGPzZHBXMgekJp WxTtYEpe/jZVVmFiWpzZwU3PO7FMx2d5IkFQd3TBbpU0ZDhwSxdQGct21QeEZV3jg8J0dU rtl/HFSETZBAVeGspvL0rTtgUSMobLClp3U0sr2CxKvOIY3FrsTgjw4mP8IYZfYmzum64P CMQvHEfFdHadrYG++McFZ/R/rk/+JwTWKJlGyCfv8S/ojkjBcy/tft5edaXttg== 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=1707777387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8JjOHxSBqbnPfBuvjzcN7ppQa0vfvDXUOg93NKA/Gc=; b=pr0P75R2cQ073APjGMBa9LYdGf0tv5SesaAQD0Gi5SJ/YYh4gIPW3m5U7dfCKRNY6x+LHn fY6wn0LuWC6GbvK+LZo+UioSuDz9BeZFJqXSqsW6q4Fyr9K1EGDinqhIOqGeNu1/KiV6wt o9pxubvnOvZcjKXQ2+iPKOKtQfJMr61Qk3c6WiGVJ1UCEgdb3DprMo/wkD+Li1hybXWFX1 X/83zo+22kmg4Xz631lljHQF3YLaw4UeXw+/Kl87Vfj/iSErToP6S0usCruciTp5YRWwBS 0pYLZsBUisf56cfsrO1fX3SzNzqTtMOTWf3NJ/V9FENycqI0+Ix8HZuIX1fpDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYfSq26Rfzq6r; Mon, 12 Feb 2024 22:36: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 41CMaRJh001441; Mon, 12 Feb 2024 22:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CMaRCq001438; Mon, 12 Feb 2024 22:36:27 GMT (envelope-from git) Date: Mon, 12 Feb 2024 22:36:27 GMT Message-Id: <202402122236.41CMaRCq001438@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: f616d61ab6b0 - main - libsecureboot do not report expected unverified files 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: Sender: owner-dev-commits-src-main@freebsd.org 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f616d61ab6b071e5fbfdbae7033a9ef04c1444ad Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f616d61ab6b071e5fbfdbae7033a9ef04c1444ad commit f616d61ab6b071e5fbfdbae7033a9ef04c1444ad Author: Simon J. Gerraty AuthorDate: 2024-02-12 22:35:01 +0000 Commit: Simon J. Gerraty CommitDate: 2024-02-12 22:35:01 +0000 libsecureboot do not report expected unverified files By default only report unverified files at severity VE_WANT and above. This inlcudes *.conf but not *.hints, *.cookie or *.tgz which get VE_TRY as their severity. If Verbose is set to 0, then VerifyFlags should default to 0 too. Thus the combination of module_verbose=0 VE_VEBOSE=0 is sufficient to make the loader almost totally silent. When verify_prep has to find_manifest and it is verified ok return VE_NOT_CHECKED to verify_file so that it can skip repeating verify_fd Also add better debugging output for is_verified and add_verify_status. vectx handle compressed modules When verifying a compressed module (.ko.gz or .ko.bz2) stat() reports the size as -1 (unknown). vectx_lseek needs to spot this during closing - and just read until EOF is hit. Note: because of the way libsa's open() works, verify_prep will see the path to be verified as module.ko not module.ko.bz2 etc. This is actually ok, because we need a separate module.ko.bz2 entry so that the package can be verified, and the hash for module.ko is of the uncompressed file which is what vectx will see. Re-work local.trust.mk so site.trust.mk need only set VE_SIGN_URL_LIST (if using the mentioned signing server) interp.c: restrict interactive input Apply the same restrictions to interactive input as for unverified conf and hints files. Use version.veriexec when LOADER_VERIEXEC is yes Reviewed by: kevans Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D43810 --- lib/libsecureboot/Makefile.inc | 8 +- lib/libsecureboot/Makefile.libsa.inc | 7 +- lib/libsecureboot/h/verify_file.h | 1 + lib/libsecureboot/local.trust.mk | 143 +++++++++++++++-------------------- lib/libsecureboot/vectx.c | 26 +++++-- lib/libsecureboot/verify_file.c | 35 +++++++-- stand/common/interp.c | 8 ++ stand/efi/loader/version.veriexec | 7 ++ stand/veriexec.mk | 3 + 9 files changed, 136 insertions(+), 102 deletions(-) diff --git a/lib/libsecureboot/Makefile.inc b/lib/libsecureboot/Makefile.inc index ff40b919bad3..b09e44edc1b0 100644 --- a/lib/libsecureboot/Makefile.inc +++ b/lib/libsecureboot/Makefile.inc @@ -58,6 +58,10 @@ _2ndLAST_PEM_USE: .USE sed -n "`grep -n .-BEGIN ${.ALLSRC:M*.pem} | tail -2 | \ sed 's,:.*,,' | xargs | (read a b; echo $$a,$$(($$b - 1)))`p" ${.ALLSRC:M*.pem} > ${.TARGET} +# rules to populate the [tv]*.pem files we use to generate ta.h +# and can add/alter VE_*_LIST as desired. +.-include "local.trust.mk" + # list of hashes we support VE_HASH_LIST?= SHA256 @@ -74,10 +78,6 @@ VE_SIGNATURE_EXT_LIST?= sig # needs to be yes for FIPS 140-2 compliance VE_SELF_TESTS?= no -# rules to populate the [tv]*.pem files we use to generate ta.h -# and can add/alter VE_*_LIST as desired. -.-include "local.trust.mk" - # this is what we use as our trust anchor CFLAGS+= -I. -DTRUST_ANCHOR_STR=ta_PEM diff --git a/lib/libsecureboot/Makefile.libsa.inc b/lib/libsecureboot/Makefile.libsa.inc index 76e0a91bc20a..907c8e8f7533 100644 --- a/lib/libsecureboot/Makefile.libsa.inc +++ b/lib/libsecureboot/Makefile.libsa.inc @@ -46,9 +46,12 @@ manifests.h: echo '${VE_MANIFEST_LIST:@m@"$m",${.newline}@}'; \ echo 'NULL };' ) > ${.TARGET} +# only add these if set XCFLAGS.verify_file+= \ - -DVE_DEBUG_LEVEL=${VE_DEBUG_LEVEL:U0} \ - -DVE_VERBOSE_DEFAULT=${VE_VERBOSE_DEFAULT:U0} \ + ${VE_DEBUG_LEVEL \ + VE_VERBOSE_DEFAULT \ + VE_VERIFY_FLAGS \ + :L:@v@${$v:S,^,-D$v=,}@} .if !empty(MANIFEST_SKIP_ALWAYS) XCFLAGS.verify_file+= -DMANIFEST_SKIP_ALWAYS=\"${MANIFEST_SKIP_ALWAYS}\" diff --git a/lib/libsecureboot/h/verify_file.h b/lib/libsecureboot/h/verify_file.h index 88d758b27af4..f918ed6d0e38 100644 --- a/lib/libsecureboot/h/verify_file.h +++ b/lib/libsecureboot/h/verify_file.h @@ -46,6 +46,7 @@ int verify_prep(int, const char *, off_t, struct stat *, const char *); void ve_debug_set(int); char *ve_error_get(void); void ve_efi_init(void); +void ve_status_set(int, int); int ve_status_get(int); int load_manifest(const char *, const char *, const char *, struct stat *); int pass_manifest(const char *, const char *); diff --git a/lib/libsecureboot/local.trust.mk b/lib/libsecureboot/local.trust.mk index 7b1e5f7ee97b..b009139a2f68 100644 --- a/lib/libsecureboot/local.trust.mk +++ b/lib/libsecureboot/local.trust.mk @@ -5,65 +5,69 @@ # the signing server (http://www.crufty.net/sjg/blog/signing-server.htm) # for each key will provide the appropriate certificate chain on request -# force these for Junos -#MANIFEST_SKIP_ALWAYS= boot -VE_HASH_LIST= \ - SHA1 \ - SHA256 \ - SHA384 \ - SHA512 - -VE_SIGNATURE_LIST= \ - ECDSA \ - RSA - -VE_SIGNATURE_EXT_LIST= \ - esig \ - rsig - -VE_SELF_TESTS= yes - -.if ${MACHINE} == "host" && ${.CURDIR:T} == "tests" - -VE_SIGNATURE_LIST+= \ - DEPRECATED_RSA_SHA1 +# allow site control +.-include "site.trust.mk" -VE_SIGNATURE_EXT_LIST+= \ - sig -.endif +#VE_DEBUG_LEVEL?=3 +#VE_VERBOSE_DEFAULT?=2 -# add OpenPGP support - possibly dormant -VE_SIGNATURE_LIST+= OPENPGP -VE_SIGNATURE_EXT_LIST+= asc +VE_HASH_LIST?= \ + SHA256 \ + SHA384 \ -# allow site override of all the above -.-include "site.trust.mk" +VE_SELF_TESTS?= yes -SIGNER ?= ${SB_TOOLS_PATH:U/volume/buildtools/bin}/sign.py +# client for the signing server above +SIGNER?= /opt/sigs/sign.py .if exists(${SIGNER}) -SIGN_HOST ?= ${SB_SITE:Usvl}-junos-signer.juniper.net -ECDSA_PORT:= ${133%y:L:gmtime} -SIGN_ECDSA= ${PYTHON} ${SIGNER} -u ${SIGN_HOST}:${ECDSA_PORT} -h sha256 -RSA2_PORT:= ${163%y:L:gmtime} -SIGN_RSA2= ${PYTHON} ${SIGNER} -u ${SIGN_HOST}:${RSA2_PORT} -h sha256 +OPENPGP_SIGNER?= ${SIGNER:H}/openpgp-sign.py +OPENPGP_SIGN_FLAGS= -a +OPENPGP_SIGN_HOST?= localhost +SIGN_HOST ?= localhost + +# A list of name/ext/url tuples. +# name should be one of ECDSA, OPENPGP or RSA, they can be repeated +# Order of ext list implies runtime preference so do not sort! +VE_SIGN_URL_LIST?= \ + ECDSA/esig/${SIGN_HOST}:${133%y:L:localtime} \ + RSA/rsig/${SIGN_HOST}:${163%y:L:localtime} \ + OPENPGP/asc/${OPENPGP_SIGN_HOST}:1234 \ + +.for sig ext url in ${VE_SIGN_URL_LIST:@x@${x:H:H} ${x:H:T} ${x:T}@} +SIGN_${sig}:= ${PYTHON} ${${sig}_SIGNER:U${SIGNER}} -u ${url} ${${sig}_SIGN_FLAGS:U-h sha256} + +VE_SIGNATURE_LIST+= ${sig} +VE_SIGNATURE_EXT_LIST+= ${ext} + +_SIGN_${sig}_USE: .USE + ${SIGN_${sig}} ${.ALLSRC} + +_TA_${sig}_USE: .USE + ${SIGN_${sig}} -C ${.TARGET} + +.if ${sig} == "OPENPGP" +ta_${sig:tl}.${ext}: _TA_${sig}_USE +ta_${ext}.h: ta_${sig:tl}.${ext} +.else +${ext:S/sig/certs/}.pem: _TA_${sig}_USE +# the last cert in the chain is the one we want +ta_${ext}.pem: ${ext:S/sig/certs/}.pem _LAST_PEM_USE +ta.h: ta_${ext}.pem +.if ${VE_SELF_TESTS} != "no" +# we use the 2nd last cert to test verification +vc_${ext}.pem: ${ext:S/sig/certs/}.pem _2ndLAST_PEM_USE +ta.h: vc_${ext}.pem +.endif +.endif +.endfor -# deal with quirk of our .esig format -XCFLAGS.vets+= -DVE_ECDSA_HASH_AGAIN +# cleanup duplicates +VE_SIGNATURE_LIST:= ${VE_SIGNATURE_LIST:O:u} -.if !empty(OPENPGP_SIGN_URL) +.if target(ta_asc.h) XCFLAGS.opgp_key+= -DHAVE_TA_ASC_H -VE_SIGNATURE_LIST+= OPENPGP -VE_SIGNATURE_EXT_LIST+= asc - -SIGN_OPENPGP= ${PYTHON} ${SIGNER:H}/openpgp-sign.py -a -u ${OPENPGP_SIGN_URL} - -ta_openpgp.asc: - ${SIGN_OPENPGP} -C ${.TARGET} - -ta_asc.h: ta_openpgp.asc - .if ${VE_SELF_TESTS} != "no" # for self test vc_openpgp.asc: ta_openpgp.asc @@ -74,48 +78,26 @@ ta_asc.h: vc_openpgp.asc .endif .endif -rcerts.pem: - ${SIGN_RSA2} -C ${.TARGET} - -ecerts.pem: - ${SIGN_ECDSA} -C ${.TARGET} - -.if ${VE_SIGNATURE_LIST:tu:MECDSA} != "" -# the last cert in the chain is the one we want -ta_ec.pem: ecerts.pem _LAST_PEM_USE -ta.h: ta_ec.pem -.if ${VE_SELF_TESTS} != "no" -# these are for verification self test -vc_ec.pem: ecerts.pem _2ndLAST_PEM_USE -ta.h: vc_ec.pem -.endif -.endif - -.if ${VE_SIGNATURE_LIST:tu:MRSA} != "" -ta_rsa.pem: rcerts.pem _LAST_PEM_USE -ta.h: ta_rsa.pem -.if ${VE_SELF_TESTS} != "no" -vc_rsa.pem: rcerts.pem _2ndLAST_PEM_USE -ta.h: vc_rsa.pem -.endif -.endif - -# we take the mtime of this as our baseline time -#BUILD_UTC_FILE= ecerts.pem -#VE_DEBUG_LEVEL=3 -#VE_VERBOSE_DEFAULT=1 - .else +VE_SIGNATURE_LIST?= RSA + # you need to provide t*.pem or t*.asc files for each trust anchor +# below assumes they are named ta_${ext}.pem eg ta_esig.pem for ECDSA .if empty(TRUST_ANCHORS) TRUST_ANCHORS!= cd ${.CURDIR} && 'ls' -1 *.pem t*.asc 2> /dev/null .endif .if empty(TRUST_ANCHORS) && ${MK_LOADER_EFI_SECUREBOOT} != "yes" .error Need TRUST_ANCHORS see ${.PARSEDIR}/README.rst .endif + .if ${TRUST_ANCHORS:T:Mt*.pem} != "" ta.h: ${TRUST_ANCHORS:M*.pem} +VE_SIGNATURE_EXT_LIST?= ${TRUST_ANCHORS:T:Mt*.pem:R:S/ta_//} +.if ${VE_SIGNATURE_EXT_LIST:Mesig} != "" +VE_SIGNATURE_LIST+= ECDSA +.endif .endif + .if ${TRUST_ANCHORS:T:Mt*.asc} != "" VE_SIGNATURE_LIST+= OPENPGP VE_SIGNATURE_EXT_LIST+= asc @@ -124,4 +106,3 @@ ta_asc.h: ${TRUST_ANCHORS:M*.asc} # we take the mtime of this as our baseline time BUILD_UTC_FILE?= ${TRUST_ANCHORS:[1]} .endif - diff --git a/lib/libsecureboot/vectx.c b/lib/libsecureboot/vectx.c index dba728421ce4..2d56830cd81d 100644 --- a/lib/libsecureboot/vectx.c +++ b/lib/libsecureboot/vectx.c @@ -306,19 +306,31 @@ vectx_lseek(struct vectx *ctx, off_t off, int whence) DEBUG_PRINTF(3, ("%s(%s, %ld, %d)\n", __func__, ctx->vec_path, (long)off, whence)); if (whence == SEEK_END && off <= 0) { - if (ctx->vec_closing && ctx->vec_hashed < ctx->vec_size) { - DEBUG_PRINTF(3, ("%s: SEEK_END %ld\n", - __func__, - (long)(ctx->vec_size - ctx->vec_hashed))); + if (ctx->vec_size < 0) { + if (ctx->vec_closing) { + /* size unknown - read until EOF */ + do { + n = vectx_read(ctx, buf, PAGE_SIZE); + if (n < 0) + return (n); + } while (n > 0); + return (ctx->vec_off); + } + } else { + if (ctx->vec_closing && ctx->vec_hashed < ctx->vec_size) { + DEBUG_PRINTF(3, ("%s: SEEK_END %ld\n", + __func__, + (long)(ctx->vec_size - ctx->vec_hashed))); + } + whence = SEEK_SET; + off += ctx->vec_size; } - whence = SEEK_SET; - off += ctx->vec_size; } else if (whence == SEEK_CUR) { whence = SEEK_SET; off += ctx->vec_off; } if (whence != SEEK_SET || - off > ctx->vec_size) { + (off > ctx->vec_size && ctx->vec_size > 0)) { printf("ERROR: %s: unsupported operation: whence=%d off=%ld -> %ld\n", __func__, whence, (long)ctx->vec_off, (long)off); return (-1); diff --git a/lib/libsecureboot/verify_file.c b/lib/libsecureboot/verify_file.c index c123ea9e1088..753204a33b6a 100644 --- a/lib/libsecureboot/verify_file.c +++ b/lib/libsecureboot/verify_file.c @@ -82,7 +82,7 @@ static int Verbose = VE_VERBOSE_DEFAULT; /** * @brief set ve status for fd */ -static void +void ve_status_set(int fd, int ves) { if (fd >= 0 && fd < SOPEN_MAX) { @@ -131,15 +131,21 @@ int is_verified(struct stat *stp) { struct verify_status *vsp; + int rc = VE_NOT_CHECKED; if (stp->st_ino > 0) { for (vsp = verified_files; vsp != NULL; vsp = vsp->vs_next) { if (stp->st_dev == vsp->vs_dev && - stp->st_ino == vsp->vs_ino) - return (vsp->vs_status); + stp->st_ino == vsp->vs_ino) { + rc = vsp->vs_status; + break; + } } } - return (VE_NOT_CHECKED); + DEBUG_PRINTF(4, ("%s: dev=%lld,ino=%llu,status=%d\n", + __func__, (long long)stp->st_dev, + (unsigned long long)stp->st_ino, rc)); + return (rc); } /* most recent first, since most likely to see repeated calls. */ @@ -156,6 +162,9 @@ add_verify_status(struct stat *stp, int status) vsp->vs_status = status; verified_files = vsp; } + DEBUG_PRINTF(4, ("%s: dev=%lld,ino=%llu,status=%d\n", + __func__, (long long)stp->st_dev, + (unsigned long long)stp->st_ino, status)); } @@ -270,11 +279,14 @@ severity_guess(const char *filename) /* * Some files like *.conf and *.hints may be unsigned, * a *.tgz is expected to have its own signed manifest. + * We allow *.conf to get VE_WANT, but files we expect + * to always be unverified get VE_TRY and we will not + * report them. */ if ((cp = strrchr(filename, '.'))) { - if (strcmp(cp, ".conf") == 0 || - strcmp(cp, ".cookie") == 0 || + if (strcmp(cp, ".cookie") == 0 || strcmp(cp, ".hints") == 0 || + strcmp(cp, ".order") == 0 || strcmp(cp, ".tgz") == 0) return (VE_TRY); if (strcmp(cp, ".4th") == 0 || @@ -398,6 +410,8 @@ void verify_report(const char *path, int severity, int status, struct stat *stp) { if (status < 0 || status == VE_FINGERPRINT_IGNORE) { + if (Verbose < VE_VERBOSE_ALL && severity < VE_WANT) + return; if (Verbose >= VE_VERBOSE_UNVERIFIED || severity > VE_TRY || status <= VE_FINGERPRINT_WRONG) { if (Verbose == VE_VERBOSE_DEBUG && stp != NULL) @@ -462,9 +476,10 @@ verify_prep(int fd, const char *filename, off_t off, struct stat *stp, caller, fd, filename, (long long)off, (long long)stp->st_dev, (unsigned long long)stp->st_ino)); rc = is_verified(stp); - DEBUG_PRINTF(4,("verify_prep: is_verified()->%d\n", rc)); if (rc == VE_NOT_CHECKED) { rc = find_manifest(filename); + if (rc == VE_VERIFIED) + rc = VE_NOT_CHECKED; } else { ve_status_set(fd, rc); } @@ -511,7 +526,8 @@ verify_file(int fd, const char *filename, off_t off, int severity, if (check_verbose) { check_verbose = 0; Verbose = getenv_int("VE_VERBOSE", VE_VERBOSE_DEFAULT); - VerifyFlags = getenv_int("VE_VERIFY_FLAGS", VEF_VERBOSE); + VerifyFlags = getenv_int("VE_VERIFY_FLAGS", + Verbose ? VEF_VERBOSE : 0); #ifndef UNIT_TEST ve_debug_set(getenv_int("VE_DEBUG_LEVEL", VE_DEBUG_LEVEL)); #endif @@ -523,6 +539,9 @@ verify_file(int fd, const char *filename, off_t off, int severity, return (0); if (rc != VE_FINGERPRINT_WRONG && loaded_manifests) { + if (rc != VE_NOT_CHECKED) + return (rc); + if (severity <= VE_GUESS) severity = severity_guess(filename); #ifdef VE_PCR_SUPPORT diff --git a/stand/common/interp.c b/stand/common/interp.c index b71e0858e702..0f142902b4ac 100644 --- a/stand/common/interp.c +++ b/stand/common/interp.c @@ -35,6 +35,10 @@ #include #include "bootstrap.h" +#ifdef LOADER_VERIEXEC +#include +#endif + #define MAXARGS 20 /* maximum number of arguments allowed */ const char * volatile interp_identifier; @@ -79,6 +83,10 @@ interact(void) input[0] = '\0'; interp_emit_prompt(); ngets(input, sizeof(input)); +#ifdef LOADER_VERIEXEC + /* some settings should be restritcted */ + ve_status_set(-1, VE_UNVERIFIED_OK); +#endif interp_run(input); } } diff --git a/stand/efi/loader/version.veriexec b/stand/efi/loader/version.veriexec new file mode 100644 index 000000000000..5c9292310c04 --- /dev/null +++ b/stand/efi/loader/version.veriexec @@ -0,0 +1,7 @@ +NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this +file is important. Make sure the current version number is on line 6. + +2.1: SMBIOS 3 support +2.0: Secure boot support +1.1: Keep in sync with i386 version. +0.1: Initial i386 version. Derived from ia64. diff --git a/stand/veriexec.mk b/stand/veriexec.mk index 930e933be0a9..a0ff7d1e8489 100644 --- a/stand/veriexec.mk +++ b/stand/veriexec.mk @@ -1,4 +1,7 @@ .if ${MK_LOADER_VERIEXEC} != "no" +.if exists(${VERSION_FILE}.veriexec) +VERSION_FILE:= ${VERSION_FILE}.veriexec +.endif CFLAGS+= -DLOADER_VERIEXEC -I${SRCTOP}/lib/libsecureboot/h .if ${MK_LOADER_VERIEXEC_VECTX} != "no" CFLAGS+= -DLOADER_VERIEXEC_VECTX From nobody Mon Feb 12 22:40: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 4TYfYV6H33z595fD; Mon, 12 Feb 2024 22:40: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 4TYfYV5l2mz4RvD; Mon, 12 Feb 2024 22:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707777630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IiG6wK9OjDjlqT/y3eUG9yxPQUUeP4kxrZlMAExC0cg=; b=eWU5UlSqeLCoUco3DqlY8EbgjLopeCCieNWv+ios16G3dB7fGHvZEM9GhoDBcD/hF3XCH5 7qOwAIrEjX90679T3XqNIzQVk9VAdHY2MsuooeQ5nOPbxQpmOeB446sbCjNoj7Ha6RFiPk QR8+OG9KtlN5F61enifDpvy+CznoGsLjSlhW4qGORpvctZ0vg22KtyOO5E7Tp837rFBNie qxXGZm8OYvacxJPGPuaAYUqjsanGA874KCUM8rej4q+y6uiZFrPb1FPSWJ/oiny/I0O2ZR 2i92KF9drUBhNSbQo01oEyyGWgSKXnKZik7O5SduPs3UOKPd7g1XIBvy9gVUzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707777630; a=rsa-sha256; cv=none; b=RJoQQN42JfOkT8kiwc/Yt/d2Kiud7H8uSa2FN86WLenY2lRzsmxbYSHeUqFyQsJDp5J9+X N3e9wTqrheHasvq9tvv9wcafHpAOr4/N0eytX8CZua5BCfi3qlv/9JXB5hTiYx+e9ofv8t UFgAnbYSZQReXRqesM6vAvpuOAAlYYkDHYopMELCErQQi14mLqzU9PPMOZ0fm8+MPR4nke JM+4M75UJ27XubbcOnTOypR/PjH/fIzAZHBmD6x8gT4aTPSftCFRsImVgohJUd3TStoLSb RAKk/yFAQxBKmo5aSUiSTR5fQptae0yOiMbQy4Ut1Mi27D5YIAb/JPFJGAgYzg== 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=1707777630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IiG6wK9OjDjlqT/y3eUG9yxPQUUeP4kxrZlMAExC0cg=; b=OEHg7F4WlRjzkOi1trFAMrFBQ55xrjRBQTLrOjAjTli4jeYA/hQWDc67epvQI3MqwVIKHw k2Vf8F9fuB32gqwVPiz7gh8+8qWIpdui8P8PC3k4cjvJxqvEN9ZUNfABJIw21EA+7f7L2J sLq8O4UHc+a0OYI78oDAb2Qvr3YOTK86HNxDpJhMe4PXUQX0omY3b8iVBIKPt5v6QKYJi1 tK2DqFS6Q/sWbuJ9fcniwFLT6fTyKIaOTf5Ll2ajBhHTKt9qFEOLyOhxP3GkV5quxgmEci apKM6CD/v2RobXF8GRA0WiM+Gv32s9JBgw0qbqSsV8WZZS8r+LbhLpY295OiAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYfYV4NWnzqDv; Mon, 12 Feb 2024 22:40: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 41CMeUkx010659; Mon, 12 Feb 2024 22:40:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CMeUxj010656; Mon, 12 Feb 2024 22:40:30 GMT (envelope-from git) Date: Mon, 12 Feb 2024 22:40:30 GMT Message-Id: <202402122240.41CMeUxj010656@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: b75bb99621fb - main - rc.subr add Exists so we can find sed 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: Sender: owner-dev-commits-src-main@freebsd.org 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b75bb99621fbebae3b7f56ea01e711333d0455d8 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b75bb99621fbebae3b7f56ea01e711333d0455d8 commit b75bb99621fbebae3b7f56ea01e711333d0455d8 Author: Simon J. Gerraty AuthorDate: 2024-02-12 22:39:20 +0000 Commit: Simon J. Gerraty CommitDate: 2024-02-12 22:39:20 +0000 rc.subr add Exists so we can find sed SED=`Exists -x /usr/bin/sed /rescue/sed` avoids adding /rescure to $PATH, and allows use of sed before /usr is mounted (if a separate filesystem). Reviewed by: jlduran_gmail.com Differential Revision: https://reviews.freebsd.org/D43826 --- libexec/rc/rc.subr | 40 +++++++++++++++++++++++++++++++++++----- libexec/rc/safe_eval.sh | 2 +- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index d76f0ba4f9a7..16b2c9fc5e88 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -156,6 +156,33 @@ vdot() return $rc } +# Exists [test] file ... +# report the first "file" that passes "test" (default -s). +Exists() +{ + local f _t=-s + + while :; do + : 1=$1 + case "$1" in + -?) + _t=$1 + shift + ;; + *) + break + ;; + esac + done + + for f in "$@"; do + [ $_t $f ] || continue + echo $f + return 0 + done + return 1 +} + # do we have $1 (could be a function) have() { @@ -179,8 +206,8 @@ rc_trace() [ -f $cf ] || return if [ -s $cf ]; then # don't try to set RC_LEVEL without sed - if [ -x /usr/bin/sed ]; then - RC_LEVEL=$(sed -n '/^RC_LEVEL=/ { s/.*=//p;q; }' $cf) + if [ -n "$SED" ]; then + RC_LEVEL=$($SED -n '/^RC_LEVEL=/ { s/.*=//p;q; }' $cf) RC_LEVEL=${RC_LEVEL:-0} fi else @@ -2498,6 +2525,8 @@ if [ -n "$boottrace_cmd" ] && [ "`${SYSCTL_N} -q kern.boottrace.enabled`" = "1" rc_boottrace=YES fi +SED=${SED:-$(Exists -x /usr/bin/sed /rescue/sed)} + # Allow for local additions and overrides. # Use vdot to ensure the file has not been tampered with. vdot /etc/local.rc.subr @@ -2514,10 +2543,11 @@ if ! have basename; then { return 0 } -else - # safe_eval.sh provides safe_dot - for untrusted files - $_SAFE_EVAL_SH vdot /libexec/safe_eval.sh + # we cannot use safe_dot without sed + [ -z "$SED" ] && _SAFE_EVAL_SH=: fi +# safe_eval.sh provides safe_dot - for untrusted files +$_SAFE_EVAL_SH vdot /libexec/safe_eval.sh $_DEBUG_SH vdot /libexec/debug.sh # Ensure we can still operate if debug.sh and diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index bd9bc9394814..10b6ed09c769 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -24,7 +24,7 @@ _SAFE_EVAL_SH=: # any non-alphanumeric chars are replaced with '_' # safe_set() { - sed 's/[ ]*#.*//;/^[A-Za-z_][A-Za-z0-9_]*=/!d;s;[^A-Za-z0-9_. "$,/=-];_;g' + ${SED:-sed} 's/[ ]*#.*//;/^[A-Za-z_][A-Za-z0-9_]*=/!d;s;[^A-Za-z0-9_. "$,/=-];_;g' } ## From nobody Mon Feb 12 22:59: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 4TYfzT0C2zz597YK; Mon, 12 Feb 2024 22:59: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 4TYfzS2sSXz4Tvh; Mon, 12 Feb 2024 22:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707778772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCf7TIal/iFsOLggd0SCknzTcwtjK9JFHv0s513Iwug=; b=vxb+Doa8+n1Wmf3+ZQxoP05W4o2fmM89Wuwk/dFPKcvqNREFqWRGPFCdLpYtXxoVdr40I/ lg2RKuA9hY7+qsP3NkzAsGlbZawEctQgRu7NilKJ63+LSUd4U3rFeBocx+fRbNw9btT31+ r7eVxnl7lXaTdYI2F216mmvLxI41YI/30jnspukKfzJBU7DnK2HjPUXa+1/XO2/CeCWCh3 nC5fjmfDzxubrkE1zzSJ7MAm6nMmfBEwy21L5SG0htQAgnLqF45ypjF6XNCy36wfPVPvCJ 75Ay8hANNNT2cRf2j4Zjn56wJGR3RRmk+AYKfk4eneNcXXkO+w1C+OKSvtAELg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707778772; a=rsa-sha256; cv=none; b=AgryVX7NZjnxZFZE9G9KqBfXExYhjxeAVmR1nLzouCjIWie68uPZJzGtoN9fNer8MH1qbH w4AKBOB5xvADe32oBYcoP1gIXwvrp4rdaII+ayRsM6/8yoxql3PNEn7q8c9xZN4/8C1Pfp eR2i1x4sSQxCDHkycpRR1oW9BzGQZH36crj/6OlX33YHGOrdhFCm97aekOEiuF9Tvo0JMm up9rjotNUoli3E152k68lZOnYo7MuQlzxwmdwYf1gNaWLVwZpuVWdBAPwRvulyWEw6rufn 6wtgLhPJVTnRIKZSfjIu7FbcL8Miv/ek8MVO7RgTNG59NZ8lnsUxSNMIR2B9/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=1707778772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vCf7TIal/iFsOLggd0SCknzTcwtjK9JFHv0s513Iwug=; b=OkHkwB59qJP3VB3RHalTxUSG/FwuXQlorte4nFhkuFvBOcYM+ld2h+gWQjUcYd3Cfv22ap XKdUA2uHGUs2DlP77HvTMA8G6C5XkSQqd8Vg38LN01T6BSr06yX3BNWTR+v8Ue23sVxBci kbaD7P987dDx5qritsa6bGTR823nyv2XBkWC+0Rxx4DeNWCK2Y2TNvPGWnvr5NSoUMB68+ si3xc0L7HsFT6g655mq/Icl48nhyOJC5TgV7MPBTlbCf+Mn7NcEYc6xM1RsujgrfrQTBBP WK5a/r5A966F/vsU2jmJvkWnfbat1rwUguZX5QVMnCs40kOo3VYS6yuYHHdUUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYfzS1zRGzr5w; Mon, 12 Feb 2024 22:59: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 41CMxWae035176; Mon, 12 Feb 2024 22:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CMxWAJ035173; Mon, 12 Feb 2024 22:59:32 GMT (envelope-from git) Date: Mon, 12 Feb 2024 22:59:32 GMT Message-Id: <202402122259.41CMxWAJ035173@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: bd45bbe440f1 - main - rescue: Fix after zfsbootcfg addition 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd45bbe440f19eeb166a13798c8dcc4dfeb29e36 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd45bbe440f19eeb166a13798c8dcc4dfeb29e36 commit bd45bbe440f19eeb166a13798c8dcc4dfeb29e36 Author: Warner Losh AuthorDate: 2024-02-12 22:10:37 +0000 Commit: Warner Losh CommitDate: 2024-02-12 22:59:14 +0000 rescue: Fix after zfsbootcfg addition Get the library dependencies correct for zfsbootcfg. libzfsbootcfg depends on a all of these... Fixes: ac4847e6b0e9 Sponsored by: Netflix --- rescue/rescue/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 4c351e632638..5d5c609eb218 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -148,7 +148,13 @@ CRUNCH_LIBS_zfs+= ${LIBBE} \ CRUNCH_LIBS_bectl+= ${CRUNCH_LIBS_zfs} CRUNCH_LIBS_zpool+= ${CRUNCH_LIBS_zfs} CRUNCH_LIBS_zdb+= ${CRUNCH_LIBS_zfs} ${LIBZDB} -CRUNCH_LIBS_zfsbootcfg+=${LIBZFSBOOTENV} +CRUNCH_LIBS_zfsbootcfg+=${LIBZFSBOOTENV} \ + ${LIBZPOOL} \ + ${LIBZFS} \ + ${LIBZUTIL} \ + ${LIBZFS_CORE} \ + ${LIBICP_RESCUE} \ + ${LIBNVPAIR} .else # liblzma needs pthread CRUNCH_LIBS+= -lpthread From nobody Tue Feb 13 01:10: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 4TYjv11kldz59Nlm for ; Tue, 13 Feb 2024 01:10:53 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYjv1009Vz4mB6 for ; Tue, 13 Feb 2024 01:10:52 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-33cd57b86bfso83490f8f.1 for ; Mon, 12 Feb 2024 17:10:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707786651; x=1708391451; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fb/uUO8FPzpUrO0oHAni5GsafTpkd6TwxJBwIjwz1cw=; b=Wbomi6X9gUx3OvQSL0NxCGjM+5YFRcKNKpe628m7MLNatbJDl+iDWgIwxKqjSJpiTF xoMRb6PcOhL1aEez9C+zVNVGXR3ZAVgc3KLVAAe1n7gQf5gkvAwQ3xm7KZh/7O6CC1hN jdX2fKUUWa9UWoY6PjFEoXXk15gL8JtrU6+/hcPvGZtCj2fFm2aNXIKe4J2VF4RaoXlJ ZmeK21NY0sjgOyCDQs18qt9O2t0KlPKcolTQdeK5dShgJ5UM/T7ul2Z2r3lSpAXlyGft T5JvAOTDvm697QjP2H/1nFqXsbvfyOhdhR4KfIOsM8ngl1ap2kmx6nqzstuPxdGjD4FI rUqw== X-Forwarded-Encrypted: i=1; AJvYcCU5+aaZDi0hkbXwOk3jMpXKQhdHmdKCl5YnpfhtR+dJIEMCi+Gs5OH5+HhjImMGDzgCbKqM6N6kSTlxIlp+Ml+QMZoS6Rz1XS2KOkK28DvewA== X-Gm-Message-State: AOJu0Yzask4h1U/6OdjyBiuQKfOuEpV+KhzNLHgd1spUV4VTiStjIrr0 BrxQNY1PdgqMX5BIe4kbCwH7WvmOEQlmTFL0SlBp9NR6CPstN2csMCcZfkEEtDg= X-Google-Smtp-Source: AGHT+IHEi2mgGj1QdxgXLYI7U8QEpck9e0YBVJuxVy6TuOebfBE2ysu9u6qMLTUpcKg6w61ovmp23g== X-Received: by 2002:a05:6000:11ca:b0:33b:61b3:4bd8 with SMTP id i10-20020a05600011ca00b0033b61b34bd8mr6066994wrx.67.1707786650924; Mon, 12 Feb 2024 17:10:50 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUAigU5rGLsyaJnF/Fy6/1uSOxja02DmsTk7rMYgQcHYQgbjtdBDl66FL6Adh6YVhQbhutg6aMXWK0kaK/jsenteHHrbCH3FzgHU0ro/cEOdWtEY6NozUjXBckN3VepHCflxcl0QWky2aEeOdkEQ7E+wg== Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id m18-20020a5d56d2000000b0033b60bad2fcsm8016717wrw.113.2024.02.12.17.10.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2024 17:10:50 -0800 (PST) Content-Type: text/plain; charset=utf-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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 0df5f65908dd - main - reboot: Implement zfs support From: Jessica Clarke In-Reply-To: <202402121853.41CIrfdp030604@gitrepo.freebsd.org> Date: Tue, 13 Feb 2024 01:10:39 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202402121853.41CIrfdp030604@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4TYjv1009Vz4mB6 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 12 Feb 2024, at 18:53, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D0df5f65908dd1913212535e6c4dd4c73= ce19c305 >=20 > commit 0df5f65908dd1913212535e6c4dd4c73ce19c305 > Author: Warner Losh > AuthorDate: 2024-02-12 18:45:37 +0000 > Commit: Warner Losh > CommitDate: 2024-02-12 18:45:37 +0000 >=20 > reboot: Implement zfs support >=20 > Implement full support for ZFS -k support. For ZFS, we have to set = a > property that gets cleared by the boot loaeder for whether or not = to > process nextboot.conf. Do this using system("zfsbootcfg..." rather = than > coding the small subset of that program inline to avoid CDDL > contamination of reboot and the complications of disabling CDDL = and/or > ZFS. The few bytes needed to implement reboot for systems with zfs = is > not worth saving for systems w/o ZFS. Can we at least use posix_spawn rather than system? The asprintf+system combo may in practice be safe, especially given the nature of this tool, but I don=E2=80=99t think it=E2=80=99s a great idea to be writing = system-using code in 2024 when it=E2=80=99s easy to avoid. That way nobody needs to = stop and think carefully about whether the code is safe, because it is by construction. Jess From nobody Tue Feb 13 02:28: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 4TYlcT1D3Cz59Y1D for ; Tue, 13 Feb 2024 02:28:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYlcS5vrBz3xPh for ; Tue, 13 Feb 2024 02:28:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-55f279dca99so5927434a12.3 for ; Mon, 12 Feb 2024 18:28:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1707791302; x=1708396102; 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=r5uCYuv5vGFnLL1HPK9A9JUbEG8KLZ4hd3S8416+U/A=; b=MIGPhen3I7Vrtl/jbS3Ur0Oc+4W+yKFoYq4cDyGPsCXB6WGrQmy4aT2vRvcYmNwO76 y/0GA3ELzW9WhhCF0r0SZwtZamyUB6aNlzPTsIkv1QCQ1JUYltjajiFXYffb67BEYT9L MDdCusjcGRqAp9GvGxFAxzuf0nD1eFS/1h90HGqwJ5j15NNABOFf1J6WLE+pw/rZEjst 776LiM8dQrvEChXgqtW62G1f9nz4F74k+3phBXqq3qMlKdboFwF7KgwT2EVb9ME6ykiK KrDWrPVGnuu4dapQTKLQZ7nOzXeJRnKX7fHhCo64eslZGVUfL8Oxf/HFxJlWijU9jBqu qREA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707791302; x=1708396102; 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=r5uCYuv5vGFnLL1HPK9A9JUbEG8KLZ4hd3S8416+U/A=; b=JwzhQ9VCcovyeH4p59dH38StOJ/cJN0mUvsT0/1AiQz/wBEwbjDJIlrNUOmkOQ6KtX RnvnYBZ9f0Bh82g1jG/0Ag/hFRwP49Il0MKBDkk/dRwbw4xTobSQVrFaT36gPjyjVt8j HTcWW8eTeej8lmzsMITWLV1qy8nSddoHVn9ZcZC2fv30WiIO0/LBdUqJBSimGvDuthLA ceyvE8D9dGaRTNA8S9CzXkEzCLU1kXINuar2icVH+9zZN0liC5E7TfyTL5m9LbwxqlBH aXYU+JjJd6cSrFfebdd5e1yhup4fATWweCB+hI73zP8twHFLc+AebYx5nkPx75rEQ4qm JzeQ== X-Forwarded-Encrypted: i=1; AJvYcCXh5GTKI30vuqQqHllhohsgQzFZmtr5xXv1j3rAY+meFXw8yAIrMSsoKUv/8HU8lffgh6uDC9bZ+Mdy3Gg9zhIzdi23IHGodP9dwWfj3II3BA== X-Gm-Message-State: AOJu0YygsiIUeNCHzMPh2Mj7ABDcg7EIgLwU+x2fKmVWE9phNEIsFPqJ X822IRkrgtNYn5B4OVHmug06FSSCmKEppuyGLjD/yRCu7u8BfOWv3BYAo9B7dDDKbr+jzJwn7TX SrtKRVh4yLydOehVjXxeZBluDvVbaBoQwoNrOqA== X-Google-Smtp-Source: AGHT+IEIRoz1ewqhQyBgUHmLDaJgAOhil9LJGcPdvFKvzE9tljiuB/6wPduJRbCnY6gbzMUcsclE12t2rtwm5MIdJ8Q= X-Received: by 2002:aa7:d40f:0:b0:561:3de1:ba36 with SMTP id z15-20020aa7d40f000000b005613de1ba36mr5517366edq.34.1707791301776; Mon, 12 Feb 2024 18:28:21 -0800 (PST) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402121853.41CIrfdp030604@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Mon, 12 Feb 2024 19:28:10 -0700 Message-ID: Subject: Re: git: 0df5f65908dd - main - reboot: Implement zfs support To: Jessica Clarke Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000e4a7c306113a2543" 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: 4TYlcS5vrBz3xPh X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --000000000000e4a7c306113a2543 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Feb 12, 2024, 6:10=E2=80=AFPM Jessica Clarke w= rote: > On 12 Feb 2024, at 18:53, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D0df5f65908dd1913212535e6c4dd4c7= 3ce19c305 > > > > commit 0df5f65908dd1913212535e6c4dd4c73ce19c305 > > Author: Warner Losh > > AuthorDate: 2024-02-12 18:45:37 +0000 > > Commit: Warner Losh > > CommitDate: 2024-02-12 18:45:37 +0000 > > > > reboot: Implement zfs support > > > > Implement full support for ZFS -k support. For ZFS, we have to set a > > property that gets cleared by the boot loaeder for whether or not to > > process nextboot.conf. Do this using system("zfsbootcfg..." rather > than > > coding the small subset of that program inline to avoid CDDL > > contamination of reboot and the complications of disabling CDDL and/= or > > ZFS. The few bytes needed to implement reboot for systems with zfs i= s > > not worth saving for systems w/o ZFS. > > Can we at least use posix_spawn rather than system? The asprintf+system > combo may in practice be safe, especially given the nature of this > tool, but I don=E2=80=99t think it=E2=80=99s a great idea to be writing s= ystem-using > code in 2024 when it=E2=80=99s easy to avoid. That way nobody needs to st= op and > think carefully about whether the code is safe, because it is by > construction. > News to me, but also the first time I've used system in 15 or 20 years... Sure, I'll rework and add you to the reviewers. So TIL... Warner > --000000000000e4a7c306113a2543 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Feb 12, 2024, 6:10=E2=80=AFPM Jessica Clarke &= lt;jrtc27@freebsd.org> wrote:<= br>
On 12 Feb 2024, at 18:53, Warner Lo= sh <imp@FreeBSD.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D0df5f65908dd1913212535e6c4dd4c= 73ce19c305
>
> commit 0df5f65908dd1913212535e6c4dd4c73ce19c305
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2024-02-12 18:45:37 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-02-12 18:45:37 +0000
>
>=C2=A0 =C2=A0 reboot: Implement zfs support
>
>=C2=A0 =C2=A0 Implement full support for ZFS -k support. For ZFS, we ha= ve to set a
>=C2=A0 =C2=A0 property that gets cleared by the boot loaeder for whethe= r or not to
>=C2=A0 =C2=A0 process nextboot.conf. Do this using system("zfsboot= cfg..." rather than
>=C2=A0 =C2=A0 coding the small subset of that program inline to avoid C= DDL
>=C2=A0 =C2=A0 contamination of reboot and the complications of disablin= g CDDL and/or
>=C2=A0 =C2=A0 ZFS. The few bytes needed to implement reboot for systems= with zfs is
>=C2=A0 =C2=A0 not worth saving for systems w/o ZFS.

Can we at least use posix_spawn rather than system? The asprintf+system
combo may in practice be safe, especially given the nature of this
tool, but I don=E2=80=99t think it=E2=80=99s a great idea to be writing sys= tem-using
code in 2024 when it=E2=80=99s easy to avoid. That way nobody needs to stop= and
think carefully about whether the code is safe, because it is by
construction.

News to me, but also the first time I've used system in 15= or 20 years...

Sure, I&= #39;ll rework and add you to the reviewers. So TIL...

Warner=C2=A0
--000000000000e4a7c306113a2543-- From nobody Tue Feb 13 03:23: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 4TYmqj1zZNz59f79; Tue, 13 Feb 2024 03:23:13 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYmqj1V06z45Dj; Tue, 13 Feb 2024 03:23:13 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707794593; 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=1C5M6OqCiXnmuG8ylEDXjyshHB/EVwRnZ9m49tXWKIg=; b=OgQrYu/OHZ9kjQzZyAznt8U5FuMLUbKVR52zPWPmnDdCuWdMvX+yMEUgdIE6o89erxI4CR q85YnlokTT6F4kgN+b2cFQhIoISE91djhPdxazKT5wCSYEAW5IQBUnkMrfUHH1nO48smE9 YeZSBobiNIelMglEEhwdnhY/pI9jU3jRi5EkaHqhxpoTijLmQG+BDPEjCKJ9YmdI+SZn+o wLTdm/E5otwumj4xeh7NrczEs0tXdp+15FwmdPeGkrEgf5dDlC6NboptFhES8k4mO2y7ij O2FU1bi3BBJIqGw1bxig/G2yKLDNSZ11veKDHJXvS/DuL3c7s8jDnoBjyRKA5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707794593; a=rsa-sha256; cv=none; b=jtsxddTvWcbsXM7O8R3HOKmdr2xzFrUBscm5Gix1O224i8loR2xGmZTYmCyUzsr2Z7jJe2 yUBAFd6x5Vs4QLpyVMod4//EKV/OwL8Onh38r5UVVKqMXblgmPi7LYPu6bZNaZJomJIU5B jQpc8GQiMXKq5VUiC/U3wmfLr6jqjSEh1bRpmQhZjwnIeg2Uu3U9+y3KwPoiGWO6ZkEfMA isVdeQCLVC4yS2Av0GlK2FzaDcSEY0mX/NjlYilANC+ARfzKwxz5cQzuj6CjFLwyb/VIGw 5bv1W6N+90y9YIZcnlFbE5PWfGykW/nr2+Zmy6jm2zqV094l+TydtgLtXZuSAQ== 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=1707794593; 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=1C5M6OqCiXnmuG8ylEDXjyshHB/EVwRnZ9m49tXWKIg=; b=kej2eok4JkDWYJt55uE0gG7S2V9aHHX/Ms9tCqpDBOcQtSI3KtgMGnc4ouB7JRZFA7buJb mCMad2lrm2aBORHK10DQD5GQwHc7P2X2XLGGUFuAQYdmSM5WafZIKCJrJH4x17X/czYi39 L/VVNNEiP8Uv1cOFjPmVnBbn8yYCmccjTdrDuw06zDNE/Dw7m38K5JhKTjTfqp0YYumpSp d6+HSRdfaCiw5p496ADSJ/jYnHQj9Ozu84Pk+tI7F/eZHFRIJ/qFbEa4ZXhOjIOF+8GZvF iZ+H3Ku33X4XyE5qG5I+qeSLHhVigcjM/btZgYZtcoGHkqSuNwqoXtqKgd6T+Q== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 1654F2298C; Tue, 13 Feb 2024 03:23:13 +0000 (UTC) Date: Tue, 13 Feb 2024 03:23:13 +0000 From: Alexey Dokuchaev To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fd1066bed67f - main - .profile: Don't bother checking for /home symlink Message-ID: References: <202402121425.41CEPmxI075183@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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202402121425.41CEPmxI075183@gitrepo.freebsd.org> On Mon, Feb 12, 2024 at 02:25:48PM +0000, Ed Maste wrote: > commit fd1066bed67f642ed01f5dd62b7b6cfb0a45fd4c > > .profile: Don't bother checking for /home symlink > > Since FreeBSD 14.0, user directories are created directly under /home. > This check should no longer be needed. > > @@ -19,9 +19,6 @@ > # set ENV to a file invoked each time sh is started for interactive use. > ENV=$HOME/.shrc; export ENV > > -# Let sh(1) know it's at home, despite /home being a symlink. > -if [ "$PWD" != "$HOME" ] && [ "$PWD" -ef "$HOME" ] ; then cd ; fi > - The installer creates separate /home, individual hackers might want to partition their drives the old way as / (root) + /usr (everything else), so this check is probably still useful. ./danfe From nobody Tue Feb 13 04:47: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 4TYphR4Ps7z59nZD; Tue, 13 Feb 2024 04:47: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 4TYphR377Bz4G7g; Tue, 13 Feb 2024 04:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707799623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q511MOcw6aP33cFLsd1XrSaLElelNB6Cv829K8RgAos=; b=VyfLwdgDWeYrvz5UL/ygZYKD0XvWc1orTAVvlyAMSsn5T9y7jgvK4n3sZkEn9xDw4vHQMa yOEbidaUCPTSUqGHs30+571QozwbXpqiSjyz5cxq/6uA/hcoouu21aus3dCCkHejwckIGf mWCFhDz8sr8yET0JHVO7LdYjXZ8A9MI2DvS+4h4yoPXnhPkoLchxobYLznSdB87hbw3FIr 4x3GdRlbEYHnpmoPNnZvuw6tpIQ1tTN5P/6cJm2/bWlfqDGjBCBvwTbKr8ep1QMQ7EKObP 2oW/OcZsrfzfAJvzW09YapDEo5UuOudaoRoBM5oj8VKQP40tIPcFQ6HyNirMQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707799623; a=rsa-sha256; cv=none; b=Ew1tCiRSFlHjbqy3Bq7rbyQN0IvKTL8Sy2OlbjkGkYiy1WVym/Qf9IP+FlgWG84pnssMOS 8AN8oHD0suWGYns4jMLYwsctHzz87t5A0fFsYk1YdWLa3E9Gaf0mnoM/URa6Le5LC8or1c At3f8iVWluS58pbZ6x0Uekd1hHGGVbA4zlGMh9y1NM8jBakZuvawDodnx/ffc1FDWqswjB wvrtHqqT1epHe6opnJdSo+anslaP1ctkjXZdHcXtBcg+cxRiISRS54EUl2Sc/idgMKM04c 3eep0DLeXCNObR9ulohIPKLAmCGAiSm9odQxcLhBZs6bQDykjfAcB7e8WR9yGQ== 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=1707799623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q511MOcw6aP33cFLsd1XrSaLElelNB6Cv829K8RgAos=; b=Pyw3pg9YpyiNOR4q7Cb9NSa30LUhS6J0DyJq7VJeQnGLbJ+fcN5MRBgKbXbgm6W0pq1eg1 ymcGVt4UTD0T/86Geth4WVaTiOPKUKwokgztTVeSNlUfa2fGSMWRLoXU2xCnhL6DnSaUNE qklj+9jPXoW5TVKhxTqjDr0hhSlcAiUE41AC+gbUgCmR8TSsawwZ1xP1lqzIXJrtN9ECnR F1ejc9DTnPonJVPJef95O/giPdOPj5oxQB+u5YCfnfRXzQq5SfDgTAqraf08RhwlI7+2ze 25F6wx4dAU+3zJ0qSw0EJZddPss6Tk09cSpswuYLCBqlbKSVm643VUoNffQi3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYphR0JBzz11hJ; Tue, 13 Feb 2024 04:47: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 41D4l2R0024112; Tue, 13 Feb 2024 04:47:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D4l2K6024109; Tue, 13 Feb 2024 04:47:02 GMT (envelope-from git) Date: Tue, 13 Feb 2024 04:47:02 GMT Message-Id: <202402130447.41D4l2K6024109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 2e8ad2b69849 - main - sysctl(8): Fix typo 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e8ad2b698498a1c380d0d6fc5792b2c56926801 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=2e8ad2b698498a1c380d0d6fc5792b2c56926801 commit 2e8ad2b698498a1c380d0d6fc5792b2c56926801 Author: Hao-Yu Hou AuthorDate: 2023-12-30 09:36:11 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:28:55 +0000 sysctl(8): Fix typo in comment Line214: combind -> combine Reviewed by: zlai Event: Advanced UNIX Programming Course (Fall’23) at NTHU Request: https://github.com/freebsd/freebsd-src/pull/966 --- sbin/sysctl/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index c37c1f3f7400..9e81f4480e40 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -211,7 +211,7 @@ main(int argc, char **argv) argc -= optind; argv += optind; - /* Nflag is name only and doesn't make sense to combind with these */ + /* Nflag is name only and doesn't make sense to combine with these */ /* TODO: few other combinations do not make sense but come back later */ if (Nflag && (lflag || nflag)) usage(); From nobody Tue Feb 13 04:47: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 4TYphS4BD9z59p0N; Tue, 13 Feb 2024 04:47: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 4TYphS1mhtz4GR5; Tue, 13 Feb 2024 04:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707799624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v3Y0kTTfJD5bgFxX+mQgbojFRd5qZ/rZA4DHhfbHsj8=; b=DxCgOoAyGbFVtV8D/DhLHhZOP5ldM34FQu9bN8mLFr35cCmKZYGT22JIK7trz2eMB7/nf1 u/YgdhyFyA0/qfPv1M5C0/a3l7mVCpPq97+kqHGBceTMi4HPpo6gjG4LUgRsORf5UfjuW5 3Eo5HOuYv/LAPB7zeiUIwwqs45K5AqAC0Qh0ZYVu6D3VGuSdk59qmuOsDbO6m4M0TktGqK f2I7GDr5vP69BU+mYt38++QeuQMyWWEO3HpjmUG1j8OoJidjNiiaR8tqEo2RxEBiGKkanb PsSG+pYJfzf/CDV0Rx1ro2YcZEpvg6blCYBO57hmOqEXKmtU/w5nHWvcN156yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707799624; a=rsa-sha256; cv=none; b=vRT6V1w4g8T+FCJS17Hy28Zf+fU8lzWEz0O3wfrppAphGkE3f0IXxlp3tuWacc8M0TPW5W O76TIX/Yw0OEXfM0Gbg0tWxXsNzDkNzRSkXN42LB0qLfc3O7rAw4KCqfTVMR0ZC1D6+FTt SUQPJed6Gxt3lfDL1yLM9xUAqd8xojQnZSBhW7d6ngq7BB6DZV6IqkSzBDMVnmL2dZYAgG 7n+ds0/R5u5vEVl+zBTPb4nNlqkBXsfCNqSzx6VX78b4fyXYL+cOpsQTDw/KMmYgxMO2AW QwkOgjuRcwk+Wub5ovE/Au+LUpfT1S+oBQsEVIs1ZO195QxbhETadGIetq2XeA== 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=1707799624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v3Y0kTTfJD5bgFxX+mQgbojFRd5qZ/rZA4DHhfbHsj8=; b=qn6WdSO70ZnKkhxXH0t5HQ1anvflSFZtGRxqMjdrY2rNkIlNg2dKAmC/WZBBUzW5YeMFzi rAzVjqwZJeUYg+vCLeETWMHdryVT9lFNAzTuxTsfw+FPXdvBWemx/555BLW0XVOw8aeDpp z13E3w49tTk619dOKxIzsHOw+BKv7FF5jkNtyOAG6NT2qQBUJzeb/cmWsS/KsvqAoE2sBE 6j0uk5RHod98TyL/n48k5FSLDHqLzj43hSqwu17jDMo7qacUtIcWhEqwJIBMRN0LEACBM2 50sguUSUoCH+K6TwPVdW5Lr9w9rChqLS5M9Mzl4pl/1vZ29b2jUuD6VXbYUiFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYphS0rqgz11Jh; Tue, 13 Feb 2024 04:47: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 41D4l4K7024154; Tue, 13 Feb 2024 04:47:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D4l4xF024151; Tue, 13 Feb 2024 04:47:04 GMT (envelope-from git) Date: Tue, 13 Feb 2024 04:47:04 GMT Message-Id: <202402130447.41D4l4xF024151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: e9866ce84f41 - main - ping(8): Fix typo in ping6.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9866ce84f41bf8a5122713b027d1af05cbbb5b3 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=e9866ce84f41bf8a5122713b027d1af05cbbb5b3 commit e9866ce84f41bf8a5122713b027d1af05cbbb5b3 Author: Hao-Yu Hou AuthorDate: 2023-12-30 09:59:27 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:29:07 +0000 ping(8): Fix typo in ping6.c Line 703 & 863: kerel -> kernel Line 2110: resposne -> response Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/967 --- sbin/ping/ping6.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c index 99de4f608d69..356f0f72a6f8 100644 --- a/sbin/ping/ping6.c +++ b/sbin/ping/ping6.c @@ -700,7 +700,7 @@ ping6(int argc, char *argv[]) } /* - * let the kerel pass extension headers of incoming packets, + * let the kernel pass extension headers of incoming packets, * for privileged socket options */ if ((options & F_VERBOSE) != 0) { @@ -860,7 +860,7 @@ ping6(int argc, char *argv[]) } #endif /*ICMP6_FILTER*/ - /* let the kerel pass extension headers of incoming packets */ + /* let the kernel pass extension headers of incoming packets */ if ((options & F_VERBOSE) != 0) { int opton = 1; @@ -2107,7 +2107,7 @@ pr_nodeaddr(struct icmp6_nodeinfo *ni, int nilen) /* * In icmp-name-lookups 05 and later, TTL of each returned address - * is contained in the resposne. We try to detect the version + * is contained in the response. We try to detect the version * by the length of the data, but note that the detection algorithm * is incomplete. We assume the latest draft by default. */ From nobody Tue Feb 13 04:47: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 4TYphT50Nhz59nv2; Tue, 13 Feb 2024 04:47: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 4TYphT2nDKz4G2v; Tue, 13 Feb 2024 04:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707799625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPwlb8WJTRroRJ+US0mk+VwEAIAISu3UjG4sx9Lc9Rc=; b=aMbtIxjvl0yxk3nW5KpJxH5437pWPuAkaqbluD+h2WJmsm0wp+ZUU9fPcnf6q36GanWgyp SoNINwlYTMy4rTgbIrZooEJmlJKCBo7XC0nF+WDk0FE1A9Qi7EO4NlrhQIhwBvKg3dYdAz SU7YP2Q+NWC3dfniFZ4l6+ZeKYpBl81/k6p8PnaJ0iCFVbop6su3Bofc1BkPWbj1Z4gI+6 lrPj8n8MwwStft2wKlRiv6YvxMb5MPIWCk92qGIIMVILfciSYHUAqTIB8EMzLlvPmzH8kV jupquUwdszPi0L9GRL/yyQOxe13rXtIPSewCNf4kGTOKIjNRwcHIi0hIWUn3zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707799625; a=rsa-sha256; cv=none; b=DdfF7BWR8+vCodJNZy8lRBRqxfM3HE3MLZaBqUTl2H03ig4bgi7d8N4Fql2s6t67YTqp/M n2Awikf/BN/A19DGLexW8MME8d34uUdSay19qqRA8JhGe69nCUwgOBzMLimYOMv3fCNnYn aNTz75DR2cpKRc59ZR76ajXvGRk45yfm45jW4imkDVsXO/O0zDR6D3UhkjNwnadhYB5GbG 2oSmjUzmoYe4ib5/epUEJrK+z5kMbBQA5S8jW/LGxl7rszCF1d1mbI36dEQraf4YQv8Uzv psgwjiAqHbISgIR1Prq0fv7OKStsCjUYtlUObuUyisYafhd4SuqVWDDctIeEZw== 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=1707799625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPwlb8WJTRroRJ+US0mk+VwEAIAISu3UjG4sx9Lc9Rc=; b=UUpuG+aMZftPNWNJcqWVglkbyWw6EJZb0w5A6t3hmqi4vNZx+j0FJfmW4qTmSTqL5WQcZc 0xDDPoOXMOCmcT81jVPWV9jkOHh+XSKNZTEbQdjuBbg+1E9AFeRnRxrrbP2tAfD6Ctkd2i o8LYnMuMGcSRNJbAHFub5ZWfT6PyHO6wbr4ol2fmeKYj0stvdAxRQ3cpP6wi62kfzN43xF OZasjpyEXwvQcqqpMwvBmd5aa1LqIO2m3K/FKGsTSo/wkL3G3c6Eq1xsLYsS+72wr8jyN6 Cqvjm8r1ah3sPQAIcE2nVbMBIkZzOgwSFiTBD8ZxHeraQ/MPFJETlCOdotLYBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYphT1tFFz11Mb; Tue, 13 Feb 2024 04:47: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 41D4l5mT024196; Tue, 13 Feb 2024 04:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D4l51d024193; Tue, 13 Feb 2024 04:47:05 GMT (envelope-from git) Date: Tue, 13 Feb 2024 04:47:05 GMT Message-Id: <202402130447.41D4l51d024193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 26e69f9f98bf - main - dump(8): Fix typo 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26e69f9f98bf976b0f898f1fcb9ca572a0f22c54 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=26e69f9f98bf976b0f898f1fcb9ca572a0f22c54 commit 26e69f9f98bf976b0f898f1fcb9ca572a0f22c54 Author: yue0211 AuthorDate: 2023-12-30 13:17:09 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:30:30 +0000 dump(8): Fix typo in comment Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/968 --- sbin/dump/dump.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index 9429704a1800..a776c8209d0b 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -97,7 +97,7 @@ void quit(const char *fmt, ...) __printflike(1, 2); void timeest(void); time_t unctime(char *str); -/* mapping rouintes */ +/* mapping routines */ union dinode; int mapfiles(ino_t maxino, long *tapesize); int mapdirs(ino_t maxino, long *tapesize); From nobody Tue Feb 13 04:47: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 4TYphW0pdTz59nZH; Tue, 13 Feb 2024 04:47: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 4TYphV41vvz4GX4; Tue, 13 Feb 2024 04:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707799626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lMvX1lHkX9PiA1HWkxeNRKFG2uADZ+2sPZnUcuR0A9w=; b=QesnK0xyXnZY1bq/ztH3zFKOty7xD9wZVZexJv9QsyGGPUjtyp1UXFW+dgHytZScJgp3hF DjW4J2wwALib7WT/qWiUAIRpHasiv3+DNEUpevb4pf15mURVuMjkJQjIfRwos6aQzKiqLb 2QEyWMnyIATneMgjMY+yCUm4rOy+RXDM9ZKYjAYjFQ3/zo+AoIE1hixhb9+hkn0qCsN16B SBjghfW4p9NMXKIuO19vK7s4n6r3eDL69UT3ljsTFkWMQauOtWduz073bSFGk4TxxTD7D+ ejqN8FNUr1Laf4O4iaCiCS3HZdrpqwE0SaLZGEtLDS90+/aGzhKcHiXMmDKumQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707799626; a=rsa-sha256; cv=none; b=yXXz0+u2XqhRo7dMwzlFV9ypn6x+qJuvrENENj7yOGskAFfMsCs5KYr2AxF/+ilScLpjyr y5gV1h1NYxox0C9d1UzZnex6gP7dfkxeE3IZZ1xToUWmheXZzklNbdhCgvfibGty/arzIL kcq2KHd7ubWfJVwQ8t7U2vpF5wE57LHWoEgLGx9U6Vz0Qb5JQwO0QzvGoJonzjP1pGKh6/ sGQfCtcmSlM7VjvbeI11aKTQxEUymeaJ9KCn21cIfhDSo6U1HZsmbjUGQKvAjZ3/YoeQYM DDwXml10tkdQrjSwtPBHHq9j+dzdDAukC4TsbqX9a/6B7NDr/NwYFeeAYFm0vA== 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=1707799626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lMvX1lHkX9PiA1HWkxeNRKFG2uADZ+2sPZnUcuR0A9w=; b=Z71j1TJ3BjVuuD7g4CQ19xB8BNC84GH2NdBaSDrbRva23kEoWv492MjeLr01sUa2A33Qv2 cBR7JSljzzQEYVibgoycNb+qna5dZg7pSMfH9ObZ8EihxIWKjF9zbZszZJuEY6rhxqHjhz wGncWJsdx4LMja/Fl3y9yRfWCXRSmxaO8C+uGbWkMZiBwW7IjiMB/Q+ztRsiCO810H3QD9 KbtaUo3W3uXENOUqBQXtX1kZkqTxrZ4QronZ+7WDZ6c10goBb7bt0pVJh+lLUcet6Rslwf sahjZ8bFn1QiWD1xnGH3wJDyZbjhSvZRX/OGnnA/XPGGnMk6TbG1w8gFohzXaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYphV37bSz11Z2; Tue, 13 Feb 2024 04:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41D4l6Vh024247; Tue, 13 Feb 2024 04:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D4l6ER024244; Tue, 13 Feb 2024 04:47:06 GMT (envelope-from git) Date: Tue, 13 Feb 2024 04:47:06 GMT Message-Id: <202402130447.41D4l6ER024244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 664812f73488 - main - Fix grammar error in test/sys/file/closefrom_test.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 664812f73488c4c0e16982c5c97d639deb9d2431 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=664812f73488c4c0e16982c5c97d639deb9d2431 commit 664812f73488c4c0e16982c5c97d639deb9d2431 Author: Yen-Cheng Chang AuthorDate: 2024-01-01 06:38:02 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:33:06 +0000 Fix grammar error in test/sys/file/closefrom_test.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/973 --- tests/sys/file/closefrom_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/file/closefrom_test.c b/tests/sys/file/closefrom_test.c index 7c6787bfd5f2..e30c5eb3d591 100644 --- a/tests/sys/file/closefrom_test.c +++ b/tests/sys/file/closefrom_test.c @@ -146,7 +146,7 @@ main(void) printf("1..21\n"); - /* We better start up with fd's 0, 1, and 2 open. */ + /* We'd better start up with fd's 0, 1, and 2 open. */ start = devnull(); if (start == -1) fail("open", "bad descriptor %d", start); From nobody Tue Feb 13 04:47: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 4TYphW6GrFz59nZL; Tue, 13 Feb 2024 04:47: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 4TYphW522dz4GPj; Tue, 13 Feb 2024 04:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707799627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LjFkj4AeDmV9CKIdggQ0JGyRBoSgO0NaSoWkzzZ3QBs=; b=ox7dmS/wJKC15tQNL518H1zEL17EGubwrMybGNTHkD1a4cgwtEq72czzveKcqnIONA6fBv cXqYbhCJXz5S2NrL86hxCePIERsxJg/hyszJH46qbhedE6q9gRgD4cIXr2Frjhsv7uPx/2 RGm0XCXThrq8JVM5VaGoluupVowIEXWmJY53U7y/L6XnWtD+B+sPh7Bt8lkXDCFOLXEAyD 7/yYBwIzERw8ynyD0GpBKROggQ8l/cCKj2cCUmMCihYbAhw4yI4xCnwcyVChOn88tSOQu5 ljzSy2WJbe78w4IchzIh4+tsqRM4cMf0+8DFWUKqjlD2hW/V/f6YqydRgQUoJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707799627; a=rsa-sha256; cv=none; b=csO9kxePI+glr1EsY92EUsbYZIgJXlw49TbtKqHUNZB68eWrQwouufrgSYl9UnC9iY9tHp s4T4IhF97VzofW6vXHOUYiB0jfCphZZfaMUTVT63BUbvmA+djXWoBtFu2bam5k6071catg m83+HZULGFwxtqFY4eMveg7ULTvqCsdsAmDbX/FRfw8UNTsyDyBsjeGJ0uYvVghQ1lBkA0 ExRCOi5VE/SObF9XcgRNMRUQw04ivBfurD/JGhEIk5LxVZOgg4fA4rx4cHiPAfn0CsEDoc BI+hZcPZmBuOGvXe1+9T8yk/7AK85JBixzG3STllSMBMOhQaZRQIVviGr8/HZA== 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=1707799627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LjFkj4AeDmV9CKIdggQ0JGyRBoSgO0NaSoWkzzZ3QBs=; b=mWJ/HD+LChu1AeFEg3Lxsakpnw+ZnPzDY/CKvMKloHe8LO5AKvJwPXPOpz2MTflL/6qQsg UIZSBpyy+9A3IpO0feZSh56IBrm876NSlvna6LpHkL0uvYcOS0pOExR5JEPqAqxp96iWMZ mWl7ce56+cpyDaM2Ja7TDPL3BVZEDGexpzJNtuxqlJXyTdp8v7JQceP4rHXULZe7h7N1Kx L+PEb5vYoMGz9MTgy4rUatj5SfX2pdC0MY/iIuDGl/07BnxNryqOm8g7jAAqzP9YninN3S dgqoSOdZW480A0LDz08gHE9xXYnP6D+4JS7+2WURm1rzrEBbA82yD9YIU8/+pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYphW47vvz11qk; Tue, 13 Feb 2024 04:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41D4l71r024286; Tue, 13 Feb 2024 04:47:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D4l7wJ024283; Tue, 13 Feb 2024 04:47:07 GMT (envelope-from git) Date: Tue, 13 Feb 2024 04:47:07 GMT Message-Id: <202402130447.41D4l7wJ024283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: ee40f9e860a1 - main - Fix typo in share/examples/sound/ossinit.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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee40f9e860a10649575a0c80eb92dcfec7e353db Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=ee40f9e860a10649575a0c80eb92dcfec7e353db commit ee40f9e860a10649575a0c80eb92dcfec7e353db Author: YuZhong-Chen AuthorDate: 2024-01-01 08:25:52 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:36:05 +0000 Fix typo in share/examples/sound/ossinit.h Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/974 --- share/examples/sound/ossinit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/examples/sound/ossinit.h b/share/examples/sound/ossinit.h index 5fd614ecb4fb..83920712286d 100644 --- a/share/examples/sound/ossinit.h +++ b/share/examples/sound/ossinit.h @@ -227,7 +227,7 @@ oss_init(config_t *config) * If desired frag is smaller than minimum, based on number of channels * and format (size in bits: 8, 16, 24, 32), set that as frag. Buffer size * is 2^frag, but the real size of the buffer will be read when the - * configuration of the device is successfull + * configuration of the device is successful */ int min_frag = size2frag(config->sample_size * config->channels); From nobody Tue Feb 13 04:47: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 4TYphY1Gs0z59p0Y; Tue, 13 Feb 2024 04:47: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 4TYphX62HDz4GMq; Tue, 13 Feb 2024 04:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707799628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=539v88yHMrlz6keTYyekggwv7Zj41fpiQADQJ1McN2M=; b=iu+2wgkGNGOlmQ04uMAFHgJc+t8z5esgggnWACy5FdXzc9cDgQrQuoR3F70cFhzJ9GGM1p m1CjhDXo+9gLbVKZetHnDNMrYsbrnwbZaGLVWoAmHrQJpT++kK2hT78Z48V4FBNtAzc/Er 1dORKBxBYuIN9YewYHBdb+82Kb1U9JFTX69UsFQwfntKXXlTodY4PQKkKUnmasADnNRBTE F4ONQdcxmsems9K/KUzpXySOBWpIXyPFHKQBLRcS61mBjdjn/v42xoQy/q1LllKnJt1yit z0f1E2TOt/0Igrq9xH3KDfW0bdghk4TYUHbbv5uZRU6EuiPQrKutcDGNaN/DzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707799628; a=rsa-sha256; cv=none; b=iuAmgKNZFqdp6SnSWWPMKxq/qYCvu0IWEis09SKv3IliL5w3tDSlSnoGbQxZjGQ3iiBr1c sM1eatfdwPmPApf+WxKRy54hlU2nlnaMVf08rza31vXYthWFj/6wOZnNQfF8yH3aIVaPUU sftN7iAPBJc0/PUaswlZbXYeESIp7fZCQn+sIO4Ek7KVy6JKJVNGVAqBPiVJmyyT9mxRBc W7nADPq7wnSiuHZ3qu/Bn6hhUZtbruMs+/5q52WGRyuTN0jAmesLrSZ6dAqCn5+cnZGXOi dhflIFbizCXh+PrEHp0Uy0zheB3IBX8YTslAyJMDRtdz8uK+PRWjmQrd/S7njw== 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=1707799628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=539v88yHMrlz6keTYyekggwv7Zj41fpiQADQJ1McN2M=; b=R8uRQ8wnf6TpmOBmvgL4788iU3g/WWL6qovg3v1hxBQfX6UhJDsSwarmsBmgn37U9s+PS4 lJf4/Y+PDgxm6ILFZXQE/0ubXTCmK79BHScPzat3PYWeV7c2r5XURUe3r3BTLvSXb1xBPr KSSmnajqQQV9mzRruHG5ocKLnXpN5Qs+8ww8lGdVBPwhdVKhKJW3AnVCa5vnCrdKph7BY6 ziMlZXmoOiWVmEoiDCHqisJdwZGDp/6Y96Q/drl4v8Ii+SqAwUHfZEAk+xUD88WCv1kBVS Q6eYRjgqdUHCeRbtBmbtUslCtmMm6PIXg8vxmpEJXy2eD/Z4kDkQX/QZ/P6rRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYphX58Ghz11cR; Tue, 13 Feb 2024 04:47: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 41D4l8Xq024325; Tue, 13 Feb 2024 04:47:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D4l8Xu024322; Tue, 13 Feb 2024 04:47:08 GMT (envelope-from git) Date: Tue, 13 Feb 2024 04:47:08 GMT Message-Id: <202402130447.41D4l8Xu024322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: edc7b46ebebb - main - Fix typo in share/examples/sunrpc/dir/rls.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edc7b46ebebb064da44ca88c6afeeb9639b6fcd3 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=edc7b46ebebb064da44ca88c6afeeb9639b6fcd3 commit edc7b46ebebb064da44ca88c6afeeb9639b6fcd3 Author: YuZhong-Chen AuthorDate: 2024-01-01 09:20:01 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:36:58 +0000 Fix typo in share/examples/sunrpc/dir/rls.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/974 --- share/examples/sunrpc/dir/rls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/examples/sunrpc/dir/rls.c b/share/examples/sunrpc/dir/rls.c index c165bba08e04..5c39b7139e14 100644 --- a/share/examples/sunrpc/dir/rls.c +++ b/share/examples/sunrpc/dir/rls.c @@ -71,7 +71,7 @@ main(argc, argv) } /* - * Successfuly got a directory listing. + * Successfully got a directory listing. * Print it out. */ for (nl = result->readdir_res_u.list; nl != NULL; nl = nl->next) { From nobody Tue Feb 13 04:47: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 4TYphZ2CTCz59nrk; Tue, 13 Feb 2024 04:47: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 4TYphZ03tmz4GXn; Tue, 13 Feb 2024 04:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707799630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WWsizgRn6j+xCIH0CWuuvFXWyp4/nDdeEqiGiNkQYQo=; b=KnRtPAh4q07Dq5ZTANJobPrTJ7Y8b9mYruUAL394FsdqXK8r0Rh01tvYqURQgPRt0jaM7A 1cwBf9UYhrImAs+EsXoKX3CmlTWlZzTk5sXZXiPwsBS0pDt2y9X7n/0rZrAynYjGVwce1u h9FMymlW30WYy/h0YLmr8CMmW/5Asynh6vAhm65nF8IXamE7dqsEdE/S4T/nqdpn/O2K6W XEDSOlco5IjYjzKlpDV5+nMPpkZtDdR6r17Y5drUMoVq57Zp4OAHfjHR/x6qljXHPUBQKS Ie+M0gbUhsvfh68ioNqrc8yQSzucssBBi1OVILpKWLEr/WpH8XEqUEb+7opzGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707799630; a=rsa-sha256; cv=none; b=HBGk532gbbyWZZQFsPmNC0NiCKoM7NLOiE/aFWMRD7Z+163iseCr+j9PWLfazAdWXjpf8A puPL6LIm+vN8xg8a5IXMmgaVMHoA/tbuBSylsreW7JXLtRR0mYjrhTv+RBIN+FruZVPtGr BrNSOmBua+IhmMexuDV4gG9rSOfkvW9Z4jjYYRMzSDSRCL+bjVJMN7ePQJ7mki0k3UtBbV 3cZh93YLGcyzzZF2F9pg89fZcPEig4XElqE/z+t3wrEeQKdxtB++yhldc0/kK6xgMA/gN2 tyfYcS1mri2abZKAPZfEoIThgO5i+ENVStybM7KxH9D8rWqgZ0Y5pPG0abl8uA== 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=1707799630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WWsizgRn6j+xCIH0CWuuvFXWyp4/nDdeEqiGiNkQYQo=; b=s6FoL72E6906jbIbpLk4z/mKrJpk15K/KWBHzQe0q4/tIKkMpTO06qRzEnbBCRWXvxVQE2 HDcyJkgCmxELRXMV5hpVCCArcRAZzKgoQnoXzUpsj4pWiF4SH8Hdlj9azjbtzaU3GA+djZ DpBdOxnkuO8rhkd0h2yZ3e+W2lpg0cjcHZsOrY2ZNYzJ5hDLytUhRNawpMOeLlgV1eKJON 0nYfS8Wc87TyXxfG0ydXNFnP1as6KyLCC/KDOPIqUWkDFdYiq2xk01LdLrR08adHWoshHj rPjmL9JcRfX3vkJVvw4h6YWKVCvER3dAqOKfums+owGsu8u/7MLDU1W7G971sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYphY6Gljz11ql; Tue, 13 Feb 2024 04:47: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 41D4l9a8024378; Tue, 13 Feb 2024 04:47:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D4l97i024375; Tue, 13 Feb 2024 04:47:09 GMT (envelope-from git) Date: Tue, 13 Feb 2024 04:47:09 GMT Message-Id: <202402130447.41D4l97i024375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 8b6876e13672 - main - chio(8): Fix typo in the copyright section 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b6876e13672e418a6a9f47d1e62378311bd8ef0 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=8b6876e13672e418a6a9f47d1e62378311bd8ef0 commit 8b6876e13672e418a6a9f47d1e62378311bd8ef0 Author: Wilbert Allen Koeswoyo Suwito AuthorDate: 2024-01-02 13:21:07 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:38:27 +0000 chio(8): Fix typo in the copyright section Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/978 --- bin/chio/chio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index 4feafe5ce720..07def55ee88f 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -32,7 +32,7 @@ */ /* * Additional Copyright (c) 1997, by Matthew Jacob, for NASA/Ames Research Ctr. - * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications + * Additional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ #include From nobody Tue Feb 13 04:47: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 4TYphb2M82z59nv9; Tue, 13 Feb 2024 04:47: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 4TYphb18xyz4GVL; Tue, 13 Feb 2024 04:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707799631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2f36rL7t4x6hExaPEUKZqG/kTHH6QAKEvh93TGbvlCo=; b=Aell/llSCQslfvEkMNc/dibTJasfgoE9FDEJaH/6AfQVYgBKoCUXCI/S3uCfzm2RM8sf44 SNMppfBmY6ZqWeQ2OfgIqKnwtuTNtL2JAESktizkqjEpS9xLLWE+JxDVCFqhviUPDAIi5W wtpd+NzDtQq8NIxQ5pZRtkO/l9k7BIHnd3ZGKI4gOXEj11IVQ47Gvysl2TGtcoC045R6Dn U/R2vv2SKQx64mFIQ3x4THMVs51L7e8d/PsFXOwl4XE0CBQ6u12dGbY3xKaK5k2lUDSVVq xUTgZnxIhDcPb8YgoWra5zEox6fVhfwALCGNRiRivkst6ZbcfehfkRnrsQZzkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707799631; a=rsa-sha256; cv=none; b=q5nyJOn7NmlhJ+bNptqZCfR/CE7FU2AU6DwtZsKfggtWe7RMTBrSkkWIkaOA3umVy+wwe1 0NIiLqJLfnp5HT3o3Qz5gc3ZixESEa3ETa5KIDnC7w32wba2y+4lRzRalArcJG9LGtuKMf zfSi67ma3hGZt7Z2nyOvOv5DeBKyEk3QcSW2sLNpvnTScahwoONp9iNjSavb78xxOZ4K9D xdgUDBuCPJNBgfEiEUOQHzdtNPFRiO9yXDe3VcwQedEN/sMbdyEVrhuaD9c+8ZWgndqklv zOg5etfSH4VNZwXnNkqW5MXKhdfu7JfXqD2xMhV02fm2TaVdZPARt09+laEQ/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=1707799631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2f36rL7t4x6hExaPEUKZqG/kTHH6QAKEvh93TGbvlCo=; b=E/A8aGGE7R2Z9bMk1pF6kMIh27vxRHP/p/nNDN8b3OSmiPpp/2knM4ykJb46qDDmVCTXzJ zTrPeKeunDTmjTEAAqpFZuWz7jRlNwbvAx0pDPEaTnEqc3Y7uvsElLF65W1ogsQQq30cAI 5Gl8dZS6OGuSWANDFskX9YbMuOI9CxuQZMchN0qo0vTF/db4u4eiVlWAx/5pjvyxomeG4C igajcBduHG2k3CKxU/sYGl3S7hiRb6WeVnfhSLY5cOFkEFKRE9r/weFJOFJYCMU8gaKoVk yWq549UZghfhcuKbtUdT8ZCHU7NOXYhpHqGeydSipu/JlHcx0/FpKIbxQUj5Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYphb09YKz11Z3; Tue, 13 Feb 2024 04:47: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 41D4lAXE024419; Tue, 13 Feb 2024 04:47:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D4lAVc024416; Tue, 13 Feb 2024 04:47:10 GMT (envelope-from git) Date: Tue, 13 Feb 2024 04:47:10 GMT Message-Id: <202402130447.41D4lAVc024416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 84886bf93ae9 - main - ed(1): Grammar fixes 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84886bf93ae96ee4d19cd7f31696ba368cabddae Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=84886bf93ae96ee4d19cd7f31696ba368cabddae commit 84886bf93ae96ee4d19cd7f31696ba368cabddae Author: Wilbert Allen Koeswoyo Suwito AuthorDate: 2024-01-03 06:15:46 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:42:54 +0000 ed(1): Grammar fixes - Adding a missing verb "is" on line 723 - Changing is to are on line 835 Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/986 --- bin/ed/ed.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ed/ed.1 b/bin/ed/ed.1 index b680f69eb706..0db9f8d76bb8 100644 --- a/bin/ed/ed.1 +++ b/bin/ed/ed.1 @@ -720,7 +720,7 @@ with By default, only the first match in each line is replaced. If the .Em g -(global) suffix is given, then every match to be replaced. +(global) suffix is given, then every match is to be replaced. The .Em n suffix, where @@ -832,7 +832,7 @@ Write the addressed lines to .Ar file . Any previous contents of .Ar file -is lost without warning. +are lost without warning. If there is no default filename, then the default filename is set to .Ar file , otherwise it is unchanged. From nobody Tue Feb 13 06:22: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 4TYrpR5HLQz59yg4; Tue, 13 Feb 2024 06:22: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 4TYrpR4X9Jz4RlY; Tue, 13 Feb 2024 06:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707805343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zM8vB/pmyuLoxijAUCr4A83zmBmbvJmZys56zvX+L7s=; b=VpU2UbkuGMnBLyAuZuHsIVKXjczuxGhpbkQPx+yy/B61yOaR6JhYDdpKxf8f6yNFqMca2a nY+BdDdWvtZ3KSAXfW5DkCWhZLuTTlk1TZJA0vbUu/kRS9UpKshnASpl/7GjoVktCBgJsS V2s88o+hIqnyYgLqcXhRCNtLpwnOfacY8jKKpC8sR1Vp0yVMmVpO3+jVnutDtGp0M+AQMv GUIQ9xyq4H+tb97VxldlZFGiuFnRxFvYBHC3QKpbP29OG1y0YyMbQE+8WMfvc06H5I4GPt zIU6GKWqGu/n7f/zJPIF1F8ZHQvuvAkiweho3eiybuU0SelQUvCljWMpEhun9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707805343; a=rsa-sha256; cv=none; b=Spe1lcTRTgqBGziPbQIalheFrCvv1sQUFD8S8rtM2rr/scAAFJPedf+Df4010uoDtIIMQY Xxv0qpZBwwCB81RSOvkBlWyy5NSYCbSsf1xZ6hDwo7dv2tdypvyUwKy4hCFjuSjPSCYEjR 4qLSxRav3tjVfgO1HwqHUYsVnjVQRRq246EqRaZ2IjYkJX6g30dMDBx14fKuTkceI1Z2nJ hU0wXE4bfq+eo/bh7priKjcgP/UxHyEqO8OpX2x7cPz6yXmBU01ySUjLEdin41rxuCr5eM vxl5yoS4gfztt3P6U8sHvguqStQQPYUfE78F5789CboAxbRildkTSTekcvdGwg== 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=1707805343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zM8vB/pmyuLoxijAUCr4A83zmBmbvJmZys56zvX+L7s=; b=RF+4bdYLb1Pd677zbS1Ee3zqfRy5cSz2olSJ1zPsRavI++I6OT04WoHboAhBS5ckj99Iiu 20N7gIGqITQgmwPGX2Xgwbgo/tI+meK7mNEP59MDtRh427CcW7ijWUPzfbD0wD56a6Ttm9 kbz8MthWB0z060wcaY6fH6BV7ucI/0DRFB9Sv7+tCclLygFfnqnI4g9ypHaxRULOmyvIf9 S0k36wz5tn188Ug9qu7VJx24pCWFGrPlZJLSAPhA23EcBhmxpfZsH53sjacBDo9mtyhnE1 5qPZ4CM3Kcw7L0/A5A54U5KJaHa+1JaIxHgNPIshK4SK18zXUCJAvYJBUmTEkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYrpR3bnzz143r; Tue, 13 Feb 2024 06:22: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 41D6MNYu091163; Tue, 13 Feb 2024 06:22:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D6MNm9091160; Tue, 13 Feb 2024 06:22:23 GMT (envelope-from git) Date: Tue, 13 Feb 2024 06:22:23 GMT Message-Id: <202402130622.41D6MNm9091160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: f4e0aec989f9 - main - ypldap(8): Fix grammar in ypldap.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4e0aec989f990a2792c829966e4af07f7880d81 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=f4e0aec989f990a2792c829966e4af07f7880d81 commit f4e0aec989f990a2792c829966e4af07f7880d81 Author: Shi-Xin Huang AuthorDate: 2024-01-04 04:23:09 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 06:11:07 +0000 ypldap(8): Fix grammar in ypldap.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/991 --- usr.sbin/ypldap/ypldap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ypldap/ypldap.c b/usr.sbin/ypldap/ypldap.c index ff1965dd6e2c..01b5955aa822 100644 --- a/usr.sbin/ypldap/ypldap.c +++ b/usr.sbin/ypldap/ypldap.c @@ -142,7 +142,7 @@ main_start_update(struct env *env) /* * XXX: Currently this function should only be called when updating is - * finished. A notification should be send to ldapclient that it should stop + * finished. A notification should be sent to ldapclient that it should stop * sending new pwd/grp entries before it can be called from different places. */ void From nobody Tue Feb 13 06:22: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 4TYrpS6YcFz59yL9; Tue, 13 Feb 2024 06:22: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 4TYrpS5K4Mz4Rfh; Tue, 13 Feb 2024 06:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707805344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TWtQblLO94DrwECcqo0GN+k7urq0Je8zHvyrNWtnhIw=; b=j7ZmknpQNeRN40E7xPZ74PPhJDeXj43J0KsL0+geCqQN/D47/odGEw5cjqu8EMdPgs/h4l vqOB3IuheArpiwOOCTco1ncfvSEc1zX4XQ4OEW/cDKsTXek7/TRPMOsNrqv1IW6Ibfr1wO KuEzYPGnBITev7Ijm/45T3HqEEIe4Bycs/mw0CIdT+dAILWSABC6DQzWeWtlwfmxcQ2aPy hHNH2wUSnMMmrwT7fnMXs/4625ApPhYjURwM7oi7XVd1ptDzed2OV8GAinQHDDmdT1v1CJ VpSm2QHD05IWajB4V+IrNpT6QwX2cAbmshL4bdyDBcjbbRxEqwnGmomX0qjRtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707805344; a=rsa-sha256; cv=none; b=axKfVoyafVGiNUKSIxSZ8G11stxZQHyE6rdSdQcxsODOdxqRFm2MBWq4SukcFkvXsVwixo 0w9BwN7at/pPviXS7XV65HvBKWKUVU4oIo5pRIUMoQFEamsHBOnBUjt5swvYAy/PJd3N/E Inm+f+9NFt+JaIw+rFm36gblgdvTsJihZdGnZIWIqtkPOn8S50TzPC/y9QrDzyGVkr3JrC JuuXJftUGE8ZxbTlRCLqT8vNRXBDNwjA7+mT7VYOV0NA9YEwmY7c9cnP47AYPCLdUaXrG7 Zf16ErXYialull/BSTajpDpaAOsK626m5xA19NvqiyONE0giFdQnLCbIxsNZMQ== 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=1707805344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TWtQblLO94DrwECcqo0GN+k7urq0Je8zHvyrNWtnhIw=; b=jJb5hBMoES9wldfy/QlHSPe1uCXdtaUouJljDeocXU29TVq9riSppmUMozatmG7RybUe2+ hj6TGPvmP3+uM+4qMWWq/swEQDJSmIFJa98kXZpB0J0apeZMw+2I5TfvYa1bmISVhKfK4n Buoi6mGpFx7RGuBbLUsSrv1dEWlJZVix13hMGCv9hZPbG8l0zpJ+nsUkov6XU4EYNhV5p3 /80VKCyPX0KSXbP72mAH2QRRLTvxwcxmJDege0v4RffpC9ZDFk1ExMkLro5ssOtolTOjzK LVInYEMUafOsnYWCBJRtT1MJLxjBSI4LRxV7ca7mbtOD6Rzmu4aFQDqAI5hQ0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYrpS4PYhz142d; Tue, 13 Feb 2024 06:22: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 41D6MOOJ091206; Tue, 13 Feb 2024 06:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D6MOnd091203; Tue, 13 Feb 2024 06:22:24 GMT (envelope-from git) Date: Tue, 13 Feb 2024 06:22:24 GMT Message-Id: <202402130622.41D6MOnd091203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 3cddabf0bd5f - main - sh(1): Grammar fix in jobs.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cddabf0bd5fa9532fe2a1653b7b30f0ffe40401 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=3cddabf0bd5fa9532fe2a1653b7b30f0ffe40401 commit 3cddabf0bd5fa9532fe2a1653b7b30f0ffe40401 Author: Fu-Cheng Wang AuthorDate: 2024-01-04 06:15:09 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 06:13:08 +0000 sh(1): Grammar fix in jobs.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/992 --- bin/sh/jobs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 90b5892f72b7..1328ae50edef 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -93,7 +93,7 @@ struct job { short nprocs; /* number of processes */ pid_t pgrp; /* process group of this job */ char state; /* true if job is finished */ - char used; /* true if this entry is in used */ + char used; /* true if this entry is in use */ char changed; /* true if status has changed */ char foreground; /* true if running in the foreground */ char remembered; /* true if $! referenced */ From nobody Tue Feb 13 06:22:25 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 4TYrpV2QNvz59ygD; Tue, 13 Feb 2024 06:22: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 4TYrpT6FtWz4RrR; Tue, 13 Feb 2024 06:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707805345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA2M1p9SSNDzYLhXdvPemxKswIGX+lgKAQfLyXxCFo0=; b=ppL5sgUHqQGy4VuxWvZUFCXpg+B/+uts4YuueKIgwSYfDVw4t29EQcTNIxMkNVBk9Xwny8 wvtnQ2T3ipYqDxA8+lu+HDeGqLi0WNqsK0sv2lwB5t9o+cQsoZ4pDWZUzOFUbTyPBVqLD0 wob/8KrvJ3pr3JeAgwBlE/lmlUV5MmtlSI5L9OJb0PQCf9bjBtI7HgM30cH1pumGHDSRb0 dMBkCKv7hqhasDzFOhA6YlD/Rcr77+U1UuI5WhGhmNvLhJOzXnKoRFv21kOzeRPuF11ZE+ /ASdcJm8EgputQym5TzWy21kLBjd8sg9by1tpHkAEFAuODg4xpG7dhnzplAPdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707805345; a=rsa-sha256; cv=none; b=t12tzppv1/l9GLYzTRGIYcYkiGrTfqD1WoCyU4SK/y5cYXAYN4IWdHbnrpxT8lPgslJRtF kwGvmSVy9QDj7s04kmHXEorhzRdFkZNFfK3OqD2UQqP3YiRP4VVhZ+DjGJuvvpw14uywCA lAp/xZHuJ0LX0B6pecSicB/diUbDnPYHlxSjAs0KiY54IVKGKsmkilsj/nA13QcHYqKolZ Uk/nuxdsPZCq1dJTtlgRotc2LrgaOHUQcW4d9flmX2/dJcgcSPQ6iF8si1lqB5bvYcULkK royjDMqTSXlP2QrtIQRDDyOyxlaVBqLbVacowB2qcDsuvHVIlFmEIWUeS2eeRQ== 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=1707805345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA2M1p9SSNDzYLhXdvPemxKswIGX+lgKAQfLyXxCFo0=; b=v1OHXvO82QD4o0nE03ZgrsnsiqtLJxe9bzxrSmEZkp2pmUIpqSjJdx71wSloDNoBXtiYQt wJ/yk5wDcbJQ09wsdcyklVjusRP/xxOZwakW3ORBgYHcoH9BUK6cTrAmlWEvPH9dBCjKLZ rA1j1XjkwAbTYr4N1r80pG6AXft6YvMJVh9SvGLRr6czc7OwoMwXO5NMnSuWnS+FwadVY5 PQ4GciFDqvwjkcC4w0QmpbevbKy4EMpRz0vMbygrNZtg4EEhRdTahlRSathrBjT2cxFMFN mS3fy+rpSzFNStiIkX98nLzKF1yADAex5cy9gLj++qZ9+pu1iisQ1trq4Kt9Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYrpT5Lj0z142f; Tue, 13 Feb 2024 06:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41D6MPND091245; Tue, 13 Feb 2024 06:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D6MPui091242; Tue, 13 Feb 2024 06:22:25 GMT (envelope-from git) Date: Tue, 13 Feb 2024 06:22:25 GMT Message-Id: <202402130622.41D6MPui091242@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 0789c3bd2c45 - main - share/examples/sound: Fix spelling "controller" 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0789c3bd2c4597e40b1d2556d21bfd10ff628a0a Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=0789c3bd2c4597e40b1d2556d21bfd10ff628a0a commit 0789c3bd2c4597e40b1d2556d21bfd10ff628a0a Author: Assume-Zhan AuthorDate: 2024-01-05 04:13:58 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 06:18:04 +0000 share/examples/sound: Fix spelling "controller" Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/994 --- share/examples/sound/midi.c | 4 ++-- share/examples/sound/ossmidi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/examples/sound/midi.c b/share/examples/sound/midi.c index 7149bcb31c82..6d6ac9aa0fcd 100644 --- a/share/examples/sound/midi.c +++ b/share/examples/sound/midi.c @@ -49,7 +49,7 @@ main() switch (event.type) { case NOTE_ON: case NOTE_OFF: - case CONTROLER_ON: + case CONTROLLER_ON: if ((l = read(midi_config.fd, &(event.note), sizeof(event.note))) == -1) { perror("Error reading MIDI note"); exit(1); @@ -65,7 +65,7 @@ main() case NOTE_OFF: printf("Channel %d, note %d, velocity %d\n", event.channel, event.note, event.velocity); break; - case CONTROLER_ON: + case CONTROLLER_ON: printf("Channel %d, controller %d, value %d\n", event.channel, event.controller, event.value); break; default: diff --git a/share/examples/sound/ossmidi.h b/share/examples/sound/ossmidi.h index 60bf5e41173e..99a6bacffe73 100644 --- a/share/examples/sound/ossmidi.h +++ b/share/examples/sound/ossmidi.h @@ -33,7 +33,7 @@ #define NOTE_ON 0x90 #define NOTE_OFF 0x80 #define CHANNEL_MASK 0xF -#define CONTROLER_ON 0xB0 +#define CONTROLLER_ON 0xB0 typedef struct midi_event { unsigned char type; From nobody Tue Feb 13 06:22: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 4TYrpW2Jdtz59yMX; Tue, 13 Feb 2024 06:22: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 4TYrpW07WSz4Rvd; Tue, 13 Feb 2024 06:22:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707805347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jytTE2qAd5zLsmJ9+cer8A6IhpKfTPBps1I/a/uokMs=; b=G0C4h77KGB+JLl4qMxZprTEHiy0v32QjMbuthd0v9+kd+0t0n+xLFk1K88nZU45wy5NY88 Z6eTfIl8JVbO9ha7OHD+idhHZwPy/TNt/YMmejSiPHPGsLWFIQnCzFmoM51/I8Olqgt+/H U9AdqNjHtLhjpG4cNuLx5h2wx4Lx3q0coKKEd+eN0qyGsnSPk1eaJUQFkWwLJvYgfr7m/H yEnokptzgd7dKq34r0RDXBx48cPHL9N18xF2cQBsXH/E2mFqay5D3CexVQQ02e9oO3WmXw IGeHBsMqQ7JW2x0nwv7MgRyAZC0bUeioWsaDUiLGMkZMzxYrvt7x7j3TWkRUQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707805347; a=rsa-sha256; cv=none; b=GBmwUtMfIT0YNiWErdrbjUMZahDsd306NACv3A8V94TYRLlfxaHyIVNNgT3gjQTAH4yR7c 2K/zxMULH+kXIFf927pWtuU+0hgFngpW8pCFmX5Ahmev5PUSvNJCMxEhGah3w/8ulD9qMM OpKq1iLfZgEWdMFCDu/1ZA/Arzck9P6lh96YvcYJmxWMwcBV/4evSQ5j1dbwPnx0F0QTuS VWkPUBiGa0qriFit+sf9QWMYIbuRWUDp7qa7Ix2T0ff+HoCWcF+ckNOoqp5aFQ/fcJvGUi VJ6HbbhbJeCUOFtd5VE0tvAOW80ba4IvlIf1HNnbXOoF8NkbuWD4K1XpCp4Xow== 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=1707805347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jytTE2qAd5zLsmJ9+cer8A6IhpKfTPBps1I/a/uokMs=; b=wqHJ8SrfS70YijtZ5ZN+60ZJIi9ohQoOrykvWrTajnT99/LGoju70CeyomLOCwpquhqRSZ yvrHxg4Iko/TJpXRLzJJko0Cv1FUsDUIhPxT8objutnC/P+5ehnA6tAOD3LdNajTvsJTGs n1IIUWe8J+1pmbSps7NxDWKcZWKKjwG9MQu1UTNGVjPb40b6KHU0lHZyy2d3dsD0PIoWpH FcEkoGVWwuqhVoHUlWYTNWgnTEZsoupz0E+6wnzB0swc9zU6TYCVaihnymOfUotWQhZBbc LXCiJb1dGCVyGke+rtHPTJXMSHKlJWNkkJPhU+q7GixoNHPHl+GcOwoHnH6GCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYrpV6LZ8z14J6; Tue, 13 Feb 2024 06:22: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 41D6MQQI091287; Tue, 13 Feb 2024 06:22:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D6MQLI091284; Tue, 13 Feb 2024 06:22:26 GMT (envelope-from git) Date: Tue, 13 Feb 2024 06:22:26 GMT Message-Id: <202402130622.41D6MQLI091284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: eb8ba6fb74f2 - main - rpc: Fix typo 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb8ba6fb74f2d957bd5df357ae73f66a6002014a Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8ba6fb74f2d957bd5df357ae73f66a6002014a commit eb8ba6fb74f2d957bd5df357ae73f66a6002014a Author: Assume-Zhan AuthorDate: 2024-01-05 04:51:50 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 06:20:45 +0000 rpc: Fix typo in comment Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/995 --- lib/libc/rpc/svc_vc.c | 2 +- sys/rpc/svc_vc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c index a4f45ba4aca9..e5826fdb6543 100644 --- a/lib/libc/rpc/svc_vc.c +++ b/lib/libc/rpc/svc_vc.c @@ -34,7 +34,7 @@ * svc_vc.c, Server side for Connection Oriented based RPC. * * Actually implements two flavors of transporter - - * a tcp rendezvouser (a listner and connection establisher) + * a tcp rendezvouser (a listener and connection establisher) * and a record/tcp stream. */ diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c index 531bedb6b65a..8e7ff888eaa2 100644 --- a/sys/rpc/svc_vc.c +++ b/sys/rpc/svc_vc.c @@ -35,7 +35,7 @@ * svc_vc.c, Server side for Connection Oriented based RPC. * * Actually implements two flavors of transporter - - * a tcp rendezvouser (a listner and connection establisher) + * a tcp rendezvouser (a listener and connection establisher) * and a record/tcp stream. */ From nobody Tue Feb 13 07:24: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 4TYt9j6qb9z59b9h; Tue, 13 Feb 2024 07:24: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 4TYt9j6K6cz4c54; Tue, 13 Feb 2024 07:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707809049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t2kbk+tok9xYDNCKb+5DFZgy510sGcHMtmEjIZJBpTs=; b=HXqamvpAi5qa4lrpKhPfNfscKNavRkPHXk+nA/6zd3GDecNQVsdpi8CJ79REnpQR3FNeFy uwCCuKb/nwNligey/zN9lISCLoF3XrOWqsmgEMNaBmERx4N+EFO8f6u69bNfjSpc7frTTD yMCvseE6+45icub+WH+bD1OqC0JwXcj359mfGr0a+940dcnWJq4HRTkEGqTr/fcShZlDRl BQ0D3RMendk/tfCoo4sF5XIFy6ugKpJ/H2U/SqP2jOZVRZ35dXVinZbLmnNuPplc1FDbkR rdL2Z2YsA7yv1svsuvOkrrThCNh+bjYsoFvhebeYsKRtDl7fNoUdVCt1wevB5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707809049; a=rsa-sha256; cv=none; b=VezYaXN8gqi4eLZVhp9nMCE1RSTQCrjshYvk2kicn6X19EyFG54ikui3POLcBt5PIBBttV 6OZ5qPG/5TX5wT12PtUX7hZalY7X1VtmhOVcN0HiJtlelkjyE6Rusx0IdNB29luurNcKm8 FeEyfT81m4INhh8AN8X3SD5lKh2I+Qk8P3kGSRujSdnC+d/nIcCVeUXvtOjhsUzBmOz2Mv YveTSjf2Y5EG6P0OBMZf/J1RCLsjkhsotR+Gqxj7go5zv+4jsYY0fLfNMvmkXbylBvFiyF DFqd9oPMDntVnqSKSfTxLD1Viz4rduAzV6aSTomzcRf8EGiUiQzna+DYJ1r7Rg== 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=1707809049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t2kbk+tok9xYDNCKb+5DFZgy510sGcHMtmEjIZJBpTs=; b=c3XIzDFcSX/OTuxh0bq7gpvWVmyZVBfqphpXIxSjXDJtLCLiLR2nkcQPC/wY1Ox3HozNib JJ6cr8ftJTQSbgzdrpyrlbFmlDNBfoxePlLDLNLH8/Fu96Ws7DYzw9Hvt610NEU6uvN0sK FYS3G7w/EasboH9bk0qGOfP4mWHrZwFRVSY0AANXeOTpvXrqyEQmIJzS7O8oSSGGk8jE0d TLwAdfQLjnQtBIixI9hJyszKKxNi684F4zdHEyTX+l2pbBF1KqfBvdaGU/o7YszOUPmpXW okf8Vb5rhM+JoStBvRVNLA1+xZAd9w26oTtnb095yeShWvcHocMvWpPXnaz3/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 4TYt9j5PNbz15XL; Tue, 13 Feb 2024 07:24: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 41D7O9o7092516; Tue, 13 Feb 2024 07:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D7O9mv092513; Tue, 13 Feb 2024 07:24:09 GMT (envelope-from git) Date: Tue, 13 Feb 2024 07:24:09 GMT Message-Id: <202402130724.41D7O9mv092513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 69f9c5a51346 - main - nvmecontrol(8): Fix typo in ns.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69f9c5a51346b1ada4854cb4131e8a63b7dd8b46 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=69f9c5a51346b1ada4854cb4131e8a63b7dd8b46 commit 69f9c5a51346b1ada4854cb4131e8a63b7dd8b46 Author: Yu-Sheng Ma AuthorDate: 2024-01-05 08:11:48 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:06:22 +0000 nvmecontrol(8): Fix typo in ns.c `Insufficient` was spelled wrongly on line 537. Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/997 --- sbin/nvmecontrol/ns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index 62923056bd4e..1f1cd6101e35 100644 --- a/sbin/nvmecontrol/ns.c +++ b/sbin/nvmecontrol/ns.c @@ -531,7 +531,7 @@ nscontrollers(const struct cmd *f, int argc, char *argv[]) /* * NS MGMT Command specific status values: * 0xa = Invalid Format - * 0x15 = Namespace Insuffience capacity + * 0x15 = Namespace Insufficient capacity * 0x16 = Namespace ID unavailable (number namespaces exceeded) * 0xb = Thin Provisioning Not supported */ From nobody Tue Feb 13 07:24: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 4TYt9l2DhVz59ZqD; Tue, 13 Feb 2024 07:24: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 4TYt9l0DdFz4cJn; Tue, 13 Feb 2024 07:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707809051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LznoiPGKVMGSveL2Hs/gOWSEuLdMOSMnizOnGzatOF8=; b=QSCMV/lW/j3mXL4ifngW5W4u01gTsDgiPZ5YhC79nmG15Vr/iZLIJ4YDMJ+Uf3+/6j3Smf lxaGLiK3z/iXuuEfYO9gPeos47r6Y0oJ/7xHPkSs0FX1b5IBv84xGuhXfG6AVH8guz+os5 8NClZzZltwHGccceJCYoEfGOBKf4VCQTuF1kNRvAcyQ4YvYYiI6zjYQvf7ZLkf9nOXcVy+ 2B0oSh7nRNPpoKY5p13Y89BKKaEHeLz5MJh++HZa4FQu/F/g0CltH2U+sxEK7F6RCxL+Km /59XxJLf7hGsD2fZ/DRP4PWVFe7/0qZYVbWYFjfiXQ1ixXPkeDi1NyiPAE1LeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707809051; a=rsa-sha256; cv=none; b=cd2gR3wBwibEXYI9pViAGZXqz/tMM6rvjOzNF3tJI08UaM5IiYFkBgddbTjnbPthocU+6L h+oeM/Cysr1nzCe78L+iznk4/V7NzDh4TB3EdjP/6tGzVaHx3zF5rJuAwcFR5G3kFpM9z+ pL13dCHFgHrZmz1AwfBs6A67SNfye/9s5Cqh3bc7yuC/oT3R7FCA5fZu7qDICzfBh390Lg nfaKMoGiCJCEFPerh93B19fE5Iak4f28iEPsUfNIype/PzbAt6hAgovjdLXoCrTiNQI1/6 yWkrcwjk3+WnjTrg+NXDkQFfX2dSF83CXvvYuhzop1TtEAkXWGbA4oe95BD03w== 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=1707809051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LznoiPGKVMGSveL2Hs/gOWSEuLdMOSMnizOnGzatOF8=; b=a4Wt4PSqusqx2uvkMcUhZtL0Mpy5EvyqmlzYGi4KWj3Mr649AUoMh/c8+iXlg6mSgRSsII dG6/mZAXfSGljDuNHFNn6cFJHYcsn/8HbAtS02zxNagYY6owFDmx9qGoqsxCrhjEfnE2rO c6b3d+kUwXkH6Hyc0TONXMQDo9bLZyGzkgGbAVFMMQh2opETIDpMuJK4CoxCeodsbjl1c6 AA1BTzhtBueS8+O22YcZc11OFW3lQJX+tbk5rWpXScTZibqSXsVjrVch8qwe/sOR1lNVpj GCwbZg3L4yxGPJGj6OiNTRlADhtm1m42BVZtMnMzj2T8sKN4Vp+yJY5C+vf6Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYt9k6QYLz15k3; Tue, 13 Feb 2024 07:24: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 41D7OAqD092558; Tue, 13 Feb 2024 07:24:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D7OAt6092555; Tue, 13 Feb 2024 07:24:10 GMT (envelope-from git) Date: Tue, 13 Feb 2024 07:24:10 GMT Message-Id: <202402130724.41D7OAt6092555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: c9213e4bb924 - main - restore(8): Fix typo in restore.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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9213e4bb924cf3e664e8b624c1affc137114ebf Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=c9213e4bb924cf3e664e8b624c1affc137114ebf commit c9213e4bb924cf3e664e8b624c1affc137114ebf Author: Yu-Sheng Ma AuthorDate: 2024-01-05 08:42:50 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:07:35 +0000 restore(8): Fix typo in restore.h `operation` was spelled wrongly on line 60. `dumped` was spelled wrongly on line 74. Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/998 --- sbin/restore/restore.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h index e54555f39dd8..407816993196 100644 --- a/sbin/restore/restore.h +++ b/sbin/restore/restore.h @@ -57,7 +57,7 @@ extern long volno; /* current volume being read */ extern long ntrec; /* number of TP_BSIZE records per tape block */ extern time_t dumptime; /* time that this dump begins */ extern time_t dumpdate; /* time that this dump was made */ -extern char command; /* opration being performed */ +extern char command; /* operation being performed */ extern FILE *terminal; /* file descriptor for the terminal input */ extern int Bcvt; /* need byte swapping on inodes and dirs */ extern int oldinofmt; /* reading tape with FreeBSD 1 format inodes */ @@ -71,7 +71,7 @@ struct entry { char e_type; /* type of this entry, see below */ short e_flags; /* status flags, see below */ ino_t e_ino; /* inode number in previous file sys */ - long e_index; /* unique index (for dumpped table) */ + long e_index; /* unique index (for dumped table) */ struct entry *e_parent; /* pointer to parent directory (..) */ struct entry *e_sibling; /* next element in this directory (.) */ struct entry *e_links; /* hard links to this inode */ From nobody Tue Feb 13 07:24: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 4TYt9m2sv5z59bCZ; Tue, 13 Feb 2024 07:24: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 4TYt9m1FZNz4cGk; Tue, 13 Feb 2024 07:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707809052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zuCu4j0hsgxXEKzgsDbpPGckRZDABY5aevmVMoUnKg0=; b=g8iBhnUzE+hw6dS5zEjxxKw7qzeo/uioM0dQEfpuZOqsuAn9OPQ9tztIVZNkIjamNHIBCS CPEpot6eINNqH39OMwRuCN+MMdI5zeiG4dAnSzx4XPnGSW5GmGmmZu8CLNa7xT7YzHAZfR nEC0I3D6HXNFOAzPJqGXkQvVfjqDq6fCeOYp0ASLgDY31chZ+ALqWWy6Er6whg+FAxFLvx NxHO7O96uq+pPN9uAmJdqZ+1xWTe3Pxsd7IHYMYE8Lpqp3jdw+V8els5LTpPmiLHU9D6an n/zma0rY72hewWmWrYTPuCx6gMe+oE9gld0f3AqaNJxaCgBqr5dRmXoFhlRsog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707809052; a=rsa-sha256; cv=none; b=yiDpty9AW2FqvjYhc1OzyhpLdrn9LXTSKqbWtIGZ6jLkyOkf2lNRKYM9oIbBIxzspiYID8 D9ytqEc+nXl8r+13oKVztGqKrQfQXKvQYAVOh8nO2xrpEzPEeiGnfwQxiEasKHek3SzzHL pGf7PTpzvGgzhD8T6wZxW4UXhlRvkOG5rww6EDlKM7f9lx/+Qzas+1+PMQai6W/vEfPgc0 BeO7mfbAHnBiaxBTbfJ+rn7GLohZCnm3e2GQWtiwdg87S3d0D0GPCkdhOBK1xzy56nsrpt oFrKNe6WOTK3id5/kaFeiyJyzMmtA4BhmimUISqzQSjR/0vIn7IbTScMjoPlug== 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=1707809052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zuCu4j0hsgxXEKzgsDbpPGckRZDABY5aevmVMoUnKg0=; b=RBFdTVWaKFRKvBEjJHe4SCA1Mjo9gCPKJjmiDrjd67DFkBZpMEKQHms88s3kulq6Gf8H7M BwqVGfJI2vsUbjH5TPl3bvoBdirWbnACrxA2OxxZL5hdTH5hwc6sguPcLNv4I/o1vBJGfg h9qbGwimybR502KDl7Ul2kp7ifvJrv81u36Kd21WoCgvUL/FD3DaFqYJqxa49S5+qdx8M9 M2gZ0bsdiLM759bCkdD2Say0EeWN6CQSt9xVZVHeMPWqHN0D9f1xOP5pxL2totCaqvvITF nTLfxgj8+hs7HKV8mjgi5tfYTJ1w7x+XDv9+KPgZD1gPAyVwLhJmy9DUJRFH0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYt9m0HvGz15jJ; Tue, 13 Feb 2024 07:24: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 41D7OB8d092606; Tue, 13 Feb 2024 07:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D7OBsS092603; Tue, 13 Feb 2024 07:24:11 GMT (envelope-from git) Date: Tue, 13 Feb 2024 07:24:11 GMT Message-Id: <202402130724.41D7OBsS092603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 711a74e19ffd - main - pax(1): Grammar fix in file_subs.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 711a74e19ffd7bcd116744a333c5c22835c17307 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=711a74e19ffd7bcd116744a333c5c22835c17307 commit 711a74e19ffd7bcd116744a333c5c22835c17307 Author: HUNG-CHI CHANG AuthorDate: 2024-01-07 07:50:25 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:09:32 +0000 pax(1): Grammar fix in file_subs.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/999 --- bin/pax/file_subs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 7c68e643f04c..7214de337ec4 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -716,7 +716,7 @@ set_pmode(char *fnm, mode_t mode) * block boundaries significantly reduces the overhead when copying files * that are NOT very sparse. This overhead (when compared to a write) is * almost below the measurement resolution on many systems. Without it, - * files with holes cannot be safely copied. It does has a side effect as + * files with holes cannot be safely copied. It does have a side effect as * it can put holes into files that did not have them before, but that is * not a problem since the file contents are unchanged (in fact it saves * file space). (Except on paging files for diskless clients. But since we From nobody Tue Feb 13 07:24: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 4TYt9n3bLZz59bS0; Tue, 13 Feb 2024 07:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYt9n2BdTz4cQ5; Tue, 13 Feb 2024 07:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707809053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DYPA9rNpEsCn16+00XLD5RWbUyjj0mJEwv0U2txK+E8=; b=Gv8mKRSJhp5YgkIWNo1ph2wmdNSUXfadp+L7TLa6UvfZgAFNtN7RzT5QmJ7nYkUBRf0IuK zGBDoMSwhDoA32aw48DVrcY7PZ8wt/onikbsXr/1IlP/U1MHxegdc169aLmy09ek6qfjO3 BlYRT44Z3HKdPb8+cytehigccyMdZ7Afg2dnZCq3xlFVgrRr2DwNWRKfmweDlUG8+GZRfT LQfg8r8CGCdS3pK8iTXnB1i3J6Fu691Wy7oeAtlqs/rg/lsPnQoMFpkEjvBP/m57tZ9xnq PRptNP9ShWSBwbzLR3JfG/z8MRR1hwAWnruQx6MossEe/542DX2cAIdQXCbQfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707809053; a=rsa-sha256; cv=none; b=T4ehU66WXwhnaEkzo+AbYpabdKWXixWC1hbPEfMZSOQSKwLS/kVsEYBCBaTcdzAc726u8A JjYCXZYkpHfYPBxW0d5A4sHX+nkdC3opKZOMqNXOq6yjgwg1HkWaDYdPGlPkPnjOrlhFOX jKXEOWe3IJZlOwaIf8/bSeEEWVhzTK7rljV+C+SbfJ5O0zNrvGQnkx85sqcKg82Ko8PQcq CeVN59eZcVPpktw6ArZ5jgvZj0MU9uqBaW3E+Fx0T9oHQYc84YjG7TIwCA7QOWiqcIOWQV 0P4SX38utU9fLHz2QZmwbnNgnQcko0g/ZQPMjEcKyTTU9rYnvIKbrLAndd0YEA== 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=1707809053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DYPA9rNpEsCn16+00XLD5RWbUyjj0mJEwv0U2txK+E8=; b=ZRPtRN3Bzlltn40pbw6ikWUHWHk1/qyCmG+dMPcl3D7YifYYwA54lJDpknc6nOyBbcM3j7 TF1f/i3yRm8mhtoEJdmCAECmsnbud3qWRoMNYFf7zcuJi6hEBTqcaZX505DmKl3pbNb+QC wBmkx1xW8N5/ZZuUu6ilo+fuc+bCdL9+tuToG+G1/m3mvvHFvkC5YimvzpVB0levD1HvpX LryXRol8HGqFwHOCxD2lrYvsDxlqY/WoC2ZYXX7EJL+Pez+WlbIRrwOPk4j/PZ5cvXgbMf e1FupcmpII0tmWKjIv2hot5sBzPRG04BM8pAk4wD5YYDqn8LUXNkXnA4zhrGuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYt9n1H4hz15Rh; Tue, 13 Feb 2024 07:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41D7OD3S092642; Tue, 13 Feb 2024 07:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D7ODhs092639; Tue, 13 Feb 2024 07:24:13 GMT (envelope-from git) Date: Tue, 13 Feb 2024 07:24:13 GMT Message-Id: <202402130724.41D7ODhs092639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 94d9c5f3bebc - main - ipf(8): Fix typo 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94d9c5f3bebc1104325a1181f4231ccfef87adf0 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=94d9c5f3bebc1104325a1181f4231ccfef87adf0 commit 94d9c5f3bebc1104325a1181f4231ccfef87adf0 Author: Shin-Yi Zheng AuthorDate: 2024-01-05 14:02:31 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:14:27 +0000 ipf(8): Fix typo Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1002 --- sbin/ipf/ipf/ipf.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ipf/ipf/ipf.8 b/sbin/ipf/ipf/ipf.8 index b999f04e5d03..1c45b017e117 100644 --- a/sbin/ipf/ipf/ipf.8 +++ b/sbin/ipf/ipf/ipf.8 @@ -48,7 +48,7 @@ supports \fBlanguage\fI. At present, the only target language supported is \fBC\fB (-cc) for which two files - \fBip_rules.c\fP and \fBip_rules.h\fP are generated in the \fBCURRENT DIRECTORY\fP when \fBipf\fP is being run. These files can be used with the -\fBIPFILTER_COMPILED\fP kernel option to build filter rules staticlly into +\fBIPFILTER_COMPILED\fP kernel option to build filter rules statically into the kernel. .TP .B \-d From nobody Tue Feb 13 07:24: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 4TYt9q1v4rz59ZqQ; Tue, 13 Feb 2024 07:24: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 4TYt9p3FNgz4cQL; Tue, 13 Feb 2024 07:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707809054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TIfCrP4nasiEAH9GlgqJ4mcwo/uSvSsUMq+27WsmAE=; b=wf/b0dWlytFvePJZY3uAIXKDO+6Wz9ibg5ZHaGvlYVyGJzxQI1S8UpbIfX1by2puozZDx5 THV0nu6lpkE+D86ww1S1250YyydXn85AWfYukC5q/MmbXJRJD/JSqjZWXkd554LEqekvKB hHVocVgm6UPCMnc3PNsajU8mJV2W4IyVO0/KyZrLz9MQy2G/1JYGL+HVQ5/BUg0akaYm/T Kir/clKk/Mnvf8Cb51NOyvbCGt205C7KEQR0H7fbVHaTw9NLuq+gSDpXAJQzMZSlHSaEhW +f/fa9wpWOtD8SYwUMqqAW6uPrd3Raw0qQoTgopDr4KXUnglbS8LFIQZ90m1hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707809054; a=rsa-sha256; cv=none; b=RbXG+mF6l5l2SnyVvlEEHKGSOu+g0uaq4fTXWO/n9DzYACeQ7qZCiSH/WMAWiD3j7r2QZu DBEpwb8tFqyWS8wRWtSDPsdCRX4haMzNzHBlypJky41JODNbd+nUIyZzPm9zM48/8xbtgt oM2keF1csHNAc/S12Y1p0eTFvDt897jMfzoHZxSKN9XpWqIr56rXkc4DN6lLqskNl9z7nY xUaZdcUbGpRZkZsO0DvVtuhdP+mptFxPCQfK4QHQeh2ad769t0nyZSrN1oL4FTtkYc+WSm 4PBMgzHezFoJ7E/4wVWaCGSCfl0uJKkk2634gkjpeZmS8nr8DwY7xwktAWiDCw== 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=1707809054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TIfCrP4nasiEAH9GlgqJ4mcwo/uSvSsUMq+27WsmAE=; b=jg1uNusOHN7s7RiIS3gA+8Yk66Y0smdqOLZVpwzVEWoh+GUWRANoSNWRa+ubUgb6D2WA/P wIr8yQ/PrTTkbNQaiQhFGbJwXLWWejFw0wy8avl+rXWGKhLW4VzwWli49V4MJmr9D4IIV8 6c8PaX7fNSVdHIV1Bt/l5W4+md1ikqznR/aCAUpEVhWBnJZ/+9uzvlT6I8JZQNesG0BAGK u50WZeIMTn5r9B9I6MaaCQTfakN28fgI3+8cpEoeA4FIxasz8sGsM4o7fHYYETNdutJTSP D+bpm5mzl/nZvFA8eyAW80RPk43wpKI6mi0HezFaP3tYMc9mEun9KabuZGcGAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYt9p2Jbsz15jK; Tue, 13 Feb 2024 07:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41D7OEC3092682; Tue, 13 Feb 2024 07:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D7OEOB092679; Tue, 13 Feb 2024 07:24:14 GMT (envelope-from git) Date: Tue, 13 Feb 2024 07:24:14 GMT Message-Id: <202402130724.41D7OEOB092679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: dcde2454bc52 - main - Grammar fix in share/doc/IPv6/IMPLEMENTATION 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcde2454bc52f5d959a4e65692350773044d88c6 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=dcde2454bc52f5d959a4e65692350773044d88c6 commit dcde2454bc52f5d959a4e65692350773044d88c6 Author: Ho-Kun Lin AuthorDate: 2024-01-05 17:56:26 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:16:01 +0000 Grammar fix in share/doc/IPv6/IMPLEMENTATION Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1003 --- share/doc/IPv6/IMPLEMENTATION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION index 179073383886..ffeb63223561 100644 --- a/share/doc/IPv6/IMPLEMENTATION +++ b/share/doc/IPv6/IMPLEMENTATION @@ -707,7 +707,7 @@ node-local multicast group ff01::1. 1.4.2 Stateless address autoconfiguration on hosts In IPv6 specification, nodes are separated into two categories: -routers and hosts. Routers forward packets addressed to others, hosts does +routers and hosts. Routers forward packets addressed to others, hosts do not forward the packets. net.inet6.ip6.forwarding defines whether this node is a router or a host (router if it is 1, host if it is 0). @@ -1481,7 +1481,7 @@ Users can join groups by using appropriate system calls like setsockopt(2). 1.15.2 Router case -In addition to the above, routers needs to handle the following items. +In addition to the above, routers need to handle the following items. The following items need to be configured manually by using ifconfig(8). o The subnet-router anycast addresses for the interfaces it is configured From nobody Tue Feb 13 07:24: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 4TYt9q5Mc8z59bR4; Tue, 13 Feb 2024 07:24: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 4TYt9q3XT6z4cHT; Tue, 13 Feb 2024 07:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707809055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a4b+Z9U3FE721ueGon7OSBa8FoGI5bUJXQUuqWWDP9g=; b=GSxz55hBGr9VFdmzKakwO6iU5YTk95cpMrLBTqSdrP7ieFxJBFQQP0922ufZN+5GLDOJsx oJ9UySXy4rpg7QhrBrtV1vnMxU4lGG2iLBKSeodyRiMahHYzkrYWFUg2MRzB2n4Pr0kaOK WoqX02h8q2kcqco4Ptm6e1bYC2+Gw0qE4qaUWQSZiAEExCmYzFYoVAzQwJ24sgmwFOqa7l 42DGGCGFHFGP0ZR3wbPRVEX8OR7kBkS04MRGiW/jCfnwWWBBhOYumHddHWc17lSPae3qIt 0scM/hOxBDIrDZA6tyPmyLUTFqmauxYHOhk0e0Gg8oWjM3jKWrGnvlH/lY/NQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707809055; a=rsa-sha256; cv=none; b=FZPezTO1pQayti7DvtLHsBP/6EKJaueDoACNZDepGj6TLvd/jVZWC28YnZCeZyM0EJnJ0N PTTUiAo9JYrWqdOQAARCPg3l8JSXisyzOO95rJ+f8NKc4a0ozDj/nWEntgX/ruKeLd37xJ G+57azi/ILfKwp/KLFfmJab8W4AH+QOQgSdV+49/8ttqch3nrIGZkX7Jb6yb98RcDwEiiD BJCyYc6iuc28RfcOC0YJw6wlAvexZyD44+CEGKJk9ZHi4E2OuKF/juVnKtvebnsPhX02kl 5WiTsTg9FHzI+eQPvy3snPE8WzwEApJ5fl/rhVb5Latm4405G0hmBNSGdjHA0Q== 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=1707809055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a4b+Z9U3FE721ueGon7OSBa8FoGI5bUJXQUuqWWDP9g=; b=DcAeZWVHlr9I4vHvzpnssTFvtAsMlL5XheG/z5A4yHN7PrIGNyGqNZ4sC8YxBr23ObSYOW W/CuKcCjW27C6OLETs5F6gOOgej8LASIsy68AAnoqXX3J4kaIXL6NYMnkXxg5tkrPsZFhy YblnamtZkE7Wl7UKH+6njhjwmE93QMR+5vw+uzZDiByPhI+9rhvhu3mJn/ax0UPTKqUQ38 7n+nT06V+pH8ReaVP2IiS3t4xZsngzlc4gmSgTuAqPAZHnAIA58Gr1A3yIfRvCldZ5Sg50 mGajXksfVRYFJg+Qpv6zSvV9b/pigxsjEWxyjw5wdf9RzTsIusSY8gx7o3Bw9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYt9q2fjcz15mW; Tue, 13 Feb 2024 07:24: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 41D7OF2w092727; Tue, 13 Feb 2024 07:24:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D7OFjO092724; Tue, 13 Feb 2024 07:24:15 GMT (envelope-from git) Date: Tue, 13 Feb 2024 07:24:15 GMT Message-Id: <202402130724.41D7OFjO092724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 0a68b0066f5e - main - fdisk(8): Fix typo forth -> fourth 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a68b0066f5efab8b751384a434912b4282f5310 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=0a68b0066f5efab8b751384a434912b4282f5310 commit 0a68b0066f5efab8b751384a434912b4282f5310 Author: Chih-Chun Wu AuthorDate: 2024-01-07 09:00:36 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:17:48 +0000 fdisk(8): Fix typo forth -> fourth Event: Advanced UNIX Programming Course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1010 --- sbin/fdisk/fdisk.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index 3c6a73318271..981233f6998d 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -456,7 +456,7 @@ downwards to correspond to head and cylinder boundaries): Example: to set slices 1, 2 and 4 to .Fx slices, the first being 2 Gigabytes, the second being 10 Gigabytes and the -forth being the remainder of the disk (again, numbers will be rounded +fourth being the remainder of the disk (again, numbers will be rounded appropriately): .Pp .Dl "p 1 165 63 2G" From nobody Tue Feb 13 07:24: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 4TYt9r6YR3z59bR5; Tue, 13 Feb 2024 07:24: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 4TYt9r4dVvz4cXp; Tue, 13 Feb 2024 07:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707809056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/JJ0bHJF4UWJE4hr11/zXwWogBqMfYT3VU0Wly2IYK8=; b=w/N7jw+68GxZbwGo+5FE+/g1acj3Z/nG8fW44qAOx1HaPR0NEWFTJf9nnib2C5s1e/C8xp dTof/4SRAX3jJegKABUsf9BBojxZ3cVfEE2WWAsjtzjF7sGwrAjRtQSPhxVUEJL8OrpOv0 69m7dPSzgqUZICTRIfhRxhKtK/lFa1MxJIcE1TZmP1hDblPE8wNwbmTaiRnJ+Nk+u9DEJv 1xMOTY/+XCNR0ITXYOqoeuZwIe0MtpwzLsuUONgjInkwmM9uRKNSuD4LbBqLCfJZ2DKlKr uLQ8s00Zx2dxe4D0yc9IAd5tkO40POgDWHtagMhC8f5/U6fsAlIODmmL5Jvmyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707809056; a=rsa-sha256; cv=none; b=R2/hfpjizV9mw9hT6A2CffKxEtdgIIKiBnzTQ2CN0czCB5ZMWeOaDwZAmcAG5Z54I3Fwxd OUnIF2pAsQ3KjUPmtUcxDz/Q8FqMtAUq4gbipUOmqAoXQ6VltN2QPLY+NjNeQe71FYlxdL ocmGU66wOKthWtP7p9AaOpkDRYaGa1nRy0f+kKn5RB+ejWSYgWlmLVx7RnkPh/p0UXEJ9d vxagDFAbfsHFmkv+Z+XirecqhWddhw07nJQZtyu63JJknERHqGrmmKt9fGiCUe7iiUWt07 ICFF4kBAt4LfpUqc3eRmwR2o8Z+RCh2KuIRvRW8RV0dOUuytLwZElYOlD4jX/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=1707809056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/JJ0bHJF4UWJE4hr11/zXwWogBqMfYT3VU0Wly2IYK8=; b=ZHCj4aCLQYw5GLZ8KVwLXrDn3yFdtk9BGNIeLs6+sPw6BFvfQChHyd6dIqLFjvANMEUQYt Kb6RHyR2NqZ4JDpijm1GPfSyWSu0TnxbDZ/5CIsp64FnZY4z6nryJaGWBKzfwkWsf541xn RtR0JW5+LgJTh34eDUD9YubNYbIrK+VmwIz6iFTJcYjnjNXoF5rcJxWxqMzHUfNDdXGbqw RzsYe0EqxZpu0qn5wOYLzbq4lxACpfQVXzZLuWroMPvruy5lYnDW7iOkv9mKBYG7fVXOlV 42FN388frWoB00fkAEJCMqzTUP6ggt5L85VPO8hnfuSd5S6VVumNavWbDJ+1Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYt9r3lptz15QJ; Tue, 13 Feb 2024 07:24: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 41D7OGwX092763; Tue, 13 Feb 2024 07:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D7OGmT092760; Tue, 13 Feb 2024 07:24:16 GMT (envelope-from git) Date: Tue, 13 Feb 2024 07:24:16 GMT Message-Id: <202402130724.41D7OGmT092760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 01d463b6f21d - main - arm64/cmn600: Grammar fix 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01d463b6f21d027ba16cb4f1040c00b295b1df17 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=01d463b6f21d027ba16cb4f1040c00b295b1df17 commit 01d463b6f21d027ba16cb4f1040c00b295b1df17 Author: LO WEN-CHIEN AuthorDate: 2024-01-07 12:32:48 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:19:22 +0000 arm64/cmn600: Grammar fix Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1011 --- sys/arm64/arm64/cmn600.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/cmn600.c b/sys/arm64/arm64/cmn600.c index 7079907e63ce..4e3be8fee40e 100644 --- a/sys/arm64/arm64/cmn600.c +++ b/sys/arm64/arm64/cmn600.c @@ -353,7 +353,7 @@ cmn600_create_node(struct cmn600_softc *sc, off_t node_offset, child_offset = FLD(val, POR_CFGM_CHILD_INFO_CHILD_PTR_OFFSET); if (parent == NULL) { - /* Find XP node with Id 8. It have to be last in a row. */ + /* Find XP node with Id 8. It has to be last in a row. */ for (i = 0; i < node->nd_child_count; i++) { val = node->nd_read8(node, child_offset + (i * 8)); val &= POR_CFGM_CHILD_POINTER_BASE_MASK; From nobody Tue Feb 13 07:24: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 4TYt9t0w0Nz59b4s; Tue, 13 Feb 2024 07:24: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 4TYt9s5P0gz4cTN; Tue, 13 Feb 2024 07:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707809057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=csUDxoDmrIHACjA53523otDYtV2xBDcbA4AXs78JshM=; b=gDEwDZDQG08Q62mhoW8Qpl4Bc643obL8RmZ7gbkTuSGh+Wh1Um5Ge2x3ZtvXK2sRKeZlwD FeUYAazmtVxRKSU72DSO1opKIWCtGPZ9STSu5DiqrNDCV8Jpin5N3bODJwmph8s4cmLrM7 +fZrEEdhhvz2fbJ9WPEYbSbdHKoM6YPvRZtos605Rvem0rgE7p8U6RNHYFsMOp0EBo9Wi5 33R22qkYk9KRG8bvw/FuzE60BdlxJ6FfHi38PVb7SVwm1C4PYWyHoMTZ6Jzx967yEGffWy DhDXCf6CV0XyozJfGS1XT86blj2ahkVC3ZCQ5hLzAenEkxTtBsqTL/agavvXkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707809057; a=rsa-sha256; cv=none; b=ig8tMoDQUIPAErztQIyaLRlYiIgcNNGFUMaOrb2Q0E0gwqOT7B9kPybTMV1aeW3I8WKMbg auzy6djuihlI8d7QZDe253mJWP4e+Z65z1wk4Y4OwaAzn5eQee1m/vOvVZlJiqy4wDTBOG +K/pXrL+QWHX9lPzZWXn+uOlGu60lLLcXgP8befHnjYNRNAbpCWUgHmhT4w7GmHldQ4k+i YZHMQ9kgOl8JNzRS+PQknsiKfpODzwHGrGn7+mmc6vphdaP4ifx0WTQ1i7QDbptGzs+sd0 aPN0/BKttzz8nTedCC+54n9ak9RK2JcfPQRQGn7bMb2KvOH//MoKhj0Tipjf4Q== 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=1707809057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=csUDxoDmrIHACjA53523otDYtV2xBDcbA4AXs78JshM=; b=nID0i99jU35+N2pThUwdms4BJOMWK+CbLnV0ZutNZdrFZQBlBXH774iaYmskStJV8/E18D S/M7lfqa1Pef4HgUwv20ZZF+4+dysTaSv9pcC9ioWdzlRWjVLsXGwXM8wx/6FIOu4WzDI4 t6rwKq0WcyA4lfEwWW4NGFiFY4h9ouDTYSpQIkZ1RnUZBFo6qHS+Figto+MacZBvvMxXZR 1QRuVNbRraSQdI1yr2P+AszGGnnM9BcEgVlw6hVfUUz8bEFHZH14P7MjahklClYUtd48jD Xbemvrf8mhWPFk7HoJA3eQpCWC0ZJIV9mQ6HyR1k7mWMqOmwJofVTNeVavMEaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYt9s4WFlz15XM; Tue, 13 Feb 2024 07:24: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 41D7OHOo092805; Tue, 13 Feb 2024 07:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D7OHO5092802; Tue, 13 Feb 2024 07:24:17 GMT (envelope-from git) Date: Tue, 13 Feb 2024 07:24:17 GMT Message-Id: <202402130724.41D7OHO5092802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 1d83ae9d3d66 - main - install(1): Fix typo in usr.bin/xinstall/xinstall.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d83ae9d3d66e3af9ad192b19578493f6554dd21 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1d83ae9d3d66e3af9ad192b19578493f6554dd21 commit 1d83ae9d3d66e3af9ad192b19578493f6554dd21 Author: LO WEN-CHIEN AuthorDate: 2024-01-07 12:53:10 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:21:45 +0000 install(1): Fix typo in usr.bin/xinstall/xinstall.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1012 --- usr.bin/xinstall/xinstall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 66f2c165c683..1e5adadd8f49 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -65,7 +65,7 @@ #include "mtree.h" /* - * Memory strategy threshold, in pages: if physmem is larger then this, use a + * Memory strategy threshold, in pages: if physmem is larger than this, use a * large buffer. */ #define PHYSPAGES_THRESHOLD (32*1024) From nobody Tue Feb 13 08:25: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 4TYvXS52Xyz59hcT; Tue, 13 Feb 2024 08:25: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 4TYvXS4VXfz4mbs; Tue, 13 Feb 2024 08:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707812728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ULzbCVDqY3Z/Xbiy1dwljJgoxuWCdWOcdo6NHteHVg=; b=sT9Xri/4ipdQIWVfus+BOvijttoF2nMj3v4zi+zsuASghy4O187DYoj7v80uM9bcCahEUy uuG6GxgTggEqZbnApcz+Vui949T4BmsxbbouSzvtuMhfKZ4EKsHA+ADIHzfxduOzNRmBPr nW4NJRCJcVeJMz6maqxj534o1PdnTz5h8Opvipz8Gwjzdh+our41YIuOEUHHck2K9ALxuA iMMR/TaCOKoGSi8GngHL6hI6ndsKky66TuCBhzdcwNFm8DWA1iYn9HRr/e4jpWJhobEH3M cWBdLks5/m/mpwYLclHtuiMTL8fOWnI94bV9u6BrlIDyqDEdQDnHoh4df1RWnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707812728; a=rsa-sha256; cv=none; b=xjzWX40+Xn9KGKmZGHAN6/ZOrYvXDgb9SF1ggKtQJgAIWkQsRc7/spPy/Lmbycug3Mr2vV 40zGtP3sSk4tbHuQ/gfWYvjNhEl5r9Gh0AWRRryK2yBLK4iE52FFsPyp3LSit/Zi9rSM3Y F4iq+PkgHnXsA/kB5JM2NK/eDok4NrH2N+M6QgGRhZUc96vieQug1jlOmW1tvnaN1LUI09 Iclkgv8iAZdfpiNkkrf/t+hF+bJJDm7cJczfPHditfkaFp//JRwR9tbLJZjXU1qQaAfpPa AOGU9MF7ZreHoa96P2/NmjxcTxqMr83K1FBhqTCrLOlpcRZiMXDPYa4e22FsXw== 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=1707812728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ULzbCVDqY3Z/Xbiy1dwljJgoxuWCdWOcdo6NHteHVg=; b=R/dDbEfyZOygfDXjlFtCiNpMTAR2ezZ5bopfq0Lg001N94XDbfD22ZSLQIP4qaJvX9vS+p MnR3qeRYa31N7uTPi9DUgpXmzY91BLO2gxvUAT1afv7sglq0lYaPO85PfUsmbymEEKqswz EheStXoYUBAZ0PCIKJyawvX+VpA4XNTGuJM9aa0nUWG9pLhdlALSMUZW1MNWy7w1zbE3MU cwuLaAPyDpoyiyVlcKTuKtTJlTWVNvN8arGGCil3K2p/pfFa3htZJClDffvQBrSeBMpToB fambsWq03WZUSDrJiqvtUQhBOfdHHpST8Cb3YQizMs1deSRJ6UHqpdKiB9jQMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvXS3X3Gz172J; Tue, 13 Feb 2024 08:25: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 41D8PSfQ095034; Tue, 13 Feb 2024 08:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8PSUC095031; Tue, 13 Feb 2024 08:25:28 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:25:28 GMT Message-Id: <202402130825.41D8PSUC095031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: b1d0cf28ff5b - main - ar(1): Fix grammar error in write.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1d0cf28ff5b925eb65d6363e32da9cd0d3c3857 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d0cf28ff5b925eb65d6363e32da9cd0d3c3857 commit b1d0cf28ff5b925eb65d6363e32da9cd0d3c3857 Author: LO WEN-CHIEN AuthorDate: 2024-01-07 13:01:56 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:31:59 +0000 ar(1): Fix grammar error in write.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1013 --- usr.bin/ar/write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c index 1279a1ca7cb8..a630e81480ee 100644 --- a/usr.bin/ar/write.c +++ b/usr.bin/ar/write.c @@ -121,7 +121,7 @@ create_obj_from_file(struct bsdar *bsdar, const char *name, time_t mtime) /* * When option '-u' is specified and member is not newer than the - * existing one, the replace will not happen. While if mtime == 0, + * existing one, the replacement will not happen. While if mtime == 0, * which indicates that this is to "replace a none exist member", * the replace will proceed regardless of '-u'. */ From nobody Tue Feb 13 08:25: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 4TYvXT5sWCz59jJ2; Tue, 13 Feb 2024 08:25: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 4TYvXT5RBLz4ms4; Tue, 13 Feb 2024 08:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707812729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jykXPRXtwG8VhcCYs8jlSyW0qwgDJ1kFVvwRLIvJiRY=; b=c+r0m7fdhjstf4lKR6IdvpUaysgAOHnzYuy/FyJlJvRAKaMK4aqenYi5S62AkdDb0o04ZR fXL+PY1OVZBCc4KhS/McbxEhTSw3RYTVwZi0/xlNbhKXJuuFsFhMJTdx6mAzjIpnN8j7Wf WdppSkTcmFkmnEeG340GvwDQ4IK4bJDbs6ZCtcW+hpxVk6VWNcNxigDWJIMk+vroQTCTLv xq1dn6/OyjPU6yl/5P3DI6sQaP+NnQqmpPBM+S3p1DmyKdk4fPdwA2dr3xSCY0h/FAbr6L E4NJyF7ufx2v5ia622K0C9Ur6w72eeGm/HttFGfjltj6x15ifbmS2G5zIkWjXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707812729; a=rsa-sha256; cv=none; b=T3SW/CiK5cs0QV1nwSUcNSz6fM3JuBiJ4SATf4AgsQofTs4U2EkxIoQ+N7dKOWSt48iHqN /1HcLUYtwVQNVxEM7SxXRasZU8uoLnLOJK2syfSobA/MPMW7tjiIozSWi5LEATvfKx95Ul cDj+XjtbTV8RmofD63+ZAvfAABxXPcxgDxhrDnPkvqKXj0PtqLw46N4Cwkl0kSYfEujTXG 4b4NKycljXlRYnS9UI2ypAJ/VIoktkRzjt+orpm88FGx6McnTaHf846yXwlvK1hFzvZPIC SFDg4e6u7uNfjexzdUuU+EcKURsxmd609VOMCFMyZ+MEEBdmNnCoNY2vd143xA== 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=1707812729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jykXPRXtwG8VhcCYs8jlSyW0qwgDJ1kFVvwRLIvJiRY=; b=ZdnWV7YbPpNGibnQB0Bp0QjnZXIOjCHb1JL3GBQ7jvXxXWRxBjUV/npehRVJi7/OAOFy4c ZMBTFWwpjBHJPDkFwT9XHc60SNTpYFXoXBYTUSDl/SMR+b3tJNTaZJI6fZVi43wDATYJnW YLrIin/ifgr9mb+YGgW48AT3iKjEEM3IikpOZXR2DwQ7nfA73pP3/Tmt6vkGroFwtIVC1A GaVk+1AF+dpyQDHxE0H9Lo8wld5si9Cbyw93INIxkOgWIXxcm2uSnNL1sj555rnz1QItSd NYLMAiJHwP/OHnBQV9N4z44t98wC6M0TKRw7UgrLLlDu/rl418RjWZ0jy3df8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvXT4Xljz173v; Tue, 13 Feb 2024 08:25: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 41D8PTVS095083; Tue, 13 Feb 2024 08:25:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8PTIo095080; Tue, 13 Feb 2024 08:25:29 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:25:29 GMT Message-Id: <202402130825.41D8PTIo095080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 49eeca743b70 - main - stat(1): Fix grammar error in stat.c 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49eeca743b70d13883ed1db73b6e04fbab791681 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=49eeca743b70d13883ed1db73b6e04fbab791681 commit 49eeca743b70d13883ed1db73b6e04fbab791681 Author: LO WEN-CHIEN AuthorDate: 2024-01-07 13:14:12 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:33:16 +0000 stat(1): Fix grammar error in stat.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1014 --- usr.bin/stat/stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index 720069db3195..1fd8288728c1 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -1022,7 +1022,7 @@ format1(const struct stat *st, (void)strcat(lfmt, tmp); /* - * For precision of less that nine digits, trim off the + * For precision of less than nine digits, trim off the * less significant figures. */ for (; prec < 9; prec++) From nobody Tue Feb 13 08:25: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 4TYvXW1dtjz59hcW; Tue, 13 Feb 2024 08:25: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 4TYvXV6W5tz4mY6; Tue, 13 Feb 2024 08:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707812730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tz+cq2Vq6WiA6hT5HslCHkxfj9ib+fgHO5gWRQuzFSE=; b=gG2eyqDSkx/vi4L85Yb11VYxY7fbFUI8/UqtjyYgimuYH4avZLfeQqbCB7rVraNs280R1Y W4XQEqKXh8vHxpODRhhENjD8Nq2Bp7eKDXxFX77azmGEkERG/584oUDTBoPDEBDmWs3YWA NKZc7+CHmZFKGdwfkBiekxZIqMqRDNYHvAoTtAZf589ZRlIXr8mLD3aMVzWTZWYKoVw22V TVAFyKwWMmfbXhIn9LV/UgF4NrK9F6MnOujCK7DjC197wfyb9VGAOdlyffDcRMn85SEQbG Y12cwYHgyqEVSjZBXD6VoIh6S14NeOuH1g4lctg+9imdyj8QL/Ai4it5jjSkeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707812730; a=rsa-sha256; cv=none; b=XJauyJcb1CaTTXyamyuxv/PlL9yxwwgWyuohzRdwLMfRnow0ri3hFcx0N/VUpmJo3W2kQy C9mJsCQtywY63TAfUZQUaB4ROjKLpvazuQ3vTuvy7wR/b7W3WCplEhjnsO8HuCPlCwk1n3 qVzPIRf/P1FHSepQgB5+hGabcw8Dnqg40W0/+c0lPaEYawUb1Fgg9DqTS05OT84JH/XXNT +HCpPR5xBSZac2TgNMdeppXZNumST1Cg/DJyQ6yWKRLqUmyAk7/MLEg2pO1i7wHh4buguP MUdPtW+cOaYma2IjiG6LMcZxqq7Cz5esZtcbf5tN2KQ0l4lZTYmk7lcYoD/7zQ== 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=1707812730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tz+cq2Vq6WiA6hT5HslCHkxfj9ib+fgHO5gWRQuzFSE=; b=P91bk/uUvuf/vpO9K90qkSu8lrJX+VjSlT9pmFDtVYhLKzGxHvxhWdZCDD/smHAnCbBCsO Zukay0w0BzlBZmAiLI+SIJYqZZ5XUJ/eZoi5qQsen1azG93QENYr9CQAFhznhcpsOHRRsu JXVKTKuRWq2q+Tck2/MMxLgBim5pP7i+WpM69NOnFVR+yiMgZEGBzL9NePiNs7KIUpeAaI JBNL1IqyIXgSbVAWymtMVHxTeE7fIpY6LvL+ZpK0h/CQJsPeufvp2hK+0h4z+IHaqnSVVx j0wLo4ISNaRdZ7TXS3t37AdtpP+OxHq2mPnCvag+AGCqno09GeRUNRI3Vcf7hA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvXV5ZnTz1712; Tue, 13 Feb 2024 08:25: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 41D8PUFW095126; Tue, 13 Feb 2024 08:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8PU4d095123; Tue, 13 Feb 2024 08:25:30 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:25:30 GMT Message-Id: <202402130825.41D8PU4d095123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 1d479bf6b474 - main - gjournal(8): standardize capitalization 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d479bf6b4741fdc24490ad7179bbef0a78af288 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1d479bf6b4741fdc24490ad7179bbef0a78af288 commit 1d479bf6b4741fdc24490ad7179bbef0a78af288 Author: Cheng-Hsun Lin AuthorDate: 2024-01-08 09:37:47 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:09:35 +0000 gjournal(8): standardize capitalization for consistency Event: Advanced UNIX Programming Course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1017 --- lib/geom/journal/gjournal.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/geom/journal/gjournal.8 b/lib/geom/journal/gjournal.8 index 80f987679b10..f9959ffa0f3f 100644 --- a/lib/geom/journal/gjournal.8 +++ b/lib/geom/journal/gjournal.8 @@ -61,7 +61,7 @@ The .Nm utility is used for journal configuration on the given GEOM provider. -The Journal and data may be stored on the same provider or on two separate +The journal and data may be stored on the same provider or on two separate providers. This is block level journaling, not file system level journaling, which means everything gets logged, e.g.\& for file systems, it journals both data and From nobody Tue Feb 13 08:25: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 4TYvXX2KFTz59jNZ; Tue, 13 Feb 2024 08:25: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 4TYvXX08mCz4mqB; Tue, 13 Feb 2024 08:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707812732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W/vZ+uclo+8k7nPoHlXQ/a70H3e7kesvrK9O6U+MYaw=; b=HgZQOnxQDDsSIfdHfy7czdJ0g4w2h1mhLUctXX4MoyewNjErPVgRtbGDNd5szLIWoNGP+6 vANpkwNzSeS+STrx4zaGgnlyxNNwuRl2jzIMd0doysA86R52xzfQiA65czB0mvmwZ00SD+ Xw6aVxZ90jLqmBR4M7pgk0DWkm38XqbGkBHk+eGhOViQ7zpsCNkjc78lJOqCAbvk9nFvS+ 57nJHmulfhf2/uy6A/NuaKbSZLfc4bQMTvaRUJzgxOqLkwTkknQpqzXte1L+M3KanPFlLh vefO4xLKWF6F+YaCSdjSaRSav5cvD5foZwftkuqPzNMM6kuIbhLRoA3M9Nth0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707812732; a=rsa-sha256; cv=none; b=Gz/gZLxAuOy1Qz51rejj3TdXNs71KV9Y0x4uY9cBtFNX94z12roUAsfuApegLqpVFJFkbb dqVEcIfMrCQT9W3MqoO7CFYWKRx2RyTY7o/cbCeoC2lAj4H6Af22B44CqoRt9fc3Ge3tE9 Jq4bRWROr0sBDcXZMrN3C/Ba6NlgDmjU4D+hlDsgbW3WP4cb+Fa86zCQDA+YcFzRWXT4No V7TQ+if3cfToQGpy6uY4ObtR9mgWUIZiTM+lGurmh+P3skQfKJlxsjF5ZZdN4zZcTgt6ag apPSFkvka/wOVsCkaLp0ZO6fNcMfkp6RYiS+e9TkKEO3fxw5BzKLo36Wfz0kDg== 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=1707812732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W/vZ+uclo+8k7nPoHlXQ/a70H3e7kesvrK9O6U+MYaw=; b=fEosv88EH/TBca0m88a0Nn/HoqQi9+BZW9vWOe7lZhcA65Qj9yEI37h6/Cg2CroXjiJc9I 3nwqyFhqHGV5cWjyzWDqCIO4UNbtLY8d4eXZ+gtTNbg9AA1WK30q3AmPS7bwQUEttO7lda x7CcyWGzg75xT4MeonEM51t80lFFyIUFmSQWbzkciSLeOnisnGXrpvJJsWjD478IA2SSRk AXlkIG44AadK+iXoLSX76ttlQWZJSXjwSo1dygUhcR50Q5od0CSIyY8xBRDHgaOC+lys27 QFXaG4ITzsrKjXtO6126Er/X5SuPwa/+dhYno6beRNwETGeAnbG60nR7GuZTqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvXW6Ktjz17J6; Tue, 13 Feb 2024 08:25: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 41D8PV9P095168; Tue, 13 Feb 2024 08:25:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8PVb4095165; Tue, 13 Feb 2024 08:25:31 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:25:31 GMT Message-Id: <202402130825.41D8PVb4095165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: c8e7649b9909 - main - veriexec(8): Fix typo 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8e7649b9909edc41bdff6c9f0b720d9e116dcc0 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=c8e7649b9909edc41bdff6c9f0b720d9e116dcc0 commit c8e7649b9909edc41bdff6c9f0b720d9e116dcc0 Author: Jui-Hsuan Chang AuthorDate: 2024-01-09 16:36:18 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:11:30 +0000 veriexec(8): Fix typo Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1018 --- sbin/veriexec/veriexec.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/veriexec/veriexec.8 b/sbin/veriexec/veriexec.8 index 734b1cda40f6..2e476f327b14 100644 --- a/sbin/veriexec/veriexec.8 +++ b/sbin/veriexec/veriexec.8 @@ -171,6 +171,6 @@ modules. .Sh HISTORY The Verified Exec system first appeared in .Nx . -This utility derrives from the one found in Junos. +This utility derives from the one found in Junos. The key difference is the requirement that manifest files be digitally signed. From nobody Tue Feb 13 08:25: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 4TYvXY2GMLz59jKw; Tue, 13 Feb 2024 08:25: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 4TYvXY1P9jz4mvd; Tue, 13 Feb 2024 08:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707812733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xH55T3xnPQNzFFD4JRxPGDy3c56Y98JT3FPan7kLMy4=; b=UGC0n3fQDcAORpiZvJEwrwS7W6TnpRXxR3+6L5fERfWpS/dhf+4FlEB2ioTT04R2jM4meM w4rEu8NNqaeYSqWdyX2XBHYdr4U5iCjr2SBZfD0T9BNx7Rq8k3+6vZaIu4ewZFXBlzsgaE AGN24xn3D+uZG7j2mIzjnQGk93gXFMhDw8FFPk8UkYJD0xbBL/yXo+4n9iUQESvfyMX/Z3 biP/+cZHGKxt+kc2VMsPsTY9oWH5x8GnrQze5TfkP7s5nuuzA9puob/cuIVz0R7EzpBZAA X03hLe4aySgJuePsIPXVG0TE3SKyXUBAlCx21fAn2CWtijbL+OsTYFg7j9idtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707812733; a=rsa-sha256; cv=none; b=PLXH6WjRYMacWiF6+sMEBMMNMi8kyyM5U2908+1AV468ohA7DJ7R3hupl87JtJsUVvsr/V 6/Fuk/GU21Y9kSRAhshobIWLlSfMQVhxOtqGM1ttET33aQuE8LwfBDvsubmIL3/uw8vIgs lD3iKCofymktk/7/7uKNPpYHPNPYshmqK+a9K5IGAu3Qyty5sXJLTzgs9Xsyl3IFQAof7k JMQqnvldJgwMvahZ7gOc0CXUOPAQwC5cYvyiyv5YlWzV0rOnG3dVZN+E2SsM/VswzUlCRz 2R0yHfH6EntgZQCtDwzQDf+djO+gpsfKdMw1kn/rKT7PxEFjYPJGZbZQoWgcbg== 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=1707812733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xH55T3xnPQNzFFD4JRxPGDy3c56Y98JT3FPan7kLMy4=; b=QiA44jXsA+deOxt6ZXMeMvAXtBXW3C2kVskLaY/vzu6OyrI+WbGPyPad48/paUp0e2pr9T 80yWcLIGYiPvt0v2XhrZhcrDdD/HhkLWT4PeZSUHXmR11GNxnBo7vzpqYTEQjZirJUniUl z2Sfmo6IC4Mq6yfvv+OBkEfqDY8HJN4c79Axi31QKfu3eKHaW3dgDqO+xKTqleBB9KZKSv G9TkVNpEqr/bxv4A0ZwN3IRsFHtRs6wi+W+OeIFU8wcRHipq0skuo6ElawybMsQ+IfhjHW je4J3zHDkbjuAw8T+QlSfUtPTFPk5J0ZB8zw2QrNwbEifp0T0Rf5WItGpUdVXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvXY0TzPz173w; Tue, 13 Feb 2024 08:25: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 41D8PWfp095220; Tue, 13 Feb 2024 08:25:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8PWS6095217; Tue, 13 Feb 2024 08:25:32 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:25:32 GMT Message-Id: <202402130825.41D8PWS6095217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: b287f26c3fc3 - main - setkey(8): Grammar fix: a FQDN -> an FQDN 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b287f26c3fc3d701ef17fa00cceac6272d353816 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b287f26c3fc3d701ef17fa00cceac6272d353816 commit b287f26c3fc3d701ef17fa00cceac6272d353816 Author: Yi-Chen Li AuthorDate: 2024-01-11 06:31:13 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:12:39 +0000 setkey(8): Grammar fix: a FQDN -> an FQDN Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1024 --- sbin/setkey/setkey.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index 8eece16030e5..88b4dc6fc91f 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -230,7 +230,7 @@ IPv4/v6 address. The .Nm utility -can resolve a FQDN into numeric addresses. +can resolve an FQDN into numeric addresses. If the FQDN resolves into multiple addresses, .Nm will install multiple SAD/SPD entries into the kernel From nobody Tue Feb 13 08:43: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 4TYvxk2wpQz59lMv; Tue, 13 Feb 2024 08:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYvxk2GKWz4qYj; Tue, 13 Feb 2024 08:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707813834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vV5t9bm2j65ya5/jldTuC6Mdog3FryyearYcioDqzHk=; b=LBYzVV3VDJh/4wp2nZz15b6hQYrx9I5N9s2rUNzSjFxgOajsTBWiFsk5wsorIqavC3BvaE BYYHy0NLGSM2/ZgWpIYZum6lAJaF+YR8YVEcmC5YONeYqLsRWL3KDucOiqOWgLDk2W6hzS 924EFO1h2q4D6SYAZVkctRGaH7hMci/3NQJX3aDH1vexAJIrlatrUhGIHWRrJN7ieQxaHz jW+Yqi5OwoEJWulq+VFc1gynj5b1ei/a/uY0pZ8K6h7zaqxu90F0Ew0fLsRvXDVCp3R7Wy U8Okguc/o5T+Az93fTiu3sQTJr+0sJSG2R7p6KsuOdh+fLPa3CPn2+86CZV5Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707813834; a=rsa-sha256; cv=none; b=OnyXhKvTC+yCx6H1ATtUVMJlIF62YMS/Qf2kkS8nWE1UFe91VRqkLc4DXSCNMvTD3+SvGO 7T9HFJ+CQSKhMRMWvTHIWWk7rAPPzt88C6fTcxCUjf3H7NH6JlGfo8GLRGYscKHIM9fRmn QvAouR1FY2Cu06uKgd2Swthbd6HF2aEJFW+yMfvA7pL4B6RBcMF1MqmY4PGQNNrRnr5czm 4oKw7kwVu9/1lOUSQ0uadBiLO2gPXs+6oHnNMe784eeU039qBoRZrKbbWU/yKL51tCB19n ScTgkV7a8mXQkus5PkvQ4Q7+C1l5t0xEjMJCVbAoj7QJEfUq/TNdRVmQDSqHwg== 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=1707813834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vV5t9bm2j65ya5/jldTuC6Mdog3FryyearYcioDqzHk=; b=oIl7+syyAaBmMbDUVcDOAeWCgbAsqqKttAAOEmt0PpByjlXzdfZFPZETWO0zEwNbD+h+zG cFbeo2AHYekN2D0nxtx9L8UWlycJ/srlUAy0gTDt6f91s5HIgyy3Zvz0XCR7e7bN2V6QHk KBUELAoxc5gRXYvSzTr2Lo8/8qJqpWsTIkQD5cM/8jbYKR79YKd7oozzCeQU9O+uWcy0kD HEiEQqJX25FkLy+0wTlZp8HG6Ye6RqqqT3Dyp482uyw+NoOIVDLGvOLb+kYpaWGT2R3++q S/6h2j6vG1ErWS5ExMbD1K4uqGSoafkYJKv7x0UYLOIBFq9VSns7xGHNb1if6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvxk1KdJz17FN; Tue, 13 Feb 2024 08:43: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 41D8hsoa028659; Tue, 13 Feb 2024 08:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8hsqD028656; Tue, 13 Feb 2024 08:43:54 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:43:54 GMT Message-Id: <202402130843.41D8hsqD028656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 31f6889564a4 - main - rcorder(8): Fix grammar 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31f6889564a45a6793d0e26f3da3d3009648dd39 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=31f6889564a45a6793d0e26f3da3d3009648dd39 commit 31f6889564a45a6793d0e26f3da3d3009648dd39 Author: Yi-Chen Li AuthorDate: 2024-01-12 05:27:08 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:36:05 +0000 rcorder(8): Fix grammar Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1029 --- sbin/rcorder/rcorder.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/rcorder/rcorder.8 b/sbin/rcorder/rcorder.8 index 5481f821e853..cc94ca6992d5 100644 --- a/sbin/rcorder/rcorder.8 +++ b/sbin/rcorder/rcorder.8 @@ -224,7 +224,7 @@ If a file has an item in or in .Ql BEFORE that could not be provided, -this missing provider and the requirement will be drawn bold red as well. +this missing provider and the requirement will be drawn in bold red as well. .Sh SEE ALSO .Xr acpiconf 8 , .Xr rc 8 , From nobody Tue Feb 13 08:43: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 4TYvxl3slJz59lKh; Tue, 13 Feb 2024 08:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYvxl3Hs3z4qdw; Tue, 13 Feb 2024 08:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707813835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DEA91J7+k76sYA8Tkgs2ctv0GHrO86GtCG4nmMb02z8=; b=BNt9UVenT1nKLtB5Pt/9YEiH/z/11aRAbtEkcnYMJ1S7x5shaMM8RRRJcz/8Pb46GAdS6z CBoo0kOE05Zk4RmHlWuIdkfA3u7fLQc95/83BElQyB8+2Fyc5cTwvmjF+MJNFgHDk77Lt1 /Xrp8piAn7NUcerhvWXlCXMSft6tZDhcdsgyT8jNVroTVnipdluibDgbUk9vBiqBxCKOMj DooD/YyN3/Me8Udnwlwz37Jrh7VOECsFLat6FG3t45c5ZMaFCsJaPvtqmRDObx6LNyQr9i kx1Nzw0+NjjRHOXea8DJ7QexqlSvMyZVF2owvmYXuj9TnOgM1sjgu7e3LYWZ4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707813835; a=rsa-sha256; cv=none; b=HjYlcjQyElnG9MP/YG9ASXTK1Xa9wy9i642g9Uz3ob+zsoCK5jR9ygh7Ep0KVt7kHArOAC T+A8t8qakqQTS3JpCsMSLP7l6ZCEyH64qQKoKu6O4DWYF6uJCCY5OOgYGMQm4D2HwodyVu lUXGgdiC9GEOGvkvDzbnaZGkkWDnoIQh1mV1QDBJH/pUWVSS4PMbtvXlsY/sehxIZgK8FM H0UKErCmcygU/7OVbQ9stFW/uPrMFKKVuGfgRAsBbwu5s9WB6+4U3S/gLwl+AFvrR11ab0 SGITCNBIW4i9v7Ol6hqMt4SvEiY/asXTOe7UNZDd1IG4YiGS0n+1k4CyM4Qe2w== 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=1707813835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DEA91J7+k76sYA8Tkgs2ctv0GHrO86GtCG4nmMb02z8=; b=SnPM8lEKhNdpWN2Y1sIORRfPpLP+2rHKOkvYZOTspw4jbYqFPeQ4w4trieyHvVRglTTS1Z /DvZC3Xcj3j0hUd5hWYWGZu6jXkvE60yLwl7X7neqzTbp1ysyNIoXzgLV8w/9EiNtipwwO zcmYSthWIQhYBxtYpbsICrkSXeUCkzZJTXDp/OQybFOJGOdhX45mlYbAuABS4HdZwhIN6K 1Dt2EIEfhE054NscDLHOd9cGvTuqbwFRpnwzujj/UloGSNeiU3OC+QhsN+eNbr8u/TSv6m 2E0tcKZaE0n7q+dtR3ElBDqoikuVQ9P74quLHDsKQ1X3lYkAmCJIZLnjOQ9OOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvxl2NRfz17HN; Tue, 13 Feb 2024 08:43: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 41D8htFd028715; Tue, 13 Feb 2024 08:43:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8htXx028712; Tue, 13 Feb 2024 08:43:55 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:43:55 GMT Message-Id: <202402130843.41D8htXx028712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 9977fb8042a4 - main - camcontrol(8): Fix grammar: a ATA -> an ATA 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9977fb8042a4b2f2b3386684e137dfb42bf1707f Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=9977fb8042a4b2f2b3386684e137dfb42bf1707f commit 9977fb8042a4b2f2b3386684e137dfb42bf1707f Author: Yi-Chen Li AuthorDate: 2024-01-12 06:37:41 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:37:21 +0000 camcontrol(8): Fix grammar: a ATA -> an ATA Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1030 --- sbin/camcontrol/camcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index ae6d896752fc..bb206bf6ad85 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -524,7 +524,7 @@ This is to aid in script writing. Print out transfer rate information. .El .It Ic identify -Send a ATA identify command (0xec) to a device. +Send an ATA identify command (0xec) to a device. .It Ic reportluns Send the SCSI REPORT LUNS (0xA0) command to the given device. By default, From nobody Tue Feb 13 08:43: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 4TYvxm75Srz59lKl; Tue, 13 Feb 2024 08:43: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 4TYvxm4HY6z4qh4; Tue, 13 Feb 2024 08:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707813836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OUXAtEydzoAs8qeHTwAOJNjeE8VP3appcBe9VxryuN0=; b=ja/O0W2OCPYY9SriKVGyt9KYpYnT4/Ypkg2LD8CArtUU8oTdmoz6aBTm7Yf7GVulHeWe3X eCBl0tqaZW1neEpLQwupxy/STNu5golGOhDorekUmNYjhW3CK/IIszZa/pZI3lh18FH+m9 jKEO9j09aNimTikZGDdliaCh6NMshX37O+rGAjXir1qEz0KS5pFrf4/hQ8KP+wxljvQMDZ mvIP3ZrLey2hrfDRbgdTKPoYFB5kaO075RWBTiMiX/YNpWCJe32ov39TKJT2daS1bUMnhg n88/slRRLAg/znVj37p3QyYyiUyrfAgtYY74dRDtYs/gwpmS1rh/9J0l08e5uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707813836; a=rsa-sha256; cv=none; b=sXzVdVkTZSZ0/sBc3LUGeqjuSdSYv5sBUAXolmTlGdwtO5iL0VzwHJI3/KClTy79U423zL LD1VltfraGzT8HPz/yXxibBCp7ECLYIbTsgffdV/kUjBUu01p0RxTZZLg7ZpccqKp9kUPC 8Pb4eumU/p74TDGupRugQl8BQ/QLXNX8TCcE7mID0LLn2Db78iEnC/YVdKrK/jsBiEmFl9 EZs82WHa/rIPw5OUnElFReCiop/w3hvqteCq9Ey7kQ6gZ/Vm7vdPQtxs5QjmzIpEy1Qs6t tYn0ImgP4tBM25X3Jr/o5Kcdecy10mrPK3E3CKCdcSAr8Zx1TSK1Ee4wr2UQOA== 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=1707813836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OUXAtEydzoAs8qeHTwAOJNjeE8VP3appcBe9VxryuN0=; b=uavxlchfBHsu+vqjcQcYyoBw/a2B3g9s4Q8lY7ktt1oSeut5wFEm7bLqmsxLbC6u2zqnkF s0PKum86PsUA/YGl97UitvoQAdaRJ1DCk0oQBTDg9H9tly+LQPd3UgDhp9D94NDTswHBM0 zNtUS63rGGRbi6xz+Yzd9XcdsBuztS68m1fnF4uZH/qChklgboDbor7H4FjGl+5lezwNBR i3184PMz2p0W6bKS3+kSfB+l8ksHkqgCTmwN11KR6cnLE+Hh0bVgC998uljaDya+PS4GMI P323o2Tlh3QnbHevuhj+DX7OjRNuSdWPqjplaJ3e3LRHO63UBdZItZlpICDu5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvxm3NHDz17Kh; Tue, 13 Feb 2024 08:43: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 41D8hu7G028756; Tue, 13 Feb 2024 08:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8hu5g028753; Tue, 13 Feb 2024 08:43:56 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:43:56 GMT Message-Id: <202402130843.41D8hu5g028753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: c407d351df08 - main - ccdconfig(8): Minor grammar fix 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c407d351df08a226f81f5de4406f7371aa6ed270 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=c407d351df08a226f81f5de4406f7371aa6ed270 commit c407d351df08a226f81f5de4406f7371aa6ed270 Author: Yi-Chen Li AuthorDate: 2024-01-12 06:49:14 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:38:57 +0000 ccdconfig(8): Minor grammar fix Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1031 --- sbin/ccdconfig/ccdconfig.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index 4014a36b0771..ec9bbd6d0ff4 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -145,7 +145,7 @@ are exactly the same as you might place in the configuration file. The first example creates a 4-disk stripe out of four scsi disk partitions. -The stripe uses a 64 sector interleave. +The stripe uses a 64-sector interleave. The second example is an example of a complex stripe/mirror combination. It reads as a two disk stripe of da4 and da5 which is mirrored to a two disk stripe of da6 and da7. From nobody Tue Feb 13 08:43: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 4TYvxp0QnSz59lQM; Tue, 13 Feb 2024 08:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYvxn5F4zz4qwj; Tue, 13 Feb 2024 08:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707813837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YQ+CM8jVd2xonVYGx5HLu9aVJFEtkZcvBXMN7U8DxHg=; b=Jx4bV4eCnqoDmyuGU3+Al7At3QSY5KZNiQIqOuesqXXLYfnRsb9nRr7vGH9xvXBpC6fxe5 G1ut12TIepSJfNw7ahcaf7LdvhelzF2L4imP7co5hz/lh8Lcu1Bi09eHlCfOwisOdpfKDT VtZZJjPPc1rd+dgxPnBapUZj9fASpgJGQkWhUZP4718C0cvLobRTEAE+2NP3VlIsTQS0As PdFvJ/ESTZlH0NeWVyIncevutk+Jj2UEVjrouHq0OeCXo0bvwQhh9/IP6jd9QV5qg04xyw qt3xu/H1eXYPxcIR+CllDq8eR4ZZPRjDlk67Hum+2wn5j2WKNiyy9nIKpvIdgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707813837; a=rsa-sha256; cv=none; b=MZHSwFwhL2oDHe2UUh32kU55lP9LVGXkk56tpSdEAdxgNHyYgjcAyWT2R7yUH1yr38wKAg sV5zBSz5zi9/17PJ/AK8vsGMKYNlIB76wJ5AAaqSrcbj+f4QaO1h6MNPbQcs+9vyxEDjGE IL2NMJRUGbdpMMl3VYa63QcolJhtH8eJF+V53xtc9XKYCxI4WDRo0+BG14Z9AqVIZb6My9 lHwLvJY430IHcu1ibl07h1VnQbJPv1n4pHSuCuYIjZJgx2xpqBFdoWUKtccTwgEAxzPbfz pJ66Y0RpKlvw8uQAM4g5n3Jl/EKQB6akCcEDfOmKnT9NExc52d1RvmYJp4KClA== 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=1707813837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YQ+CM8jVd2xonVYGx5HLu9aVJFEtkZcvBXMN7U8DxHg=; b=cDUNIsVARGE03yIXF+7LLJb9kKP7xidW+iPQFYb5WZyWPC/WZdSY4g5e5slRLYqOxtaz0I YM1RJajHpK0goFI/UilaCr61pcHbRbTZy7qAW+GPuFl7rhA+pnx8fKu1/K166xynV8qFBY hFgy/7+VhsKw5ZOl1EbhS2nniTr63yDewL38/HOMP1zrYRIa3pmluvLlTCsgUXYEhr0Khl AtYMe7Rtr//58w2msWs+gHACQUsjqvJVzcGnZh51AyGJWg7tiSaaWlabRa24b8HcEkPN8F vce1V9O0thwDfrW8R+BcpDSzmcRLQb72DvXzh5Wtih+bCSOUHohxKHZ4vKi+Jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvxn4MGnz16nr; Tue, 13 Feb 2024 08:43: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 41D8hvGS028799; Tue, 13 Feb 2024 08:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8hvlL028796; Tue, 13 Feb 2024 08:43:57 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:43:57 GMT Message-Id: <202402130843.41D8hvlL028796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: e8289f82c005 - main - comcontrol(8): Grammar fix 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8289f82c00523a961692362a888d2262f8314d0 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=e8289f82c00523a961692362a888d2262f8314d0 commit e8289f82c00523a961692362a888d2262f8314d0 Author: Yi-Chen Li AuthorDate: 2024-01-12 07:10:53 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:40:09 +0000 comcontrol(8): Grammar fix Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1032 --- sbin/comcontrol/comcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8 index 46c7f987d774..c5fdb52992dc 100644 --- a/sbin/comcontrol/comcontrol.8 +++ b/sbin/comcontrol/comcontrol.8 @@ -35,7 +35,7 @@ to the given number. The units are seconds. The default is 5 minutes, 0 means waiting forever. -This option needed mainly to specify upper limit of minutes +This option is needed mainly to specify an upper limit of minutes to prevent modem hanging. .El .Pp From nobody Tue Feb 13 08:43: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 4TYvxq1FXGz59lN5; Tue, 13 Feb 2024 08:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYvxp5yyYz4r2F; Tue, 13 Feb 2024 08:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707813838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69fm006F9tIRWwg6CY6oxMV1iiY8g/KWPyBMTvVpKdQ=; b=BSnDeHVyR31xaRXTlSx7ZBa1jTtl5OABRlgxUe2MiUywKHJSWFInucYMjYYI40WuY3NDh4 SkXdGdNpiFiEB82IiJxzFJc2t/MUULMDDEyt8MG1tR7q7VnB627lGif/aH2IxEkABt3t+1 kJs2RiDyNSwenXqqBJo9lcs37cj6qzcjB2SFQBPIN1hKs+VxLdLyn6EAfI/ltuzJ8/+pvT uyfGDxQ8vABHvI4QMFHDgn5hhz/6D6S43WTwWMuyv0qGwRrr+oGe12nfRaVxTxiwfOOEmG KAQL9R6arockZWxNJPuZVoCWikEVHHp+1B0pQn5YdFEk6GM2Zm//nkLcRLimWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707813838; a=rsa-sha256; cv=none; b=t7OgbpEa/8+UHqANWaNEL8IkkX2tqO6HmIngD15dLjKHkdH3DFnU5+lyX7quSFZzuAP6Pd 6T0cLGp56jSd9GEQUV5138SDSbmTo5Fay0MOH8IThppqdOSsZ/msYTR0qq4Rvi3jp9oFRw R5ancfi9irXer6eYUE0DExwt/4hFNUeNfRX5EmBiEHQbOBaM6abjwv4HIA0m3iyOtrrfCt D4Q++s+VJZYMAVo8ckaSN0sbHldKWRCakJh2Zm3XvqyxcRQ0iCqeIF7tgsDNqedEJMwKgc cu/798vv6zjk7hFX1XI9GROol06NQgs87dZrKcQFASDXnxsK8PdYBO2qJSj5lg== 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=1707813838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69fm006F9tIRWwg6CY6oxMV1iiY8g/KWPyBMTvVpKdQ=; b=clF4BhmAVDlMsta8EkoMaq0x467PjmuiokfjSB/5XXt2cyvQctwrlMa/fCuEhyTREi0Sn8 KS1lmW4KDmKVLCPF1mJZOQojAnF+OI3DUl10qG7fMVGkm8yeXIgfPmmZtqUylp0/4v6U1R ONgQGTNzPnqwd9ZrgFj4IBdUbBDT7EGF4hB/SVHlTxBhDiAY18vc/Nb9y4Zv32L4QcwNHz gusXHyHrB4aLu4Lp+kJ4R91TVCMkfSO5fSO4x6AZyAOFmt3pS7iZV42rUwNJAkRPojzW++ 6D5HwZFRsZe71Bxld8UAyUzG/7ojjXDt+El85S8AGuRbUyFg2JMKHp/PHXjQ/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 4TYvxp54PTz17HR; Tue, 13 Feb 2024 08:43: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 41D8hwAj028836; Tue, 13 Feb 2024 08:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8hwEJ028833; Tue, 13 Feb 2024 08:43:58 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:43:58 GMT Message-Id: <202402130843.41D8hwEJ028833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 7a71b350237e - main - devmatch(8): Grammar fix 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a71b350237e0b1804abc160b804a204dc409cf2 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=7a71b350237e0b1804abc160b804a204dc409cf2 commit 7a71b350237e0b1804abc160b804a204dc409cf2 Author: Yi-Chen Li AuthorDate: 2024-01-12 07:50:01 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:41:32 +0000 devmatch(8): Grammar fix Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1034 --- sbin/devmatch/devmatch.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8 index f5e3a5154a32..71bd7365d645 100644 --- a/sbin/devmatch/devmatch.8 +++ b/sbin/devmatch/devmatch.8 @@ -97,7 +97,7 @@ The term PNP is overloaded in .Fx . It means, generically, the identifying data the bus provides about a device. -While this include old ISA PNP identifiers, it also includes the +While this includes old ISA PNP identifiers, it also includes the logical equivalent in USB, PCI, and others. .Pp Many drivers currently lack proper PNP table decorations and need to From nobody Tue Feb 13 08:43: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 4TYvxr1qNhz59lNH; Tue, 13 Feb 2024 08:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYvxq74ztz4qhm; Tue, 13 Feb 2024 08:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707813840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgQQmtwTkgf/BHcru8ljjbqHChLIqPdF+kkGIVZNLRU=; b=TeiATIcHJgaHgAEXzJyS2ff2oXdyl/zdXCg8RWIeHN1AJL20GJWYqNOQHWeQiBYPj7Pt/H 7pbqRP+UjQWvx4bbTeNtegTTPLajU2X8y2n3AR1DAS+h3zWIY2p2HirIiDfN7AhPAtJ5mQ dKrXWQAUEf00FYALO2PTywSMSd2GUyB4cNq9cGl0/N3vrNAhQeiCu3T5nF9cACLZU9DrLZ g77GsCv558mXDzJxNTvykQLkUfXeqoEPZ6x7jVOVF0u1xcW0h7dFCW7TseopxkLnjHampq uGesRdUUDaNDspBv7I3uuq7W6QPDfaZhSwe4biM5Z0zyZmbTZEPLBs4F0H3W3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707813840; a=rsa-sha256; cv=none; b=U220PuNn3VcRSGBxCg/c1ZwUAdZw0C5DQXMhtKnrAac8VF7tht+YKgGWUmpwiJ0s1yp5us Sma6wNWuQKUgKnZaOQmSk0mVEFMY4V773NO53RpxlIaj2Zx8m9EaMrxRPjHQdMp2k4Hqk1 Jb56+SaAzYCXjlVa+PYrv7Vmu5k8aLj65fMavHwYtairl1ZfoRjxUT7h3MfUfsycm+O/k1 OV8qACBV3kNzNoqx1oe7xKP6/phGheycWGHkNqoB7Hz4FZLyWnVa/+uqbtNVj9xVYfBID6 iOQwA87SirjPxEjz+yirj5YaDwkMIirMD8TY0URR0MOAdt+xIuVy4jET3/oLgw== 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=1707813840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgQQmtwTkgf/BHcru8ljjbqHChLIqPdF+kkGIVZNLRU=; b=godgkhMJtfTjdVlwSAzZxjMGPDN75t3DQTJzlpTMx1QeA17UiKtNojwEYbjXCdHjnxy8I1 0Jbe4MJ0S5Xj363YPwKGnttJaUMxEWheYn1J8M4oC1s+vmemDeYbziXdn/cPjxWD7La2bC Sy2abLrjaGOG2Z6sOqoJRZP5oRfJGUzt8QunmBtpHxPZlghEeIMT2JwCY/K3Vm+QP1PV/d 9VPmpuFDNqOdbAKoofemiN6UuNCl1jumFqa+xHJY5ZR/fufQ3ulmqeNHgT1aEnD2IodIRC EZsoQXcj8icor7ztaqQvFwSDM69tqEAd9Q/sS5ezMLPEbxnD9zLvz8Kl3UwkVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYvxq682hz16r0; Tue, 13 Feb 2024 08:43: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 41D8hxwL028884; Tue, 13 Feb 2024 08:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D8hx6j028881; Tue, 13 Feb 2024 08:43:59 GMT (envelope-from git) Date: Tue, 13 Feb 2024 08:43:59 GMT Message-Id: <202402130843.41D8hx6j028881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: d3905a3b07b8 - main - dmesg(8): Fix typo timetamps -> timestamps 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3905a3b07b8f784f9c1e8022d0e99ae3832c93e Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=d3905a3b07b8f784f9c1e8022d0e99ae3832c93e commit d3905a3b07b8f784f9c1e8022d0e99ae3832c93e Author: Yi-Chen Li AuthorDate: 2024-01-12 07:56:41 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:42:49 +0000 dmesg(8): Fix typo timetamps -> timestamps Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1036 --- sbin/dmesg/dmesg.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index 2ef3be8b6610..0dca0ff5da89 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -74,7 +74,7 @@ variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent .It kern.msgbuf_show_timestamp : No 0 -If set to 0, no timetamps are added. +If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. If set to 2, then a microsecond granularity timestamp will be added. From nobody Tue Feb 13 09:07: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 4TYwSd3JrVz59nXK; Tue, 13 Feb 2024 09:07: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 4TYwSd2pSmz4vj2; Tue, 13 Feb 2024 09:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707815233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BKeDGGYP6+bfRQFbkjgTybJCIIOewsKMGc1lPNJhAZc=; b=U9Cj3J617cAab//LSPJyoqxCcArbS6eiM0cFaXCqCKKV7T5eEQM96BSNiqk4hz2RvRFDbk aCTyLmVXpH86fF3R9JtUFCGUD48keY/flmXKewlhStj/EbdAfcHEba42Ke1bLoSS7tX9or WF75Ujv7E1OpJvKDFpx+qdVvJKMz4FMdmsIISsJeBah1Mqj0c6qgx+CEwDlP9HgeNkCw6u VjnIvMDXK//1+DAzp4HTQ0wm/gQLPChjf89MfejT6G2WXlgDWWOyAzTrMU+uleM88YCoDx zJQf6Oj5dVqyEmPn9hmuTINUhCsvpzssXbf7RMcywoIThVDnDGouhq3bQwYLDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707815233; a=rsa-sha256; cv=none; b=JwswiNenQLljtNfO3fc2sI2KEvgNqLKKU15loHhIcRXSq6yIaynBPj7JPefCBWE1bVFqDX S+f6K/9T4ZxvYgTB4m2+p4EcfqlT1udmGkaprGC+EA6fa3gIPtJBi24A4cALUmSBdbZvIT TZpXrcGVs9k+Ta10DZaQvAHVnbtNGSYhXKAqg5QGQaefjfK6MifkG7gqN0cR+zZWPrJ8/v zVDDHleVtnf42A30kX2AQJERJMJfMUsvobHSU3+RMByxVO4FUKX6xmCnJc9GP0hFGBT/1S ZI/LikS3D3vXG3iPqQPFyY31qtkggVSpCAEf10m8rdJ84vWBgJPS5eNzIWtj+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=1707815233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BKeDGGYP6+bfRQFbkjgTybJCIIOewsKMGc1lPNJhAZc=; b=a/kdd9zrFnS+2XvPijZBD9mBoLgdYxOgi7v8sTylX2URELAW2u0xCIvJLX3/0XSs+BcppQ 6LBJNjVw9V+8pzVpNhBgzCQWlQYW1wngfN/T8RE8sS2neY9CmxRJWT4LgyvmSx+4wgU7g9 V4U7WH9+8PawXewrrfRBd4m2QtViHgFoiueKRWAPbUWoi7bPJ4mCw1+SrSwM6gR/gw19Ws UKFFX+d1W8WBhyEdfe1LIkFaESw9bXLAvwedZYllarIBrzscFNFM/n6mTdVw3OxOSmNzyT hzbI2nTRjqEPlMkmE2RHdG5dATcmNYGKMZoUPZ2ezBEjMdgPYl/Ib6xLvDYOUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYwSd1rrdz17xn; Tue, 13 Feb 2024 09:07: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 41D97Dnm063219; Tue, 13 Feb 2024 09:07:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D97DGn063214; Tue, 13 Feb 2024 09:07:13 GMT (envelope-from git) Date: Tue, 13 Feb 2024 09:07:13 GMT Message-Id: <202402130907.41D97DGn063214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: f446c9482cbc - main - libbe(3): Fix typo and grammar 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f446c9482cbcd1235ed05597e7c8a0bb320d71fe Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=f446c9482cbcd1235ed05597e7c8a0bb320d71fe commit f446c9482cbcd1235ed05597e7c8a0bb320d71fe Author: Cheng-Yuan Wu AuthorDate: 2024-01-12 09:11:30 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:52:35 +0000 libbe(3): Fix typo and grammar Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1039 --- lib/libbe/libbe.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index de2c29c65268..0ba5d484bdfc 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -147,8 +147,8 @@ .Sh DESCRIPTION .Nm interfaces with libzfs to provide a set of functions for various operations -regarding ZFS boot environments including "deep" boot environments in which -a boot environments has child datasets. +regarding ZFS boot environments, including "deep" boot environments in which +a boot environment has child datasets. .Pp A context structure is passed to each function, allowing for a small amount of state to be retained, such as errors from previous operations. From nobody Tue Feb 13 09:07: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 4TYwSf4GVyz59n2t; Tue, 13 Feb 2024 09:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYwSf3QV4z4vLs; Tue, 13 Feb 2024 09:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707815234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qL0AMKM8qM4fOPc3ec7V1QTlKsXEJ7qMKY/rgJv8puY=; b=YbWtRkkzu0NwXQ47E0tLeorJOxwI1R75yD8UWEeK8/wTw3MZnI+CFyVyRHYiAa18SICzHi C+woV3U5jCbXC3AS6VPwBUErjxtdvuMCEzFEzfLPuMZ7bKIlSOhC0T8D4LzLLL1QuX73gZ gQxkdfgGbeSnTIIoIQceYZbxBUL5QY2O6SIN5bfIOYWylWuy1wlYTH87Jc9Op9elNuv4ZL GUb2oucuGX2kPBG5L0qD1FLW10taoUBKOC+eTcnC1pN/G1g/payKqNAVqYTIw75kPQ0i7x 7zmJ7CtPu0Qm2kSGoCAokBBjlrLggSqLv4mYjtM52vPvBL/wgVrpZvKrzgd+pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707815234; a=rsa-sha256; cv=none; b=KIK+n7KY8Y5U2nH25Flc3vz9TxW2Lvehkr+msm1ezX4yUwiQrYU0R/LZzEJ8P8afQ5wXSN YP1DwdT4gIYBRBI6OksFjlA/M8B+am2TKLnHot2Lnr0sDYWdMxid/Wn+X5jgYLyvc76XeX rhm+irp2EFTAMvbfP578fKX6JaGnbhCoFapykxlya0FE181ZbKM0w/VyuvKo6q1+ugxQZq /CUTePvGQ7sDIWhORS/beMav7mWMk1uqyHZMOQP7/DmaKaYtW6cAyrnsuoPg0oOUu+SbaH tqFRYyJngtzzx3bygg1zO2oKqwTOjg190XaIPUkwBi8Swh4oFSPWadIc3xqFPQ== 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=1707815234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qL0AMKM8qM4fOPc3ec7V1QTlKsXEJ7qMKY/rgJv8puY=; b=SuvKEyhgVz/3sI7I0rD3VFa7mXHHDCE2+Yll9PYleez2mRBF+2IOWmGMFQ/5WrGz+9++wi fzujOOku0G1pNo8Y9FgBFePAds0SjORjt+mKPkocKlrD0yP0vRCYHagJnT0XY50ezn4bMZ naSyfxGqbuaqj3jCDHPxWaShmWeKV+fYfYkAt2PpZIC4yw+qVhVg+5VZeTGsm34mEILFyC VoNh4sYpa12r5iLRla9k3zxY0O6Kk0NujuFCJru/RltWI0P11SM2V+gyWPgZivhsb9+ebT eWPt/nhemUO+spfexo93uGNeauB2B7zM6xcTAcdn5dqMmhvHiysVz0YFp5/ADg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYwSf2WGwz17xp; Tue, 13 Feb 2024 09:07: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 41D97EPO063264; Tue, 13 Feb 2024 09:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D97EVh063261; Tue, 13 Feb 2024 09:07:14 GMT (envelope-from git) Date: Tue, 13 Feb 2024 09:07:14 GMT Message-Id: <202402130907.41D97EVh063261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 38b7eebc4a52 - main - libbsdstat: Fix typo in bsdstat.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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38b7eebc4a523983ae9146cc88dc55ba9ade0abc Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=38b7eebc4a523983ae9146cc88dc55ba9ade0abc commit 38b7eebc4a523983ae9146cc88dc55ba9ade0abc Author: Cheng-Yuan Wu AuthorDate: 2024-01-12 08:51:17 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:53:35 +0000 libbsdstat: Fix typo in bsdstat.h Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1040 --- lib/libbsdstat/bsdstat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libbsdstat/bsdstat.h b/lib/libbsdstat/bsdstat.h index 9dd9eb2cd00b..1b0d1f24e93f 100644 --- a/lib/libbsdstat/bsdstat.h +++ b/lib/libbsdstat/bsdstat.h @@ -36,7 +36,7 @@ */ /* - * Statistic definition/description. The are defined + * Statistic definition/description. These are defined * for stats that correspond 1-1 w/ a collected stat * and for stats that are calculated indirectly. */ From nobody Tue Feb 13 09: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 4TYwSj0r7Zz59nSv; Tue, 13 Feb 2024 09:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYwSh50bNz4vgB; Tue, 13 Feb 2024 09: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=1707815236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnMiZsUiTMu1YNxglonsg0YXsyxHSoRG8ZYYCM/OQEA=; b=a9h26y3kEW+mZTBv8UeDidJLpnDFnb9hDYa0fBSOQVIGR5nj2z47eMv57jG2Jy/6pJLB4h oKQ7h8L7+aQ0w3cIq2GVlejMsV9V/0UccH8J8DafNAHEYXFOp8ifZT3IEduZdYdI77iKJL 28eqRUU9bOQLgzN2y+zHtEFeWASxQRe/IXOmrYpSFywpxIIoSxpzZLQHKaU1A11iQLY3aR KCaxfF8PdcdvVM9c/ycv8worUoRhrQrvP2oC9D9gk0URnhk2yc4CHjpYPaphLWH+8wOy9W f8ln6NBJLRKeRDGeMX7uSdgnDwZGRRtnUOyLvLVOIhjErtTsCA8VEJ+UoxoiSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707815236; a=rsa-sha256; cv=none; b=iFVi4wrDeEWvL3W7kxQgQt0xOKEMERMFMBMX72VNfUCjquRcjFQEgmQYm+iA0aFYnSEOb7 QPxw8yRbv7ZFO8KGG5aRO/7o8GNzmJMo5g5H2+1FJSkfMxK7FYyfpr/ezckXFEfQMKkvpT /26s/SIXBEHFR+Lwq1NUEyQV6UyRk9cfSzIGShjdFHvAH+u9ZWQt6pi+5zA36DbmcvD2mn qi7xGdykzRsZt8bKjufCO+pnDRUoQQLLVqQPuMTvJfywV7tT9jaVlYd2+v0sDHrt5ELKBs xmE21FT4lJCXK0lzSfJWVyhdOqbvm9ImRUjUKP5qMJ0m1Ffd3W84vHmTNnhDVQ== 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=1707815236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnMiZsUiTMu1YNxglonsg0YXsyxHSoRG8ZYYCM/OQEA=; b=bxp1mSco85axtNfD4Q0yJHMrgDnR6S/Lng1RiaCVxWPX4YSVzoAE3HpHLmX0Bvkvz3/JnZ sNi1+p3CzVSyBm683mjSaux/lzJbh5pqktt6S4nyWTwL1jM5NXsmu8oKmTuZEX+itc6YPI 7jL1boyN040ERS2ZEy53MdfPZlD9Q0BsGACjs7DJ/dOHOuvTvtmlEsqtJJxhSeJN1NDOpH 7KuUXI4bQvxwnSwk1EyOArUtwlHZxPTXH37jhfMYZ7jBUN84AjDKGvfqWEJoomuNmwvK8S ZH8Lt+DZG0clFvNOqL65P0CVv9/oekGqXkdZy6xNqPq4CbUJrYCHnhaUt8XRAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYwSh45jWz183V; Tue, 13 Feb 2024 09: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 41D97GR1063342; Tue, 13 Feb 2024 09: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 41D97G8N063339; Tue, 13 Feb 2024 09:07:16 GMT (envelope-from git) Date: Tue, 13 Feb 2024 09:07:16 GMT Message-Id: <202402130907.41D97G8N063339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 26c3d72eca93 - main - growfs(8): Fix spelling 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26c3d72eca935191baa4c09563c18b075a4f07a6 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=26c3d72eca935191baa4c09563c18b075a4f07a6 commit 26c3d72eca935191baa4c09563c18b075a4f07a6 Author: HUANG,YU-JIA AuthorDate: 2024-01-13 13:46:28 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 09:03:40 +0000 growfs(8): Fix spelling Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1055 --- sbin/growfs/growfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c index daa3931df300..9a48287107e7 100644 --- a/sbin/growfs/growfs.c +++ b/sbin/growfs/growfs.c @@ -232,7 +232,7 @@ growfs(int fsi, int fso, unsigned int Nflag) * * We probably should rather change the summary for the cylinder group * statistics here to the value of what would be in there, if the file - * system were created initially with the new size. Therefor we still + * system were created initially with the new size. Therefore we still * need to find an easy way of calculating that. * Possibly we can try to read the first superblock copy and apply the * "diffed" stats between the old and new superblock by still copying @@ -679,7 +679,7 @@ updjcg(int cylno, time_t modtime, int fsi, int fso, unsigned int Nflag) sblock.fs_frag); } else { /* - * Lets rejoin a possible partially growed + * Lets rejoin a possible partially grown * fragment. */ k = 0; @@ -705,7 +705,7 @@ updjcg(int cylno, time_t modtime, int fsi, int fso, unsigned int Nflag) j++; } /* - * Lets rejoin a possible partially growed fragment. + * Lets rejoin a possible partially grown fragment. */ k = 0; while (isset(cg_blksfree(&acg), i) && @@ -733,7 +733,7 @@ updjcg(int cylno, time_t modtime, int fsi, int fso, unsigned int Nflag) } /* - * Handle the last new block if there are stll some new fragments left. + * Handle the last new block if there are still some new fragments left. * Here we don't have to bother about the cluster summary or the even * the rotational layout table. */ From nobody Tue Feb 13 09:07: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 4TYwSh2CjGz59nXQ; Tue, 13 Feb 2024 09: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 4TYwSg4Xtjz4vP1; Tue, 13 Feb 2024 09:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707815235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtSkzejyQL3wdd78xUPnKrrZKG5UFJtHXiHoijqJAJk=; b=g9EXsorOBkK8TXnHqyB6amSOtza/ivuLpsSSEz1PYFfu0c5NBH7AT7kGt5pcFXVb/l8/Q5 HxXozv27zSoEhGi+Dw+60GUkHnZal20YMorYi9IxM/AAMvaAzIxz3YOioxISBgG9cz/aSm vMrzW2WjhUNLFQrIrXx6ARyXeimvOhNGigZXiplj4pZQQqRuEyfOR2Q707kfSzJzJ9I4Dl eR97Mg3QNOdd0iA+J2yMPqIc2ZRhyLlb4fd2n2beDldocD279rsngMvE0dxNJbzQ0e2jBL K4oZb8ggA51T17RfF6k3tuCq2GcRN1XXDE0G1OoGD/UEK6RRYBpeSsGCIhSWUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707815235; a=rsa-sha256; cv=none; b=UqL9TkzVh0Eb5ekLHtkBJIEs5QsYETiY85mWFb2ZOCkjMD3EFiQc8W8fUfzo+o33KROBhC SfGAAREaSLRSAO8Ft6ixd9zJ+EM5Fn45h72R/DJhG9xBiqo4WOdJ+gVBRjXsu3iA6/qllM Gelax1qE6vjkEprZ7PUhM9tljyFMRESB6qr9Sg6cVHNg7i4n/cDl2kfWlrDCD0pLXRXqNM ChNTRQRaO2DGedjCT4S0lJ2RiX0lpcyuw/WyODKgmlkNVuF/cFAR/Uro2Qd/isQjO1i8a0 d7wM3nSQ6WxLkedmXlTKKjncuhXy5i6dB4csbHIUOK+//HmigZIoTky4tWmN7A== 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=1707815235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtSkzejyQL3wdd78xUPnKrrZKG5UFJtHXiHoijqJAJk=; b=gxEC3pQIJHZGOJ8nVAivICrDlJFCYeHyC+cXj4bgIECUDG4LD0MVdaciKdKxb439YxXY9l rdnsQg20ZY+cPQAliM7fvOhdU33BF1Soo13adDayuyvHe1N8Rd7TOuYo14yO+fHNo4y28E OtNQ3uQUanr9nfwrgC3v0JwTRVZFoVdUZhL/lYU9AzotAqRtXamdbuRZ7PafsB9044Vv7g gzSJRDmGeLS+x9AWmEKjXXA3vZRYmJA/Z3G3m19hRV/NL9oteKw69THlEyIMt125Rcn9Tf IxXZPVBMQUuUj6qj6KBV9wi5BQWIwnVJFRfMl/l3efcs64NjQFs4r9WT2mCsgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYwSg3RFMz17xq; Tue, 13 Feb 2024 09:07: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 41D97FwP063306; Tue, 13 Feb 2024 09:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D97FTO063303; Tue, 13 Feb 2024 09:07:15 GMT (envelope-from git) Date: Tue, 13 Feb 2024 09:07:15 GMT Message-Id: <202402130907.41D97FTO063303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 2a3a8eb9fac6 - main - libusb(3): Fix link 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a3a8eb9fac66183e5af4852bbcb40824629f182 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=2a3a8eb9fac66183e5af4852bbcb40824629f182 commit 2a3a8eb9fac66183e5af4852bbcb40824629f182 Author: Ting-Hsuan Huang AuthorDate: 2024-01-12 11:55:00 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:55:54 +0000 libusb(3): Fix link in comment Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1042 --- lib/libusb/libusb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 022b5562a819..732fc9dca1e0 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -245,7 +245,7 @@ enum libusb_log_level { /* XXX */ /* libusb_set_debug should take parameters from libusb_log_level * above according to - * http://libusb.sourceforge.net/api-1.0/group__lib.html + * https://libusb.sourceforge.io/api-1.0/group__libusb__lib.html */ enum libusb_debug_level { LIBUSB_DEBUG_NO=0, From nobody Tue Feb 13 09:07: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 4TYwSj72n8z59nQg; Tue, 13 Feb 2024 09:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYwSj5h2Bz4vZl; Tue, 13 Feb 2024 09:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707815237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4GaUzB8zLeBklCGIu7LlKysIwvse48Gmk8f/v6iHI1w=; b=cIimW8K/kLNgTp51KVCAHO4FQMtbTOjQjbNvbqL/gZJom7emS8/FOZ6oPvT8Vqh7oAn1cD fAryoQr4aRX3hzmsQ3M1HUdJrmxUiXFM+RmaL8HpkKhGkB421rcIwHeuttZcbINLp14g8y LBnsGzY36BFoH2IXFN2ccKhOXP4A1zfRWPsZQj9NWkHakxRNLbN/Y1/yLgueUUOxM/X6p6 cmYiGp845ymSmnGn0HCCSe6qmum2qMAfbIKfyvtJxmvWNfCB3vSaXSX19rYMPX+S2ruZmM /8g0O/7gUPceo5gnbzVT/IGCEvd/8gdBve+l3RwcM5HzXMff9VKb7newb8J7IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707815237; a=rsa-sha256; cv=none; b=QK41cLgMFScCA2L+TenyhYSqtkfUYby/6cjMJuJq7gfHT/pyvg/mFL4Z5E4NEUtyp9LlPg E4oZjoYB/9ORmUJlfDXxAqhmI3p57tbDPQteJYEKDzUrCNB5d5a4g7O1x/H3eVrWGGYANb 059/YB4OBNyvCV76u8Ib/yw1ZIr21ByauN18yPdIW/11Pj6tD50mqRmtwoBilWeqh8Q2Px CD13DoZ5a60imUgioXxyis6FXApG6wCgyvA2AwguTsPf8TtTZqX+fYpgYzt1ezFF07pVMD 3dNLn6qD5dKsfYLVLCVfE3dPA8U88uidn3j6RZM7cBHoVkxzImEj3+KLAkY3Wg== 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=1707815237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4GaUzB8zLeBklCGIu7LlKysIwvse48Gmk8f/v6iHI1w=; b=cJv8mCCpWc2tohpTM6XCYddPz8G9WwsblNZfWEtkns63MNNj3tKeE9jqhdDIQiFVQ59mZt v4CVjQ5wQmjhqxFKFG4R71ysLoZiWLt00d9gU5b4p+03qICMLCVDhe3RYVpwvObg2paGdP hzOQjz/45SdNIL/DdatLORwm2myLKzD6sOGOUAsU83oqiofkamqYbKY2xuQcAjMhI91Q1a sNUyWokvbyRxp52wBiiCKXnGi1os1jXb/p05LKlZM4wNvpSb9x5vO2jS15cWxnRcAsF6Hj R9uBnaj+ZxvFL7R3p5Cn1MYghZZXVT1wUR6B6XxTxM+KfTRJueiVLii9pZ6uew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYwSj4YDrz17v7; Tue, 13 Feb 2024 09:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41D97HO1063378; Tue, 13 Feb 2024 09:07:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D97HUP063375; Tue, 13 Feb 2024 09:07:17 GMT (envelope-from git) Date: Tue, 13 Feb 2024 09:07:17 GMT Message-Id: <202402130907.41D97HUP063375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: b00271ceea27 - main - growfs(8): Grammar fix 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b00271ceea273a229354820a893bcf727d0e6f18 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b00271ceea273a229354820a893bcf727d0e6f18 commit b00271ceea273a229354820a893bcf727d0e6f18 Author: HUANG,YU-JIA AuthorDate: 2024-01-13 14:07:33 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 09:05:18 +0000 growfs(8): Grammar fix Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1056 --- sbin/growfs/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c index 456e67dbc5c2..bfff2acad2b5 100644 --- a/sbin/growfs/debug.c +++ b/sbin/growfs/debug.c @@ -57,7 +57,7 @@ static FILE *dbg_log = NULL; static unsigned int indent = 0; /* - * prototypes not done here, as they come with debug.h + * prototypes are not done here, as they come with debug.h */ /* From nobody Tue Feb 13 09:39: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 4TYxB365rTz59rd0; Tue, 13 Feb 2024 09:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYxB35c3Kz50X0; Tue, 13 Feb 2024 09:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707817179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zVevPtLENGvuBdToAGN0QRxGLSk8OP6oh4xNWtmNecs=; b=V+7SJoyn6zHBByY0b1P+1H3c0u+7VPKb0yCtCPOYzHG5pj7v/45yp9ayEw+wykGSpBM3VS qqT280eShmdKbClZxyKA5y/h/F438ck2weVoEEq8FETNCN7ArWMiW+IE4n76wTEp/XrwlH qJv05r6TGju5dbZH6u+RPbULvTNpQ7HObK0f5c0FnoNAyDudEXQVzfFGI4nzcC178nP1iU Nsq9rWQ1rFbYTTlpsnQox2MFvfaK0xu745LWqzmEoyN1/9ywB7kUvkc9ri7zGglzZzUO8q 4o42PjgLVq9oEYQgABGed2OR1UnjJgbO48tYK5ZI9g03QeGre7hvWlZzR4CAXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707817179; a=rsa-sha256; cv=none; b=imyN6/3/931WG4mhYVgXofUDczzBNZ1z5c00diz7Lpl5rnzxHcyn6w41y/EsY1dJ6TYqm2 EGh7lzcuqEnDMmeG8xq4ACLsAAeERGQL/y37Z31dpZgtlnR/rMsbeZTGwBlhnEHwgTcHFM 75X/C8P1mNcJ7e9p5QBaFAl/6nC2L8b18Cv6mCf38Nw+w7eAIf7JK38fP3aeIM5nme4xCe Rco1MpijcsoQpgTM/d28ccPuF6ORV0N3lhVDvoHvWXYghSsXafFz/wVu3CzpIbqiuTcazQ gCUXElDiodbjulhY3WxfdE+q/Xk0OxyTJCEng4tNcfl140EAjL+YxXSjgsymtw== 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=1707817179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zVevPtLENGvuBdToAGN0QRxGLSk8OP6oh4xNWtmNecs=; b=fjTF5+OFGGDelCURB24C0Xwxqp/K3XsvdWj38gNatCZRt4ar+ugufbZIM+BlVp8QBZbQs/ xBp4AfghFMp9bcRcwjbAvqhTYreSJQw7C18vZSXs8dvTWrVxYsogK4d3bcEuFb/DmwWCXZ /xauuQVgD18+HLKD+TzqX5LdEa/nxkJkwcWsbiC6cHU1BU/YVNM6KvOlFtVzkeGy8VM/JV ZvALVLMrhjxAiKoDK+g3AOWIIlFgC0QjpS7zDwbr+izZIncDY3mckKvCPhvQD6ZMc/xrwG B4mwGTLOy5RaqWBpyp4wBEoDMqLKAFsXVpCHSAP/cYO3S7Fwt2/q6ZCVsjZCRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYxB34ZFdz18fr; Tue, 13 Feb 2024 09:39: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 41D9dd68014388; Tue, 13 Feb 2024 09:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41D9ddTr014385; Tue, 13 Feb 2024 09:39:39 GMT (envelope-from git) Date: Tue, 13 Feb 2024 09:39:39 GMT Message-Id: <202402130939.41D9ddTr014385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 47e99e5bc5bc - main - mana: fix leaking pci resource problem detaching mana deivces 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: Sender: owner-dev-commits-src-main@freebsd.org 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47e99e5bc5bcfa621fe6a3e62386f227c47e8cff Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=47e99e5bc5bcfa621fe6a3e62386f227c47e8cff commit 47e99e5bc5bcfa621fe6a3e62386f227c47e8cff Author: Wei Hu AuthorDate: 2024-02-13 09:21:14 +0000 Commit: Wei Hu CommitDate: 2024-02-13 09:38:31 +0000 mana: fix leaking pci resource problem detaching mana deivces Fixing the error messages when detaching the mana gdma devices showed in dmesg: "Device leaked memory resources". Reported by: NetApp MFC after: 3 days Sponsored by: Microsoft --- sys/dev/mana/gdma_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index e955d9e1d304..13f8a30762b1 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -1562,7 +1562,7 @@ alloc_bar_out: static void mana_gd_free_pci_res(struct gdma_context *gc) { - if (!gc || gc->dev) + if (!gc || !gc->dev) return; if (gc->bar0 != NULL) { From nobody Tue Feb 13 11:03: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 4TYz3G2kZNz5B1yj; Tue, 13 Feb 2024 11:03: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 4TYz3G28lcz59Ks; Tue, 13 Feb 2024 11:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707822234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kUXESCh+KkBUXn44MegofduhC370fQBwQzxOxoXB5+M=; b=jYEgA4UwhWVd0Ns2jwJkiHN0K0fieFqz03W/HNRPrf8we4Gt1TRkTB1F3E8qzDTbGikhl2 G+J6ACkzJN558HMcyYPzbOY2KPsC6B6NkkB4KMC6H8iwzS3tZq/tEwAbaWG8GRgbYpnVG5 v5K6La0NYiOi0RN/eqy0cKSB3Md0KgW1oFKlqcZfr42BaJlN/qwUQYim/FAPQKUnh+EmgT e/RzF6zwmUDlnJDNirvzjcE3B4Zq9qIUDjOG5e2ui0c3AKOWRWaVeGuoqNVFlIwUKQ5DOh mu1D6mj6Jnzmiaqc/8P1I/X8gHmF7tOGHCCBTgTzlvPOeMbEgYwgWErVdbDp2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707822234; a=rsa-sha256; cv=none; b=gcy7EfwjoMPZ3fj2c5lx3u388giS8cDhTPtXRR61MigsgCjprDARmtZZ0u4u0TXLmT8bAg uCpjhaLqu5rOs3UycUglYGMB46BiimWke6XJPmw8cipIGjZ4u+k0D0Q1LchbbpXAtlFBi6 YXS8BNDSPPh7bsQdLUAC1jIqprt53+zU0cmqm7cUnUIQOejSjhIfWxzI6bvPxhAo3eCJ31 XGaqM5nK4FVKtSAHKjOpjkQWvdoxbOkslMp71H7RgAppKuqRrNKH24xNviSeVv0GVDfkKp wpa6TDK2IVp2169vDMh6JCyVHsOhSM1zJjlgGMzqsBHMU5oweUYdeqwwlem4PA== 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=1707822234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kUXESCh+KkBUXn44MegofduhC370fQBwQzxOxoXB5+M=; b=qT0KLxxia5mbvhTmfXDhMmucdN0DG8fjgcPrpoiVtHZ/E14WIH+gM8RMBw/BIbdA0aGqUk HJql6KH3CBQtXpnZPGnA9BqfQH0UDf8H1q9xWaGQuzXvJgY8136cwrvxM7JrPvDDsBET5p 22qoC6h+T00Iq1ltJ4ik6tYAGKdTyYeMBzgSOEdXwRZiJVJrLEddDairtAH0Ct7djg/FIe aH9/x+DkpLoasjt4ZrLYxkLQ/8WaKBMOBKrK3CYfuWRxebk5D+r472o/aHFWuDx9FOc+54 60oLjG8/iF+tqu2OgOjfY5sqhBgQKzkZRZDTnnLW5zUrmr/GaqFP5WgCODZECw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYz3G19n2z1Bm0; Tue, 13 Feb 2024 11:03: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 41DB3snq064870; Tue, 13 Feb 2024 11:03:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DB3s8I064867; Tue, 13 Feb 2024 11:03:54 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:03:54 GMT Message-Id: <202402131103.41DB3s8I064867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: a400e2590416 - main - ed(1): Fix grammar 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a400e2590416949987dab710930ffd94539a545a Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=a400e2590416949987dab710930ffd94539a545a commit a400e2590416949987dab710930ffd94539a545a Author: Chia-Jung Chang AuthorDate: 2024-01-11 22:22:32 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 09:55:54 +0000 ed(1): Fix grammar in comment Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1025 --- bin/ed/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ed/main.c b/bin/ed/main.c index fefb83b7bc71..57f1faba29c4 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -1289,7 +1289,7 @@ has_trailing_escape(char *s, char *t) } -/* strip_escapes: return copy of escaped string of at most length PATH_MAX */ +/* strip_escapes: return a copy of escaped string of at most length PATH_MAX */ char * strip_escapes(char *s) { From nobody Tue Feb 13 11:03: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 4TYz3H42BHz5B2PG; Tue, 13 Feb 2024 11:03: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 4TYz3H35Gyz598s; Tue, 13 Feb 2024 11:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707822235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xF8Wpd7iXvDSer7Hw9Zxym0wAUIOMfkD06TOAV5V2iY=; b=HKhvpVyTgEPtB6fAN3j23BRTbPbBq04a8YakJGPb3ikKs+g4mOOKwn6sFprpQtBfykD8Ki S16t++AfGxb+rwJDsbK2qTXLpj7tVcd7+Tl/xzJVSTW4d6jqT/PJnmF5Abf3yWCWkGQqlT wcZtgVgQC3uOCMvvpSzovyBzWxZ25gzmL0MH2mIlmOXGWx1QnW79jadC66HXFqaGJn9ZGO dLXJTlouaNFGhJO3D4Vf7v12qzJA11o75XIlRpNYdpkcoEoVqK3Nuh84uB7sdnUDPuyQpK qC5+2Vvb0wHzbAlDeTRKckMMbWQaHNzOip9cQmPXlFDvj97VYhDOmyr3O8FKAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707822235; a=rsa-sha256; cv=none; b=yUlpcFKed6uDJ47lThTVSGp/gAPEoxzesOmaAT78/7t3vEStTBQTtreWc6L+4JtYFsSLSh Eu+3yL/lv7RtVZqWbICmBkNalvxEG0PP/4un+zF97kHDcrABt2xv7f0Qu2vsgJvjJYkZ9L xY45Dio+RqRVJegv4Qame4B1Wu7a26sc0xPxoVtxcWKCbgBCGvmBrqOxkjU+pcijtRuqXy jYmiOTYcuBNnROuIk+zxRyL4eJYRQ/V+wBhTkIiHHo0Yq1Q3EOpcGH30vZ1V478vkk0vvc nXVNPmRTa3uxD70cSOyXc9I7EqxDXeKpttXJuzR7cCm49vF90E22WJTnuyi0Fw== 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=1707822235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xF8Wpd7iXvDSer7Hw9Zxym0wAUIOMfkD06TOAV5V2iY=; b=lya/eCabzwssFmu52iu5jRULVNjlWIstUcrCyFcQDJkDoqy4SA4JeDhaUmfVMB7ln+iVWT Es/ugqY/yJHB8d/DcB1CWNMpDRPN6I8iiLp4+Mi+hnXijAYJsOvsHbyY7aQ+ltFGdnW7aB OjXBJe18FzrO314VIZrwdNJ+Ta9ynrYH7Vg68Mfh6ceo1qL2nmJux99VpCcn9sCO3lVOtR yP94wAWeIAZRhp13X5JdXbhL70kiHebkdSSCumTKMjP0LyFGwkgrE5GKqnJBZ7bgSNWBfm L2fhrlBe8sxI/YcUcgfk8biRvu5ScUQCN01pH+4Wqf+MicsekbYFGckwl94aDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYz3H291lz1Bhy; Tue, 13 Feb 2024 11:03: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 41DB3tdn064906; Tue, 13 Feb 2024 11:03:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DB3taW064903; Tue, 13 Feb 2024 11:03:55 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:03:55 GMT Message-Id: <202402131103.41DB3taW064903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 304f52ad1ba5 - main - df(1): Fix grammar 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 304f52ad1ba5a9783b2eb547fed33c541e1af901 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=304f52ad1ba5a9783b2eb547fed33c541e1af901 commit 304f52ad1ba5a9783b2eb547fed33c541e1af901 Author: Chia-Jung Chang AuthorDate: 2024-01-11 22:49:37 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 10:31:05 +0000 df(1): Fix grammar Event: Advance UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1027 --- bin/df/df.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/df/df.1 b/bin/df/df.1 index d3b0b082250a..ceb1bb45babf 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -117,7 +117,7 @@ option and any .Ev BLOCKSIZE specification from the environment. .It Fl l -Select locally-mounted file system for display. +Select a locally-mounted file system for display. If used in combination with the .Fl t Ar type option, file system types will be added or excluded according to the From nobody Tue Feb 13 11:03: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 4TYz3K0b5gz5B1yq; Tue, 13 Feb 2024 11:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYz3J3ln6z59L9; Tue, 13 Feb 2024 11:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707822236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTUPiViGytdYcMfdxgy2awJUmmVN/P5YGWdqvHFNS/I=; b=POLc7H6enTIgASAhi1CFs5rf9kvyeOMd7lLWUDrARP+twyWcNSAWgcetyBVUpMYnjxtnpK oHl3G7jBW5H6JpneNl06ZOGGxVySHXlgeRCdm23rwfLpQLDN5yR/4loEfbEwPoZy+43Tgt o0D+6cuwBFuYXIv1FQtZW2tABo+BO5ZRC/zdHhYs9QMGJfz3Jle4nQIPobdnTlfqkhpD9r p1nWDXLO0+Ou714bIgB1ZQ7gL3/chR5sIxjJWdXzOpBEBJIDLUvPzoCu/iKc5Z13YI7z8L 5qDcYOJKAyuVEhvpvo5xKgtMN/uMOuYj7ICrVjS/53ZVpWV/DU5dFnlujZBISA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707822236; a=rsa-sha256; cv=none; b=OwqUe8gvHLaANq4EX9iKdntUbdpjJgsVnFMIDk9e/pOl537JsF6Y21O0o35lwiQ7SAReGx CaqQWP5xJxRb8IMR9qS/mToaWjza72Mf8povp5/YM/JFflF9vgbHWvrGCat0BUfRfQHpl8 2QvQpsljhHw4W1l1Rbbv3oG5A/G0ADpSz781+wPwvWVmymCkKFetu7wTu4QinqcyTGgrhC jnw6hG5jcwYBUzQ+yvuTm3Pfxa695ZOwfDah1gjkr3udwHdEj1fDdpEMqVNaIdPe9Bo7MB PH6dKd5usAarsjV4FzqHkKNectrydEzxc5/Ai6s3bTcbrO6i5Kqdp7ShPT+TQg== 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=1707822236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTUPiViGytdYcMfdxgy2awJUmmVN/P5YGWdqvHFNS/I=; b=RdNwJXcwS5KI0BmI5LghyulqsG2H36z8B5V3RX09/j2Tnrx8flHRd305kLasslF4vQBnw8 9IWgFVm+2QZIFigfGkrbki24r7hf/ykn08v9nBO715JxGE8hPmHJICFySnqPc8QEemTY3N qIViToqfr16AyPryV/xA7FEt3Ep0kutP/gkvQ/qInnMTjbFCBTTBeze9zJalHiLoFIg4dc atnCtue6wlCmswWy06YmMQ05qsH5xyGlgZQ+0ktg/yPPYypM+hSyk5SmoZ+Y3lYf5kSVfJ H+cH2u5B7LWZ8gn6KQhbUagheWAqp7jRu2METDERpFqdFfLfPa8bUmZ2QbjF7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYz3J2lfLz1Bm1; Tue, 13 Feb 2024 11:03: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 41DB3uh0064952; Tue, 13 Feb 2024 11:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DB3u08064949; Tue, 13 Feb 2024 11:03:56 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:03:56 GMT Message-Id: <202402131103.41DB3u08064949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 416fdc2d7165 - main - cp(1): Grammar fix 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 416fdc2d71656e2f0b4a16828fb0c736ae32b74a Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=416fdc2d71656e2f0b4a16828fb0c736ae32b74a commit 416fdc2d71656e2f0b4a16828fb0c736ae32b74a Author: Chia-Jung Chang AuthorDate: 2024-01-12 01:36:41 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 10:53:50 +0000 cp(1): Grammar fix in comment Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1033 --- bin/cp/cp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 14d1cc2a3f75..4d77dfe3feed 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -340,7 +340,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) * noexist/dir/foo (where foo is a file in dir), which * is the case where the target exists. * - * Also, check for "..". This is for correct path + * Also, check for "..". This is for the correct path * concatenation for paths ending in "..", e.g. * cp -R .. /tmp * Paths ending in ".." are changed to ".". This is From nobody Tue Feb 13 11:03: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 4TYz3L0FYBz5B2LV; Tue, 13 Feb 2024 11:03: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 4TYz3K4dt6z594k; Tue, 13 Feb 2024 11:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707822237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uj0WuHkoxPJN6GsyTmm8z3q6hR/cbRYKvq4JpC7vQvI=; b=ImrpYTQWuDqWINLYdgEnE8/oaCoM1oMglEdQx3auPUny8qJLsHGHXHBlFkBkESLLhWwuWT 2Cmsk1tOaN3XQP7kR+vmzYF567bnhAeRhPzNPse/YV4HVj2L3aRDP25GMpz+eKsk48pHxh tF4Fb/km285wXNc4i01UpnCcxrhew8HrqGyN8la9P25L7SsuLi4djc2rWdmb+laikTBwRF 1Q45AqENLZ+HAuhCkFdlCGhf44ues7e7mDX6pBVDhUYWV8UVEhoSE1MviTedOZNkA+XUXZ ZGlAjXVohL7uBp/5dEKWM0yPC6DqUuxMmgmgGjBBCQHzpvnuBemZPqV4Qp6SRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707822237; a=rsa-sha256; cv=none; b=eKjkgyNtklgaTjuetlmUrj+uEi5UJf/KA7rbMMKqAta3qIg4W69ksiPTxzcBTyJhwrwKdL w+kGTy/i8L0p8DXrYB1ympEeNK2dmbb2XOqiydmxZBTPAMTYA6tLlB2iRz16Wp9G2zWIZ2 F3X/hMwZ7mBd0tCmSnpxwDIWho5SUQlXT2CXeC0et+AY3AsjaEMLXeVEY8ZWGXjSaAlngs A+gLU5ChqeI/1kzg2CmnmunsokwVxRH2ZeTS11W/19YKfWg6HTJH9NdpblVzHb7nl7T0mm lLtH9RBv5sp+6uP6t1EWzDMOE7ftEe4W8gmHLq0wAbpPQ6ppiGjdFyZRPoTYug== 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=1707822237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uj0WuHkoxPJN6GsyTmm8z3q6hR/cbRYKvq4JpC7vQvI=; b=qugasHAwylTbFOxy7qESkrUh1ZXMYFuJ+di+k6AyVyNuXPZtxHHoVMaBfjAiSSVjKn2qOX PyCE+KMdm9y8JqQTr7Kc3iUqRi8OpukOKf33H+XapcUuiJruOJ/VlrL5998qVSWw5uJep1 7dz8Khv0Tq/hIYHlIrgwpGz5KintDiIXUmH+WyE5vOngdZoTk6KQAW9E8cwQg7TlmZa2Rq zU1YmUXiQtSmBotK/8HX4Wkym1yU1qF5/dDF3IeMAZaCeUatpex8HuT5t2lp4mODqgS14W uFj5ZSfiL6u3n8XpGWHsVWZns8IXvfFOgCPWFt8O0ja1XxbldEfvS6CPK5Ihpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYz3K3lksz1Bm2; Tue, 13 Feb 2024 11:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DB3v2j064988; Tue, 13 Feb 2024 11:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DB3vdT064985; Tue, 13 Feb 2024 11:03:57 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:03:57 GMT Message-Id: <202402131103.41DB3vdT064985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 8e9fc2d9f657 - main - date(1): Grammar fixes 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e9fc2d9f657f99ae368524868dd04080bc390bf Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=8e9fc2d9f657f99ae368524868dd04080bc390bf commit 8e9fc2d9f657f99ae368524868dd04080bc390bf Author: Chia-Jung Chang AuthorDate: 2024-01-12 01:58:35 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 11:00:59 +0000 date(1): Grammar fixes Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1035 --- bin/date/date.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index 194635e923b3..286b1f45414a 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -223,8 +223,8 @@ day, week day, month or year according to .Ar val . If .Ar val -is preceded with a plus or minus sign, -the date is adjusted forwards or backwards according to the remaining string, +is preceded by a plus or minus sign, +the date is adjusted forward or backward according to the remaining string, otherwise the relevant part of the date is set. The date can be adjusted as many times as required using these flags. Flags are processed in the order given. @@ -284,7 +284,7 @@ will be necessary to reach October 29, 2:30. .Pp When the date is adjusted to a specific value that does not actually exist (for example March 26, 1:30 BST 2000 in the Europe/London timezone), -the date will be silently adjusted forwards in units of one hour until it +the date will be silently adjusted forward in units of one hour until it reaches a valid time. When the date is adjusted to a specific value that occurs twice (for example October 29, 1:30 2000), From nobody Tue Feb 13 11:03: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 4TYz3L6MZwz5B2Hk; Tue, 13 Feb 2024 11:03: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 4TYz3L55BNz59VC; Tue, 13 Feb 2024 11:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707822238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I2GHBAivawA4rcaLvyrHquGV8BRUTbUJYb/6gH9AqhE=; b=PyYbMTJ6zhIYQ1MeTBkFdahhpadS0o4hI9BrRa4JdRNZ91alZedMSEev4apR5ssksYqRUB SBuVxiPx9mFd+NjNc44eQzwHiUHkU/zxE12wr6JZC81W9CQXUwPr76BLOZ85pP/1PP3pzE OUcKvj9q/+nl7MEtzhULFsP/qm5WoGWRv8gbQdIMr0/17yJrUGua/CwNnLRK7KOd7X7CUV JKogRtvjnRpDmvKHIDp4y4dwFohje/5tAci7MZlq444XROXpaW3/4mChv/xyJbgjH3U/hT IPDLGbZQziePlpJ6nRu5pTgnEJaqlujmnqJ6iOjkBR5J6kQamCcDTXxkPHZ4gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707822238; a=rsa-sha256; cv=none; b=d1DaJSpIOlMJXyT7Cm/Oxje24LmNvpSRnFs2sqAm8oVWZoPmk298r5+Nu692BlFpWqD7fu mSAnqX+jnBv5eJfNx9P7g4efLm3KO/xfHyzu2e8XXp4LDJP5mvT0RqvVMqtp93aY9aNhXS EP+CP+qRL7VRXR+CbhOJBYyKfIPGX0Mz7n8hd8YfydjDK1RZ2uGArpF8if8oeffun3fSUY EFAmEZO/JBgG5cicAk+GsMmxythaDSSXbsNKUah3eJMevXvhSvucM5QBJ4P/MTY4pe+5gX djTTTI0oEMz0lsUUbSmjRiWuxu/GutuPj7ZeKRVR1z2cZchaE94ZU2ch2rmMxQ== 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=1707822238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I2GHBAivawA4rcaLvyrHquGV8BRUTbUJYb/6gH9AqhE=; b=Rzc8TTWB5lT45sUErvu20hKGux0uxYabEdtSs98LaOHBJx66rV/DDCi65TCNzQ8lH8si4O UHBtRV1z8T1pgO+A4KGgpeCZp9IW6X3DS6Xi4A3+hyh105DRw7OdkasAdGHxWqJ3BewB78 My/JRh1USEk4/JZB+CG34J94rAUeTWpR5cLx+70h40nfl86R2vdV+3ygSRlO8cwT3rn96e 885nrPr9KYiw2VyXM1jQp3Rh+REomEf8ghLk69s15UMy70/tbC9G7LhYiTCtdZ7Nx82jSK k4NdxLlWZKZs/SuU/S18kGXWE1gMGubUXK7jMKqt1UJO1sHX/3LoC8w0NnWpcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYz3L46s1z1Bm3; Tue, 13 Feb 2024 11:03: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 41DB3wng065033; Tue, 13 Feb 2024 11:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DB3wli065030; Tue, 13 Feb 2024 11:03:58 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:03:58 GMT Message-Id: <202402131103.41DB3wli065030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 26cf4a61f693 - main - hostname(1): Grammar fix 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26cf4a61f693339ca261d3acaf4d01290acc525e Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=26cf4a61f693339ca261d3acaf4d01290acc525e commit 26cf4a61f693339ca261d3acaf4d01290acc525e Author: Chia-Jung Chang AuthorDate: 2024-01-12 02:15:01 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 11:02:17 +0000 hostname(1): Grammar fix Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1037 --- bin/hostname/hostname.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1 index da9c12d0278a..16f3dd468300 100644 --- a/bin/hostname/hostname.1 +++ b/bin/hostname/hostname.1 @@ -31,7 +31,7 @@ .Os .Sh NAME .Nm hostname -.Nd set or print name of current host system +.Nd set or print the name of current host system .Sh SYNOPSIS .Nm .Op Fl f From nobody Tue Feb 13 11: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 4TYzHX71TPz5B3V1; Tue, 13 Feb 2024 11:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYzHX6HJQz3yhq; Tue, 13 Feb 2024 11:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707822872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwQqttFEgfT8+p8p+ONOBRfDHvxm0wp+4vz/f2McyUM=; b=EeNBIxxezfY3Fkmb5HuzYbtAKCaHKC3+fMTPwUsZ2p4wrzdJC4pSnpIBBwrZ8uaprs7/fM sLdOb65Ijq7rBVnSa8MhSoaWeUBsz4aQnElkFPQWlYqIFWEhsMTSE3PwD9iK7dVLSdYP8S hyEePsbdWgC7vmmI6a9zSHkTI0sGJQC06Dcc97wyVLz9PlDYL1nmnCmkGIjZsgbf7wDgML olc3GEDcIiZZdQGBznAbn8liVzX5bKpiRs8FiYtQPuAD7N+yyMVTJA7fwRkFk9qk6SARUt uOv7VCr2UEYTlarH79qWki+ugHPPjzkxBz+Lxcl8iYwrhjSNBj9qG8K//w7L4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707822872; a=rsa-sha256; cv=none; b=qyCIvp+NMf495oUpnxKAUjOKC9jiIX+dURBznBPykzi4wkZaa+rtgPhGG5zpc3AqKfektH NKm5PXMuZUrfCGind/5oqykoXdeuBk+zLiIaYvVgeTyLtflQyDX7d7YB32FiiS4ZQv1tex K19Ijg3lEHGS0KozT6dgs1zL8NBYiSRWkby9zpSFUmeSSTR7//TK65D1Jc/oZ12zquyI2U 5BHmooUXd9qI4inZ71o6Ez/nkgajAkn4otqjOqHeH2feaPZ1qICy0gUBHNgQWlXa7f24F/ TVGRrv3KfKaJafNNgKpOV4zysXxctNTGOWrIowtAc/tzPQb/4TRaYAbBKCVNQQ== 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=1707822872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwQqttFEgfT8+p8p+ONOBRfDHvxm0wp+4vz/f2McyUM=; b=kW3L5XUWg+SsNYSfoTvtdNYEhuuU+o10m2MCBXRjvHDCgcPQjR4Ub/8WdOf99kkXBLPhfH IgYWdXCtCDOoyBX7UEO+uqatXmm3RTeISCW4uFfor9cVeT9FSAaoqC+DpUWtYDqWeuTbtp /6zdGnsROp2BvpSgwHoEL6f1JL1iGJf0gKibOXQw5WhZSrvx7kRVXyKu/3LkneV20axn19 L/pZThTJW33mprNo5c3Encq51vpCxamtr10KMIItbPwLUEsOK0eWSUbuXeATyhYJu7joXB aMLiC0Ltv0G2TU0ckSZP3xQ8IxwyeN4TFssbw/qLqjlIecmkt4+3F3DOmPai9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYzHX5Hd2z1BpR; Tue, 13 Feb 2024 11: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 41DBEWND081939; Tue, 13 Feb 2024 11: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 41DBEWCb081936; Tue, 13 Feb 2024 11:14:32 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:14:32 GMT Message-Id: <202402131114.41DBEWCb081936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 90405e1d63ff - main - domainname(1): Grammar fix 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: Sender: owner-dev-commits-src-main@freebsd.org 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90405e1d63ff919705422745f19a8b56a37f5ac0 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=90405e1d63ff919705422745f19a8b56a37f5ac0 commit 90405e1d63ff919705422745f19a8b56a37f5ac0 Author: Chia-Jung Chang AuthorDate: 2024-01-12 02:30:46 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-13 11:13:33 +0000 domainname(1): Grammar fix Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1038 --- bin/domainname/domainname.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1 index d83169788f2a..bdadef416ce8 100644 --- a/bin/domainname/domainname.1 +++ b/bin/domainname/domainname.1 @@ -44,7 +44,7 @@ set the domain name by supplying an argument; this is usually done with the .Va nisdomainname variable in the .Pa /etc/rc.conf -file, normally run at boot +file, normally runs at boot time. .Sh NOTES The YP/NIS (formerly ``Yellow Pages'' but renamed for legal reasons) From nobody Tue Feb 13 11:51: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 4TZ06X0X0mz5B7F6; Tue, 13 Feb 2024 11:51: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 4TZ06W6zFXz44VY; Tue, 13 Feb 2024 11:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1eyl+0TqIHNIYEiesJz8fh/H3FDsdmPB+o/VafX5Src=; b=pAA7wIBl2tneDT0AA5y2PnMrY8dM06hDzpw37Kaf51n9qQDGIJN9E2QwmFlRWIPbL/1uWl HpkndQqoWIuY1GMljXJ3DPDvySVsqHZlqcFkSX9h8WQPufYQD9ZlMpbVfUP23BeVTAdCiz 5pWY8Cu7ox+953r+CIH+D5cje23QeGtHcV69TSgnQWLp1gFql6CU4k2w5YmYw+Q9mG9rTy TMAjmR3FGULdHo6cGdgjfv5ODyKd5HA/Ad8mJDNBq4etVrjUHCRkACIvy9ZDEOj6XF3sGl QM0iHYM4A0m0UuA8zepoUh74V5XtDkQ8j7YsjuR2QYFodpzmKq+Q2EF74vdz3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825108; a=rsa-sha256; cv=none; b=lOM38W/s1H9AfYZMuZlKBkefmizFVfj6ugnwx6MdwgRFgICVaBW7UZp5r7KLzUSrQDmhwd Lgz1x9dzDuCP2aEu+QPKJkoLRbVZuHDoRXofwMBqSRmQl0O6L0JRbYQS6b/d353yINeHkJ +cj8GDWzzqE9KZmGOnhLjfoQJvJvRCxLCFNAFNu1gaMQaeYIzTKc6x0XbraX/AD4LiQcVJ C4Psh1nwKAaAbKY3h7MdBKwBf/jjQxX7Ev+QRYzzoAafDZRgBIaoPRfcmvzN8NkxWdNfkJ /AaJj6c3ipd9gVlR5v5x63/wyBqNlW/MY3FRf26jV1qtfI21aCBM//yR9yLQTA== 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=1707825108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1eyl+0TqIHNIYEiesJz8fh/H3FDsdmPB+o/VafX5Src=; b=QGNWPf4J4ytRKJ2tW5DjttuaZNzKZ1sktX42Qi920OJflo6G2b06VhPHDR8EA0hD9wLOUJ Yoy7cUnzKWMMHC4oIh27RbdQlZ5+i48T4zg+BVMnbGE+inXDoLrPJ+ZKet11//XrJHUPzW hYpr9l5sCmHDxdoPasFOq2+QqoLhYlPd3f+i/hjqIOXhhaahqrko3mVPzJr/SYQwQVQ8a0 PVJPgvRWcXA1WUgJjR6L4yXK5TVthijk19BRQUtOIh6XqeBcc/cosIOXofm+o835tTdSRU 3veoCo1MsAvVEODmf3+uq30NbZYfSUCyVSrSLSZmoWMGXdLXJt3Yhc80fmM6IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ06W62D7z1Chj; Tue, 13 Feb 2024 11:51: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 41DBplAS045757; Tue, 13 Feb 2024 11:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBplR0045754; Tue, 13 Feb 2024 11:51:47 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:47 GMT Message-Id: <202402131151.41DBplR0045754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 639a626b4050 - main - arm: Clean up socdev_va 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: Sender: owner-dev-commits-src-main@freebsd.org 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 639a626b40503f81a184ccd93fb9bc023f86a3fd Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=639a626b40503f81a184ccd93fb9bc023f86a3fd commit 639a626b40503f81a184ccd93fb9bc023f86a3fd Author: Andrew Turner AuthorDate: 2024-01-08 14:43:32 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:52 +0000 arm: Clean up socdev_va Support socdev_va on arm and ensure the variable is available on arm64. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43359 --- sys/arm/arm/machdep.c | 8 ++++++++ sys/arm/include/machdep.h | 7 +++++++ sys/arm64/arm64/machdep.c | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index 999e47fd381a..c36953c513be 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -134,6 +134,14 @@ static delay_func *delay_impl; static void *delay_arg; #endif +#if defined(SOCDEV_PA) +#if !defined(SOCDEV_VA) +#error SOCDEV_PA defined, but not SOCDEV_VA +#endif +uintptr_t socdev_va = SOCDEV_VA; +#endif + + struct kva_md_info kmi; /* * arm32_vector_init: diff --git a/sys/arm/include/machdep.h b/sys/arm/include/machdep.h index f999cce12b47..45e44a65368b 100644 --- a/sys/arm/include/machdep.h +++ b/sys/arm/include/machdep.h @@ -51,6 +51,13 @@ void arm_add_efi_map_entries(struct efi_map_header *efihdr, struct mem_region *mr, int *mrcnt); #endif +#ifdef SOCDEV_PA +/* + * The virtual address SOCDEV_PA is mapped at. + */ +extern uintptr_t socdev_va; +#endif + /* * Symbols created by ldscript.arm which are accessible in the kernel as global * symbols. They have uint8 type because they mark the byte location where the diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 92f9e5692be4..9ce1c40b674c 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -138,6 +138,15 @@ struct kva_md_info kmi; int64_t dczva_line_size; /* The size of cache line the dc zva zeroes */ int has_pan; +#if defined(SOCDEV_PA) +/* + * This is the virtual address used to access SOCDEV_PA. As it's set before + * .bss is cleared we need to ensure it's preserved. To do this use + * __read_mostly as it's only ever set once but read in the putc functions. + */ +uintptr_t socdev_va __read_mostly; +#endif + /* * Physical address of the EFI System Table. Stashed from the metadata hints * passed into the kernel and used by the EFI code to call runtime services. From nobody Tue Feb 13 11:51: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 4TZ06Y3GRTz5B7Gh; Tue, 13 Feb 2024 11:51: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 4TZ06Y0sByz44kt; Tue, 13 Feb 2024 11:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4F2Df/4L2J9qjVekzHYdHM9nrOPhC9kqI86fE4hKCQ=; b=qw2Czc/fkntXvSeOkQOxj0sOqmEGvGcFGpm9VWM0ooKpHG9t8XUaqFXSn5jCCTUnWY04m8 v2I3ceh78nzBpAC8y6S2y8xjV9/4eSSHRMrATR8wms4qvmX0/FfwAxZHGteSmFxQDlz+AI 0BehD/iH2YVKTodedvCFwJLgWpfnde+1x8ZviEy15EZGfodAYrmzhvmrIPClQVs1QcTjUk fGlFz5bLk/pEPUbxpVKMwQOAufZjsTJY97RGLPbP7s7F7WGAs61X41RMgHh4fgZxydGRew kFbPazfz5nM2UexS3uRiiujvds6+6T3BFe4I5blh1sUh2eP4mmqZJ9ISWpXUaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825109; a=rsa-sha256; cv=none; b=KG1/8nHIoPXcZVEIulZj799PpLIH+z+h4s/Se/MRaUk2zzWqR2VOapyai+Vb8fssL0jxw9 t5SinJfvGiUtm5R76OgVzXFcgTE/FU8CgLDlJW0L8+pwDXDirBXonTmRygbN9N25Nansom v8mGOuD3nFa+5iVeMxJ1yWJIL07pbn2rAH09CCUWIVE/kLr9i6tym+wESDfn9cci45SoD2 r3iWXr16xA+qWoRuI04zl1TpJZj7fAa36VDzKUdThWJgPWSteCRHYzZggEZ7MIcBal4WUW CWbyk5nTwol5ZNWaxg8lSHgh13yOMxid3IlXjUF65N3DJ7+DWLI/Gkatt3UPTA== 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=1707825109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4F2Df/4L2J9qjVekzHYdHM9nrOPhC9kqI86fE4hKCQ=; b=GXhG4YIFGjASLBbMkzIT1cBN0uWyR/tgsvxcyjD9pwllj0L4gL4K20gsfbB1oWchyO4F1l FD5RaeA+j00IwQ8c2bOqCeGGW7oJHMkWUGNRvCvdGJxaVTwVUL3fdnE4rSg2WfTJ9ihhi+ uqhvHeoxmbhlxqUgfiOrMzgG/B9uP4kSIpJGI8YG0y5VSkN41gAJ6b2Sa/Tjg9WC3F1Wie YGiyeT6wlfJrEZoGwJ6RwPzm4TN761XK7mItWfzLKvtD+Vust9qKilaI/hqY76ZJbFFqSI qSBcUpPZpNDLLF3z6kudxI1g4MIqr1V/SCGOwaUD3m80bfkRQyjN5xfWt4irpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ06X70MpzDbK; Tue, 13 Feb 2024 11:51: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 41DBpmiO045813; Tue, 13 Feb 2024 11:51:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBpmtb045810; Tue, 13 Feb 2024 11:51:48 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:48 GMT Message-Id: <202402131151.41DBpmtb045810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 202890922e31 - main - sys: Simplify enabling EARLY_PRINTF uarts 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: Sender: owner-dev-commits-src-main@freebsd.org 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 202890922e31382f9b11bf5f78d3dd0350d69dc1 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=202890922e31382f9b11bf5f78d3dd0350d69dc1 commit 202890922e31382f9b11bf5f78d3dd0350d69dc1 Author: Andrew Turner AuthorDate: 2024-01-08 14:45:51 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:52 +0000 sys: Simplify enabling EARLY_PRINTF uarts Support selecting the early uart with "options EARLY_PRINTF=foo" in the kernel configuration file. This allows us to not have to change source files when enabling EARLY_PRINTF, simplifying enabling it. New uart drivers can be enabled by defining a new early_printf_foo value to be unique, then using "#if CHECK_EARLY_PRINTF(foo)" to decide when to enable the uart. While here add pl011 early printf support. Reviewed by: imp (earlier version) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43360 --- sys/dev/uart/uart_dev_mvebu.c | 11 +++-------- sys/dev/uart/uart_dev_ns8250.c | 7 +++++-- sys/dev/uart/uart_dev_pl011.c | 14 ++++++++++++++ sys/dev/uart/uart_dev_snps.c | 19 ++++++++----------- sys/kern/kern_cons.c | 12 ++++++++++++ sys/sys/systm.h | 9 +++++++++ 6 files changed, 51 insertions(+), 21 deletions(-) diff --git a/sys/dev/uart/uart_dev_mvebu.c b/sys/dev/uart/uart_dev_mvebu.c index 921298ffb6c7..8f989aa0ca14 100644 --- a/sys/dev/uart/uart_dev_mvebu.c +++ b/sys/dev/uart/uart_dev_mvebu.c @@ -104,18 +104,15 @@ /* * For debugging purposes */ -#if 0 -#ifdef EARLY_PRINTF -#if defined(SOCDEV_PA) && defined(SOCDEV_VA) -#define UART_REG_OFFSET 0x12000 +#if CHECK_EARLY_PRINTF(mvebu) static void uart_mvebu_early_putc(int c) { volatile uint32_t *tsh; volatile uint32_t *stat; - tsh = (uint32_t *)(SOCDEV_VA + UART_REG_OFFSET + UART_TSH); - stat = (uint32_t *)(SOCDEV_VA + UART_REG_OFFSET + UART_STAT); + tsh = (uint32_t *)(socdev_va + UART_REG_OFFSET + UART_TSH); + stat = (uint32_t *)(socdev_va + UART_REG_OFFSET + UART_STAT); while(!(*stat & STAT_TX_RDY)) ; @@ -125,8 +122,6 @@ uart_mvebu_early_putc(int c) early_putc_t *early_putc = uart_mvebu_early_putc; #endif -#endif -#endif /* * Low-level UART interface. diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index f211084cb013..090909fdf8d2 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -81,9 +81,12 @@ SYSCTL_INT(_hw, OID_AUTO, broken_txfifo, CTLFLAG_RWTUN, * To use early printf on x86, add the following to your kernel config: * * options UART_NS8250_EARLY_PORT=0x3f8 - * options EARLY_PRINTF + * options EARLY_PRINTF=ns8250 */ -#if defined(EARLY_PRINTF) && (defined(__amd64__) || defined(__i386__)) +#if CHECK_EARLY_PRINTF(ns8250) +#if !(defined(__amd64__) || defined(__i386__)) +#error ns8250 early putc is x86 specific as it uses inb/outb +#endif static void uart_ns8250_early_putc(int c) { diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c index 4fd53ab67bf3..bfcf8cf1584e 100644 --- a/sys/dev/uart/uart_dev_pl011.c +++ b/sys/dev/uart/uart_dev_pl011.c @@ -249,6 +249,20 @@ uart_pl011_term(struct uart_bas *bas) { } +#if CHECK_EARLY_PRINTF(pl011) +static void +uart_pl011_early_putc(int c) +{ + volatile uint32_t *fr = (uint32_t *)(socdev_va + UART_FR * 4); + volatile uint32_t *dr = (uint32_t *)(socdev_va + UART_DR * 4); + + while ((*fr & FR_TXFF) != 0) + ; + *dr = c & 0xff; +} +early_putc_t *early_putc = uart_pl011_early_putc; +#endif /* CHECK_EARLY_PRINTF */ + static void uart_pl011_putc(struct uart_bas *bas, int c) { diff --git a/sys/dev/uart/uart_dev_snps.c b/sys/dev/uart/uart_dev_snps.c index b8b1f1f78142..b6efd1948b3e 100644 --- a/sys/dev/uart/uart_dev_snps.c +++ b/sys/dev/uart/uart_dev_snps.c @@ -54,18 +54,16 @@ struct snps_softc { /* * To use early printf on 64 bits Allwinner SoC, add to kernel config * options SOCDEV_PA=0x0 - * options SOCDEV_VA=0x40000000 - * options EARLY_PRINTF + * options EARLY_PRINTF=snps * * To use early printf on 32 bits Allwinner SoC, add to kernel config * options SOCDEV_PA=0x01C00000 * options SOCDEV_VA=0x10000000 - * options EARLY_PRINTF + * options EARLY_PRINTF=snps * * remove the if 0 */ -#if 0 -#ifdef EARLY_PRINTF +#if CHECK_EARLY_PRINTF(snps) static void uart_snps_early_putc(int c) { @@ -73,12 +71,12 @@ uart_snps_early_putc(int c) volatile uint32_t *tx; #ifdef ALLWINNER_64 - stat = (uint32_t *) (SOCDEV_VA + 0x1C2807C); - tx = (uint32_t *) (SOCDEV_VA + 0x1C28000); + stat = (uint32_t *) (socdev_va + 0x1C2807C); + tx = (uint32_t *) (socdev_va + 0x1C28000); #endif #ifdef ALLWINNER_32 - stat = (uint32_t *) (SOCDEV_VA + 0x2807C); - tx = (uint32_t *) (SOCDEV_VA + 0x28000); + stat = (uint32_t *) (socdev_va + 0x2807C); + tx = (uint32_t *) (socdev_va + 0x28000); #endif while ((*stat & (1 << 2)) == 0) @@ -86,8 +84,7 @@ uart_snps_early_putc(int c) *tx = c; } early_putc_t *early_putc = uart_snps_early_putc; -#endif /* EARLY_PRINTF */ -#endif +#endif /* CHECK_EARLY_PRINTF */ static kobj_method_t snps_methods[] = { KOBJMETHOD(uart_probe, ns8250_bus_probe), diff --git a/sys/kern/kern_cons.c b/sys/kern/kern_cons.c index 462cd0c45758..a99699ed5bce 100644 --- a/sys/kern/kern_cons.c +++ b/sys/kern/kern_cons.c @@ -72,6 +72,18 @@ #include #include +/* + * Check for 'options EARLY_PRINTF' that may have been used in old kernel + * config files. If you are hitting this error you should update your + * config to use 'options EARLY_PRINTF=', e.g. with the + * Arm pl011 use: + * + * options EARLY_PRINTF=pl011 + */ +#if CHECK_EARLY_PRINTF(1) +#error Update your config to use 'options EARLY_PRINTF=' +#endif + static MALLOC_DEFINE(M_TTYCONS, "tty console", "tty console handling"); struct cn_device { diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 376a35e7e8e2..f72f82c100dc 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -208,6 +208,15 @@ critical_exit(void) #ifdef EARLY_PRINTF typedef void early_putc_t(int ch); extern early_putc_t *early_putc; +#define CHECK_EARLY_PRINTF(x) \ + __CONCAT(early_printf_, EARLY_PRINTF) == __CONCAT(early_printf_, x) +#define early_printf_1 1 +#define early_printf_mvebu 2 +#define early_printf_ns8250 3 +#define early_printf_pl011 4 +#define early_printf_snps 5 +#else +#define CHECK_EARLY_PRINTF(x) 0 #endif int kvprintf(char const *, void (*)(int, void*), void *, int, __va_list) __printflike(1, 0); From nobody Tue Feb 13 11:51: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 4TZ06Z5Tj1z5B70p; Tue, 13 Feb 2024 11:51: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 4TZ06Z21lcz44hX; Tue, 13 Feb 2024 11:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XdrCrUWD5GIZZL+clp/mRPm32l2OwpXDcrbzMtTd/8c=; b=dQTHrvIotW6bG6+xZIHSVitfsfbl2PBuRCoebAkxB+AsvF17QILvVrCdZTg16gBgc108C0 z0nPaubBrEHACNGCb8g73BJYKniF+xCxaQMVnEUb/8UztaznJpr5Je4gUAlXZnBcYWub5b njkYfI8ruBPrmuWsIH3fONWNAfJ99a4ba7eiCAngav5IMuEgYhqiY5b8I6hCFT3t81hcC8 ZCP5uJXcGJ7u+vK4AUs+U+LQouSMBGqVVpZikPBJr47uCqKN4zf66UGPJyVuHFkyOIohJy G0rDX32nNsCEkZ1YepamLHxEGF/ffnIYVvio7RyN94/4QX625g4KPDA460av+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825110; a=rsa-sha256; cv=none; b=OG2Cnb9slplMseVQmTkA6Vk533EtDDGGlqvpoQ4OAB0xj3KX+Tq62EMEOcN6vSd0GiAFBK StiOcU7230YkKrL1QlqAGlZ1IGGFB8P1kNJa736ArgJ7bLtVv7DRaM9KbccxVRA2VQXd1z 5g6Lq1StRdMJz54QFl71ApsowoD2MSCQz33JqERvXzSzDfpQBzpsbfjS76fFM7zKDd55LJ vz9MT3oPdnhUDP5Rxvl5jF+re2APnrTQKCu/mJaiTuFy/3z+Wx+0XZCuE51ddSd723D4Xk /zyKUjb+DAN7mU+qxEJFzdWLTJeNPC2bRgn8ndaHri/qIOowmmb4wDbMNooOxA== 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=1707825110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XdrCrUWD5GIZZL+clp/mRPm32l2OwpXDcrbzMtTd/8c=; b=j7B/byT8XBTaWuiVo6IOWuPNMIHyPEZA6VuMgkNF0wz5zNT16tKD80ETlOK+NVfCFlqVJp itl4JwWtRDJvizNoG8I1Oo4hdaubfo4+BjhOmJ6ehRjUQYeKRqQT8k53OW966LT3aK/nrm miR9gmQyB2A6bUpd8IIbxYM8rN1IBuiQw1m0iMfH8wBhRfkQtAFk8ZYMc4rkK8w6TVYrWb OYhtzgt304Fn5bW5qYqppFYql0lHh+BkIOFbQ+ComF6vmDxA1QAWVwKZEUghvv8vPp60Xi 5LKFr7wjM+iGNmfgCI1x24GroJXbGUKYBKeEv1R/VS37eM0Ic/lLINuhLiHcsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ06Z14hpzDbL; Tue, 13 Feb 2024 11:51: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 41DBpoOM045867; Tue, 13 Feb 2024 11:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBpoao045864; Tue, 13 Feb 2024 11:51:50 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:50 GMT Message-Id: <202402131151.41DBpoao045864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 949670f8f466 - main - dev/uart: Use a linker set to find uart classes 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: Sender: owner-dev-commits-src-main@freebsd.org 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 949670f8f46656a30ffbd22c9ae2cc645bda8533 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=949670f8f46656a30ffbd22c9ae2cc645bda8533 commit 949670f8f46656a30ffbd22c9ae2cc645bda8533 Author: Andrew Turner AuthorDate: 2024-01-08 15:02:29 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:52 +0000 dev/uart: Use a linker set to find uart classes When the uart is configured via the environment we need to find the uart class with a specified name. Currently to do this with an incomplete list of uarts. As we may not have included all uarts in the kernel each class is defined as weak. Switch to a linker set so the list is always up to date based on what is included in the kernel, and the class can be static. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43361 --- sys/dev/uart/uart.h | 4 ++++ sys/dev/uart/uart_dev_ns8250.c | 1 + sys/dev/uart/uart_dev_z8530.c | 1 + sys/dev/uart/uart_subr.c | 12 +++--------- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h index 5eae06ceba6f..987152283c81 100644 --- a/sys/dev/uart/uart.h +++ b/sys/dev/uart/uart.h @@ -29,6 +29,8 @@ #ifndef _DEV_UART_H_ #define _DEV_UART_H_ +#include + /* * Bus access structure. This structure holds the minimum information needed * to access the UART. The rclk field, although not important to actually @@ -99,6 +101,8 @@ uart_setreg(struct uart_bas *bas, int reg, int value) */ struct uart_class; +SET_DECLARE(uart_class_set, struct uart_class); + extern struct uart_class uart_ns8250_class __attribute__((weak)); extern struct uart_class uart_quicc_class __attribute__((weak)); extern struct uart_class uart_z8530_class __attribute__((weak)); diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index 090909fdf8d2..f660639862ff 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -451,6 +451,7 @@ struct uart_class uart_ns8250_class = { .uc_rclk = DEFAULT_RCLK, .uc_rshift = 0 }; +DATA_SET(uart_class_set, uart_ns8250_class); /* * XXX -- refactor out ACPI and FDT ifdefs diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c index 8e1adac0aec2..107fcb1eb4ba 100644 --- a/sys/dev/uart/uart_dev_z8530.c +++ b/sys/dev/uart/uart_dev_z8530.c @@ -309,6 +309,7 @@ struct uart_class uart_z8530_class = { .uc_rclk = DEFAULT_RCLK, .uc_rshift = 0 }; +DATA_SET(uart_class_set, uart_z8530_class); #define SIGCHG(c, i, s, d) \ if (c) { \ diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c index d10084cfa6d8..e7570e173358 100644 --- a/sys/dev/uart/uart_subr.c +++ b/sys/dev/uart/uart_subr.c @@ -48,11 +48,6 @@ #define UART_TAG_XO 9 #define UART_TAG_BD 10 -static struct uart_class *uart_classes[] = { - &uart_ns8250_class, - &uart_z8530_class, -}; - static bus_addr_t uart_parse_addr(const char **p) { @@ -62,13 +57,12 @@ uart_parse_addr(const char **p) static struct uart_class * uart_parse_class(struct uart_class *class, const char **p) { - struct uart_class *uc; + struct uart_class **puc, *uc; const char *nm; size_t len; - u_int i; - for (i = 0; i < nitems(uart_classes); i++) { - uc = uart_classes[i]; + SET_FOREACH(puc, uart_class_set) { + uc = *puc; nm = uart_getname(uc); if (nm == NULL || *nm == '\0') continue; From nobody Tue Feb 13 11:51: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 4TZ06b5Sxcz5B7RB; Tue, 13 Feb 2024 11:51: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 4TZ06b2vX5z44hk; Tue, 13 Feb 2024 11:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=crnkgNeEsxJJ9glejUF3KJsns/W7I7wQrZpTX/j6rq0=; b=U+p2Wuhvu21M7qDbAo8xH26jRTKAK1E8TZEE2YYZoyn03n2PFmeXsM1mwTIIE1VvydAr0N dOg1pIFPfnxQU0ETR4r2I4EaaEvBAS4nX0zsqgDjh8/p5wHNwuTRZO6jZ11BnBTEfykj8+ 4R51NESROlY73/2ef/+kt/m11yYJ0VO1ZY5OI+XFNwrjBpl7gFfMOuDZGsrZ4+/e2qcUnY jxBPl219LRuiSZwxLjDo3JvHtbG4t+Twh4WBZoyC67Cnwwsb8knNAt2FKrKQJDbXt5Y0wf mkfBoKfOZ2Dzsasl5VQlzvpPd3B1ajug0/QWg20s9m14xxa5pstI1Uoc/b29bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825111; a=rsa-sha256; cv=none; b=Tgo/AuQzSbTmzxBsViz0iHsO4rxCKn8e07H72/uUSuEKp/0E1w5ijdmetz2QUScovyXl4w fNx3rwEjgKSOF/DUEdf8y/+7N0dC3wNF2y2kD+9I34TYVMUknACrt+JfIxZe52MPw/hEd7 CznwmU6j0WGEGmCufcpN+r/jblM7qy7+3+Njf9CslB3EhIt/psscxQwKaeKqYCpb2BvqAe 10evMXmF6MDkzfr3I3RLeqCTCQ8LFrexFahK0va0IrrBlYXuN6Y8UbBLg2ZeB6F7kSEWH3 MUihF9iCQXmGGh8BllOKOjw7mTDI2xCSCdpfJgnoa7iOBi2pQW5xYVolnVMmKg== 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=1707825111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=crnkgNeEsxJJ9glejUF3KJsns/W7I7wQrZpTX/j6rq0=; b=LZditPGhJB3/JK0yv2MI/EqEHwkvSzwILU8CDXMVe8RMB9fKpvo6b3+9u2y/UlBFDHdtPe F5Q6KQpwFG2pMGfrlWyvI1w+XC+Jh7xWf0k6JNufGcWdi+wi13dqTOIAgflJca6w+ACvwT ebGGAaBt/RHYjMdrG8otEyRLA9+FlMbOArYSHljChS8UscgSoruBehBYUDF6BTJASwSNZb W7pwZGL68zYpOYtHPIwoLTXNRgw+8+CKvRJXfGpEhXIjE9F9b/1dwE/Jp8UKN0oAVspWNG rnu5kS36rwhFZntEwnsHn6aTQ/5yJBvBo/zutHBnUXZE554mgbi+n+MJ0C1jJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ06b20r4z1Crl; Tue, 13 Feb 2024 11:51: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 41DBpp2S045915; Tue, 13 Feb 2024 11:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBpppD045912; Tue, 13 Feb 2024 11:51:51 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:51 GMT Message-Id: <202402131151.41DBpppD045912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: eae36de826cc - main - dev/uart: Support setting the register io width 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: Sender: owner-dev-commits-src-main@freebsd.org 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eae36de826cc6fde3a78b1febad824dad20e004d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=eae36de826cc6fde3a78b1febad824dad20e004d commit eae36de826cc6fde3a78b1febad824dad20e004d Author: Andrew Turner AuthorDate: 2024-01-08 15:22:58 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:52 +0000 dev/uart: Support setting the register io width Some uarts require a specific register width. Support setting this in the kernel environment. Reviewed by: imp (earlier version) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43362 --- sys/dev/uart/uart_subr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c index e7570e173358..03c7fd8caea9 100644 --- a/sys/dev/uart/uart_subr.c +++ b/sys/dev/uart/uart_subr.c @@ -47,6 +47,7 @@ #define UART_TAG_SB 8 #define UART_TAG_XO 9 #define UART_TAG_BD 10 +#define UART_TAG_RW 11 static bus_addr_t uart_parse_addr(const char **p) @@ -148,6 +149,10 @@ uart_parse_tag(const char **p) tag = UART_TAG_RS; goto out; } + if ((*p)[0] == 'r' && (*p)[1] == 'w') { + tag = UART_TAG_RW; + goto out; + } if ((*p)[0] == 's' && (*p)[1] == 'b') { tag = UART_TAG_SB; goto out; @@ -225,6 +230,7 @@ uart_getenv(int devtype, struct uart_devinfo *di, struct uart_class *class) /* Set defaults. */ di->bas.chan = 0; di->bas.regshft = 0; + di->bas.regiowidth = 1; di->bas.rclk = 0; di->baudrate = 0; di->databits = 8; @@ -264,6 +270,9 @@ uart_getenv(int devtype, struct uart_devinfo *di, struct uart_class *class) case UART_TAG_RS: di->bas.regshft = uart_parse_long(&spec); break; + case UART_TAG_RW: + di->bas.regiowidth = uart_parse_long(&spec); + break; case UART_TAG_SB: di->stopbits = uart_parse_long(&spec); break; From nobody Tue Feb 13 11:51: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 4TZ06c673Cz5B7RF; Tue, 13 Feb 2024 11:51: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 4TZ06c3Njnz44fg; Tue, 13 Feb 2024 11:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gg33kFb9Gt0zNGNI6wQ1gEnY9T3uxO3nZp04nK+eJo=; b=MhigO8JiEoNftp7kGV+G9ie6dY6sR1oSXKZaa6kRY+bsK9+4tZSeoGHxbiXew8byAHfEp1 rhpPRs/Q5Y+0el5+Xp2MHblKPCIn/BPBcVMj1yi8dqKqR1Ngqhv8wdHNw/c+YM0vG/whz0 Mk8utSgzdvrU6FqtljQLJt4n97mo2t/dRB6nNHEXIjkhqjLkeV6QnMrFTaUCqA+4BSQ/Ac 3L37avtqmQRciVbtvL4MutLcGbGZcSR64XGYGASlodW3QO3eCwWY3RaYrP0ZFj7vumC33G GOGSGLBjwtnEgPhRO1mwsdkHMinw614gGTarpKW1uODBFFmLoJxosB/BxYHssQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825112; a=rsa-sha256; cv=none; b=K5FB+g/npOc8xBcTXJhRoi1Pr4dhd6Or6Ok3W+paq8himQ4O+5fgx6HSN6C73ASG3+oBHI g6TEdYVUiJ1Ru0LvfOxhb1ZWpNyERTMBrneNPLSRLAs2J0dMA1S+7XYdFefBVgOlnHrp1a LX2umfMArRZ9siM4nGF3iCxfcgPjGQka3WwRCL6WDBEre7pV0RfMKKFXAKqzgz4RmVOiuu vN3wyyq2gHtx17SQURYtjYj686KCCnmosSaJdrTQ9/0XY5bORYDr/AynOfdRTndd8qDABN 3OehwJriE/6ldGPZBykONtW6MqleXB3LdGui69GtzSlpjFSvPDQtkSF+sdssOA== 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=1707825112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1gg33kFb9Gt0zNGNI6wQ1gEnY9T3uxO3nZp04nK+eJo=; b=v0omh1fSMKUzVe2gd7D7ptjoT2QrrFwf5Mlzd898agM31LDtza9QpkZtN137gZEQXy/nQL nTgZ/REzo6MMTmxmqfktLkPGolJ0MoifH8fIklPOcJ19ucKMMsCieRKzHfY/oST1bpjKk7 tiXlpxSW5WBQ8JaABqYbDHy+XD7kWIjCvKkDky4MeHazriik+wuS6b+6+6Ewm3EDesQQS+ afBDXEUIGsidRdtqv97IjBhJotwXAbJ0yve+y1RbWdt7vTAZdpHFG/G3VxwLgsNJzBQv2E eKCp+dfIOXbi9j+agSPznLMFZy/cOHDBUo0+JfT7mRp7ICUcYqkDKu4+A6tPRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ06c2TPWzDyk; Tue, 13 Feb 2024 11:51: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 41DBpqKX045968; Tue, 13 Feb 2024 11:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBpqvl045965; Tue, 13 Feb 2024 11:51:52 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:52 GMT Message-Id: <202402131151.41DBpqvl045965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 53391af1518e - main - dev/uart: Support the pl011 uart in hw.uart.console 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: Sender: owner-dev-commits-src-main@freebsd.org 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53391af1518e6e72545d720c8069b24aa253edad Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=53391af1518e6e72545d720c8069b24aa253edad commit 53391af1518e6e72545d720c8069b24aa253edad Author: Andrew Turner AuthorDate: 2024-01-08 15:24:33 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:52 +0000 dev/uart: Support the pl011 uart in hw.uart.console Add the pl011 uart to the list of supported uarts for use by hw.uart.console. This is commonly found in Arm based devices, and a variant is standardised in the Arm SBSA. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43363 --- sys/dev/uart/uart_dev_pl011.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c index bfcf8cf1584e..d91ae256f2a3 100644 --- a/sys/dev/uart/uart_dev_pl011.c +++ b/sys/dev/uart/uart_dev_pl011.c @@ -332,7 +332,7 @@ static kobj_method_t uart_pl011_methods[] = { }; static struct uart_class uart_pl011_class = { - "uart_pl011", + "pl011", uart_pl011_methods, sizeof(struct uart_pl011_softc), .uc_ops = &uart_pl011_ops, @@ -340,6 +340,7 @@ static struct uart_class uart_pl011_class = { .uc_rclk = 0, .uc_rshift = 2 }; +DATA_SET(uart_class_set, uart_pl011_class); #ifdef FDT static struct ofw_compat_data fdt_compat_data[] = { From nobody Tue Feb 13 11:51: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 4TZ06d6VkJz5B7FD; Tue, 13 Feb 2024 11:51: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 4TZ06d4Mp7z44dR; Tue, 13 Feb 2024 11:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xyaQ5V0lzVOBiomMuseJByeZFkZgrQsMuHrePLuff9o=; b=rfn9EzCIRAwMcOt0SqoKr2rb58q1xT+m8c8d7mnJKY4lTwXF9QIshsz304f9EtmbIn8i5w ZTP97SoQEf/nUrIdpeiq60kDTEPw03j31prPNDtuBreUbS5Kz5QcrHxou/iS8yNT/K0fho fK6+AsK1sn1I58IjOo+8BEblgbKkExvGZsU1C+C/c7NmWuGDEGduD6awjWW0f7T0LeXmLZ EKP6ITZBi/1rq1KF0sxL9Zbzep5+HkfggJzsr9SnutnPaXLIoLhKq0qmD9GTNNQX4I4l9O X8O4uW2Ark0+9WeOja9N+P0VCMSzwwcjWjLGWEJgB9PULbxk4tLS46B3D4fmig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825113; a=rsa-sha256; cv=none; b=biX8HqxJuEMmwJZiQ0KAMREN51WKNErHiCkKk8hrOSG5SIT7hPgTGjee5RJvSDTChQxSvw eNpsaBZDOmDtUg3ybycej6HwirMXNQwDFJfZv1LE9y65SpQlli/a8aTNAz4D2MsozwL823 OhdjV6JRKimCFUM6VLyP+tSqH99bF8BDCTyBgE8WPpjy3DNVq2pJloiADQz/nOPScOG07l JgaS5lXtj6NxEglxItpKVuZMo+Dhz2edCdzv/dN73lgz+Ithobs0qS9Zjsa/HzsSxbPQoX qNE6182whnXOFllgL7KYCbEXAg2BRNtPssZO+/54p4m8LnkMnkFbQ/7nXfnjOQ== 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=1707825113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xyaQ5V0lzVOBiomMuseJByeZFkZgrQsMuHrePLuff9o=; b=areZL4OI3j9Iw75OzWafAiAxgMBzNrZFtsYlN9cfTNkD8a7Ge0SKAL5vtrrpLzqGrUiZ8V dzvo9UNb/mt9Gwd/LMBZlc42ZXmaEoQMyqKJiESv5TUfrXRd7wwwxjtwzlvztR9E1fokut c1N6aR6cBOSNF8MzDJPnHw56lSKY841RK/v4WB+T95j4iPOH42EpMYifivrBLNBhl25/Rx AB33b0bl+K/U6YNPtNc9IHGkj6tyYPPOboc8O474gWjOp5I60sfw4c8LEOMQGhTwOvDwtv g/xuHsTfpYMtDwPt5XGUz3tWuh1omuocJzwXpVJGJ3+Z0AQDOhwen/1pV3EsYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ06d3JVwz1Chl; Tue, 13 Feb 2024 11:51: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 41DBprp7046025; Tue, 13 Feb 2024 11:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBprMO046022; Tue, 13 Feb 2024 11:51:53 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:53 GMT Message-Id: <202402131151.41DBprMO046022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b889b90adb1c - main - arm64: Add EARLY_PRINTF and SOCDEV_PA to NOTES 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: Sender: owner-dev-commits-src-main@freebsd.org 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b889b90adb1cb3ba36a769576ee595e6e86dd84b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b889b90adb1cb3ba36a769576ee595e6e86dd84b commit b889b90adb1cb3ba36a769576ee595e6e86dd84b Author: Andrew Turner AuthorDate: 2024-01-08 17:25:02 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:53 +0000 arm64: Add EARLY_PRINTF and SOCDEV_PA to NOTES This ensures they are build tested. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43364 --- sys/arm64/conf/NOTES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 031b5f9567b5..48cd2647df70 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -121,6 +121,10 @@ device uart_ns8250 # ns8250-type UART driver device uart_snps device pl011 +# Early printf using the pl011 uart under the Arm FVP +options SOCDEV_PA=0x1c090000 +options EARLY_PRINTF=pl011 + # USB support device aw_usbphy # Allwinner USB PHY device dwcotg # DWC OTG controller From nobody Tue Feb 13 11:51: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 4TZ06g0wzpz5B7FF; Tue, 13 Feb 2024 11:51: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 4TZ06f4rtgz44nD; Tue, 13 Feb 2024 11:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2RQkk6uvEE0dmZzUHUdqNgKzKnAaShPe9eMR31OamU=; b=i6EK7o6aw0ZZL9a9zZf4fhtK07mUk8JVUfmdjhzGUHLAueBTXe3k7Vr7hXModYu15JEg9Z dlHn5mBn3Spcm3HzkymguPF35XQwd8LL5SNVYhRTJsO389K4QXgdE4FYc8s8zapWH9clin cOmURMxXjk8VFYj8HKX6EBgNP9+jBHBNa8BhWQnb4HlKtkIcXM1gu8Busc01HKcuCVwe0x UbQCo8Dko+3wU1jdx5TKrCylWlaNLcm/FGMpFWpqKA7VWeMAEaNT3+SMR+bgygAv1HleaK ZLRbvwoLv2V6nq/SlfFfwqUjP9nvP9gcmpwCLlFqAs5l419nJ5u/NhS9WSFVKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825114; a=rsa-sha256; cv=none; b=SD6lfrAwaNpqXlx1mkxoZheMKWKpZsG1aUHotQUJ1hWIU5SOJNpvg3zp/KCTEXTlRQTfKW IRdSO+bijOKU1Ypy9Up/G86ALCuhGAms2RGElSHUS9qMXJWyDwC7t8MDmpXrqINYg0uXW4 VOkSuyWOnWcw70Pmr7OQhE61YMjcvXtquZ9SIvuddJI0CMg+PrPsGGwnIIkD1QUIe93VKs hl38E15l3Zg0XlUlHhOj5hIibSGMr6qmQU5XinCNib2N/ftyTkMyO4d3s7N/5f69KCDmOX Uxty8m4twnaiiP76EmvfP7NM5DujEUTdkImxqr8+AAdvi+4lg1EOb1hUHTGSAw== 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=1707825114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2RQkk6uvEE0dmZzUHUdqNgKzKnAaShPe9eMR31OamU=; b=V/JM7iKcvbJSTVFfT+qz70j/eB/NZUHL2ltK8ooosTriwI361KHR46DhsReq9ZDSjMeXyN XrWlbBA78RywoldK81lbRemGZGs0tRKcbw6aCFXuZuWD0++YfO2ROb5apTVVcdPEDUYoxK Bp48a5sPdDQH45j03e6AILZErGv8ltdCeA+2DNS4/t+v12+Esob93XxRrfRDQrfY75OY3W TWugQCnT5NRYRzlNySVMslyk7Y/8rN3UXuAks7sX0MUbUYEXruoApVvsSCIIta7plSAGWl VKFMJjbPMxQPYEez34ak3PhORsNJnt1KlA7fwza1tNopzlDLkVEihKXrW5q4Xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ06f3wY2zDbQ; Tue, 13 Feb 2024 11:51: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 41DBpsPC046171; Tue, 13 Feb 2024 11:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBps7v046156; Tue, 13 Feb 2024 11:51:54 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:54 GMT Message-Id: <202402131151.41DBps7v046156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a9fc9d6d15f0 - main - dev/uart: Support 8-byte register access 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: Sender: owner-dev-commits-src-main@freebsd.org 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9fc9d6d15f006feb6d7ddb036e020d5f9d19fce Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a9fc9d6d15f006feb6d7ddb036e020d5f9d19fce commit a9fc9d6d15f006feb6d7ddb036e020d5f9d19fce Author: Andrew Turner AuthorDate: 2024-01-09 13:29:47 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:53 +0000 dev/uart: Support 8-byte register access While we only support 4-byte registers in the uart code the physical access may be to an 8-byte register. Support this as an option on non-i386. On i386 we lack the needed 8-byte bus_space functions. ACPI has an option for 8-byte register io width, and FDT can be given any size. Support these sizes, even if we don't expect to see hardware with an 8-byte io width. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43374 --- sys/dev/uart/uart.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h index 987152283c81..4cdec00c9829 100644 --- a/sys/dev/uart/uart.h +++ b/sys/dev/uart/uart.h @@ -56,6 +56,11 @@ uart_getreg(struct uart_bas *bas, int reg) uint32_t ret; switch (uart_regiowidth(bas)) { +#if !defined(__i386__) + case 8: + ret = bus_space_read_8(bas->bst, bas->bsh, uart_regofs(bas, reg)); + break; +#endif case 4: ret = bus_space_read_4(bas->bst, bas->bsh, uart_regofs(bas, reg)); break; @@ -71,10 +76,15 @@ uart_getreg(struct uart_bas *bas, int reg) } static inline void -uart_setreg(struct uart_bas *bas, int reg, int value) +uart_setreg(struct uart_bas *bas, int reg, uint32_t value) { switch (uart_regiowidth(bas)) { +#if !defined(__i386__) + case 8: + bus_space_write_8(bas->bst, bas->bsh, uart_regofs(bas, reg), value); + break; +#endif case 4: bus_space_write_4(bas->bst, bas->bsh, uart_regofs(bas, reg), value); break; From nobody Tue Feb 13 11:51: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 4TZ06h0S2cz5B75s; Tue, 13 Feb 2024 11:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZ06g5l8rz44qq; Tue, 13 Feb 2024 11:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707825115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M5btQu7jlOihjDuBGwJil1S8uesRu9C/CQKGJTAdWFc=; b=Osxf58aHfbi3dglkXNSsT/+6pcnQVQC61gMeSgsAkONFIO6KYUT6sUXM5ch2uZqtNHlDuP dcJjeasqR7uhP0MxjlKjCB7MY48RBOB8xL9MjHZ2rQftU+tqnUnP9Fa1NsvMs6R1Jxykoh HA+zYmPO1KW+7EPk5APob562x2zsH5GME96DqUF9VoIH5vGO0FeGcyqVBgQbEmDBrUZi+7 vf+gPpjtoMSfQA4LNUSBON3CkMzwDlDFJn5bmpFR/k2SG5ywGq3D4K6Kg20qr2dbtLpXTq Fg2ausJmRZOXwMiqbrD+1tgGL02ZnUXobsl0BlkTFYvlTeJg2278cmR9TRjGgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707825115; a=rsa-sha256; cv=none; b=j3cXE0LR0N/O4S37TGA2/6fSgqM4Be2lDPxsOvhqFJmqCfDKm16gJcGtKYkDWBvv/+TfQ6 xRRAqlo7SmPUE3962zQuD2J92irsHYRDxzx8L0EC/vDUEeVKNSNPyHnGcSwLmBBNXVpwCF dCdXwftehkJath04XvA3bgYhdHGPUQ5aOLqqiVooKPisMImFL+KknqlxScDe/cESDDjnxq yLlXVKpajRC1AzXvI8Z8AhbZi/K4f/74bv6QKaweXUGp+mhpwhjB4o2kj4iNKwxGx1XcRz UwivRYQ2decNtd6Iva3KSId0OHER9yYGejHaaT0HJbfmDTusHIPi4yIdf9w8vQ== 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=1707825115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M5btQu7jlOihjDuBGwJil1S8uesRu9C/CQKGJTAdWFc=; b=ciCFBh5VTb35jm8ziLtJmnrLnwZlLqIzuYokAa6JLGZlxm0ZJYt3n6lpGjSanyDbQmTKm1 n96GoU/iIfMmLGkRXU98d2bjVi2nm0IocVwt+B95ZOa27QPwAYufJJFP0Ri4qzciWsA2pL XlVS1RjhHZN+58qC3o5bbs3Qu0xHyQtdhK+H4Q1ysxgkq6CmetATijRcuI/O6Kw39VdCy4 wxZryYta+w+2MjY0MJX5tqUCzEVy40c125QZ5yooflEHxB20ozwjT7OytYT/FAiTi4eNz3 IUaSn4iOhSY8bLxfV10ixbtwgGXk6Q5AsrfSLpxpO9k1MD01KUDRO7SXxGS/RA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ06g4kmrzF29; Tue, 13 Feb 2024 11:51: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 41DBptLw047348; Tue, 13 Feb 2024 11:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DBptlO047332; Tue, 13 Feb 2024 11:51:55 GMT (envelope-from git) Date: Tue, 13 Feb 2024 11:51:55 GMT Message-Id: <202402131151.41DBptlO047332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 69e4b35eb35d - main - arm: Add EARLY_PRINTF and SOCDEV_PA/VA to NOTES 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: Sender: owner-dev-commits-src-main@freebsd.org 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69e4b35eb35d159e0472acf72661b491d730e7fc Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=69e4b35eb35d159e0472acf72661b491d730e7fc commit 69e4b35eb35d159e0472acf72661b491d730e7fc Author: Andrew Turner AuthorDate: 2024-02-13 10:08:11 +0000 Commit: Andrew Turner CommitDate: 2024-02-13 11:48:53 +0000 arm: Add EARLY_PRINTF and SOCDEV_PA/VA to NOTES This ensures they are build tested. Sponsored by: Arm Ltd --- sys/arm/conf/NOTES | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index 74ee03dd4764..994cf9a59b5e 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -56,6 +56,14 @@ device syscon # Backlight subsystem device backlight +# Serial (COM) ports +device pl011 + +# Early printf using the pl011 uart under the Arm FVP +options SOCDEV_PA=0x1c090000 +options SOCDEV_VA=0x1c090000 +options EARLY_PRINTF=pl011 + # Undo options from sys/conf/NOTES that we do not want... nooptions COMPAT_FREEBSD4 From nobody Tue Feb 13 14:24: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 4TZ3Vv2XWLz5BQ3T; Tue, 13 Feb 2024 14:24: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 4TZ3Vv1bTRz4Qpf; Tue, 13 Feb 2024 14:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707834279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0M1bMWyS9rRuA44hijx95NWv8zh5ggBR86Qfa2fMYM=; b=b4eTmfmMo/ht5kGsld1sx1LlQEb+AyyTPVEa7soyEn0vfvVGZtblRPLpdyNi7DXJ/pFU+S nAF2/zOIt2jMbagKw8ABGTImcL3jfHU3S89gSliT7yiVMq5FfUluP+6dU0ls6KwogFx4If mz0NtxwEj5mN0tFHOMFG4OzXVYOrdXAm/e+oHqC258+GMWipk87mhmxgvSwRF9lS8+8rtx 2QKRfY4kOPCVLBDCwsKADtXBxcaVA/UW2VEoFSzTtr1jqDt9iKDxZ0ZFhSSo2u754Djzl7 //2F/lAJWJPPZpCgddq+diaStr5yuRj3D+bzHLBamVjxwjKsNK+tQApBsBTVIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707834279; a=rsa-sha256; cv=none; b=cQq8kyb+pqAbRmAzxbEiwAnJcAvUoXtZ9mvM6ZBfOHqvfJNFmXezZmzGjVhwDcGsbHYXGh WEKD0wTFfw3l4kN1DfV1rloj0uQ/GqYSr00QZ9SBKWxi9HhF7GqzXw/AbhgKoWsIxXPQpP nO+0HUWwW/JgslwS9V/Ryn9HsE9PkCxO5OpZGm03qvkVHNYsH2NnDN4Jl4emZqpeIvpYiI 33w+jEwrKTxuybk79zPx1aNFWktpr1255Uu7B9rZtsg/Jld2oqD/ZDHVokXH244OiAgmJz GuDFCfiUwhs8xkTxDPMVCIQZhx19MxoDPgWdR8sTO36FgqyAN/hPBcuH8gGNqQ== 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=1707834279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0M1bMWyS9rRuA44hijx95NWv8zh5ggBR86Qfa2fMYM=; b=Bep3rieDMue1jp2mMv6KzkzxJzc/bK1F7Xu/MANS34S+buyZsOdktGE5qxLp1yoX+i7v9m 5A1/dOrCJpna1XSOQfEzDURCCARYR1EsnuRgsDrTH37iRNsSuNLQESUwxFGuYI1AlpSfGk gs0l4y7QfdSDFlqoGSns1aTfaWzQQrC8zxcQtLbuhHXQ2SDbYMWduVtm6bdW6V0iStQFqx hpILPEydWm23StHB+ITr0BKpmc4NbjsYP/X20GYPmnPFNb5//0+jnk5e1gknkIb0Oqofgz H902pJfpiCOZfwJrPFfl8x5HZyrmcBvBQkAohcqqUc+cHfzgbX1cuCWZZce34Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ3Vt64jgzJfn; Tue, 13 Feb 2024 14:24: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 41DEOctd001279; Tue, 13 Feb 2024 14:24:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DEOcXH001275; Tue, 13 Feb 2024 14:24:38 GMT (envelope-from git) Date: Tue, 13 Feb 2024 14:24:38 GMT Message-Id: <202402131424.41DEOcXH001275@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: 9ea864b54b57 - main - rtld symlook_obj: move common code to check filtees into helper 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: Sender: owner-dev-commits-src-main@freebsd.org 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ea864b54b57f2d0125860fb923f8db52b20eac2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ea864b54b57f2d0125860fb923f8db52b20eac2 commit 9ea864b54b57f2d0125860fb923f8db52b20eac2 Author: Konstantin Belousov AuthorDate: 2024-02-13 00:48:42 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-13 14:23:41 +0000 rtld symlook_obj: move common code to check filtees into helper Revieved by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43858 --- libexec/rtld-elf/rtld.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 24abc4580f53..31560b79f19e 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -4690,6 +4690,20 @@ symlook_needed(SymLook *req, const Needed_Entry *needed, DoneList *dlp) return (ESRCH); } +static int +symlook_obj_load_filtees(SymLook *req, SymLook *req1, const Obj_Entry *obj, + Needed_Entry *needed) +{ + DoneList donelist; + int flags; + + flags = (req->flags & SYMLOOK_EARLY) != 0 ? RTLD_LO_EARLY : 0; + load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); + donelist_init(&donelist); + symlook_init_from_req(req1, req); + return (symlook_needed(req1, needed, &donelist)); +} + /* * Search the symbol table of a single shared object for a symbol of * the given name and version, if requested. Returns a pointer to the @@ -4702,9 +4716,8 @@ symlook_needed(SymLook *req, const Needed_Entry *needed, DoneList *dlp) int symlook_obj(SymLook *req, const Obj_Entry *obj) { - DoneList donelist; SymLook req1; - int flags, res, mres; + int res, mres; /* * If there is at least one valid hash at this point, we prefer to @@ -4719,11 +4732,8 @@ symlook_obj(SymLook *req, const Obj_Entry *obj) if (mres == 0) { if (obj->needed_filtees != NULL) { - flags = (req->flags & SYMLOOK_EARLY) ? RTLD_LO_EARLY : 0; - load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); - donelist_init(&donelist); - symlook_init_from_req(&req1, req); - res = symlook_needed(&req1, obj->needed_filtees, &donelist); + res = symlook_obj_load_filtees(req, &req1, obj, + obj->needed_filtees); if (res == 0) { req->sym_out = req1.sym_out; req->defobj_out = req1.defobj_out; @@ -4731,11 +4741,8 @@ symlook_obj(SymLook *req, const Obj_Entry *obj) return (res); } if (obj->needed_aux_filtees != NULL) { - flags = (req->flags & SYMLOOK_EARLY) ? RTLD_LO_EARLY : 0; - load_filtees(__DECONST(Obj_Entry *, obj), flags, req->lockstate); - donelist_init(&donelist); - symlook_init_from_req(&req1, req); - res = symlook_needed(&req1, obj->needed_aux_filtees, &donelist); + res = symlook_obj_load_filtees(req, &req1, obj, + obj->needed_aux_filtees); if (res == 0) { req->sym_out = req1.sym_out; req->defobj_out = req1.defobj_out; From nobody Tue Feb 13 14:24: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 4TZ3Vw2KGsz5BQ3Y; Tue, 13 Feb 2024 14:24: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 4TZ3Vw1RXzz4R0n; Tue, 13 Feb 2024 14:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707834280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0idwtNl1gktbVPcjepGxmRR6NqImV3HOWep/8wwRrOM=; b=YrlJX6c1VIPv3PGfmAjzdt3QxEyfhNu5A/LxbU4HOsE13JChlih7hbGgFzamsMigvYYMYz MWZVsC/oj1DDNhlZfQ1ToHsv8XR9Toafxt/UhF8wpA850yOgrkHkNw8tVmeRzwZ+bft5xL TqlOm4SyGXLWwYj0xSeCqBIHJGc6/Fhww/6dyf4FPqkDKjcAFuQkcMV+s9G/8d3FY2T5d5 dICrDyYNc+TKcyaLAlobBp/B50rveJx7fVKAQ6DetcjmJXfWrz7lS9yBjudaLl+xMp6TQD SuPuGWO6AT+OXT8gcx5lWpho/lI4/gRT7DjrqW1H1G8jxtwAo8kRtG3zpb8xsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707834280; a=rsa-sha256; cv=none; b=hFTz88OFAHNiW1LPAi5WyH91JtTLEW95erkIqYv0XMMt6P1GyNSjh8zGfXs9dV9XYhB3KJ i0HErN9fhLjg5zlncY56T+zCFhNic6AC4EU/I+KX1ew1dqYGKQgkfiXL9HzNemyCIt4rQL YQLQ2chXF71Ohfu1WVTBWZvKYyqcYgdEd2PgOR4JNV3uDLSgAMV8WxDw348LGfwR+lRBgE SVe932eva34tQmdqzsEInWaNRf3d0EUTkArcwo1+OgqGIBT23ALB8uebZYIDElLa0+NRCr 6sGj2ohmm9kRWPcSl8kr07sGrryEGq8x2QALq2+3SOJqwrjZQuYynfyCFsCLaw== 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=1707834280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0idwtNl1gktbVPcjepGxmRR6NqImV3HOWep/8wwRrOM=; b=lu6n5hqhDbXNyJmuLU5YLBDfcWwSTWquSVs8XQ+rCZKQrrsvzkjcP58o2DNEc0vUIw1AAL S6ogy7dlrh6jpz6RtGmcCZIkFtdyf4FKd37Vy6Cb6wgGEIDpZ+Efnm99efq1f7opOmce7v wiYM8tfOu1Uxb3w66L2hiQPx6+aPUk2ZvEHlGLdHCMRzQzT1CpIvHPZMpa23p8+vGPOI92 DSLpJEAoeYLuGwevKCPa1rPP8Zzb63DZ1rlGl1ZYaJ5e0TZLNEC5WdQwwnzNq8XmW6xufI KgGSlek36kA0Vu+4abzV1EjboCZeT656OTHiiykfL0YsnvCZjgR5FX/iNrfJQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ3Vw0H9GzJX8; Tue, 13 Feb 2024 14:24: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 41DEOdtj001328; Tue, 13 Feb 2024 14:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DEOdjb001325; Tue, 13 Feb 2024 14:24:39 GMT (envelope-from git) Date: Tue, 13 Feb 2024 14:24:39 GMT Message-Id: <202402131424.41DEOdjb001325@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: 30b5f6b33b35 - main - rtld load_filtees(): reindent and reduce block nesting 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: Sender: owner-dev-commits-src-main@freebsd.org 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30b5f6b33b35623e6b6aa1d27a78311e199fa602 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=30b5f6b33b35623e6b6aa1d27a78311e199fa602 commit 30b5f6b33b35623e6b6aa1d27a78311e199fa602 Author: Konstantin Belousov AuthorDate: 2024-02-13 01:19:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-13 14:23:55 +0000 rtld load_filtees(): reindent and reduce block nesting Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43858 --- libexec/rtld-elf/rtld.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 31560b79f19e..dfd9e74407ed 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2582,13 +2582,12 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags, static void load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate) { - - if (!obj->filtees_loaded) { + if (obj->filtees_loaded) + return; lock_restart_for_upgrade(lockstate); load_filtee1(obj, obj->needed_filtees, flags, lockstate); load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate); obj->filtees_loaded = true; - } } static int From nobody Tue Feb 13 14:24: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 4TZ3Vx4gMRz5BPvl; Tue, 13 Feb 2024 14:24: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 4TZ3Vx2ZtYz4QbD; Tue, 13 Feb 2024 14:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707834281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kjy/7WesmPH2LLgkmYgeq3pJJWbm6gmrLTrKzYD9Wjw=; b=iUGzDxyidAoi152KGAUHQIdqoPOElzpOVpcB0SWc5YcEzv5ZgqX8VQotNUtIW2CEjdGn2e zdfsYFGPKr6BADKPvHhW7hdeIjMoRQcNfhzqy6UgyXUzmUilU2fnP6IKpb8O4XY6JrZySp kchJ2gFmkjuHehDhGSGj2ZLXfb+TaO8tZyV+3Th0yp0XsRCPuUM1zzoPKe6ERvDJuk3oyZ qUOnAoH1P72IsNW0rnB1V38Htx3l9DwKKW430uMfyAiYnk+mWU8TrqEdAqH4Tn4D++bPu1 SQvTP3q/E1IpRmZI6YYP2PFw/JvwrSplfzRmSyhrf8mjkbCpTbsUlqhIGobFCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707834281; a=rsa-sha256; cv=none; b=eMkV+v2fZuPzL14u0tE4/XrWcXx55jHytG/f3J5x0dnTayFF4THVjKZjBGTcqx0j/3Ftuw rE6WmTyvWeX5eJ9OOCW3bXgkwQpSVbaTMOhxD9TYENQQtTkLNXIZesFEM/E6YRt66AmusV C1MhteYMmrf0vTpZA1/BZAv6IRCGVx34L9+6qVUDgveDhlx6N67EFsIuUPcreEJ+QLzTQY zeuq6CRcVvKMFcJlfU+uUqO2uHaUqB1Ykis5HqTGMFwHpQH7KxreortbQDuagJWprRs5WP X3VlRepPJFBDlqJH7jSEGaUFT58VlC+Sy4sKLwOIRIGyca7O7KDmyCSRFqIoEQ== 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=1707834281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kjy/7WesmPH2LLgkmYgeq3pJJWbm6gmrLTrKzYD9Wjw=; b=ncO/y1/6h/kYdEHQdCNlLy+cjCK8QLUEPuIyd9kgwe3dRJNgGAQ9K3dphnanRoFI22b4+t ZZ+bx1RImOtHfMgugWiVWBlaqZ//kwHcOTQiCaEEykP/tZ4V6tN9tb4Ompko08CEc0+uVD g9weAoUeHZO0S0vnF3PGoaXbfnfYwzVU2F05hhHgJG0D2C47xVOyTpqNHShL7hMGN6TLFU cllJhnglylxbytLfUxoKzFo5ed6D5z1rxEWl/TIkbwXdqGgHwHxs0gnuz9Qe880iv0I1u4 G3bk1txyiK+Mi3D3sC98uP6L9KdBOpF6mbNX+KWiZaPN6R9Rq3GoYHZeozUKlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ3Vx1PCRzJX9; Tue, 13 Feb 2024 14:24: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 41DEOfuS001391; Tue, 13 Feb 2024 14:24:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DEOfTj001389; Tue, 13 Feb 2024 14:24:41 GMT (envelope-from git) Date: Tue, 13 Feb 2024 14:24:41 GMT Message-Id: <202402131424.41DEOfTj001389@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: 968a18975adc - main - rtld: ignore load_filtees() calls if we already loading filtees for the obj 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: Sender: owner-dev-commits-src-main@freebsd.org 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 968a18975adc9c2a619bb52aa2f009de99fc9e24 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=968a18975adc9c2a619bb52aa2f009de99fc9e24 commit 968a18975adc9c2a619bb52aa2f009de99fc9e24 Author: Konstantin Belousov AuthorDate: 2024-02-13 01:09:03 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-13 14:24:01 +0000 rtld: ignore load_filtees() calls if we already loading filtees for the obj in addition to avoiding it for already loaded filtees. Issue is that during load, rtld needs to resolve some special ABI symbols, like executable stack fixer and static TLS initializer, which might trigger recursion. Example is libthr which is filter for libsys, and which exports __pthread_distribute_static_tls. Tested by: kevans, krion Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43858 --- libexec/rtld-elf/rtld.c | 4 +++- libexec/rtld-elf/rtld.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index dfd9e74407ed..7d6b8ae52703 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2582,12 +2582,14 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags, static void load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate) { - if (obj->filtees_loaded) + if (obj->filtees_loaded || obj->filtees_loading) return; lock_restart_for_upgrade(lockstate); + obj->filtees_loading = true; load_filtee1(obj, obj->needed_filtees, flags, lockstate); load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate); obj->filtees_loaded = true; + obj->filtees_loading = false; } static int diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index e8b15095812b..6311b3e6cc7f 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -263,6 +263,7 @@ typedef struct Struct_Obj_Entry { bool on_fini_list: 1; /* Object is already on fini list. */ bool dag_inited : 1; /* Object has its DAG initialized. */ bool filtees_loaded : 1; /* Filtees loaded */ + bool filtees_loading : 1; /* In process of filtees loading */ bool irelative : 1; /* Object has R_MACHDEP_IRELATIVE relocs */ bool irelative_nonplt : 1; /* Object has R_MACHDEP_IRELATIVE non-plt relocs */ bool gnu_ifunc : 1; /* Object has references to STT_GNU_IFUNC */ From nobody Tue Feb 13 15:38: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 4TZ58D1s37z594bJ; Tue, 13 Feb 2024 15:38: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 4TZ58D1BF7z4fjb; Tue, 13 Feb 2024 15:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707838716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o2GIeu+3Vnd9i0fOh8h60YSGrXjOgUl2+wXkcatWTXs=; b=InWij+rGbAXtYnBImlH1uZjmn+JzkyzzTTHsI94f6Ighe6FreMFpINdUth8iGFbatkvLHe C/KwYCN9ptE4c4rDxeukgNIDuq4sb9aObqh70JZF/jtlnHx6FQo9ByfYaNeiBGESC7Ldxt Irp0VvXi4XypTeg9RBjjzV1f1jABgjL1VgBvHtGd6AtShXhQV6ZngFzhct7y/cArwXYSQb +WyehEWGHHYoc8+r9SxUD4G8H+6wfP307i6xC1zMSAPXaJauopDXS3vd5pJglgbvOPC0j6 kpczoauZ57G42ponQq6irqUtl96PpFlv5yT/TEJVFkz8HMPTTnsm5z7xN38WKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707838716; a=rsa-sha256; cv=none; b=lnIMPvHNnzBM8j9P1YPNPGNuygr5PbyLKEZkj/ffkrPfiUzNHk5t/X3oib5WNlBFdk7Pfb xGt78yM19PVs2qgPdS36xntF51ZlDPkaDZMkzAU7vv+d7tZmKn4kp49no0AKn7s12o3YiK 54kTG349GpjNYMOEzIKdy2piQhXl4v7PFV4SwYJkhGzwLvCDm4yPHkFKDHDxVtnET7f1wh 4Sp53NxKsIedE95qvM2760LAUmMiU3hyDD7QsooC1ZDQbTKupdHmBPm4ICz8yu6hWDcHmV uIcu+zXefMpB//UgBslusLrime0l2VS/EBx8M3js22fHP9ScuVwyJLuH/Nx5dg== 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=1707838716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o2GIeu+3Vnd9i0fOh8h60YSGrXjOgUl2+wXkcatWTXs=; b=yB6YEBk/2gCegb3UlYgdWFZtY0s3D5gVePrasjiTL/bXUT6ssq4pkXb9eVImqwNAH2lVbg Y8UMxnSenHe6TEINhUpnlVfhbhruhomMHKpHCyZqkWxtO4Up5F332/3F3ZiEo51/pCq4MQ QaOcuJNpHkcIasfjczkukZirlKoOTys2ThS6DOkeAheBSYdkceL79TtmJxSdCGzN6oTsNw vK3GWrg9SYzC7wvd5Ln5xQnJnkqnidezf3hp0eb3eSHfDYEA1WOb6asXT3dvUm0BQs5xPo 8iELBkEmX5ej1j4udYF/oXrMpV2aPF2+Xy01OxCSkQR0iYBv5wSFuwk9GDTG/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 4TZ58D04BgzLFk; Tue, 13 Feb 2024 15:38: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 41DFcZAB018984; Tue, 13 Feb 2024 15:38:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DFcZcR018981; Tue, 13 Feb 2024 15:38:35 GMT (envelope-from git) Date: Tue, 13 Feb 2024 15:38:35 GMT Message-Id: <202402131538.41DFcZcR018981@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: c5796f1572c8 - main - rtld: add some dlopen 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: Sender: owner-dev-commits-src-main@freebsd.org 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5796f1572c82b88e8b6a2810c92f30e5ac3e118 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c5796f1572c82b88e8b6a2810c92f30e5ac3e118 commit c5796f1572c82b88e8b6a2810c92f30e5ac3e118 Author: Kyle Evans AuthorDate: 2024-02-13 15:38:02 +0000 Commit: Kyle Evans CommitDate: 2024-02-13 15:38:02 +0000 rtld: add some dlopen tests dlopen_basic just tests that libthr.so can be dlopen()ed, which will just serve as a sanity check that "libthr.so" is a thing that can be dlopened in case we get a weird failure in dlopen_recursing. dlopen_recursing tests a regression reported after the libsys split, where some dlopen() may cause infinite recursion and a resulting crash. This case is inspired by bdrewery's description of what seemed to be causing his issue. The corresponding fix landed in commit 968a18975ad ("rtld: ignore load_filtees() calls if we already [...]") Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D43859 --- libexec/rtld-elf/tests/Makefile | 2 ++ libexec/rtld-elf/tests/dlopen_test.c | 52 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index 06e143a441a1..e380e9850fc1 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -13,6 +13,8 @@ ATF_TESTS_C+= ld_preload_fds SRCS.$t= $t.c common.c .endfor +ATF_TESTS_C+= dlopen_test + WARNS?= 3 .include diff --git a/libexec/rtld-elf/tests/dlopen_test.c b/libexec/rtld-elf/tests/dlopen_test.c new file mode 100644 index 000000000000..ab1e8da1cb41 --- /dev/null +++ b/libexec/rtld-elf/tests/dlopen_test.c @@ -0,0 +1,52 @@ +/*- + * + * Copyright (C) 2024 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +#include + +#include + +ATF_TC_WITHOUT_HEAD(dlopen_basic); +ATF_TC_BODY(dlopen_basic, tc) +{ + void *hdl, *sym; + + hdl = dlopen("libthr.so", RTLD_NOW); + ATF_REQUIRE(hdl != NULL); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym != NULL); + + dlclose(hdl); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym == NULL); +} + +ATF_TC_WITHOUT_HEAD(dlopen_recursing); +ATF_TC_BODY(dlopen_recursing, tc) +{ + void *hdl; + + /* + * If this doesn't crash, we're OK; a regression at one point caused + * some infinite recursion here. + */ + hdl = dlopen("libthr.so", RTLD_NOW | RTLD_GLOBAL); + ATF_REQUIRE(hdl != NULL); + + dlclose(hdl); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dlopen_basic); + ATF_TP_ADD_TC(tp, dlopen_recursing); + + return atf_no_error(); +} From nobody Tue Feb 13 16:18: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 4TZ62G70rFz599Rt; Tue, 13 Feb 2024 16:18: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 4TZ62G6WVfz4l1m; Tue, 13 Feb 2024 16:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707841110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d4MTj1xLAHiHjrMhDnO9aR12PwIwd++rMcvv06PF59c=; b=JOfNw/oa6zRjSLSlpKTwiLtprhIyUyf4ov082V4nfDH+y9h7gsX8JFiYFQuW6BIc4BxJJN 5JA1UmirBH81gD9abCHnLhcQoMBXJ3uy/WftuX7EIwiL2KgzbAuXmJFvgQ8PmSvM0klLeP u7yVNxprl083QY2ClDgOGf3Hy9m/4RBzO7TtBN5fmxlIz2D9Uh3t2lHTvkZ8nLBKACNmX2 m+9P5hIHxWASnjTKophGElMA2XxuhJ41U26Mm3+y0R+fOdGDLslA5RlBgNv7biKOsYHZfM MGGHB+jC9La8zJma/xivMZcFFPzodetkQMMvOR0MIbplNsfkxdDRQfxzyPAmKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707841110; a=rsa-sha256; cv=none; b=SOJhHzqnH8MDUrHNFtO/Njfj8D/oDhuizcFRVoLbPQWgf9zEykRLgCloZQohsx3q78IylO wrF6SXAxBYUzJq7uXTKX2PZHwsPB9BlFk6YALodZd3NK6JOXCbVu+WDcxIww2fwHKaRiqe 2SplHojP5AKDy7Oe6C6HSwxcijPpNpg7Hq05uuTKHu7vek4O37PUeN6ULX0YKop7a1Yc2m j5/YqGVUvEchqpNssI2RC8z4lF2mIaliLgmonBE+Z+QY9gOWzpL6GaBjCIchD4bpcXsZfB gFpwmz/rAKSLOiAzFXAv5bXsjEGl7uflSIXpng4pCRmVaQfN44dtbEZ4bKOyxw== 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=1707841110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d4MTj1xLAHiHjrMhDnO9aR12PwIwd++rMcvv06PF59c=; b=VlRZ6/5MTYBtsssqQWt6cE8xcHEzJ0fgKELb/GjUHbVi3DKgg3CnkhZ+n5YD7xHncLyL0g GMwnV10cybYRQY8LQn64ZqUnaIAMEfGAYmxM4LmhCcMOa6vb6f71ly+RZEkQVf3dII+MJl udw1HNYaLHDf6Sm6GsttcNFxY9IwlC1UsPXmu5VNnZn9noiITItZWuX9JBWEEnkrVU1ZWe P6q+oMVipxlLsYI+tk89lAXrEiVwKB7cVE7zqlBxm3ot6T1bFOUct/1qXAfeUcWQMIqvo/ 0mm1A1maElrusLWPKkzc/zQCpU25VNgP788DuSBgA6e/9QTR9IIfYlzgvTODHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ62G5ZxmzMT1; Tue, 13 Feb 2024 16:18: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 41DGIUSC087643; Tue, 13 Feb 2024 16:18:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DGIUgX087640; Tue, 13 Feb 2024 16:18:30 GMT (envelope-from git) Date: Tue, 13 Feb 2024 16:18:30 GMT Message-Id: <202402131618.41DGIUgX087640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: fd24a63a38d0 - main - x86/ucode: add const where appropriate 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: Sender: owner-dev-commits-src-main@freebsd.org 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: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd24a63a38d0d4cb4f5041ef232036abe09d9d4f Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=fd24a63a38d0d4cb4f5041ef232036abe09d9d4f commit fd24a63a38d0d4cb4f5041ef232036abe09d9d4f Author: Chuck Silvers AuthorDate: 2024-02-13 16:15:25 +0000 Commit: Chuck Silvers CommitDate: 2024-02-13 16:18:06 +0000 x86/ucode: add const where appropriate Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43865 --- sys/x86/include/ucode.h | 2 +- sys/x86/x86/ucode.c | 40 +++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/sys/x86/include/ucode.h b/sys/x86/include/ucode.h index cf9c756fc8f3..e97d41c89ed0 100644 --- a/sys/x86/include/ucode.h +++ b/sys/x86/include/ucode.h @@ -56,7 +56,7 @@ struct ucode_intel_extsig_table { } entries[0]; }; -int ucode_intel_load(void *data, bool unsafe, +int ucode_intel_load(const void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp); size_t ucode_load_bsp(uintptr_t free); void ucode_load_ap(int cpu); diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c index 1366c50f9ae5..8e9f8e113c40 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -50,14 +50,14 @@ #include #include -static void *ucode_intel_match(uint8_t *data, size_t *len); -static int ucode_intel_verify(struct ucode_intel_header *hdr, +static const void *ucode_intel_match(const uint8_t *data, size_t *len); +static int ucode_intel_verify(const struct ucode_intel_header *hdr, size_t resid); static struct ucode_ops { const char *vendor; - int (*load)(void *, bool, uint64_t *, uint64_t *); - void *(*match)(uint8_t *, size_t *); + int (*load)(const void *, bool, uint64_t *, uint64_t *); + const void *(*match)(const uint8_t *, size_t *); } loaders[] = { { .vendor = INTEL_VENDOR_ID, @@ -67,8 +67,8 @@ static struct ucode_ops { }; /* Selected microcode update data. */ -static void *early_ucode_data; -static void *ucode_data; +static const void *early_ucode_data; +static const void *ucode_data; static struct ucode_ops *ucode_loader; /* Variables used for reporting success or failure. */ @@ -103,7 +103,7 @@ log_msg(void *arg __unused) SYSINIT(ucode_log, SI_SUB_CPU, SI_ORDER_FIRST, log_msg, NULL); int -ucode_intel_load(void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp) +ucode_intel_load(const void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp) { uint64_t nrev, orev; uint32_t cpuid[4]; @@ -140,9 +140,10 @@ ucode_intel_load(void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp) } static int -ucode_intel_verify(struct ucode_intel_header *hdr, size_t resid) +ucode_intel_verify(const struct ucode_intel_header *hdr, size_t resid) { - uint32_t cksum, *data, size; + const uint32_t *data; + uint32_t cksum, size; int i; if (resid < sizeof(struct ucode_intel_header)) @@ -160,7 +161,7 @@ ucode_intel_verify(struct ucode_intel_header *hdr, size_t resid) return (1); cksum = 0; - data = (uint32_t *)hdr; + data = (const uint32_t *)hdr; for (i = 0; i < size / sizeof(uint32_t); i++) cksum += data[i]; if (cksum != 0) @@ -168,12 +169,12 @@ ucode_intel_verify(struct ucode_intel_header *hdr, size_t resid) return (0); } -static void * -ucode_intel_match(uint8_t *data, size_t *len) +static const void * +ucode_intel_match(const uint8_t *data, size_t *len) { - struct ucode_intel_header *hdr; - struct ucode_intel_extsig_table *table; - struct ucode_intel_extsig *entry; + const struct ucode_intel_header *hdr; + const struct ucode_intel_extsig_table *table; + const struct ucode_intel_extsig *entry; uint64_t platformid; size_t resid; uint32_t data_size, flags, regs[4], sig, total_size; @@ -186,7 +187,7 @@ ucode_intel_match(uint8_t *data, size_t *len) flags = 1 << ((platformid >> 50) & 0x7); for (resid = *len; resid > 0; data += total_size, resid -= total_size) { - hdr = (struct ucode_intel_header *)data; + hdr = (const struct ucode_intel_header *)data; if (ucode_intel_verify(hdr, resid) != 0) { ucode_error = VERIFICATION_FAILED; break; @@ -200,8 +201,8 @@ ucode_intel_match(uint8_t *data, size_t *len) total_size = UCODE_INTEL_DEFAULT_DATA_SIZE + sizeof(struct ucode_intel_header); if (data_size > total_size + sizeof(struct ucode_intel_header)) - table = (struct ucode_intel_extsig_table *) - ((uint8_t *)(hdr + 1) + data_size); + table = (const struct ucode_intel_extsig_table *) + ((const uint8_t *)(hdr + 1) + data_size); else table = NULL; @@ -317,7 +318,8 @@ ucode_load_bsp(uintptr_t free) uint32_t regs[4]; char vendor[13]; } cpuid; - uint8_t *addr, *fileaddr, *match; + const uint8_t *fileaddr, *match; + uint8_t *addr; char *type; uint64_t nrev, orev; caddr_t file; From nobody Tue Feb 13 16:29: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 4TZ6HM0DBVz59BPr; Tue, 13 Feb 2024 16:29:51 +0000 (UTC) (envelope-from dch@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 4TZ6HL6pfpz4nBJ; Tue, 13 Feb 2024 16:29:50 +0000 (UTC) (envelope-from dch@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707841791; 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=GK3TOc66HV/NjSRq4T+ahwEH8INJD4wCIcNAtX4Iowc=; b=NtTrgwhUYcEgf11sZ32jyrpacFWkvsM7vCt6L5dd4dgLB4YmpL5jwtmA66N3x+zHd/YDBh uKvZELgS7TWvVhAyZ+Ux0HJlb7dRiGFkXTQWWKK+jwDiWRuOrrfn0AhNlRJQGST7JKIDAl F4THOet7dRUmWUSigwaAQN4zFaje/AKsOC2+VanKlfeKZa5EGQaePCoWODBffSskca4tlW 8VEBG/x9vlL96nVRLt2YG8xPT5cHZRjSKPG320DKXbSV7lcW4KI1LePk7fEEJs7ICseJrz W87r5JYVWa4Y78BNOntsEICiPX0o8eak8LvZdvYcJw1ekX/Nod/sUcz+RQBcxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707841791; a=rsa-sha256; cv=none; b=yhsCzpfsaovVKG0EORvMuhYAXX8JtrcLXe/STjTAFRMpxh3sF9qMsISc3GiYZVppotZAfp hYfNYkECeuuRNG5amI0VfpmINOUUssftzaM1NqsKD135W4M0nw7C37l0+GXroVDILbl9OB KDacJDYuos0MZvK/wo+yYpcHsl4u40yyKEzvjQV9jfFOOAWdrk2/1HKKfV82uTVIq5hvQn ulirGaaVKiG1EoU+STn9f5JyH+cDq/lkfGMrq7yCxE3Vtyx1RzzDg9Z8IE3FaUewVZ9xu5 qeS4SxGgB5CvLVCxW3Hmz8cKxXMGB1fXg8LNfSaHPKsvaRQAkH54RbSORHd3CQ== 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=1707841791; 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=GK3TOc66HV/NjSRq4T+ahwEH8INJD4wCIcNAtX4Iowc=; b=Rq3jT37KUHFOQqCfejQrPHODADA/M0YAYbwbueZCiRc/SoOzmN+arbJqfsVugUZH2dL7O7 hLegoM3Bz1LFcvSY1mfNBP7e/JOBMvELKy1zBaGFzqK3veS4SW7bs7F6ZldQFti8kzhK+s wQt/kgM4OR/i+CICU9dgQjD1tROWd+FUjGh5S4CYfcXtwlul+HBHlAOG7GNbOVydF/MUUg qeu5MPlOAv65qpNh//MJIPQiruU15Lcu/EYBCM2vySljOuLTlGMqEiYAFDc2Brn4ZqL7wL yZCwiHfoHbnOsm0oQ4CQ6t3xxdCNxX1D7Z4PTOFXON4Or5KNGkQ8vzDm8unMtw== Received: from auth2-smtp.messagingengine.com (auth2-smtp.messagingengine.com [66.111.4.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dch/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TZ6HL5bKHz1B8v; Tue, 13 Feb 2024 16:29:50 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailauth.nyi.internal (Postfix) with ESMTP id 2283027C005B; Tue, 13 Feb 2024 11:29:50 -0500 (EST) Received: from imap44 ([10.202.2.94]) by compute2.internal (MEProxy); Tue, 13 Feb 2024 11:29:50 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudehgdekkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefofgggkfgjfhffhffvvefutgfgsehtqhertderreejnecuhfhrohhmpedfffgr vhgvucevohhtthhlvghhuhgsvghrfdcuoegutghhsefhrhgvvgeuufffrdhorhhgqeenuc ggtffrrghtthgvrhhnpeetkedtleeviedtkedtieeffeeuffduueektdefgedvteekueeh fefgiedulefgtdenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegutghhodhmvghsmhhtphgr uhhthhhpvghrshhonhgrlhhithihqdduvdegledutdefgeduqdduvddufeduudejjedqug gthheppefhrhgvvgeuufffrdhorhhgsehfrghsthhmrghilhdrfhhm X-ME-Proxy: Feedback-ID: icedc46df:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id DF45A36A0076; Tue, 13 Feb 2024 11:29:49 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-144-ge5821d614e-fm-20240125.002-ge5821d61 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Message-Id: In-Reply-To: References: <202402100934.41A9Y11l044213@gitrepo.freebsd.org> Date: Tue, 13 Feb 2024 16:29:26 +0000 From: "Dave Cottlehuber" To: "Michael Tuexen" , "Richard Scheffenegger" Cc: "Cheng Cui" , transport@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: hitting Assertion !callout_active(&tp->t_callout) failed at /usr/src/sys/netinet/tcp_subr.c:2386 after 62d47d7 Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, 12 Feb 2024, at 19:53, Cheng Cui wrote: > I created https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D277009. = You=20 > may add your findings there. > > On Mon, Feb 12, 2024 at 6:41=E2=80=AFAM Dave Cottlehuber wrote: >> On Mon, 12 Feb 2024, at 10:26, tuexen@freebsd.org wrote: >> >> On Feb 12, 2024, at 09:50, Dave Cottlehuber wrot= e: >> >>=20 >> >> On Mon, 12 Feb 2024, at 08:31, Dave Cottlehuber wrote: >> >>> I'm repeatedly hitting this assert soon after boot on my ryzen de= sktop=20 >> >>> I've a coredump. >> >>>=20 >> >>> Panic String: Assertion !callout_active(&tp->t_callout) failed at=20 >> >>> /usr/src/sys/netinet/tcp_subr.c:2386 [snip] >> this one happens during boot very early, I have a coredump handy if t= hat helps. >> I will try with all sysctls disabled, and without zerotier (overlay n= etwork) >> too, see if that makes a difference. Richard's partial revert 57e27ff07aff35289892f79288bebf76a3c31fec fixes = this, thanks. disabling sysctls + zerotier made no difference. A+ Dave =E2=80=94=E2=80=94=E2=80=94 O for a muse of fire, that would ascend the brightest heaven of inventio= n! From nobody Tue Feb 13 16:39: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 4TZ6VS0WRcz59Cch; Tue, 13 Feb 2024 16:39:28 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) 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) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZ6VR5ngHz4nwn; Tue, 13 Feb 2024 16:39:27 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Authentication-Results: mx1.freebsd.org; none Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id C33193C019A; Tue, 13 Feb 2024 16:39:21 +0000 (UTC) Date: Tue, 13 Feb 2024 16:39:21 +0000 From: Brooks Davis To: Alexey Dokuchaev Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fd1066bed67f - main - .profile: Don't bother checking for /home symlink Message-ID: References: <202402121425.41CEPmxI075183@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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US] X-Rspamd-Queue-Id: 4TZ6VR5ngHz4nwn X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Tue, Feb 13, 2024 at 03:23:13AM +0000, Alexey Dokuchaev wrote: > On Mon, Feb 12, 2024 at 02:25:48PM +0000, Ed Maste wrote: > > commit fd1066bed67f642ed01f5dd62b7b6cfb0a45fd4c > > > > .profile: Don't bother checking for /home symlink > > > > Since FreeBSD 14.0, user directories are created directly under /home. > > This check should no longer be needed. > > > > @@ -19,9 +19,6 @@ > > # set ENV to a file invoked each time sh is started for interactive use. > > ENV=$HOME/.shrc; export ENV > > > > -# Let sh(1) know it's at home, despite /home being a symlink. > > -if [ "$PWD" != "$HOME" ] && [ "$PWD" -ef "$HOME" ] ; then cd ; fi > > - > > The installer creates separate /home, individual hackers might want to > partition their drives the old way as / (root) + /usr (everything else), > so this check is probably still useful. Perhaps more likely to be an issue: not all FreeBSD 14 systems started as fresh installs. -- Brooks From nobody Tue Feb 13 17:47: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 4TZ81P6G1Sz59MQy; Tue, 13 Feb 2024 17:47: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 4TZ81P5mQrz4203; Tue, 13 Feb 2024 17:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707846473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NX4gqCutnabSKrHxYzd2Fg3LLBPkkGJq3/Zn2u40AvU=; b=bKFa4KwHSF1lkxKQV5E8nHR6P8tVuXAwSZ73JXPEnaAnrSUiWm5rKdGaskzR3S7AVt7XPM f3iR4hMc1ENbv4gJ0V6SbZvAYfmndVnbxhRSs2K7v78mRDLDgBnAs8IVo2nMZ8wFacJI7W I1F9Bf1coOsa27vvWPIdn/ic7Xszo3S88VTB8YEuBSBeBTDHfFU75WfTSt/b7r0dWmBy8o Iqlb0CeyqX3QwSwIRyQEtwNI8yO/xyTwrm3R+YQkfi1qoeG67dpVtYhJpCGSRoYhFu9/of wuUaDmnCLlB5t2cQuobf/manNUW0xcDFKqQHL9hJP7usylvxKg+QMwULfDv76A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707846473; a=rsa-sha256; cv=none; b=evqvjB3pS37itB2gZewTumD+0tfsKETdrpv2S28JGMmzEsByXo2BSWXCGza0gTQ8uB29gq 5FIXhz/ZVN0RwDL8jkGgWSDhDfED6kRsICwMIw9M+RUyd8Oni14sq7PI5stbUZycyjm8K0 cKt3e6O7LOT7OLhCIGpfTs/RlWz8fUji21So0H1tp51X/a3EN0GTm9lrSLS7ulJdi1PMNi 9tdhajJYKoMi5kqJT2TtmiqwlwoiDiWNo+vCiQoTBhzdJaxOAxHXz6a7aKhkSy5Z+x/BQZ xeq/YQLkbP9eM/eTdbEB7eVoNk8qFtZKr9jWcmNwNvLqABGIK59KVNP4p6wgJw== 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=1707846473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NX4gqCutnabSKrHxYzd2Fg3LLBPkkGJq3/Zn2u40AvU=; b=WNV+JgpPKtOdTp8QmmOdipwBBWf4v38Hr2rMyhRhI5v1WwU8AmTpu2LLZ4O1xXrRR7TV9m y1CQKNGmt/5Gytk90OxXAWIGszEADjvuWQT2PeBzpQA3b0pFsyMBwCtP2R6eoKewB9dEzl q4RPS+rStWkAgmfNxwWE7Z+/29sIvJim5sr2+K1d3oe/aStxZi9IyaLrLbGbfdmq9hhOaE eQQiqwE5t4YVjFavKTaEk8ax2o52p6O6mYWCRGIeGNejEgZv0LJSECe/zAf30hlmSdK4KV 7gN3kiU1h43aRvr26X/yq7TFmz2BXyKkJk5kCkLg9gUhCOlkexHLoOJPn3CCBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ81P4pqbzPk2; Tue, 13 Feb 2024 17:47: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 41DHlr3J038088; Tue, 13 Feb 2024 17:47:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DHlrbO038085; Tue, 13 Feb 2024 17:47:53 GMT (envelope-from git) Date: Tue, 13 Feb 2024 17:47:53 GMT Message-Id: <202402131747.41DHlrbO038085@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: 9cc816c255df - main - Fix typo in da flags reporting 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cc816c255df15ebd43e6ab3c29e0af59b741e85 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9cc816c255df15ebd43e6ab3c29e0af59b741e85 commit 9cc816c255df15ebd43e6ab3c29e0af59b741e85 Author: Dan Kotowski AuthorDate: 2024-02-13 17:42:13 +0000 Commit: Warner Losh CommitDate: 2024-02-13 17:44:59 +0000 Fix typo in da flags reporting ANNOUCNED -> ANNOUNCED Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41948 --- sys/cam/scsi/scsi_da.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 35bfd096f3e1..d578e4ccb712 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -137,7 +137,7 @@ typedef enum { "\013CAN_RC16" \ "\014PROBED" \ "\015DIRTY" \ - "\016ANNOUCNED" \ + "\016ANNOUNCED" \ "\017CAN_ATA_DMA" \ "\020CAN_ATA_LOG" \ "\021CAN_ATA_IDLOG" \ From nobody Tue Feb 13 18:19: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 4TZ8jk5qX3z59RKp; Tue, 13 Feb 2024 18:19:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZ8jk0qwqz46Dp; Tue, 13 Feb 2024 18:19:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-51182ece518so3678256e87.3; Tue, 13 Feb 2024 10:19:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707848359; x=1708453159; 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=uW9wlsVDbmvIqQKc0XClCoQN4K98QVSHw8koVv5pSiw=; b=KAdZpj4F9pcRhSG7t/h2kMSHsgQgVOxN9ENDgZZTYYEx5aOpVw2sxJc2CQ0ADDp2Nh S2jEk0Cb+GZH2PdWNPrKpLz/3oi7fL43+iMqW5P3ksbStPJlChgIyRy5GIBbLae9U5hc k09F9y6U8LbeYZ+LvdD5oy8JM0w9gD4E781hj2Y1ztvv/S9+6j0Qqvwuro+fF75/ZjeS T9soTuH1y4iLh1c6dK8bzeg76czh4mM12Dtu81MKRnTSLnkiztm02MfRa+gInu2yuxoS UIoR6CpHsfvdA5mV4ilxz4E/S9kdLg1/FSavqhivbGP3cilKrToi14DRO6Y67G8nn/vH zkSg== X-Forwarded-Encrypted: i=1; AJvYcCXhCO6gJr34BRysJcbgprP57RlC8noXr+Kpt+oejs124uD5MqqGrvBPnHCYYJRkBDEn7l81d8KZ55PI3p3XM/6OYq4ut9CxdeklEKAu3EjAao3VzL3UGKQ58PBqT4ARuPlkLyPrpzlfA6Pf0u6MIsnb+Cn8XsWJ+U9cROLGrLZzjvVJ/KXTxOKvtutvZjQ= X-Gm-Message-State: AOJu0Yx7AjKD3fCD+alYXJtv+z7Qd/mcKUGIXJrJGOp3++ywtuWgLiSQ JPNxlS8I9U5pYilhvslVkPDSLzEtlRyH40YRhqeynp5n508Pb0xmsG5PnkKBQtVmngShsWLYEsO qiloEkrfT8cjmbd3ZHKvbJ+uUlVpOD7Rw X-Google-Smtp-Source: AGHT+IEF2+wagBZevw2zsbrlhb4yB04hUXCTiYrq88RP0pHwlWAOoBooP3n/5/szrXgBWdghm0A/s6ZxZYkshkL1wHU= X-Received: by 2002:ac2:592e:0:b0:511:534c:e714 with SMTP id v14-20020ac2592e000000b00511534ce714mr203457lfi.65.1707848358777; Tue, 13 Feb 2024 10:19:18 -0800 (PST) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402121425.41CEPmxI075183@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Tue, 13 Feb 2024 13:19:06 -0500 Message-ID: Subject: Re: git: fd1066bed67f - main - .profile: Don't bother checking for /home symlink To: Brooks Davis Cc: Alexey Dokuchaev , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4TZ8jk0qwqz46Dp X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Tue, 13 Feb 2024 at 11:39, Brooks Davis wrote: > > > The installer creates separate /home, individual hackers might want to > > partition their drives the old way as / (root) + /usr (everything else), > > so this check is probably still useful. > > Perhaps more likely to be an issue: not all FreeBSD 14 systems started > as fresh installs. Ok, I can put it back. From nobody Tue Feb 13 18:25: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 4TZ8rv2xwBz59Rnv; Tue, 13 Feb 2024 18:25: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 4TZ8rv2MYMz470G; Tue, 13 Feb 2024 18:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707848735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Abp5BWfi+o/K0940rGmgkc16vc2gRiSuojAgi+c9vA=; b=cHCCiy6gWAd1N6mwQLCXzi2k/KSJlfJnbCDoYCGdLNU2SDynIZYd9K7PWUmiqxVQoQ2AQg RAyKpy8e1jM3hMkWYUroeJr6BwuoMY4K5E9SKGdOa6cjHyrABuZc8y3C1YxpKbXwO6H7u0 xsNRqAhFa/SRxYtLSUbnz91nZfbeRoeuG/0uC4y7+p5KllQ8GbbJ1eJdRSLp6JQ6tC5FDN +fYAYRzodvwbVpCfVFx7qTupqV1o77bAEA+zpNpi0jfNyUk/qWb7pNuEVxgN8/ZGfFZxvI 07W+sx6w4i8pY59IvPVop0HC2OJAdKuYnlsLosf9u+WqtZkEVhcHpYigS8ofIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707848735; a=rsa-sha256; cv=none; b=fL8AWMSsSubwIsp+fRaJfUL6rB8ffbzQf3/9pb7zXKpCN3+BwfQqLUdeajpYiR/oQ7MPiP MPqs3P8ENlsJGYzU5mOXKOolDLzoGoDkb5HL/9jdzk2Ng4G1QMos0eWKbi29YjH8K813p3 hEVeGWFQgN9AcVoLOCzvfy6FexaNCR+imt+c7absrVePwLkxjuQ9uAhTGJFDbeKiQ6NW7D qHZXfin6/i7SLk73K5pp7jM01KnBn4L1JkDin8Rxm5skj/UiqRxK3vWlFpU3WHwYe1QLZA qVTzjj2/7cxu7Nwx3QRkscwgHxCgZJ5PLLYJ9avZjIOpgxg7yPEK0fwEfDIHaQ== 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=1707848735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Abp5BWfi+o/K0940rGmgkc16vc2gRiSuojAgi+c9vA=; b=cOcnfttcovM15yGRIcr+2Wjz/0bfVuaE3C1wmbuuGiungJaMtKkDlkQ8RpU3WrJeK3tlaF FZtwvsznzEIU5xDnI621+bIr1n5C1ZeGwD3DxvhX6X5e7+RX3+/nuC8Mi1N7YZQtWp8QAH 1Tm2EOJz9Hy8PIZge+PwyAV6hUpV8Qqw43r8rSIkekmbdJCxwKz7uYIyM0RMXZgK+6eyZJ iTQNEQh4/S74GQN6Cyn3GSYunks718RdBTKgefz7xiKEpYwesbjAqPUGYJMdJ6iOVmBVIR 6q041Atq53ninztrAgysS775amvJexvQyTPPxjWUjmywR12SN073EqwiH0J0/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 4TZ8rv1Nk6zQ92; Tue, 13 Feb 2024 18:25: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 41DIPZHF005978; Tue, 13 Feb 2024 18:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DIPZM0005975; Tue, 13 Feb 2024 18:25:35 GMT (envelope-from git) Date: Tue, 13 Feb 2024 18:25:35 GMT Message-Id: <202402131825.41DIPZM0005975@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: b4b61ead7eab - main - dot.profile: handle symlinked $HOME 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4b61ead7eabb7b6f3a6de67f7594b17c3a20660 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b4b61ead7eabb7b6f3a6de67f7594b17c3a20660 commit b4b61ead7eabb7b6f3a6de67f7594b17c3a20660 Author: Edward Tomasz Napierala AuthorDate: 2019-01-09 11:04:27 +0000 Commit: Ed Maste CommitDate: 2024-02-13 18:24:22 +0000 dot.profile: handle symlinked $HOME Reapply 4cea05a273c875b5d5d4c41bfa6f2f0a60fa4a66: Make sh(1) recognize the default $HOME. By default /home is a symlink; without this change, when you log in, sh(1) won't realize the current directory (eg '/usr/home/test') is the same as $HOME ('/home/test'). /home is no longer a symlink by default, but new users may be added on systems that started out with an earlier version of FreeBSD (and still have /home as a symlink) or admins may do so. This test is not particularly expensive, so just restore it. Suggested by: danfe, brooks --- share/skel/dot.profile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/skel/dot.profile b/share/skel/dot.profile index 7b9aa96c834a..40dfa58f4e84 100644 --- a/share/skel/dot.profile +++ b/share/skel/dot.profile @@ -19,6 +19,9 @@ PAGER=less; export PAGER # set ENV to a file invoked each time sh is started for interactive use. ENV=$HOME/.shrc; export ENV +# Let sh(1) know it's at home, despite /home being a symlink. +if [ "$PWD" != "$HOME" ] && [ "$PWD" -ef "$HOME" ] ; then cd ; fi + # Query terminal size; useful for serial lines. if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi From nobody Tue Feb 13 20:36: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 4TZClx5l1Bz59jm1; Tue, 13 Feb 2024 20:36: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 4TZClx5Qbnz4Q73; Tue, 13 Feb 2024 20:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707856589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qEbNmYFKiI0qlHkPrQ8A8DGGvXhK4b3MxaYQy2R7wiU=; b=V6w3qV5cgVn4fwAPvvBYgNxILYxYR9Tn7QVz/C7bZTa2cM5dSHX7aj5Omqa6zpjdCNo9Kk cUTFg2YacbTmptcxMqOmqJgnIc7HkIYZrbOd9Qi7Qw0+efg9xwf0pi8rqoe0JM8oFViPBT qFNMNatIGmxKdXWggyxuZ0tR2JpnzDRQaAGCLpn+aDswlwuD4idx4KQDT3KHmyuUtPe49N 1n9naJz/39PTV83hlzsn7hoH7TL0bQ+vrp+G7F7CJT3tOEwP2rQz3yOEr/gkHsl8WnRVUb w6IjIaDGTDUKerDnW7WYinbIh3pRoW2DvvKFO70katHkIc+wggBAzU1KpHV+Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707856589; a=rsa-sha256; cv=none; b=mMO0R8KZ6MMhT0K/9+CCpRA5ZQw+xv/4ihTcaxxVbTvy0xoywMy9XzgVoYXjREMMm2b9Ov ER84j+9BJN7Ov/9fTBvesDzAHHSJrIBPJcTFGwGpVpSw+7bwxlVwsC/iEJLLUhozhoQx0G CvHWLEjYeYJj3YGvgxi+T8OqN6r23JoVGAPT55WwJWxNu/MUIAoC1ebLXil9S85sKPUUjI 9iSeirQTUYwKM80nge0VnzNn/RoaWVRZy3zU5Um64HKnkeXN3cR2f45/eySXW6BcbnVCkE Xi/MnMJzcrerMirbGxAuOsKF142UsAVtEJ6qZewM1Kgs7jeMK7KhmPkzeHrY0A== 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=1707856589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qEbNmYFKiI0qlHkPrQ8A8DGGvXhK4b3MxaYQy2R7wiU=; b=ygVvHWp+/Z9exsao4eHp/cVCqscLYlCXtb9wVtxbR+DPc/jCT8wXaKdr5hN63Bj621pK05 r05O9srnndWk/WqAQpg4gudUUtbdDDarj2lyo4cWioH6oUY3JE/Ni/TmBOrGLNs3XuPQwg qNnX2fH0WxQvCfiYi4lGnmzv+QRs7172ur4XsXpj/U09H+QhfyBOKlHV9jgRf/LMwHmavs 5XK9XB6Wvlm+CWy5CAJCEv5Xves2yBQ3go6wpkWHmLFfFRCTLyBDU0M9k52onI2bAkc1rX Npx2kfk+An9B/gWVji7P8JTu4qPXjXH2l0gJO1ZrSZWPPKQtAHkHIcst+5/4MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZClx4W49zV3c; Tue, 13 Feb 2024 20:36: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 41DKaTLC025468; Tue, 13 Feb 2024 20:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DKaTwh025465; Tue, 13 Feb 2024 20:36:29 GMT (envelope-from git) Date: Tue, 13 Feb 2024 20:36:29 GMT Message-Id: <202402132036.41DKaTwh025465@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: 46c599340f18 - main - Update tzcode to 2024a. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46c599340f187db577b9212ab18022f3c7380c68 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=46c599340f187db577b9212ab18022f3c7380c68 commit 46c599340f187db577b9212ab18022f3c7380c68 Merge: b4b61ead7eab 378c74faf328 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-13 20:20:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-13 20:31:41 +0000 Update tzcode to 2024a. MFC after: 3 weeks Sponsored by: Klara, Inc. contrib/tzcode/Makefile | 261 +++++++---- contrib/tzcode/NEWS | 193 +++++++- contrib/tzcode/README | 19 +- contrib/tzcode/date.1 | 14 +- contrib/tzcode/localtime.c | 128 +++--- contrib/tzcode/newctime.3 | 16 +- contrib/tzcode/newstrftime.3 | 152 ++++++- contrib/tzcode/newtzset.3 | 206 +++++---- contrib/tzcode/private.h | 44 +- contrib/tzcode/strftime.c | 7 +- contrib/tzcode/theory.html | 37 +- contrib/tzcode/tz-art.html | 419 ++++++++---------- contrib/tzcode/tz-link.html | 118 +++-- contrib/tzcode/tzdir.h | 6 + contrib/tzcode/tzfile.5 | 32 +- contrib/tzcode/tzfile.h | 14 +- contrib/tzcode/tzselect.8 | 2 +- contrib/tzcode/tzselect.ksh | 1006 +++++++++++++++++++++++------------------- contrib/tzcode/version | 2 +- contrib/tzcode/zdump.c | 2 +- contrib/tzcode/zic.8 | 35 +- contrib/tzcode/zic.c | 239 +++++----- lib/libc/gen/sysconf.c | 2 +- lib/libc/stdtime/strftime.c | 2 +- 24 files changed, 1767 insertions(+), 1189 deletions(-) diff --cc contrib/tzcode/Makefile index 0e56af89e2a4,000000000000..d48354c72df4 mode 100644,000000..100644 --- a/contrib/tzcode/Makefile +++ b/contrib/tzcode/Makefile @@@ -1,1250 -1,0 +1,1361 @@@ +# Make and install tzdb code and data. - +# This file is in the public domain, so clarified as of +# 2009-05-17 by Arthur David Olson. ++# Request POSIX conformance; this must be the first non-comment line. ++.POSIX: ++# On older platforms you may need to scrounge for a POSIX-conforming 'make'. ++# For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or ++# /usr/xpg4/bin/make, not /usr/ccs/bin/make. ++ ++# To affect how this Makefile works, you can run a shell script like this: ++# ++# #!/bin/sh ++# make CC='gcc -std=gnu11' "$@" ++# ++# This example script is appropriate for a pre-2017 GNU/Linux system ++# where a non-default setting is needed to support this package's use of C99. ++# ++# Alternatively, you can simply edit this Makefile to tailor the following ++# macro definitions. ++ ++############################################################################### ++# Start of macros that one plausibly might want to tailor. + +# Package name for the code distribution. +PACKAGE= tzcode + +# Version number for the distribution, overridden in the 'tarballs' rule below. +VERSION= unknown + +# Email address for bug reports. +BUGEMAIL= tz@iana.org + +# DATAFORM selects the data format. +# Available formats represent essentially the same data, albeit +# possibly with minor discrepancies that users are not likely to notice. +# To get new features and the best data right away, use: +# DATAFORM= vanguard +# To wait a while before using new features, to give downstream users +# time to upgrade zic (the default), use: +# DATAFORM= main +# To wait even longer for new features, use: +# DATAFORM= rearguard +# Rearguard users might also want "ZFLAGS = -b fat"; see below. +DATAFORM= main + +# Change the line below for your timezone (after finding the one you want in +# one of the $(TDATA) source files, or adding it to a source file). +# Alternatively, if you discover you've got the wrong timezone, you can just +# 'zic -l -' to remove it, or 'zic -l rightzone' to change it. +# Use the command +# make zonenames +# to get a list of the values you can use for LOCALTIME. + +LOCALTIME= Factory + - # The POSIXRULES macro controls interpretation of POSIX-like TZ ++# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ +# settings like TZ='EET-2EEST' that lack DST transition rules. +# If POSIXRULES is '-', no template is installed; this is the default. +# Any other value for POSIXRULES is obsolete and should not be relied on, as: +# * It does not work correctly in popular implementations such as GNU/Linux. +# * It does not work even in tzcode, except for historical timestamps +# that precede the last explicit transition in the POSIXRULES file. +# Hence it typically does not work for current and future timestamps. +# If, despite the above, you want a template for handling these settings, +# you can change the line below (after finding the timezone you want in the +# one of the $(TDATA) source files, or adding it to a source file). +# Alternatively, if you discover you've got the wrong timezone, you can just +# 'zic -p -' to remove it, or 'zic -p rightzone' to change it. +# Use the command +# make zonenames +# to get a list of the values you can use for POSIXRULES. + +POSIXRULES= - + +# Also see TZDEFRULESTRING below, which takes effect only +# if POSIXRULES is '-' or if the template file cannot be accessed. + + +# Installation locations. +# +# The defaults are suitable for Debian, except that if REDO is +# posix_right or right_posix then files that Debian puts under +# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead +# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps, +# respectively. Problems with the Debian approach are discussed in +# the commentary for the right_posix rule (below). + +# Destination directory, which can be used for staging. +# 'make DESTDIR=/stage install' installs under /stage (e.g., to +# /stage/etc/localtime instead of to /etc/localtime). Files under +# /stage are not intended to work as-is, but can be copied by hand to +# the root directory later. If DESTDIR is empty, 'make install' does +# not stage, but installs directly into production locations. +DESTDIR = + +# Everything is installed into subdirectories of TOPDIR, and used there. +# TOPDIR should be empty (meaning the root directory), +# or a directory name that does not end in "/". +# TOPDIR should be empty or an absolute name unless you're just testing. +TOPDIR = + +# The default local timezone is taken from the file TZDEFAULT. +TZDEFAULT = $(TOPDIR)/etc/localtime + +# The subdirectory containing installed program and data files, and +# likewise for installed files that can be shared among architectures. +# These should be relative file names. +USRDIR = usr +USRSHAREDIR = $(USRDIR)/share + +# "Compiled" timezone information is placed in the "TZDIR" directory +# (and subdirectories). +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. +TZDIR_BASENAME= zoneinfo +TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME) + +# The "tzselect" and (if you do "make INSTALL") "date" commands go in: +BINDIR = $(TOPDIR)/$(USRDIR)/bin + +# The "zdump" command goes in: +ZDUMPDIR = $(BINDIR) + +# The "zic" command goes in: +ZICDIR = $(TOPDIR)/$(USRDIR)/sbin + +# Manual pages go in subdirectories of. . . +MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man + +# Library functions are put in an archive in LIBDIR. +LIBDIR = $(TOPDIR)/$(USRDIR)/lib + + +# Types to try, as an alternative to time_t. +TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL) +TIME_T_ALTERNATIVES_HEAD = int_least64_t +TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t + +# What kind of TZif data files to generate. (TZif is the binary time +# zone data format that zic generates; see Internet RFC 8536.) +# If you want only POSIX time, with time values interpreted as +# seconds since the epoch (not counting leap seconds), use +# REDO= posix_only +# below. If you want only "right" time, with values interpreted +# as seconds since the epoch (counting leap seconds), use +# REDO= right_only +# below. If you want both sets of data available, with leap seconds not +# counted normally, use +# REDO= posix_right +# below. If you want both sets of data available, with leap seconds counted +# normally, use +# REDO= right_posix +# below. POSIX mandates that leap seconds not be counted; for compatibility +# with it, use "posix_only" or "posix_right". Use POSIX time on systems with +# leap smearing; this can work better than unsmeared "right" time with +# applications that are not leap second aware, and is closer to unsmeared +# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error). + +REDO= posix_right + +# Whether to put an "Expires" line in the leapseconds file. +# Use EXPIRES_LINE=1 to put the line in, 0 to omit it. +# The EXPIRES_LINE value matters only if REDO's value contains "right". +# If you change EXPIRES_LINE, remove the leapseconds file before running "make". +# zic's support for the Expires line was introduced in tzdb 2020a, +# and was modified in tzdb 2021b to generate version 4 TZif files. +# EXPIRES_LINE defaults to 0 for now so that the leapseconds file +# can be given to pre-2020a zic implementations and so that TZif files +# built by newer zic implementations can be read by pre-2021b libraries. +EXPIRES_LINE= 0 + +# To install data in text form that has all the information of the TZif data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward +# To omit these links, use +# BACKWARD= + +BACKWARD= backward + +# If you want out-of-scope and often-wrong data from the file 'backzone', +# but only for entries listed in the backward-compatibility file zone.tab, use +# PACKRATDATA= backzone +# PACKRATLIST= zone.tab +# If you want all the 'backzone' data, use +# PACKRATDATA= backzone +# PACKRATLIST= +# To omit this data, use +# PACKRATDATA= +# PACKRATLIST= + +PACKRATDATA= +PACKRATLIST= + +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + +# Non-default libraries needed to link. +# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0. +LDLIBS= + - # Add the following to the end of the "CFLAGS=" line as needed to override - # defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1". ++# Add the following to an uncommented "CFLAGS=" line as needed ++# to override defaults specified in the source code or by the system. ++# "-DFOO" is equivalent to "-DFOO=1". +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. +# -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# -DHAVE_DECL_ENVIRON if declares 'environ' +# -DHAVE_DECL_TIMEGM=0 if does not declare timegm +# -DHAVE_DIRECT_H if mkdir needs (MS-Windows) +# -DHAVE__GENERIC=0 if _Generic does not work* +# -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux), +# -DHAVE_GETRANDOM=0 to avoid using getrandom +# -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris), +# where LDLIBS also needs to contain -lintl on some hosts; +# -DHAVE_GETTEXT=0 to avoid using gettext +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares +# ctime_r and asctime_r incompatibly with the POSIX standard +# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). +# -DHAVE_INTTYPES_H=0 if does not work*+ +# -DHAVE_LINK=0 if your system lacks a link function +# -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function +# -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz +# localtime_rz can make zdump significantly faster, but is nonstandard. +# -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure. +# -DHAVE_POSIX_DECLS=0 if your system's include files do not declare +# functions like 'link' or variables like 'tzname' required by POSIX +# -DHAVE_SETENV=0 if your system lacks the setenv function +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+ +# -DHAVE_STDCKDINT_H=0 if neither nor substitutes like +# __builtin_add_overflow work* +# -DHAVE_STDINT_H=0 if does not work*+ +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l +# -DHAVE_STRDUP=0 if your system lacks the strdup function +# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+ +# -DHAVE_SYMLINK=0 if your system lacks the symlink function +# -DHAVE_SYS_STAT_H=0 if does not work* +# -DHAVE_TZSET=0 if your system lacks a tzset function +# -DHAVE_UNISTD_H=0 if does not work* +# -DHAVE_UTMPX_H=0 if does not work* +# -Dlocale_t=XXX if your system uses XXX instead of locale_t - # -DPORT_TO_C89 if tzcode should also run on C89 platforms+ ++# -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+ ++# Typically it is better to use a later standard. For example, ++# with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'. ++# Even with -DPORT_TO_C89, the code needs at least one C99 ++# feature (integers at least 64 bits wide) and maybe more. +# -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers +# with external linkage, e.g., applications cannot define 'localtime'. +# -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DSUPPORT_C89 if the tzcode library should support C89 callers+ ++# However, this might trigger latent bugs in C99-or-later callers. +# -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has +# security implications and is not recommended for general use +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; +# not needed by the main-program tz code, which is single-threaded. +# Append other compiler flags as needed, e.g., -pthread on GNU/Linux. +# -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. +# -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" +# -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; +# the default is system-supplied, typically "/usr/lib/locale" +# -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified - # DST transitions for POSIX-style TZ strings lacking them, ++# DST transitions for POSIX.1-2017-style TZ strings lacking them, +# in the usual case where POSIXRULES is '-'. If not specified, +# TZDEFRULESTRING defaults to US rules for future DST transitions. +# This mishandles some past timestamps, as US DST rules have changed. +# It also mishandles settings like TZ='EET-2EEST' for eastern Europe, +# as Europe and US DST rules differ. +# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255) +# -DUNINIT_TRAP if reading uninitialized storage can cause problems +# other than simply getting garbage data +# -DUSE_LTZ=0 to build zdump with the system time zone library +# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. +# -DZIC_BLOAT_DEFAULT=\"fat\" to default zic's -b option to "fat", and +# similarly for "slim". Fat TZif files work around incompatibilities +# and bugs in some TZif readers, notably older ones that +# ignore or otherwise mishandle 64-bit data in TZif files; +# however, fat TZif files may trigger bugs in newer TZif readers. +# Slim TZif files are more efficient, and are the default. +# -DZIC_MAX_ABBR_LEN_WO_WARN=3 +# (or some other number) to set the maximum time zone abbreviation length +# that zic will accept without a warning (the default is 6) ++# -g to generate symbolic debugging info ++# -Idir to include from directory 'dir' ++# -O0 to disable optimization; other -O options to enable more optimization ++# -Uname to remove any definition of the macro 'name' +# $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking +# +# * Options marked "*" can be omitted if your compiler is C23 compatible. +# * Options marked "+" are obsolescent and are planned to be removed - # once the code assumes C99 or later. ++# once the code assumes C99 or later, say in the year 2029. +# +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ + -fsanitize-undefined-trap-on-error -fstack-protector +# Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow. +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wduplicated-branches -Wduplicated-cond \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wnull-dereference \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-overflow \ + -Wstrict-prototypes -Wstringop-overflow=4 \ + -Wstringop-truncation -Wsuggest-attribute=cold \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=malloc \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \ + -Wvariadic-macros -Wvla -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits +# +# If your system has a "GMT offset" field in its "struct tm"s +# (or if you decide to add such a field in your system's "time.h" file), +# add the name to a define such as +# -DTM_GMTOFF=tm_gmtoff +# to the end of the "CFLAGS=" line. If not defined, the code attempts to +# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. +# Similarly, if your system has a "zone abbreviation" field, define +# -DTM_ZONE=tm_zone - # and define NO_TM_ZONE to suppress any guessing. Although these two fields - # not required by POSIX, a future version of POSIX is planned to require them - # and they are widely available on GNU/Linux and BSD systems. ++# and define NO_TM_ZONE to suppress any guessing. ++# Although these two fields are not required by POSIX.1-2017, ++# POSIX 202x/D4 requires them and they are widely available ++# on GNU/Linux and BSD systems. +# +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 # do not support "tzname" +# # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library +# # -DHAVE_TZNAME=2 # support and define "tzname" - # # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. ++# # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 # do not support +# # -DUSG_COMPAT=1 # support, and variables are defined by system library +# # -DUSG_COMPAT=2 # support and define variables - # # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by - # # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. ++# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix ++# # Systems Group code and are required by POSIX.1-2008 and later (with XSI). +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE=0 # do not support +# # -DALTZONE=1 # support "altzone", which is defined by system library +# # -DALTZONE=2 # support and define "altzone" +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If not defined, the code attempts to guess ALTZONE from other macros. +# +# If you want functions that were inspired by early versions of X3J11's work, +# add +# -DSTD_INSPIRED +# to the end of the "CFLAGS=" line. This arranges for the following +# functions to be added to the time conversion library. +# "offtime" is like "gmtime" except that it accepts a second (long) argument +# that gives an offset to add to the time_t when converting it. - # "offtime_r" is to "offtime" what "gmtime_r" is to "gmtime". - # "timelocal" is equivalent to "mktime". ++# I.e., "offtime" is like calling "localtime_rz" with a fixed-offset zone. ++# "timelocal" is nearly equivalent to "mktime". +# "timeoff" is like "timegm" except that it accepts a second (long) argument +# that gives an offset to use when converting to a time_t. ++# I.e., "timeoff" is like calling "mktime_z" with a fixed-offset zone. +# "posix2time" and "time2posix" are described in an included manual page. +# X3J11's work does not describe any of these functions. +# These functions may well disappear in future releases of the time +# conversion package. +# +# If you don't want functions that were inspired by NetBSD, add +# -DNETBSD_INSPIRED=0 +# to the end of the "CFLAGS=" line. Otherwise, the functions +# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the +# time library, and if STD_INSPIRED is also defined to nonzero the functions +# "posix2time_z" and "time2posix_z" are added as well. +# The functions ending in "_z" (or "_rz") are like their unsuffixed +# (or suffixed-by-"_r") counterparts, except with an extra first +# argument of opaque type timezone_t that specifies the timezone. +# "tzalloc" allocates a timezone_t value, and "tzfree" frees it. +# +# If you want to allocate state structures in localtime, add +# -DALL_STATE +# to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. +# +# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put +# out by the National Institute of Standards and Technology - # which claims to test C and Posix conformance. If you want to pass PCTS, add ++# which claims to test C and POSIX conformance. If you want to pass PCTS, add +# -DPCTS +# to the end of the "CFLAGS=" line. +# +# If you want strict compliance with XPG4 as of 1994-04-09, add +# -DXPG4_1994_04_09 +# to the end of the "CFLAGS=" line. This causes "strftime" to always return +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 +# falls on a Friday, Saturday, or Sunday. ++# ++# POSIX says CFLAGS defaults to "-O 1". ++# Uncomment the following line and edit its contents as needed. + - CFLAGS= ++#CFLAGS= -O 1 + - # Linker flags. Default to $(LFLAGS) for backwards compatibility - # to release 2012h and earlier. + - LDFLAGS= $(LFLAGS) ++# The name of a POSIX-like library archiver, its flags, C compiler, ++# linker flags, and 'make' utility. Ordinarily the defaults suffice. ++# The commented-out values are the defaults specified by POSIX.1-202x/D4. ++#AR = ar ++#ARFLAGS = -rv ++#CC = c17 ++#LDFLAGS = ++#MAKE = make + +# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in +# submake command lines. The default is no leap seconds. + +LEAPSECONDS= + ++# Where to fetch leap-seconds.list from. ++leaplist_URI = \ ++ https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list ++# The file is generated by the IERS Earth Orientation Centre, in Paris. ++leaplist_TZ = Europe/Paris ++ +# The zic command and its arguments. + +zic= ./zic +ZIC= $(zic) $(ZFLAGS) + +# To shrink the size of installed TZif files, +# append "-r @N" to omit data before N-seconds-after-the-Epoch. +# To grow the files and work around bugs in older applications, +# possibly at the expense of introducing bugs in newer ones, +# append "-b fat"; see ZIC_BLOAT_DEFAULT above. +# See the zic man page for more about -b and -r. +ZFLAGS= + +# How to use zic to install TZif files. + +ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) + - # The name of a Posix-compliant 'awk' on your system. ++# The name of a POSIX-compliant 'awk' on your system. +# mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work. +# Also, it is better (though not essential) if 'awk' supports UTF-8, +# and unfortunately mawk and busybox awk do not support UTF-8. +# Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems. +AWK= awk + - # The full path name of a Posix-compliant shell, preferably one that supports ++# The full path name of a POSIX-compliant shell, preferably one that supports +# the Korn shell's 'select' statement as an extension. +# These days, Bash is the most popular. +# It should be OK to set this to /bin/sh, on platforms where /bin/sh - # lacks 'select' or doesn't completely conform to Posix, but /bin/bash ++# lacks 'select' or doesn't completely conform to POSIX, but /bin/bash +# is typically nicer if it works. +KSHELL= /bin/bash + - # Name of curl , used for HTML validation. ++# Name of curl , used for HTML validation ++# and to fetch leap-seconds.list from upstream. +CURL= curl + +# Name of GNU Privacy Guard , used to sign distributions. +GPG= gpg + +# This expensive test requires USE_LTZ. +# To suppress it, define this macro to be empty. +CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives + +# SAFE_CHAR is a regular expression that matches a safe character. +# Some parts of this distribution are limited to safe characters; +# others can use any UTF-8 character. +# For now, the safe characters are a safe subset of ASCII. +# The caller must set the shell variable 'sharp' to the character '#', +# since Makefile macros cannot contain '#'. +# TAB_CHAR is a single tab character, in single quotes. +TAB_CHAR= ' ' +SAFE_CHARSET1= $(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@' +SAFE_CHARSET2= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`' +SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~' +SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3) +SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]' + +# These non-alphabetic, non-ASCII printable characters are Latin-1, +# and so are likely displayable even in editors like XEmacs 21 +# that have limited display capabilities. +UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷ +# Non-ASCII non-letters that OK_CHAR allows, as these characters are +# useful in commentary. +UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1) + +# Put this in a bracket expression to match spaces. +s = [:space:] + +# OK_CHAR matches any character allowed in the distributed files. +# This is the same as SAFE_CHAR, except that UNUSUAL_OK_CHARSET and +# multibyte letters are also allowed so that commentary can contain a +# few safe symbols and people's names and can quote non-English sources. +# Other non-letters are limited to ASCII renderings for the +# convenience of maintainers using XEmacs 21.5.34, which by default +# mishandles Unicode characters U+0100 and greater. +OK_CHAR= '[][:alpha:]$(UNUSUAL_OK_CHARSET)'$(SAFE_CHARSET)'-]' + +# SAFE_LINE matches a line of safe characters. +# SAFE_SHARP_LINE is similar, except any OK character can follow '#'; +# this is so that comments can contain non-ASCII characters. +# OK_LINE matches a line of OK characters. +SAFE_LINE= '^'$(SAFE_CHAR)'*$$' +SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$' +OK_LINE= '^'$(OK_CHAR)'*$$' + +# Flags to give 'tar' when making a distribution. +# Try to use flags appropriate for GNU tar. +GNUTARFLAGS= --format=pax --pax-option='delete=atime,delete=ctime' \ + --numeric-owner --owner=0 --group=0 \ + --mode=go+u,go-w --sort=name +TARFLAGS= `if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \ + then echo $(GNUTARFLAGS); \ + else :; \ + fi` + +# Flags to give 'gzip' when making a distribution. +GZIPFLAGS= -9n + +# When comparing .tzs files, use GNU diff's -F'^TZ=' option if supported. +# This makes it easier to see which Zone has been affected. +DIFF_TZS= diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \ + || echo ' -F^TZ=') + - ############################################################################### - - #MAKE= make ++# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. ++RANLIB= : + - cc= cc - CC= $(cc) -DTZDIR='"$(TZDIR)"' ++# POSIX prohibits defining or using SHELL. However, csh users on systems ++# that use the user shell for Makefile commands may need to define SHELL. ++#SHELL= /bin/sh + - AR= ar ++# End of macros that one plausibly might want to tailor. ++############################################################################### + - # ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. - RANLIB= : + +TZCOBJS= zic.o +TZDOBJS= zdump.o localtime.o asctime.o strftime.o +DATEOBJS= date.o localtime.o strftime.o asctime.o +LIBSRCS= localtime.c asctime.c difftime.c strftime.c +LIBOBJS= localtime.o asctime.o difftime.o strftime.o +HEADERS= tzfile.h private.h +NONLIBSRCS= zic.c zdump.c +NEWUCBSRCS= date.c +SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \ + tzselect.ksh workman.sh +MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \ + tzfile.5 tzselect.8 zic.8 zdump.8 +MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \ + time2posix.3.txt \ + tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ + date.1.txt +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README SECURITY theory.html version +WEB_PAGES= tz-art.html tz-how-to.html tz-link.html +CHECK_WEB_PAGES=check_theory.html check_tz-art.html \ + check_tz-how-to.html check_tz-link.html +DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) +PRIMARY_YDATA= africa antarctica asia australasia \ + europe northamerica southamerica +YDATA= $(PRIMARY_YDATA) etcetera +NDATA= factory +TDATA_TO_CHECK= $(YDATA) $(NDATA) backward +TDATA= $(YDATA) $(NDATA) $(BACKWARD) - ZONETABLES= zone1970.tab zone.tab ++ZONETABLES= zone.tab zone1970.tab zonenow.tab +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) +LEAP_DEPS= leapseconds.awk leap-seconds.list +TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \ + $(PACKRATDATA) $(PACKRATLIST) +DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA) $(PACKRATLIST) +DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \ + leapseconds $(ZONETABLES) - AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk \ ++AWK_SCRIPTS= checklinks.awk checknow.awk checktab.awk leapseconds.awk \ + ziguard.awk zishrink.awk +MISC= $(AWK_SCRIPTS) +TZS_YEAR= 2050 +TZS_CUTOFF_FLAG= -c $(TZS_YEAR) +TZS= to$(TZS_YEAR).tzs +TZS_NEW= to$(TZS_YEAR)new.tzs +TZS_DEPS= $(YDATA) asctime.c localtime.c \ + private.h tzfile.h zdump.c zic.c +TZDATA_DIST = $(COMMON) $(DATA) $(MISC) +# EIGHT_YARDS is just a yard short of the whole ENCHILADA. +EIGHT_YARDS = $(TZDATA_DIST) $(DOCS) $(SOURCES) tzdata.zi +ENCHILADA = $(EIGHT_YARDS) $(TZS) + +# Consult these files when deciding whether to rebuild the 'version' file. +# This list is not the same as the output of 'git ls-files', since +# .gitignore is not distributed. +VERSION_DEPS= \ + calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \ + africa antarctica asctime.c asia australasia \ + backward backzone \ - checklinks.awk checktab.awk \ ++ checklinks.awk checknow.awk checktab.awk \ + date.1 date.c difftime.c \ + etcetera europe factory iso3166.tab \ + leap-seconds.list leapseconds.awk localtime.c \ + newctime.3 newstrftime.3 newtzset.3 northamerica \ + private.h southamerica strftime.c theory.html \ + time2posix.3 tz-art.html tz-how-to.html tz-link.html \ + tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ + workman.sh zdump.8 zdump.c zic.8 zic.c \ + ziguard.awk zishrink.awk \ - zone.tab zone1970.tab - - # And for the benefit of csh users on systems that assume the user - # shell should be used to handle commands in Makefiles. . . - - SHELL= /bin/sh ++ zone.tab zone1970.tab zonenow.tab + +all: tzselect zic zdump libtz.a $(TABDATA) \ + vanguard.zi main.zi rearguard.zi + +ALL: all date $(ENCHILADA) + +install: all $(DATA) $(REDO) $(MANS) + mkdir -p '$(DESTDIR)$(BINDIR)' \ + '$(DESTDIR)$(ZDUMPDIR)' '$(DESTDIR)$(ZICDIR)' \ + '$(DESTDIR)$(LIBDIR)' \ + '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \ + '$(DESTDIR)$(MANDIR)/man8' + $(ZIC_INSTALL) -l $(LOCALTIME) \ + `case '$(POSIXRULES)' in ?*) echo '-p';; esac \ + ` $(POSIXRULES) \ + -t '$(DESTDIR)$(TZDEFAULT)' + cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.' + cp tzselect '$(DESTDIR)$(BINDIR)/.' + cp zdump '$(DESTDIR)$(ZDUMPDIR)/.' + cp zic '$(DESTDIR)$(ZICDIR)/.' + cp libtz.a '$(DESTDIR)$(LIBDIR)/.' + $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a' + cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.' + cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.' + cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.' + +INSTALL: ALL install date.1 + mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' + cp date '$(DESTDIR)$(BINDIR)/.' + cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.' + +# Calculate version number from git, if available. +# Otherwise, use $(VERSION) unless it is "unknown" and there is already +# a 'version' file, in which case reuse the existing 'version' contents +# and append "-dirty" if the contents do not already end in "-dirty". +version: $(VERSION_DEPS) + { (type git) >/dev/null 2>&1 && \ + V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty` || \ + if test '$(VERSION)' = unknown && V=`cat $@`; then \ + case $$V in *-dirty);; *) V=$$V-dirty;; esac; \ + else \ + V='$(VERSION)'; \ + fi; } && \ + printf '%s\n' "$$V" >$@.out + mv $@.out $@ + +# These files can be tailored by setting BACKWARD, PACKRATDATA, PACKRATLIST. +vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS) + $(AWK) \ + -v DATAFORM=`expr $@ : '\(.*\).zi'` \ + -v PACKRATDATA='$(PACKRATDATA)' \ + -v PACKRATLIST='$(PACKRATLIST)' \ + -f ziguard.awk \ + $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ +# This file has a version comment that attempts to capture any tailoring +# via BACKWARD, DATAFORM, PACKRATDATA, PACKRATLIST, and REDO. +tzdata.zi: $(DATAFORM).zi version zishrink.awk + version=`sed 1q version` && \ + LC_ALL=C $(AWK) \ + -v dataform='$(DATAFORM)' \ + -v deps='$(DSTDATA_ZI_DEPS) zishrink.awk' \ + -v redo='$(REDO)' \ + -v version="$$version" \ + -f zishrink.awk \ + $(DATAFORM).zi >$@.out + mv $@.out $@ + ++tzdir.h: ++ printf '%s\n' >$@.out \ ++ '#ifndef TZDEFAULT' \ ++ '# define TZDEFAULT "$(TZDEFAULT)" /* default zone */' \ ++ '#endif' \ ++ '#ifndef TZDIR' \ ++ '# define TZDIR "$(TZDIR)" /* TZif directory */' \ ++ '#endif' ++ mv $@.out $@ ++ +version.h: version + VERSION=`cat version` && printf '%s\n' \ + 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ + "static char const TZVERSION[]=\"$$VERSION\";" \ + 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \ + >$@.out + mv $@.out $@ + +zdump: $(TZDOBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) + +zic: $(TZCOBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) + +leapseconds: $(LEAP_DEPS) + $(AWK) -v EXPIRES_LINE=$(EXPIRES_LINE) \ + -f leapseconds.awk leap-seconds.list >$@.out + mv $@.out $@ + ++# Awk script to extract a Git-style author from leap-seconds.list comments. ++EXTRACT_AUTHOR = \ ++ author_line { sub(/^.[[:space:]]*/, ""); \ ++ sub(/:[[:space:]]*/, " <"); \ ++ printf "%s>\n", $$0; \ ++ success = 1; \ ++ exit \ ++ } \ ++ /Questions or comments to:/ { author_line = 1 } \ ++ END { exit !success } ++ ++# Fetch leap-seconds.list from upstream. ++fetch-leap-seconds.list: ++ $(CURL) -OR $(leaplist_URI) ++ ++# Fetch leap-seconds.list from upstream and commit it to the local repository. ++commit-leap-seconds.list: fetch-leap-seconds.list ++ author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \ ++ date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \ ++ git commit --author="$$author" --date="$$date" -m'make $@' \ ++ leap-seconds.list ++ +# Arguments to pass to submakes of install_data. +# They can be overridden by later submake arguments. +INSTALLARGS = \ + BACKWARD='$(BACKWARD)' \ + DESTDIR='$(DESTDIR)' \ + LEAPSECONDS='$(LEAPSECONDS)' \ + PACKRATDATA='$(PACKRATDATA)' \ + PACKRATLIST='$(PACKRATLIST)' \ + TZDEFAULT='$(TZDEFAULT)' \ + TZDIR='$(TZDIR)' \ + ZIC='$(ZIC)' + +INSTALL_DATA_DEPS = zic leapseconds tzdata.zi + +# 'make install_data' installs one set of TZif files. +install_data: $(INSTALL_DATA_DEPS) + $(ZIC_INSTALL) tzdata.zi + +posix_only: $(INSTALL_DATA_DEPS) + $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data + +right_only: $(INSTALL_DATA_DEPS) + $(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \ + install_data + +# In earlier versions of this makefile, the other two directories were +# subdirectories of $(TZDIR). However, this led to configuration errors. +# For example, with posix_right under the earlier scheme, +# TZ='right/Australia/Adelaide' got you localtime with leap seconds, +# but gmtime without leap seconds, which led to problems with applications +# like sendmail that subtract gmtime from localtime. +# Therefore, the other two directories are now siblings of $(TZDIR). +# You must replace all of $(TZDIR) to switch from not using leap seconds +# to using them, or vice versa. +right_posix: right_only + rm -fr '$(DESTDIR)$(TZDIR)-leaps' + ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \ + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only + +posix_right: posix_only + rm -fr '$(DESTDIR)$(TZDIR)-posix' + ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \ + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only + +zones: $(REDO) + +# dummy.zd is not a real file; it is mentioned here only so that the +# top-level 'make' does not have a syntax error. +ZDS = dummy.zd +# Rule used only by submakes invoked by the $(TZS_NEW) rule. +# It is separate so that GNU 'make -j' can run instances in parallel. +$(ZDS): zdump + ./zdump -i $(TZS_CUTOFF_FLAG) '$(wd)/'$$(expr $@ : '\(.*\).zd') \ + >$@ + +TZS_NEW_DEPS = tzdata.zi zdump zic +$(TZS_NEW): $(TZS_NEW_DEPS) + rm -fr tzs$(TZS_YEAR).dir + mkdir tzs$(TZS_YEAR).dir + $(zic) -d tzs$(TZS_YEAR).dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out + wd=`pwd` && \ + x=`$(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \ + tzdata.zi \ + | LC_ALL=C sort -t . -k 2,2` && \ + set x $$x && \ + shift && \ + ZDS=$$* && \ + $(MAKE) wd="$$wd" TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \ + ZDS="$$ZDS" $$ZDS && \ + sed 's,^TZ=".*\.dir/,TZ=",' $$ZDS >>$@.out + rm -fr tzs$(TZS_YEAR).dir + mv $@.out $@ + +# If $(TZS) exists but 'make check_tzs' fails, a maintainer should inspect the +# failed output and fix the inconsistency, perhaps by running 'make force_tzs'. +$(TZS): + touch $@ + +force_tzs: $(TZS_NEW) + cp $(TZS_NEW) $(TZS) + +libtz.a: $(LIBOBJS) + rm -f $@ - $(AR) -rc $@ $(LIBOBJS) ++ $(AR) $(ARFLAGS) $@ $(LIBOBJS) + $(RANLIB) $@ + +date: $(DATEOBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS) + +tzselect: tzselect.ksh version + VERSION=`cat version` && sed \ - -e 's|#!/bin/bash|#!$(KSHELL)|g' \ - -e 's|AWK=[^}]*|AWK='\''$(AWK)'\''|g' \ - -e 's|\(PKGVERSION\)=.*|\1='\''($(PACKAGE)) '\''|' \ - -e 's|\(REPORT_BUGS_TO\)=.*|\1=$(BUGEMAIL)|' \ - -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ - -e 's|\(TZVERSION\)=.*|\1='"$$VERSION"'|' \ - <$@.ksh >$@.out ++ -e "s'#!/bin/bash'#!"'$(KSHELL)'\' \ ++ -e s\''\(AWK\)=[^}]*'\''\1=\'\''$(AWK)\'\'\' \ ++ -e s\''\(PKGVERSION\)=.*'\''\1=\'\''($(PACKAGE)) \'\'\' \ ++ -e s\''\(REPORT_BUGS_TO\)=.*'\''\1=\'\''$(BUGEMAIL)\'\'\' \ ++ -e s\''\(TZDIR\)=[^}]*'\''\1=\'\''$(TZDIR)\'\'\' \ ++ -e s\''\(TZVERSION\)=.*'\''\1=\'"'$$VERSION\\''" \ ++ <$@.ksh >$@.out + chmod +x $@.out + mv $@.out $@ + +check: check_back check_mild +check_mild: check_character_set check_white_space check_links \ - check_name_lengths check_slashed_abbrs check_sorted \ ++ check_name_lengths check_now \ ++ check_slashed_abbrs check_sorted \ + check_tables check_web check_ziguard check_zishrink check_tzs + ++# True if UTF8_LOCALE does not work; ++# otherwise, false but with LC_ALL set to $(UTF8_LOCALE). ++UTF8_LOCALE_MISSING = \ ++ { test ! '$(UTF8_LOCALE)' \ ++ || ! printf 'A\304\200B\n' \ ++ | LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 \ ++ || { LC_ALL='$(UTF8_LOCALE)'; export LC_ALL; false; }; } ++ +check_character_set: $(ENCHILADA) - test ! '$(UTF8_LOCALE)' || \ - ! printf 'A\304\200B\n' | \ - LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 || { \ - LC_ALL='$(UTF8_LOCALE)' && export LC_ALL && \ ++ $(UTF8_LOCALE_MISSING) || { \ + sharp='#' && \ + ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ + $(MISC) $(SOURCES) $(WEB_PAGES) \ + CONTRIBUTING LICENSE README SECURITY \ + version tzdata.zi && \ + ! grep -Env $(SAFE_LINE)'|^UNUSUAL_OK_'$(OK_CHAR)'*$$' \ + Makefile && \ + ! grep -Env $(SAFE_SHARP_LINE) $(TDATA_TO_CHECK) backzone \ + leapseconds zone.tab && \ + ! grep -Env $(OK_LINE) $(ENCHILADA); \ + } + touch $@ + +check_white_space: $(ENCHILADA) *** 3935 LINES SKIPPED *** From nobody Tue Feb 13 22:53: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 4TZGpG5hyvz5B11G; Tue, 13 Feb 2024 22:53: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 4TZGpG4jMZz4hx0; Tue, 13 Feb 2024 22:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707864822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ReLnBBFTrqjFNDsPv8MshfedmTe+tLnq/dionJXeXCA=; b=yCqZNzTrYNJ5goZpSqnGPGx/WDCqmoGweRcjcyh4SDHfnWGxtRbud9bMnKzQBq6T3KlyD6 99gNQ3wz8c4ADC49PaK7ZwJ2MCfpN7OW8l3EIQ7tQOkw/3vHxB26yzpf3N8a9wCBhUfiT7 7JqCneg5BnUhQswgABQvVDx+ZkSN7maANufhvNERVL96jwqZR0kvVFvZiBua7oepeownhL Zz5osm3tOKRz5jZcVAoALii6E8ho80rgel4esBHRGprzaeqrg/rb/Xh0Fvo2TMhrK/GMfo LsBLspOc0LjMBonPxJpgAF7cqCvIjxrxs50G3Of7WtEAAHkpK6ValQAwmskX4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707864822; a=rsa-sha256; cv=none; b=P8sbokFAIQKzBUntDswh/2Vtsxjr9rlvcg24YKo6ld9k3nbVuNvm31PV4VvgT027s30+f1 g476sro30gSoU9Vlns1lwyoFzW8J/8HECoU/fT59KaBG/VZPzhRrEjJi1qtuU+bh4e47RS l7u/UZ+T3drY7rGjBdonPBvSSQUcVkv2zYI3X1XmwvJ/vtXC7DcpOBWQ7IR5YWeCa4PY6T H+Yuxi0eUqihxVIEAPWiLBdyDTirStZLmcoofQDi/bXUpNfqE96bQWtgrRc3uIxp2iNq9B RL3orC66UmGWub6ED0jC73HD3fj7uq5diuBxfLU+wPLRgJ7kUAeGMiomgyFYTg== 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=1707864822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ReLnBBFTrqjFNDsPv8MshfedmTe+tLnq/dionJXeXCA=; b=cr8Eb/hXiC9ZtE7m86Tiej4nrUj9EJwB6BL7NkZqNp5uOEKfmtYopmTWD5sutwh20PmRln cWfTd3TwnyhftL7ASJ22v6H5cqw8Y+D7H1nXzCH/enuT0pRLnsOmffG1fuNgWbJpajnCxR JrFU93Q58tczGCu63quiNeiNfxIO2nj49dGexosvdlvknFBIk2mo/zwCVFHmpuet6ePZG+ sktvqAuFMkQxVu2kjjRLGSxHXMrK2WeI+ebMYK7Z3Vi5C3o+J8guIuZQcWNJ15ojBV1Q1a ty6hpOPRRyY89E5c0aaIRkTn0Mn/nNp3hxhjbjPSpBqYBp93nLgHkIgJEjlLjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZGpG3n4tzZRf; Tue, 13 Feb 2024 22:53: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 41DMrgXa059711; Tue, 13 Feb 2024 22:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DMrgIh059708; Tue, 13 Feb 2024 22:53:42 GMT (envelope-from git) Date: Tue, 13 Feb 2024 22:53:42 GMT Message-Id: <202402132253.41DMrgIh059708@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: 53fba3b984ac - main - build: Default to DWARF4 in the kernel 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: Sender: owner-dev-commits-src-main@freebsd.org 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53fba3b984aca0dc5d34b84d0e21f0d4d121b56f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=53fba3b984aca0dc5d34b84d0e21f0d4d121b56f commit 53fba3b984aca0dc5d34b84d0e21f0d4d121b56f Author: Mark Johnston AuthorDate: 2024-02-11 18:03:23 +0000 Commit: Mark Johnston CommitDate: 2024-02-13 22:51:09 +0000 build: Default to DWARF4 in the kernel gcc 12 defaults to emitting DWARF 5, but this is not yet supported by our libdwarf and thus by ctfconvert. Reviewed by: emaste, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43837 --- sys/conf/kern.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 08779b4da193..53781927dee8 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -256,6 +256,14 @@ CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clan .endif .endif +# +# Some newer toolchains default to DWARF 5, which isn't supported by some build +# tools yet. +# +.if (${CFLAGS:M-g} != "" || ${CFLAGS:M-g[0-3]} != "") && ${CFLAGS:M-gdwarf*} == "" +CFLAGS+= -gdwarf-4 +.endif + CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${.IMPSRC:T}} CFLAGS+= ${CWARNFLAGS.${COMPILER_TYPE}} CFLAGS+= ${CFLAGS.${COMPILER_TYPE}} ${CFLAGS.${.IMPSRC:T}} From nobody Wed Feb 14 05:23: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 4TZRRx5XZsz5B0Y2; Wed, 14 Feb 2024 05:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZRRx2svdz4NnH; Wed, 14 Feb 2024 05:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707888205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cReB6HC0oTWajbWYMewxCmhkCA6IzDA3SRQJh/v3G90=; b=B79cmyijiu2LZGW8io0wcpgdSXPNHiXiPCPCM1dIICeq4jtiuopnio0t9yOpZwfaUo7BaM z0kLO5lBdTztR1q8G+v+zOWojtKPHQZijsdnwFOP1P/eCiuvSPEOcWdfBvV+yKxyOidvjj DEX8WSflsli30Bw9PwgqmaUmGob6oqPHmQvFb4CUGgF68GQEBvoh8cEbbF8AIO+4CLpxwy vFX0vv4CWkvg7S53gRtr++hs/Tj0vXGh2HXjTzv7U63iutlHMAF5GEnTxfpYgZMAFj9uhm 1xhFrwYk1rmZP61qTNhyHc7gWs6hdv+rVPd6Jt2L2yh4P6EThYC7iRdLumK/0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707888205; a=rsa-sha256; cv=none; b=j8q78R6iqnoBPnb4v2sinc2MgFSLVoGhvXmq6OKCdZOJxTQ1RaDfgw4MiNGWbyW3AOl9zU 36/V3jFWsqiH3G5iW1ByB+LAbXKhu1bXZH3r05Mxex8T+bIggJCpeq3W5NPoR6CBvgGajQ JIRG4D93onqIuE1hjKMF72wHQZJtpyrUVrOLC1Lkg9PB3IkfchoJc/zW3+iff58pJE9CMq //CsYvEqzg94SJI1M7IXBB9XGf8RePLQLz3bGrlczt0IzhjZho0Gkzh9nIXDyM4Vxtzjje G+d+/bQsewOuzrCeLpenR+Gkk4xxqle9VOj1NtPMId+jMSuMrdC6IDDgM/Avng== 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=1707888205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cReB6HC0oTWajbWYMewxCmhkCA6IzDA3SRQJh/v3G90=; b=D6oL/9hjSGiiRnsAwmbVkRWRRUI52kQybDKhGklf86c5RoEGbyqgiKpeUBbcd15mZEkbEG GGHyPuC4pKLLadoBVXQB5TXAAds4S98xWY8Oz7jeXCeXQsY3PSnE9am3C+izYBVAAZKlZh MtR1+v5yLxnC8BhuxnWX3ydeFUebF1mZzx6k1kBdBXQg6N5tt7QrzcAlFhsWTDXZMpXQV8 rxzpwa5LHHcCEo4VsUoOBqGC5VzCMLUmEqTocVNLrcYu/WRRB4Z1bcDBSVjjZiZx6fjstn jh9GaqycIYGNxFl0EmWCnpewERlg4kAzOTd1zkBY7PXBnQjI8wtEqF2KPq18Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZRRx1Rlczm0N; Wed, 14 Feb 2024 05:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41E5NPT3015753; Wed, 14 Feb 2024 05:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41E5NOoO015750; Wed, 14 Feb 2024 05:23:24 GMT (envelope-from git) Date: Wed, 14 Feb 2024 05:23:24 GMT Message-Id: <202402140523.41E5NOoO015750@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: b76ef9a7cb8a - main - unbound: Vendor import 1.19.1 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: Sender: owner-dev-commits-src-main@freebsd.org 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b76ef9a7cb8a7c62d10ae8101f41014f34819174 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b76ef9a7cb8a7c62d10ae8101f41014f34819174 commit b76ef9a7cb8a7c62d10ae8101f41014f34819174 Merge: 53fba3b984ac 217a625642d3 Author: Cy Schubert AuthorDate: 2023-11-13 19:44:16 +0000 Commit: Cy Schubert CommitDate: 2024-02-14 05:05:50 +0000 unbound: Vendor import 1.19.1 Release notes at https://www.nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ Security: CVE-2023-50387, CVE-2023-50868 MFC after: 3 days contrib/unbound/config.guess | 11 +- contrib/unbound/config.sub | 29 +- contrib/unbound/configure | 25 +- contrib/unbound/configure.ac | 5 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 2 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 2 +- contrib/unbound/services/authzone.c | 3 +- contrib/unbound/services/cache/dns.c | 22 ++ contrib/unbound/services/cache/dns.h | 9 + contrib/unbound/testdata/val_any_negcache.rpl | 3 + contrib/unbound/util/fptr_wlist.c | 1 + contrib/unbound/validator/val_nsec.c | 3 +- contrib/unbound/validator/val_nsec3.c | 316 ++++++++++++---- contrib/unbound/validator/val_nsec3.h | 60 +++- contrib/unbound/validator/val_sigcrypt.c | 37 +- contrib/unbound/validator/val_sigcrypt.h | 3 +- contrib/unbound/validator/val_utils.c | 22 +- contrib/unbound/validator/val_utils.h | 4 +- contrib/unbound/validator/validator.c | 499 ++++++++++++++++++++++---- contrib/unbound/validator/validator.h | 18 + lib/libunbound/config.h | 4 +- 28 files changed, 889 insertions(+), 207 deletions(-) diff --cc lib/libunbound/config.h index 2fe30076a109,000000000000..0fe309a98bf3 mode 100644,000000..100644 --- a/lib/libunbound/config.h +++ b/lib/libunbound/config.h @@@ -1,1545 -1,0 +1,1545 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* apply the noreturn attribute to a function that exits the program */ +#define ATTR_NORETURN __attribute__((__noreturn__)) + +/* apply the weak attribute to a symbol */ +#define ATTR_WEAK __attribute__((weak)) + +/* Directory to chroot to */ +#define CHROOT_DIR "/var/unbound" + +/* Define this to enable client subnet option. */ +/* #undef CLIENT_SUBNET */ + +/* Do sha512 definitions in config.h */ +/* #undef COMPAT_SHA512 */ + +/* Command line arguments used with configure */ +#define CONFCMDLINE "--with-ssl=/usr --with-libexpat=/usr --disable-dnscrypt --disable-dnstap --enable-ecdsa --disable-event-api --enable-gost --with-libevent --disable-subnet --disable-tfo-client --disable-tfo-server --with-pthreads--prefix=/usr --localstatedir=/var/unbound --mandir=/usr/share/man --build=freebsd" + +/* Pathname to the Unbound configuration file */ +#define CONFIGFILE "/var/unbound/unbound.conf" + +/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work + */ +/* #undef DARWIN_BROKEN_SETREUID */ + +/* Whether daemon is deprecated */ +/* #undef DEPRECATED_DAEMON */ + +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ +/* #undef DEPRECATE_RSA_1024 */ + +/* Deprecate RSA 1024 bit length, makes that an unsupported key */ +/* #undef DEPRECATE_RSA_1024 */ + +/* Define this to enable kernel based UDP source port randomization. */ +/* #undef DISABLE_EXPLICIT_PORT_RANDOMISATION */ + +/* default dnstap socket path */ +/* #undef DNSTAP_SOCKET_PATH */ + +/* Define if you want to use debug lock checking (slow). */ +/* #undef ENABLE_LOCK_CHECKS */ + +/* Define this if you enabled-allsymbols from libunbound to link binaries to + it for smaller install size, but the libunbound export table is polluted by + internal symbols */ +/* #undef EXPORT_ALL_SYMBOLS */ + +/* Define to 1 if you have the `accept4' function. */ +#define HAVE_ACCEPT4 1 + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_uniform' function. */ +#define HAVE_ARC4RANDOM_UNIFORM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Whether the C compiler accepts the "format" attribute */ +#define HAVE_ATTR_FORMAT 1 + +/* Whether the C compiler accepts the "noreturn" attribute */ +#define HAVE_ATTR_NORETURN 1 + +/* Whether the C compiler accepts the "unused" attribute */ +#define HAVE_ATTR_UNUSED 1 + +/* Whether the C compiler accepts the "weak" attribute */ +#define HAVE_ATTR_WEAK 1 + +/* If we have be64toh */ +/* #undef HAVE_BE64TOH */ + +/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +/* #undef HAVE_BIO_SET_CALLBACK_EX */ + +/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +/* #undef HAVE_BIO_SET_CALLBACK_EX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSD_STDLIB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSD_STRING_H */ + +/* Define to 1 if you have the `chown' function. */ +#define HAVE_CHOWN 1 + +/* Define to 1 if you have the `chroot' function. */ +#define HAVE_CHROOT 1 + +/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ +/* #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA */ + +/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +/* #undef HAVE_CRYPTO_THREADID_SET_CALLBACK */ + +/* Define to 1 if you have the `ctime_r' function. */ +#define HAVE_CTIME_R 1 + +/* Define to 1 if you have the `daemon' function. */ +#define HAVE_DAEMON 1 + +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +/* #undef HAVE_DECL_ARC4RANDOM */ + +/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 + if you don't. */ +/* #undef HAVE_DECL_ARC4RANDOM_UNIFORM */ + +/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if + you don't. */ +/* #undef HAVE_DECL_EVSIGNAL_ASSIGN */ + +/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you + don't. */ +#define HAVE_DECL_INET_NTOP 1 + +/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you + don't. */ +#define HAVE_DECL_INET_PTON 1 + +/* Define to 1 if you have the declaration of `nghttp2_session_server_new', + and to 0 if you don't. */ +/* #undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW */ + +/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you + don't. */ +#define HAVE_DECL_NID_ED25519 1 + +/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you + don't. */ +#define HAVE_DECL_NID_ED448 1 + +/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you + don't. */ +#define HAVE_DECL_NID_SECP384R1 1 + +/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 + if you don't. */ +#define HAVE_DECL_NID_X9_62_PRIME256V1 1 + +/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you + don't. */ +#define HAVE_DECL_REALLOCARRAY 1 + +/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you + don't. */ +/* #undef HAVE_DECL_REDISCONNECT */ + +/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 + if you don't. */ +#define HAVE_DECL_SK_SSL_COMP_POP_FREE 1 + +/* Define to 1 if you have the declaration of + `SSL_COMP_get_compression_methods', and to 0 if you don't. */ +#define HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS 1 + +/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to + 0 if you don't. */ +/* #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO */ + +/* Define to 1 if you have the declaration of `strlcat', and to 0 if you + don't. */ +/* #undef HAVE_DECL_STRLCAT */ + +/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you + don't. */ +/* #undef HAVE_DECL_STRLCPY */ + +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if + you don't. */ +#define HAVE_DECL_XML_STOPPARSER 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `DSA_SIG_set0' function. */ +#define HAVE_DSA_SIG_SET0 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ENDIAN_H */ + +/* Define to 1 if you have the `endprotoent' function. */ +#define HAVE_ENDPROTOENT 1 + +/* Define to 1 if you have the `endpwent' function. */ +#define HAVE_ENDPWENT 1 + +/* Define to 1 if you have the `endservent' function. */ +#define HAVE_ENDSERVENT 1 + +/* Define to 1 if you have the `ENGINE_cleanup' function. */ +/* #undef HAVE_ENGINE_CLEANUP */ + +/* Define to 1 if you have the `ERR_free_strings' function. */ +/* #undef HAVE_ERR_FREE_STRINGS */ + +/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +/* #undef HAVE_ERR_LOAD_CRYPTO_STRINGS */ + +/* Define to 1 if you have the `event_assign' function. */ +/* #undef HAVE_EVENT_ASSIGN */ + +/* Define to 1 if you have the `event_base_free' function. */ +/* #undef HAVE_EVENT_BASE_FREE */ + +/* Define to 1 if you have the `event_base_get_method' function. */ +/* #undef HAVE_EVENT_BASE_GET_METHOD */ + +/* Define to 1 if you have the `event_base_new' function. */ +/* #undef HAVE_EVENT_BASE_NEW */ + +/* Define to 1 if you have the `event_base_once' function. */ +/* #undef HAVE_EVENT_BASE_ONCE */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_EVENT_H */ + +/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +#define HAVE_EVP_AES_256_CBC 1 + +/* Define to 1 if you have the `EVP_cleanup' function. */ +/* #undef HAVE_EVP_CLEANUP */ + +/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' + function. */ +/* #undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED */ + + +/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' + function. */ +/* #undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED */ + +/* Define to 1 if you have the `EVP_DigestVerify' function. */ +#define HAVE_EVP_DIGESTVERIFY 1 + +/* Define to 1 if you have the `EVP_dss1' function. */ +/* #undef HAVE_EVP_DSS1 */ + +/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +#define HAVE_EVP_ENCRYPTINIT_EX 1 + +/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ +/* #undef HAVE_EVP_MAC_CTX_SET_PARAMS */ + +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +#define HAVE_EVP_MD_CTX_NEW 1 + +/* Define to 1 if you have the `EVP_sha1' function. */ +#define HAVE_EVP_SHA1 1 + +/* Define to 1 if you have the `EVP_sha256' function. */ +#define HAVE_EVP_SHA256 1 + +/* Define to 1 if you have the `EVP_sha512' function. */ +#define HAVE_EVP_SHA512 1 + +/* Define to 1 if you have the `ev_default_loop' function. */ +/* #undef HAVE_EV_DEFAULT_LOOP */ + +/* Define to 1 if you have the `ev_loop' function. */ +/* #undef HAVE_EV_LOOP */ + +/* Define to 1 if you have the header file. */ +#define HAVE_EXPAT_H 1 + +/* Define to 1 if you have the `explicit_bzero' function. */ +#define HAVE_EXPLICIT_BZERO 1 + +/* Define to 1 if you have the `fcntl' function. */ +#define HAVE_FCNTL 1 + +/* Define to 1 if you have the `FIPS_mode' function. */ +#define HAVE_FIPS_MODE 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + +/* Define to 1 if you have the `fsync' function. */ +#define HAVE_FSYNC 1 + +/* Whether getaddrinfo is available */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getauxval' function. */ +/* #undef HAVE_GETAUXVAL */ + +/* Define to 1 if you have the `getentropy' function. */ +/* #undef HAVE_GETENTROPY */ + +/* Define to 1 if you have the `getifaddrs' function. */ +#define HAVE_GETIFADDRS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getpwnam' function. */ +#define HAVE_GETPWNAM 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the `gettid' function. */ +/* #undef HAVE_GETTID */ + +/* Define to 1 if you have the `gettid' function. */ +/* #undef HAVE_GETTID */ + +/* Define to 1 if you have the `glob' function. */ +#define HAVE_GLOB 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GLOB_H 1 + +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GRP_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_HIREDIS_HIREDIS_H */ + +/* Define to 1 if you have the `HMAC_Init_ex' function. */ +#define HAVE_HMAC_INIT_EX 1 + +/* If we have htobe64 */ +/* #undef HAVE_HTOBE64 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_IFADDRS_H 1 + +/* Define to 1 if you have the `if_nametoindex' function. */ +#define HAVE_IF_NAMETOINDEX 1 + +/* Define to 1 if you have the `if_nametoindex' function. */ +#define HAVE_IF_NAMETOINDEX 1 + +/* Define to 1 if you have the `inet_aton' function. */ +#define HAVE_INET_ATON 1 + +/* Define to 1 if you have the `inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the `inet_pton' function. */ +#define HAVE_INET_PTON 1 + +/* Define to 1 if you have the `initgroups' function. */ +#define HAVE_INITGROUPS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* if the function 'ioctlsocket' is available */ +/* #undef HAVE_IOCTLSOCKET */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IPHLPAPI_H */ + +/* Define to 1 if you have the `isblank' function. */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the `kill' function. */ +#define HAVE_KILL 1 + +/* Use portable libbsd functions */ +/* #undef HAVE_LIBBSD */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBKERN_OSBYTEORDER_H */ + +/* Define if we have LibreSSL */ +/* #undef HAVE_LIBRESSL */ + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOGIN_CAP_H 1 + +/* If have GNU libc compatible malloc */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_TCP_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETIOAPI_H */ + +/* Use libnettle for crypto */ +/* #undef HAVE_NETTLE */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETTLE_DSA_COMPAT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETTLE_EDDSA_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NET_IF_H 1 + +/* Define this to use nghttp2 client. */ +/* #undef HAVE_NGHTTP2 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NGHTTP2_NGHTTP2_H */ + +/* Use libnss for crypto */ +/* #undef HAVE_NSS */ + +/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ +/* #undef HAVE_OPENSSL_ADD_ALL_DIGESTS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_BN_H 1 + +/* Define to 1 if you have the `OPENSSL_config' function. */ +#define HAVE_OPENSSL_CONFIG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_CONF_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_CORE_NAMES_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_DH_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_DSA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_ENGINE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_ERR_H 1 + +/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +#define HAVE_OPENSSL_INIT_CRYPTO 1 + +/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +#define HAVE_OPENSSL_INIT_SSL 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_PARAM_BUILD_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_RAND_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_RSA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OPENSSL_SSL_H 1 + +/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ +/* #undef HAVE_OSSL_PARAM_BLD_NEW */ + +/* Define to 1 if you have the `poll' function. */ +#define HAVE_POLL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define if you have POSIX threads libraries and header files. */ +#define HAVE_PTHREAD 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +#define HAVE_PTHREAD_RWLOCK_T 1 + +/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +#define HAVE_PTHREAD_SPINLOCK_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define if you have Python libraries and header files. */ +/* #undef HAVE_PYTHON */ + +/* Define to 1 if you have the `random' function. */ +#define HAVE_RANDOM 1 + +/* Define to 1 if you have the `RAND_cleanup' function. */ +/* #undef HAVE_RAND_CLEANUP */ + +/* If we have reallocarray(3) */ +#define HAVE_REALLOCARRAY 1 + +/* Define to 1 if you have the `recvmsg' function. */ +#define HAVE_RECVMSG 1 + +/* Define to 1 if you have the `sendmsg' function. */ +#define HAVE_SENDMSG 1 + +/* Define to 1 if you have the `setregid' function. */ +/* #undef HAVE_SETREGID */ + +/* Define to 1 if you have the `setresgid' function. */ +#define HAVE_SETRESGID 1 + +/* Define to 1 if you have the `setresuid' function. */ +#define HAVE_SETRESUID 1 + +/* Define to 1 if you have the `setreuid' function. */ +/* #undef HAVE_SETREUID */ + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the `setusercontext' function. */ +#define HAVE_SETUSERCONTEXT 1 + +/* Define to 1 if you have the `SHA512_Update' function. */ +/* #undef HAVE_SHA512_UPDATE */ + +/* Define to 1 if you have the `shmget' function. */ +#define HAVE_SHMGET 1 + +/* Define to 1 if you have the `sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if you have the `sleep' function. */ +#define HAVE_SLEEP 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the `socketpair' function. */ +#define HAVE_SOCKETPAIR 1 + +/* Using Solaris threads */ +/* #undef HAVE_SOLARIS_THREADS */ + +/* Define to 1 if you have the `srandom' function. */ +#define HAVE_SRANDOM 1 + +/* Define if you have the SSL libraries installed. */ +#define HAVE_SSL /**/ + +/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ +#define HAVE_SSL_CTX_SET_ALPN_PROTOS 1 + +/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ +#define HAVE_SSL_CTX_SET_ALPN_SELECT_CB 1 + +/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +#define HAVE_SSL_CTX_SET_CIPHERSUITES 1 + +/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ +#define HAVE_SSL_CTX_SET_SECURITY_LEVEL 1 + +/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' + function. */ +/* #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB */ + +/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +#define HAVE_SSL_GET0_ALPN_SELECTED 1 + +/* Define to 1 if you have the `SSL_get0_peername' function. */ +#define HAVE_SSL_GET0_PEERNAME 1 + +/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ +/* #undef HAVE_SSL_GET1_PEER_CERTIFICATE */ + +/* Define to 1 if you have the `SSL_set1_host' function. */ +#define HAVE_SSL_SET1_HOST 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strptime' function. */ +#define HAVE_STRPTIME 1 + +/* Define to 1 if you have the `strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ +/* #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST */ + +/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ +#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1 + +/* Define if you have Swig libraries and header files. */ +/* #undef HAVE_SWIG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define to 1 if systemd should be used */ +/* #undef HAVE_SYSTEMD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_ENDIAN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IPC_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SHA2_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SHM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSCTL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_TARGETCONDITIONALS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the `tzset' function. */ +#define HAVE_TZSET 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `usleep' function. */ +#define HAVE_USLEEP 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINDOWS_H */ + +/* Using Windows threads */ +/* #undef HAVE_WINDOWS_THREADS */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINSOCK2_H */ + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* Define to 1 if you have the `writev' function. */ +#define HAVE_WRITEV 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WS2TCPIP_H */ + +/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ +#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1 + +/* Define to 1 if you have the `_beginthreadex' function. */ +/* #undef HAVE__BEGINTHREADEX */ + +/* If HMAC_Init_ex() returns void */ +/* #undef HMAC_INIT_EX_RETURNS_VOID */ + +/* if lex has yylex_destroy */ +#define LEX_HAS_YYLEX_DESTROY 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to the maximum message length to pass to syslog. */ +#define MAXSYSLOGMSGLEN 10240 + +/* Define if memcmp() does not compare unsigned bytes */ +/* #undef MEMCMP_IS_BROKEN */ + +/* Define if mkdir has one argument. */ +/* #undef MKDIR_HAS_ONE_ARG */ + +/* Define if the network stack does not fully support nonblocking io (causes + lower performance). */ +/* #undef NONBLOCKING_IS_BROKEN */ + +/* Put -D_ALL_SOURCE define in config.h */ +/* #undef OMITTED__D_ALL_SOURCE */ + +/* Put -D_BSD_SOURCE define in config.h */ +/* #undef OMITTED__D_BSD_SOURCE */ + +/* Put -D_DEFAULT_SOURCE define in config.h */ +/* #undef OMITTED__D_DEFAULT_SOURCE */ + +/* Put -D_GNU_SOURCE define in config.h */ +/* #undef OMITTED__D_GNU_SOURCE */ + +/* Put -D_LARGEFILE_SOURCE=1 define in config.h */ +/* #undef OMITTED__D_LARGEFILE_SOURCE_1 */ + +/* Put -D_POSIX_C_SOURCE=200112 define in config.h */ +/* #undef OMITTED__D_POSIX_C_SOURCE_200112 */ + +/* Put -D_XOPEN_SOURCE=600 define in config.h */ +/* #undef OMITTED__D_XOPEN_SOURCE_600 */ + +/* Put -D_XOPEN_SOURCE_EXTENDED=1 define in config.h */ +/* #undef OMITTED__D_XOPEN_SOURCE_EXTENDED_1 */ + +/* Put -D__EXTENSIONS__ define in config.h */ +/* #undef OMITTED__D__EXTENSIONS__ */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "unbound" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "unbound 1.19.0" ++#define PACKAGE_STRING "unbound 1.19.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "unbound" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "1.19.0" ++#define PACKAGE_VERSION "1.19.1" + +/* default pidfile location */ +#define PIDFILE "/var/unbound/unbound.pid" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* Return type of signal handlers, but autoconf 2.70 says 'your code may + safely assume C89 semantics that RETSIGTYPE is void.' */ +#define RETSIGTYPE void + +/* if REUSEPORT is enabled by default */ +#define REUSEPORT_DEFAULT 0 + +/* default rootkey location */ +#define ROOT_ANCHOR_FILE "/var/unbound/root.key" + +/* default rootcert location */ +#define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" + +/* version number for resource files */ +#define RSRC_PACKAGE_VERSION 1,19,0,0 + +/* Directory to chdir to */ +#define RUN_DIR "/var/unbound" + +/* Shared data */ +#define SHARE_DIR "/var/unbound" + +#ifdef __LP64__ +/* The size of `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 +/* The size of `size_t'. */ +/* The size of `pthread_t', as computed by sizeof. */ +#define SIZEOF_PTHREAD_T 8 +#else +#define SIZEOF_SIZE_T 4 +/* The size of `size_t'. */ +/* The size of `pthread_t', as computed by sizeof. */ +#define SIZEOF_PTHREAD_T 4 +#endif + +/* The size of `time_t', as computed by sizeof. */ +#ifdef __i386__ +#define SIZEOF_TIME_T 4 +#else +#define SIZEOF_TIME_T 8 +#endif + +/* The size of `unsigned long', as computed by sizeof. */ +#ifdef __LP64__ +#define SIZEOF_UNSIGNED_LONG 8 +#else +#define SIZEOF_UNSIGNED_LONG 4 +#endif + +/* define if (v)snprintf does not return length needed, (but length used) */ +/* #undef SNPRINTF_RET_BROKEN */ + +/* Define to 1 if libsodium supports sodium_set_misuse_handler */ +/* #undef SODIUM_MISUSE_HANDLER */ + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* use default strptime. */ +#define STRPTIME_WORKS 1 + +/* Use win32 resources and API */ +/* #undef UB_ON_WINDOWS */ + +/* the SYSLOG_FACILITY to use, default LOG_DAEMON */ +#define UB_SYSLOG_FACILITY LOG_DAEMON + +/* default username */ +#define UB_USERNAME "unbound" + +/* use to enable lightweight alloc assertions, for debug use */ +/* #undef UNBOUND_ALLOC_LITE */ + +/* use malloc not regions, for debug use */ +/* #undef UNBOUND_ALLOC_NONREGIONAL */ + +/* use statistics for allocs and frees, for debug use */ +/* #undef UNBOUND_ALLOC_STATS */ + +/* define this to enable debug checks. */ +/* #undef UNBOUND_DEBUG */ + +/* Define to 1 to use cachedb support */ +/* #undef USE_CACHEDB */ + +/* Define to 1 to enable dnscrypt support */ +/* #undef USE_DNSCRYPT */ + +/* Define to 1 to enable dnscrypt with xchacha20 support */ +/* #undef USE_DNSCRYPT_XCHACHA20 */ + +/* Define to 1 to enable dnstap support */ +/* #undef USE_DNSTAP */ + +/* Define this to enable DSA support. */ +#define USE_DSA 1 + +/* Define this to enable ECDSA support. */ +#define USE_ECDSA 1 + +/* Define this to enable an EVP workaround for older openssl */ +/* #undef USE_ECDSA_EVP_WORKAROUND */ + +/* Define this to enable ED25519 support. */ +#define USE_ED25519 1 + +/* Define this to enable ED448 support. */ +#define USE_ED448 1 + +/* Define this to enable GOST support. */ +/* #undef USE_GOST */ + +/* Define to 1 to use ipsecmod support. */ +/* #undef USE_IPSECMOD */ + *** 615 LINES SKIPPED *** From nobody Wed Feb 14 13:58: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 4TZft418d1z59vQs; Wed, 14 Feb 2024 13:58: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 4TZft40XHPz4k5F; Wed, 14 Feb 2024 13:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707919100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mkeYDbxeJG5S+sybQgIr6hc9voEH1rUHZRk9E7Xsi/c=; b=oMiCVVYGf/VpLw2hkIYd/p6kdUu6t7O7+bjTVMErT89Ccp0h7xfUDGETh6NygB/6JQIkRO Zsh7ZrFNLHIid1ikE7o3ulu49v21BXvhViEUdjGaZTh9xdOaD7UuX0XMDzFN2zgHdAqt0/ +i7D3LpiT+TdjSO/08zB1uzkPRHKgpyPMOeDUEzgvoOAvQ/ZweKX8IEaJpbaR9dGsmUeMt Ia97WziyYCVG59EHEX48IEjhbvU2FCFnGfcuIcTLthf7+wQk8VWLfnoGnnc2mSK9lfts1v T/H6ft0aGpSRS8s42yCRXLZIiSresqRr2hIEcKW3Rphl4pCNntrLucolIgIDyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707919100; a=rsa-sha256; cv=none; b=R5+ZavN2Wn1LEwqxiO+l6iSRtc7/4g+xV9clTJQ/8okV2HTtPv40vYD/Gcj1OA8YDXjW95 fu+dq8WR1UGBM4fpaBnIloZnFe+r22D1bdMu7T32m2Sn4sg2e189ghoY5cJ0DVDm4GgdD1 +n21/vCSJsjdYD9g0fKx6UZonZrrQSHgKa2pKE1SMnD9SJ7lq2cQXBm2O3nDwC7DZ1SPOl 7RiFS3gOGzWGsAs+XrszkLFjDVPHsY1KUn8eaoeXMI/Fked5AXfMOa1Ft8mcrekCm+12kb 3UBPIWea/x9JrRVPAEA/tIgj1eMtnpmUXbdMGMMhYV9IAw9Fv2yA5o2mrgTZmQ== 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=1707919100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mkeYDbxeJG5S+sybQgIr6hc9voEH1rUHZRk9E7Xsi/c=; b=pOy7sLR/bnLzNytCeisU/9Xu6CrwndEiPnLjaC8Owpmq12UYZ2TpzCfZdZcorZ1OVOjeuN vm7E1lnovB6TvYJOijVC7q7fecEoXTW6vogMa/uceDhCccLTvxmLOVxvZeLIDkeTwlr0bf 4cgAqwHukEZ1GIe4wqbrbgQDmi08KaBQhFJ+XFxDqIsWWscDqcVg0Kezf9P1rcnNGgOb4E +wnx7QtaEEL9AG8uEDSkssp2g1BrTgYoW6UpcuUdAlhArFEh424m/BZc2F1VTn2/sF+VAw B6/PzT6IaT0omR+k2BU5WmVItxtisbdl/n4/QA9MTOoA2F/D8EdE9tiIpumK+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 4TZft36j5Gz11Xq; Wed, 14 Feb 2024 13:58: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 41EDwJEU075717; Wed, 14 Feb 2024 13:58:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EDwJ0N075714; Wed, 14 Feb 2024 13:58:19 GMT (envelope-from git) Date: Wed, 14 Feb 2024 13:58:19 GMT Message-Id: <202402141358.41EDwJ0N075714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: fcea1cc9711a - main - tcp: fix RTO ssthresh for non-6675 pipe calculation 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: Sender: owner-dev-commits-src-main@freebsd.org 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcea1cc9711aa774f6fac305418db4d42b64a5bd Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=fcea1cc9711aa774f6fac305418db4d42b64a5bd commit fcea1cc9711aa774f6fac305418db4d42b64a5bd Author: Richard Scheffenegger AuthorDate: 2024-02-14 13:51:39 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-14 13:51:53 +0000 tcp: fix RTO ssthresh for non-6675 pipe calculation Follow up on D43768 to properly deal with the non-default pipe calculation. When CC_RTO is processed, the timeout will have already pulled back snd_nxt. Further, snd_fack is not pulled along with snd_una. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43876 --- sys/netinet/cc/cc.c | 2 +- sys/netinet/cc/cc_cubic.c | 2 +- sys/netinet/cc/cc_dctcp.c | 2 +- sys/netinet/cc/cc_htcp.c | 2 +- sys/netinet/cc/cc_newreno.c | 2 +- sys/netinet/tcp_input.c | 4 ++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index a3d19e31d438..c2965b1e6a48 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -492,7 +492,7 @@ newreno_cc_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index dcb096af6cbf..eb1587d44427 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -479,7 +479,7 @@ cubic_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/cc/cc_dctcp.c b/sys/netinet/cc/cc_dctcp.c index 41db7e0811aa..ae0a56839449 100644 --- a/sys/netinet/cc/cc_dctcp.c +++ b/sys/netinet/cc/cc_dctcp.c @@ -296,7 +296,7 @@ dctcp_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index 7500446d3051..949715a69c67 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -327,7 +327,7 @@ htcp_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 4f55fb7e0f7a..71f2764ef4bc 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -431,7 +431,7 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b3201750c1e6..f023d7477790 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -461,6 +461,10 @@ cc_cong_signal(struct tcpcb *tp, struct tcphdr *th, uint32_t type) tp->t_badrxtwin = 0; break; } + if (SEQ_LT(tp->snd_fack, tp->snd_una) || + SEQ_GT(tp->snd_fack, tp->snd_max)) { + tp->snd_fack = tp->snd_una; + } if (CC_ALGO(tp)->cong_signal != NULL) { if (th != NULL) From nobody Wed Feb 14 14:11: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 4TZg8z4Svjz59xWs; Wed, 14 Feb 2024 14:11: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 4TZg8z3zj7z4pC4; Wed, 14 Feb 2024 14:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707919875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vhHQleNAtrciCQG4xB9Au9fCB4zuI0qdkgbENrAIJQU=; b=DFPVXM0knc6G0BLRj7o2lMBzVrrIh75/G0n1HYC/HDPYebDi3oy3PFFQkdlmkO7SXppLk+ h29soknsUZY7kx5774A95GUjg8ogFJcsHV+cMxbh97xn2lqY9pP/0cPdQQNAfmwRWKPV4x 9GyAqjwe0KEOpx3MHh0pLdyoZuZab6BBjnyVTWkAsJCyOVfRnAVCNdildet+DnivWr1IiS Bia/1yMTWM75kOUDKjytP7+/20aQYUiMvzUeY/cdjf/iwN8mfj0eF+Q8SR9zMiQ8fSWnzT O8ChUs3w/fbojfxvjSSs0s8nPrV7C4XPum/8iMW8dvqrsuKBil/B/5jUXCgkSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707919875; a=rsa-sha256; cv=none; b=DT5mjLIYlRCP28mE68DOc0zLt8zcMnx7zZbXH7HMDO9nm0QgtK4Ggu6EVEg0BrvanlGh4t K2riq0kANJzqp04CmWHJoIoYVCHhlAYQ2VhNPXu8pV8rMY2GjYr4Rc845lE4C0mdCMZ/H/ ZX3L/61UcD4iJtzXY2DJq4O5RS/zTglKPgF6JCtPu1SUc5UbtCY8jhOcA5VMTM7w9jKe36 FktkA+LXvnMgSEvJs852JwhK79UgRYHjI0oYlGuIegQuQ915bdd4WFXFjbFPGb/vhD6xjH 5i0FWHDIlE0ZO7+foJ2POtGbNJQ4/cJ89LvzmWE4yC+5PAWWsbKV0prdmergOw== 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=1707919875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vhHQleNAtrciCQG4xB9Au9fCB4zuI0qdkgbENrAIJQU=; b=wmpSkhCUBY3KwNTfUDqi939BsRk57svs3hnsUjm2zXsqXtmYj7WjgcPFiMYHFqP3XLzjEg r1trqaIm6WQyNqOT90bAjlKh4zYFarQ2aN0sKdDe1IfvOd5ywuvSm7y2/Ydy+/BN9D60N8 Hpmdog03zsLf5uyoGCfo/NuXkhjxzn+ErzvqWCAEEv7q5YuNrB89kmc74jKZzoFHPYKG2P zl6UkOSNAhOk1YAQLJMSiB90E+imRC00MuRFIxwiTZJptbtXMBXfErbJ5ks5TY458w9d5G HJH8vW0VZPtBPcnQJJuBSEkVx7MFt0nd6/VzTSrnGzD3xXqUk0GV68uE4hqIWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZg8z34K6z11Hc; Wed, 14 Feb 2024 14:11: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 41EEBFVw007304; Wed, 14 Feb 2024 14:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EEBFRe007299; Wed, 14 Feb 2024 14:11:15 GMT (envelope-from git) Date: Wed, 14 Feb 2024 14:11:15 GMT Message-Id: <202402141411.41EEBFRe007299@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: bbd29c4394de - main - wlan(4) - remove an(4) reference 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbd29c4394de2750b6137c46bf4e577805a4120a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bbd29c4394de2750b6137c46bf4e577805a4120a commit bbd29c4394de2750b6137c46bf4e577805a4120a Author: Christopher Davidson AuthorDate: 2024-02-14 04:27:13 +0000 Commit: Ed Maste CommitDate: 2024-02-14 14:11:00 +0000 wlan(4) - remove an(4) reference Fixes: 663b174b5b53 ("an: Remove driver") Pull request: https://github.com/freebsd/freebsd-src/pull/1120 --- share/man/man4/wlan.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4 index 233b29bb89bd..4cd1bfbdc9d5 100644 --- a/share/man/man4/wlan.4 +++ b/share/man/man4/wlan.4 @@ -166,7 +166,6 @@ not ratified and subject to change. Be aware that this specification is incompatible with earlier drafts. Stations implementing earlier drafts (e.g., Linux) may be incompatible. .Sh SEE ALSO -.Xr an 4 , .Xr ath 4 , .Xr bwi 4 , .Xr bwn 4 , From nobody Wed Feb 14 14:24: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 4TZgSh238jz5B0LJ; Wed, 14 Feb 2024 14:24: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 4TZgSh139kz4qy8; Wed, 14 Feb 2024 14:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707920692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mbMo7axt9vLxqaMlUREvaT7mtS2gvpcP7PSYAHZKaJw=; b=v+d2piXGTknvfiD3Qc9a2d3fGV7g0lZw3VxMsGNTZahSgrF5Wnph0SlsFs4h1M9SZGKcWV uncYc+htkQZqy4EFEoQNtFo+6lIoewPUDgirJR1YFhMmnIxH1WtcLDfNYbGP1MkIh3zBUm y069EI37G2BiiZ7tQXgRWaOSKr4rtrF3fILAeiEwMbO2xb0nr5K/QZVb09CkLgkRBEsmDW ew0GUmFYBWGhWi8+LsDaz8Wn5A027JCqP1ghcayUUGYaCYTJMBaEv4Kw4ur0maGCojs2Ur /fl6WEFkxtfxBx+YPkK75XrCKqsoAgqbiGK5nfKox1z5piTfTiqkrbEQhwEHWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707920692; a=rsa-sha256; cv=none; b=y0pFouoQiqSLXh088uMHa3nPjEVrpr12LtwI8zQDY/QqZqe/ltATYQndubI6ARyZOmNF/E dvuzI8D0McWcvI9h0xlHz8O+dF2Bm2hqmAAr4tuIcssTJJDEj5EYNENUgG+QF8+R6p7rlT XYwPRhpiVUQXGz1dp3FiiWMzj72c38oXBvzT4jTXZNc442tPN3Q0iQvIq8e5KbKQS/9c4x 9mLcZQplsY0xnMIJwY8ExYVMbnyoHpnfRmZP0VCRucPOIHc2CQiXDkgZVcTHOc+wOiWGDJ G8vA1Cj0Ux4jdKY9gamXBprNsDOJK99b+k4BkWHHmmt99SZTpGi3hViW9bRgUQ== 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=1707920692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mbMo7axt9vLxqaMlUREvaT7mtS2gvpcP7PSYAHZKaJw=; b=kAehdQhXL2JUfOGznA2Ak5UCcT9zJx+Yqc0dKL6xqwdN6jko3O/mgru3/9TVTrKEEg4Uz9 a7MAyN+QakXGDJHio8sko7MJXIEnBpXMvgj46x5dSdyooJZJ8CDCsOjg6uvZ6w4KZSjdzv mix4OjEyvozLrDrsStEE+eYZBWfy+SY1cnfM9H2nqWoMcG23ekUu75odJZrfQtov93grzt mEttkE86xPSlmUbPmx3GXEoXIs1+JAtiHCNiW+FnAPzcxw2l3kR2ECr1BJMb972WkpLWy1 9BJd07/rGin9pq5gaBY1EEhhqxx1/EM9aiqE9SmhXmQpVr033mzju6KkLHtA3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZgSg71zRz12HS; Wed, 14 Feb 2024 14:24: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 41EEOpaX028866; Wed, 14 Feb 2024 14:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EEOpeM028863; Wed, 14 Feb 2024 14:24:51 GMT (envelope-from git) Date: Wed, 14 Feb 2024 14:24:51 GMT Message-Id: <202402141424.41EEOpeM028863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 2198221bd9df - main - sched_setscheduler(2): Change realtime privilege 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: Sender: owner-dev-commits-src-main@freebsd.org 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2198221bd9df0ceb69945120bc477309a5729241 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2198221bd9df0ceb69945120bc477309a5729241 commit 2198221bd9df0ceb69945120bc477309a5729241 Author: Florian Walpen AuthorDate: 2024-02-14 13:50:44 +0000 Commit: Olivier Certner CommitDate: 2024-02-14 14:24:11 +0000 sched_setscheduler(2): Change realtime privilege check Check for privilege PRIV_SCHED_SETPOLICY instead of PRIV_SCHED_SET, to at least make it coherent with what is done at thread creation when a realtime policy is requested, and have users authorized by mac_priority(4) pass it. This change is good enough in practice since it only allows 'root' (as before) and mac_priority(4)'s authorized users in (the point of this change), without other side effects. More changes in this area, to generally ensure that all privilege checks are consistent, are going to come as olce's priority revamp project lands. (olce: Expanded the explanations.) PR: 276962 Reported by: jbeich Reviewed by: olce Approved by: emaste (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43835 --- sys/kern/p1003_1b.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/p1003_1b.c b/sys/kern/p1003_1b.c index 21c9e3a27039..6259f7092487 100644 --- a/sys/kern/p1003_1b.c +++ b/sys/kern/p1003_1b.c @@ -233,8 +233,8 @@ kern_sched_setscheduler(struct thread *td, struct thread *targettd, targetp = targettd->td_proc; PROC_LOCK_ASSERT(targetp, MA_OWNED); - /* Don't allow non root user to set a scheduler policy. */ - error = priv_check(td, PRIV_SCHED_SET); + /* Only privileged users are allowed to set a scheduler policy. */ + error = priv_check(td, PRIV_SCHED_SETPOLICY); if (error) return (error); From nobody Wed Feb 14 14:59: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 4TZhDN2zh3z5B4y5; Wed, 14 Feb 2024 14:59: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 4TZhDN2N8Hz4vgd; Wed, 14 Feb 2024 14:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707922756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1R6Qogy6T4h5u/zm+rlQioEH3QNzyvtSXnuUI5xz+Pc=; b=AfVWsew+HYvOF4wX18VDj2x/Gn+DkCKz/Rb90FOeJq126z4dhwdfu4HJIN/es0+bVxSR6u qy0Tc6EOhZBkuJzKjmaWWEU+tfNeRwXpTRqfsrxbVg1woemv0R59jA0wd4zlS0Ks9X/mFW 6ZrEhEQuObjQtl945l1IMSPpkOd/Ho1RqJk2OeOLx1UjgE602ibvCtWM3bqX5E8/50oAox xSW9yUjSiWrR2fPtlhOmbDK8w0gRBW4aFHzafEdc2ePH0bnKU5U3KUWjepbJ4VIQ3srZnr 6FSHya7dajLDmMmY6n8DzlRhTodoou7hifhN3nGYYucxsaC0fyOY+Tx7dhSaiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707922756; a=rsa-sha256; cv=none; b=jslnvx9QG6zY44mu2q9686o8GXg7BVzk94xp6d2OxEVq4rh6qZ2PljX6CpyY6DVc3Nl4Pf siiElqCHF3OQMECKHPw6nu0wkGjEHrCJ3h7w9c8vztTGe/GqLqLefaoTwKHegdKEfZkXmm iTkz64as+lO7+grMEYThS8L2OWhGuRTxhSLzHOcFuKult3jwWV0+stJJEb6gJ+Z0yI8Mbg D0Pey9M1mSykMUHWvcszheu5hwTCkHQ2Wv8V14Rw/CR1bs3Iq85T5SvxmI29ApyoPGeQGQ qndve/OvME5d+OdURv4n2T3sfY4VfkRHuK2h9oFcD6QDijZ7eh5K8CsBu2bLgA== 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=1707922756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1R6Qogy6T4h5u/zm+rlQioEH3QNzyvtSXnuUI5xz+Pc=; b=yCcddYv9kvJaUDZhJnL1x3nktMRQtTbtUHwYamWzM9pn4qnnlYnruygDDl10f9DixwfTh0 n8sbW1iLwjlmBvzBYDmZoRArMmRPUJ/VSBOlyJShxzjb+jTd3uOI0aCqPbYXSAHhHqw9hM 9yNv8zvBSmM7eydpKZJ4luBiwXI8gdJRoCsVpa4HwMA88/dvMhW6DIxrFHktbf9n1U7L6T YqzEDMSr2yBUku7a5Rid+GeJZ4sYaDbE8F6KzJVNOSHdSJOxRma2QuZMCXt9ZVGaVKgEHj IG1tAslJKmKraeuI4UbiaDPCRUoIQosarYFf/aiTfTPWz3qzrGaZMByRsCmDvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZhDN1Pq9z12kh; Wed, 14 Feb 2024 14:59: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 41EExGRe080297; Wed, 14 Feb 2024 14:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EExGvQ080294; Wed, 14 Feb 2024 14:59:16 GMT (envelope-from git) Date: Wed, 14 Feb 2024 14:59:16 GMT Message-Id: <202402141459.41EExGvQ080294@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: f48cd806e04a - main - build: Do not run ctfconvert on VDSO files 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: Sender: owner-dev-commits-src-main@freebsd.org 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f48cd806e04a7d6f459cfd93dba283465d40e190 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f48cd806e04a7d6f459cfd93dba283465d40e190 commit f48cd806e04a7d6f459cfd93dba283465d40e190 Author: Mark Johnston AuthorDate: 2024-02-13 23:06:58 +0000 Commit: Mark Johnston CommitDate: 2024-02-14 14:57:38 +0000 build: Do not run ctfconvert on VDSO files Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43877 --- sys/conf/files.amd64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 5eae8a0de3c2..cb5ed560a82e 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -14,12 +14,14 @@ include "conf/files.x86" elf-vdso.so.o standard \ dependency "$S/amd64/amd64/sigtramp.S assym.inc $S/conf/vdso_amd64.ldscript $S/tools/amd64_vdso.sh" \ compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' DEBUG='${DEBUG}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_vdso.sh" \ + no-ctfconvert \ no-implicit-rule before-depend \ clean "elf-vdso.so.o elf-vdso.so.1 vdso_offsets.h sigtramp.pico" # elf-vdso32.so.o optional compat_freebsd32 \ dependency "$S/amd64/ia32/ia32_sigtramp.S ia32_assym.h $S/conf/vdso_amd64_ia32.ldscript $S/tools/amd64_ia32_vdso.sh" \ compile-with "env AWK='${AWK}' NM='${NM}' LD='${LD}' CC='${CC}' DEBUG='${DEBUG}' OBJCOPY='${OBJCOPY}' ELFDUMP='${ELFDUMP}' S='${S}' sh $S/tools/amd64_ia32_vdso.sh" \ + no-ctfconvert \ no-implicit-rule before-depend \ clean "elf-vdso32.so.o elf-vdso32.so.1 vdso_ia32_offsets.h ia32_sigtramp.pico" # From nobody Wed Feb 14 15:17:25 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 4TZhdK3nNFz5B74x; Wed, 14 Feb 2024 15:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZhdK3GD8z3y7j; Wed, 14 Feb 2024 15:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707923845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zs1hpJFjKCo7ZYlv+UN9hKWoXJIg3nWHmaH90kq864=; b=iO0NSrJ3IqC1S20JxWGb9d581b/uYWqjHwZpOBdFH4LcCE01L5cla/WuR0N0pujQaXJVGU GsC8cpH++wzC1ygpxpeZM3zLUN98Xn5nU8D6h0FdhbXco8qkdnulaFeL7+AnPQ1HOhdjs7 q69aLmISGJ0VMzbupLc8N6bg3jl/+BgX924E4XH9NximMznIda1TG9gKURFDrsdeDRYYw9 20+Jfdj9a3oqvmdOSYYpw8AtW7wtctUSzBa4QKs3i4HxptahfiwLJJnTvOJw3hJmJnyxEU uQe4AlzoqaNhDGcKvrHOXT/bHLLYDQs1B/uiwgvnLmA9w7azFdBkDp/ga+Utkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707923845; a=rsa-sha256; cv=none; b=rBLBOk5Y4zFOAoAovaDRSo541L6ge2mK2nhNOL61Fk+fASMODEhiiyrFEA4n2CXkS/V6oj 16ve2jQfi5IN3A79NuC51+zcCx/8Z7Z6PP9VJ4MfcU79+5Z1xvQvgP67gax9HEX32LWqLV xSvGQo6J7CB84BiYipxRrL/6IHsR1t/lPKNHjpj7mzRDsMdYTGU7hQ+dwJ22tWzUhrjE1O esiYgJGYa5ovlsC8i+5R9JWneNqg+wq2iXrPb1R0c5eybLPZ7ny5opJYbYtqSo13mhQCJ4 sDpVs+CdRAfiWclbrOAsZFRirRwu6i4VGDq/z1a7MVVhDfVT/Gl7nERmvw3WGw== 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=1707923845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zs1hpJFjKCo7ZYlv+UN9hKWoXJIg3nWHmaH90kq864=; b=gT4Xosbvc0cJZmXcl2nGGCMxKeS4VmXteMNQ3q+S1jVzLepKTmoLsLcnd3AFW8k+wDlvJc ZJcKO88XWRKSdKghz0kqfU4ew1fBO+M+WKy+vT2WjxmgZ6O4IXxfdI5zkmf6Z3tZENJarm ZEkAu3jVH0LqRaEmCJOgOGsuJFol59Mz/mtzJ8Ri1fdbYlOkpl93u3FZDgsBWKYFOUD2BT RKvihFr2LmLiAqJO0Myu6Wcihd8WDW69Fo2LD4K4P/pBXM+yAGSiFcLQcp+szK8Cj3Lwre 7Vulkf+vY9SGfiABbBp/GV7hz6zAmWddtFd192oV0Ipafz1TgK9X/NR2D2KJSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZhdK2ByKz13N1; Wed, 14 Feb 2024 15:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EFHP8n015184; Wed, 14 Feb 2024 15:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EFHPPi015181; Wed, 14 Feb 2024 15:17:25 GMT (envelope-from git) Date: Wed, 14 Feb 2024 15:17:25 GMT Message-Id: <202402141517.41EFHPPi015181@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: 94b86c12f14e - main - release: de-duplicate arm.subr fstab logic 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: Sender: owner-dev-commits-src-main@freebsd.org 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94b86c12f14e69ace1bffe23c15c77a7def23216 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=94b86c12f14e69ace1bffe23c15c77a7def23216 commit 94b86c12f14e69ace1bffe23c15c77a7def23216 Author: Mitchell Horne AuthorDate: 2024-02-14 15:11:41 +0000 Commit: Mitchell Horne CommitDate: 2024-02-14 15:16:54 +0000 release: de-duplicate arm.subr fstab logic These days, the entries are the identical for GPT and MBR. Reviewed by: manu, karels, imp MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43847 --- release/tools/arm.subr | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 2a3a278fbee6..6c53724ed52f 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -199,18 +199,10 @@ arm_install_base() { echo '# Custom /etc/fstab for FreeBSD embedded images' \ > ${CHROOTDIR}/${DESTDIR}/etc/fstab - if [ "${PART_SCHEME}" = "GPT" ]; then - echo "/dev/ufs/rootfs / ufs rw 1 1" \ - >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ - >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - fi - if [ "${PART_SCHEME}" = "MBR" ]; then - echo "/dev/ufs/rootfs / ufs rw 1 1" \ - >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ - >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - fi + echo "/dev/ufs/rootfs / ufs rw 1 1" \ + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab + echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab From nobody Wed Feb 14 15: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 4TZhdL5Vkpz5B74y; Wed, 14 Feb 2024 15: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 4TZhdL47nhz3yB8; Wed, 14 Feb 2024 15: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=1707923846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PoRF1HI5IDoI+CEnAbhwpvOhMsf29bEsPBp6uDT10fo=; b=Pfs7buIACO0Mv3szMAfizVdEEeMv3ap962r765xL8oB1JS9uE2pyf0YW3BuUHCRPTAWoX/ kwfxiOEo4QJnBNNiw8KXWN7k6Kz6lwToRSz1AkuyQSmpANo3vKzJ5JrrImCXs+wxGSiBya Ql1c1wsh+j+g6RDNTAkbpDqK2er8YiaPzxwuc4+RAfsxGBLVM7PPbB/cSrR6mnLao4whEW YBmbzs4KYh6HOh2Fs/PLeufi+Kgvl9Gu4ytpFVT0Ah/ex4gXHC0Bjk/hJ8xNnYwkU6NDh4 3IbF6iInxKtj8pJ5rmrqVl7rSUo3RViFaBo9pf+AsJRyVDqkHUp/zHK9iKd+rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707923846; a=rsa-sha256; cv=none; b=XaifzDaR1NxDN2E9oscMaVg2Nb9fcK2OzQsxZC9qVtaId2ynZgh3tuWYXzTkDgMgDrcwsS 9ZzLcmlv48C6ZMACWKank6E0ih6djbPAmaf6r7Cz2Dsl+ccUB0ocnsDgyT1neCULDOrLmL F8QcBf2rTa7s7BgiMIYob249W/woxQJXiy0XDI2bdC1iK8ZVdwKe/jTIsTMm2E0C5eNRFI jPZ0C9uhWBaUEAAC4ITWU2CkHAeROqSh/X1wY4ZqEy3GdSIgDidzPqNoZmuj03QJnf5wB0 T1is/6yMGW8osXVexGJPFpOsem0Cb6J1uvaAAZV4Y5MtsSoTVYotJz2ZdqR9Sw== 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=1707923846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PoRF1HI5IDoI+CEnAbhwpvOhMsf29bEsPBp6uDT10fo=; b=dOqaLuhRWFIIx5dm6QChDkGtoWZ5qRSdmUWtGh1Ts43ZBX6FpCXfQzJFvZIDaS/RlyczQA wtN0a2ylBkJCiw5qA1H6nG9Dy/cycOt/Ar3jgivlDRBsLtpYidGGRpmJsp3ALuE4lqEYdf k4RxFqBapvCWe+AfMFxRIp9TeGORHvelafOKH1YFdEHdvJRIkvyHz5MnE6eEPChyf4Og1z EN2fRWZWYVnHe1RB/3za9tQYiQGLuWvPw1/sK7WN8Xiapkp0cMJUyVwwRLnTpBXDDtksnD 9WR2g7iRCudO0xIb7mxG+Cb4/53UOXTcg4C3w5QAa+ETPK20l8+RMhLruzip4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZhdL2wVlz13N2; Wed, 14 Feb 2024 15: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 41EFHQSH015240; Wed, 14 Feb 2024 15: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 41EFHQRx015237; Wed, 14 Feb 2024 15:17:26 GMT (envelope-from git) Date: Wed, 14 Feb 2024 15:17:26 GMT Message-Id: <202402141517.41EFHQRx015237@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: 2af03ebfb853 - main - release: make SD card partition layout more flexible 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: Sender: owner-dev-commits-src-main@freebsd.org 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2af03ebfb853e918554e86ee0e37cf4b30a93bd0 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2af03ebfb853e918554e86ee0e37cf4b30a93bd0 commit 2af03ebfb853e918554e86ee0e37cf4b30a93bd0 Author: Mitchell Horne AuthorDate: 2024-02-14 15:12:29 +0000 Commit: Mitchell Horne CommitDate: 2024-02-14 15:16:54 +0000 release: make SD card partition layout more flexible Currently the partition layout is hardcoded to create an EFI/FAT partition and a UFS root partition, with some logic to handle GPT/MBR differences. On RISC-V platforms we are seeing the emerging pattern that firmware should be placed in a partition of a known type, rather than just a known sector of the disk. Thus, some functionality is needed to customize the layout for SD card images. Add a hook, arm_create_partitions(), which can be overridden to insert additional platform-specific partitions, possibly preceding the standard EFI and UFS ones. A couple of new variables are added to track the indices, e.g. ROOTFSPART_SUFFIX=p2. In a couple places this de-duplicates the GPT/MBR logic. Reviewed by: manu, karels, imp MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43848 --- release/tools/arm.subr | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 6c53724ed52f..983c3ea75dc7 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -67,22 +67,25 @@ arm_create_disk() { # Create the target raw file and temporary work directory. chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev} + + arm_create_partitions + if [ "${PART_SCHEME}" = "GPT" ]; then chroot ${CHROOTDIR} gpart add -t efi -l efi -a 512k -s ${FAT_SIZE} ${mddev} - chroot ${CHROOTDIR} newfs_msdos -L efi -F ${FAT_TYPE} /dev/${mddev}p1 chroot ${CHROOTDIR} gpart add -t freebsd-ufs -l rootfs -a 64k ${mddev} - chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}p2 fi if [ "${PART_SCHEME}" = "MBR" ]; then chroot ${CHROOTDIR} gpart add -t '!12' -a 512k -s ${FAT_SIZE} ${mddev} chroot ${CHROOTDIR} gpart set -a active -i 1 ${mddev} - chroot ${CHROOTDIR} newfs_msdos -L efi -F ${FAT_TYPE} /dev/${mddev}s1 chroot ${CHROOTDIR} gpart add -t freebsd ${mddev} - chroot ${CHROOTDIR} gpart create -s bsd ${mddev}s2 - chroot ${CHROOTDIR} gpart add -t freebsd-ufs -a 64k -b 64k ${mddev}s2 - chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}s2a + chroot ${CHROOTDIR} gpart create -s bsd ${mddev}${BSDLABEL_SUFFIX} + chroot ${CHROOTDIR} gpart add -t freebsd-ufs -a 64k -b 64k ${mddev}${BSDLABEL_SUFFIX} fi + # Create the EFI and UFS filesystems + chroot ${CHROOTDIR} newfs_msdos -L efi -F ${FAT_TYPE} /dev/${mddev}${EFIPART_SUFFIX} + chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}${ROOTFSPART_SUFFIX} + return 0 } @@ -171,12 +174,7 @@ arm_setup_minimal_loader() { } arm_install_base() { - if [ "${PART_SCHEME}" = "GPT" ]; then - chroot ${CHROOTDIR} mount /dev/${mddev}p2 ${DESTDIR} - fi - if [ "${PART_SCHEME}" = "MBR" ]; then - chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${DESTDIR} - fi + chroot ${CHROOTDIR} mount /dev/${mddev}${ROOTFSPART_SUFFIX} ${DESTDIR} _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) @@ -230,14 +228,8 @@ arm_install_boot() { FATMOUNT="${DESTDIR%${KERNEL}}/fat" UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" - if [ "${PART_SCHEME}" = "GPT" ]; then - dospart="/dev/${mddev}p1" - ufspart="/dev/${mddev}p2" - fi - if [ "${PART_SCHEME}" = "MBR" ]; then - dospart="/dev/${mddev}s1" - ufspart="/dev/${mddev}s2a" - fi + dospart="/dev/${mddev}${EFIPART_SUFFIX}" + ufspart="/dev/${mddev}${ROOTFSPART_SUFFIX}" chroot ${CHROOTDIR} mount_msdosfs ${dospart} ${FATMOUNT} chroot ${CHROOTDIR} mount ${ufspart} ${UFSMOUNT} @@ -271,3 +263,20 @@ arm_install_uboot() { arm_do_quirk() { # Override in the ${EMBEDDED_TARGET}/${BOARDNAME}.conf file. } + +arm_create_partitions() { + # Override in the ${EMBEDDED_TARGET}/${BOARDNAME}.conf file. + + # Set defaults for EFIPART_SUFFIX, ROOTFSPART_SUFFIX, and + # BSDLABEL_SUFFIX (MBR only), needed elsewhere. + + if [ "${PART_SCHEME}" = "GPT" ]; then + export EFIPART_SUFFIX=p1 + export ROOTFSPART_SUFFIX=p2 + fi + if [ "${PART_SCHEME}" = "MBR" ]; then + export EFIPART_SUFFIX=s1 + export BSDLABEL_SUFFIX=s2 + export ROOTFSPART_SUFFIX=s2a + fi +} From nobody Wed Feb 14 15:17: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 4TZhdN1Xglz5B751; Wed, 14 Feb 2024 15:17:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZhdM5bmRz3y5p; Wed, 14 Feb 2024 15:17:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707923847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z88Rl4SNL19tsNE+W2wcwMLkAGuVTMJ2rerIi30lxCY=; b=j5T9D8Ehl6uH5bDVEPMlDFcN4z1Lr/58LQCUiMZmmjHPRvMbfYXtLkASHzT4LQQWNtKoda baZK3B4T4wMoI2ZVuDap20AZCz5mBQvzMsa7u3B15GQnnP/KcdtQ1JJ3UGufFFMiXHMWzd mSGwb40QRgtlEQoYDHt8pvAdbbh4WhX7b33r1R743047Tbx+R8OKK3DoPCreNFFoibDXFl ZH9VlsGCSeSju3OH2v3ONCPHH6Vc9an96PhMtqyeMHj0ir7OKrhZPnmLDIAjvL33mvRq0K 59ZdQ6x++IlYfDRZ18iSDDelj/kipfWpfrRV5+V/6EHtEs7gn9mme0aBK0459A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707923847; a=rsa-sha256; cv=none; b=vinAS2uaFfa2yn+g7Ff47FFKDzUO7RFC+THREppQqMCyCjie82jl9NmjfNgKfBqN72NAfI F2OfuyuTmNrxcGceKa+SoORYvJSgQlDSbCo8GEdA2aWlZT4CeEqMgd2iaewf6mK3cbTnES VNJJjj2s02eAPuCbBhGlCjfUBL6DMP5X0bopR0KO5ss2WZVZktZx+SCRHXD2+Lu2+s4VOB 17UfhQihRk9yxNf2JpWc3ZZvO/iQzgJbiUpvBX4EbwIYQgaL89CFa0bqkbqxXBO9gpwan8 GCU4YBHB8F+CcHeo/CLAHAgYNhehQoBtODvVM8YI/g1OhKn36WQ/EvRy+qmtPw== 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=1707923847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z88Rl4SNL19tsNE+W2wcwMLkAGuVTMJ2rerIi30lxCY=; b=ha7LNaIxI4HHzBy3vkZPyHII/3Gget3Y/GEkhDJ+nIcO9FdV4z2lHB+1MarLcj59tYj5p9 gUtphcICkvea6T0pboE8Bhi/a5g6Kyz/0VRhqul7Jwx/2qDpCghJcFR8io/PB/8rI4sVpC 424bg1zlk/PMzgDL7/q8p/dPDRcS4KoSfegIu1vRGrgVCfN8IdXs/d5Y3VXtYjHfwfrWnc LR1HfhN/grKR68WY+p36svzH4xlWg52LpItd7V906Rq2EOlEVvpNJol4YRlHrtNtnd5r3O hTr/+qnFJyZKo2E/C7F2zlew1E730r6p/u5VAiB+jSrEDEgShQZ4MHqKblnzEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZhdM3VCKz138b; Wed, 14 Feb 2024 15:17: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 41EFHRg8015287; Wed, 14 Feb 2024 15:17:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EFHRxX015284; Wed, 14 Feb 2024 15:17:27 GMT (envelope-from git) Date: Wed, 14 Feb 2024 15:17:27 GMT Message-Id: <202402141517.41EFHRxX015284@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: 3fb8f1272b50 - main - riscv: add firmware partitions to GENERICSD.conf 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: Sender: owner-dev-commits-src-main@freebsd.org 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fb8f1272b50cb87cb624b321f7b81e76627c437 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3fb8f1272b50cb87cb624b321f7b81e76627c437 commit 3fb8f1272b50cb87cb624b321f7b81e76627c437 Author: Mitchell Horne AuthorDate: 2024-02-14 15:12:57 +0000 Commit: Mitchell Horne CommitDate: 2024-02-14 15:16:54 +0000 riscv: add firmware partitions to GENERICSD.conf Create two partitions in the existing space at the beginning of the image (8MB). These are intended to hold u-boot SPL and u-boot proper. The partition types selected are compatible with SiFive boards, e.g. the HiFive Unmatched. They can easily be overridden for a platform that uses the same scheme but different partition types, e.g. the StarFive VisionFive v2. Firmware is not actually installed, this too is left for the user. It is not as simple to create the firmware partitions after the fact, e.g. with partition indices 3 and 4. It is a shortcoming of current day u-boot that the SPL loader looks for a specific partition index, rather than the partition type, meaning that we will fail to boot if partition 2 doesn't contain u-boot. Thus, our GENERICSD images become more generically usable with current RISC-V hardware/firmware platforms. Reviewed by: manu, karels, imp MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43849 --- release/riscv/GENERICSD.conf | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/release/riscv/GENERICSD.conf b/release/riscv/GENERICSD.conf index 7bd58bc9f97b..d4abbc7965b8 100644 --- a/release/riscv/GENERICSD.conf +++ b/release/riscv/GENERICSD.conf @@ -1,6 +1,4 @@ #!/bin/sh -# -# EMBEDDED_TARGET_ARCH="riscv64" EMBEDDED_TARGET="riscv" @@ -11,4 +9,18 @@ IMAGE_SIZE="6144M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" PART_SCHEME="GPT" +EFIPART_SUFFIX=p3 +ROOTFSPART_SUFFIX=p4 export BOARDNAME="GENERICSD" + +arm_create_partitions() { + # Create two partitions for firmware, preceding EFI and ROOTFS: + # 1. u-boot SPL + # 2. u-boot loader + # + # The exact partition types can be rewritten by the user, but they should + # be reserved now. + + chroot ${CHROOTDIR} gpart add -t hifive-fsbl -l spl -a 512k -b 2m -s 2m ${mddev} + chroot ${CHROOTDIR} gpart add -t hifive-bbl -l uboot -a 512k -b 4m -s 4m ${mddev} +} From nobody Wed Feb 14 15: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 4TZjBp3ZNNz5BBjW; Wed, 14 Feb 2024 15:42: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 4TZjBp2zqdz43Bw; Wed, 14 Feb 2024 15: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=1707925378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ANnkYPqO0re1QOCIHxU37cJ17r6BtIiJMktx20U9+pg=; b=AjdUu1ZcA33kybKCaFNEywxWGpJFl0egPdxZAXkWQmFstKRZfdhWs/qKYQwAFFEoAW8AZU +GA3NutksYoS7f8sBRIEH8olkzD6r775xxRGiEe9o8wDCanPzaYmQdjuD9buKI9VVgvzS3 HnmqH5A+jZRtl2uWrkYoCEXuUFhjY1ZKYIrIoZlQOiMpcYA55a3k8SaQHFnvxRQKFqKd/P S3sqsB0/L5YweF9NIO0YbuO+rhT2DkNtm4xOIV2w342y8DdgzqZGieAiALmM0wFiiwL7E/ LclOXWvsREvjxGVNLZvX8PZzvhhK9Zlta/BP0sHPn4+loYdzq1yuoJ9ovk8zdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707925378; a=rsa-sha256; cv=none; b=p23n8eE9nSWqN07K6+nlSzixSSnMPu9cnXvjHoombjlkwH6PyELDJAT7o2ezwNc8x7zE8y qqCyQuGMyWyJLbsz9PXV30Dg8GqWsu4OhGz2wB3DvtBz83+3kYWocdVXX7SAd5CEHXGahd VJ9fMmFTfTwBXNkWswgEZF3KiVb6Qtl9lIymla8uXjejdHxrYqRyeAcSSb8Lbu6xlJcWZ7 7NvoWRSD5ek/yOtKTqJqGO73XMSF8AO5ayZayUT8zs7ZQSdMXkK9rA1UZ1VFmrzOR+FIGw wHGjpdWaqn+7hM5kLtSTFSc1Wuh4LlQkVyOdEiIJsvg8j3ciuT1D/gn59B3geA== 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=1707925378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ANnkYPqO0re1QOCIHxU37cJ17r6BtIiJMktx20U9+pg=; b=eA+cwGr5s0x+Z769x1ncjQlBxHi6XKzsjs1bd4lnIiQRnAPIKchug7nL5vy6VM4PicETKH ntNZl3apcUOweIdu51oDX+R2DPQLfoX48o1n9Nu1YnCsNpOkST4/chg+dbR0nD2w+LiKN7 oEUJOY2Uklrekgvo7UEq5ercZmBdZrtj86Hwb0lJzco+VfijyHqzKXWilk9dB/HPH3M+7o 7SecK+kiOlqihfm4rsZWUhik6pXYo9ItZ/tgMR8MR0xD/aFfbmNnCV93bfFvMz9fBGA3co w5kRDJy7odDgGb1w+SKFA56SnnFQAg1MKCpLVAt7wHvCWx5IoWtcQQ7AfZ7xLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZjBp1l25z13sP; Wed, 14 Feb 2024 15: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 41EFgwBc063875; Wed, 14 Feb 2024 15: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 41EFgwnn063872; Wed, 14 Feb 2024 15:42:58 GMT (envelope-from git) Date: Wed, 14 Feb 2024 15:42:58 GMT Message-Id: <202402141542.41EFgwnn063872@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: ee91dae43d23 - main - riscv: Introduce support for APLIC interrupt controller 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: Sender: owner-dev-commits-src-main@freebsd.org 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee91dae43d23a3fa94dca1c905157e66c73c45de Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ee91dae43d23a3fa94dca1c905157e66c73c45de commit ee91dae43d23a3fa94dca1c905157e66c73c45de Author: Himanshu Chauhan AuthorDate: 2024-02-14 15:31:26 +0000 Commit: Mitchell Horne CommitDate: 2024-02-14 15:42:29 +0000 riscv: Introduce support for APLIC interrupt controller This patch introduces support for the RISC-V APLIC interrupt controller [1]. Currently, it is only supports direct mode, i.e. without an IMSIC and functionally replacing the legacy RISC-V PLIC. Work on IMSIC support is in progress. [1] https://github.com/riscv/riscv-aia/releases/tag/1.0 Reviewed by: mhorne Discussed with: jrtc27 MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D43293 --- sys/conf/files.riscv | 1 + sys/riscv/riscv/aplic.c | 554 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 555 insertions(+) diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv index b6a87c63422b..be7ae2b40a08 100644 --- a/sys/conf/files.riscv +++ b/sys/conf/files.riscv @@ -27,6 +27,7 @@ libkern/memset.c standard libkern/strcmp.c standard libkern/strlen.c standard libkern/strncmp.c standard +riscv/riscv/aplic.c standard riscv/riscv/autoconf.c standard riscv/riscv/bus_machdep.c standard riscv/riscv/bus_space_asm.S standard diff --git a/sys/riscv/riscv/aplic.c b/sys/riscv/riscv/aplic.c new file mode 100644 index 000000000000..19b80409c0f2 --- /dev/null +++ b/sys/riscv/riscv/aplic.c @@ -0,0 +1,554 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Himanshu Chauhan + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include "pic_if.h" + +#define APLIC_MAX_IRQS 1023 + +/* Smaller priority number means higher priority */ +#define APLIC_INTR_DEF_PRIO 1 + +static pic_disable_intr_t aplic_disable_intr; +static pic_enable_intr_t aplic_enable_intr; +static pic_map_intr_t aplic_map_intr; +static pic_setup_intr_t aplic_setup_intr; +static pic_post_ithread_t aplic_post_ithread; +static pic_pre_ithread_t aplic_pre_ithread; +static pic_bind_intr_t aplic_bind_intr; + +struct aplic_irqsrc { + struct intr_irqsrc isrc; + u_int irq; +}; + +struct aplic_softc { + device_t dev; + struct resource *mem_res; + struct resource *irq_res; + void *ih; + struct aplic_irqsrc isrcs[APLIC_MAX_IRQS + 1]; + unsigned int hart_indices[MAXCPU]; + int ndev; +}; + +#define APLIC_DOMAIN_CFG_IE (1UL << 8) /* Enable domain IRQs */ +#define APLIC_DOMAIN_CFG_DM (1UL << 2) /* IRQ delivery mode */ +#define APLIC_DOMAIN_CFG_BE (1UL << 0) /* Endianess */ + +#define APLIC_MODE_DIRECT 0 /* Direct delivery mode */ +#define APLIC_MODE_MSI 1 /* MSI delivery mode */ + +#define APLIC_SRC_CFG_DLGT (1UL << 10) /* Source delegation */ +#define APLIC_SRC_CFG_SM_SHIFT 0 +#define APLIC_SRC_CFG_SM_MASK (0x7UL << APLIC_SRC_CFG_SM_SHIFT) + +#define APLIC_SRC_CFG_SM_INACTIVE 0 /* APLIC inactive in domain */ +#define APLIC_SRC_CFG_SM_DETACHED 1 /* Detached from source wire */ +#define APLIC_SRC_CFG_SM_EDGE_RSE 4 /* Asserted on rising edge */ +#define APLIC_SRC_CFG_SM_EDGE_FLL 5 /* Asserted on falling edge */ +#define APLIC_SRC_CFG_SM_LVL_HI 6 /* Asserted when high */ +#define APLIC_SRC_CFG_SM_LVL_LO 7 /* Asserted when low */ + +/* Register offsets in APLIC configuration space */ +#define APLIC_DOMAIN_CFG 0x0000 +#define APLIC_SRC_CFG(_idx) (0x0004 + (((_idx) - 1) * 4)) +#define APLIC_TARGET(_idx) (0x3004 + (((_idx) - 1) * 4)) +#define APLIC_MMSIADDRCFG 0x1BC0 +#define APLIC_MMSIADDRCFGH 0x1BC4 +#define APLIC_SMSIADDRCFG 0x1BC8 +#define APLIC_SMSIADDRCFGH 0x1BCC +#define APLIC_SETIPNUM 0x1CDC +#define APLIC_CLRIPNUM 0x1DDC +#define APLIC_SETIENUM 0x1EDC +#define APLIC_CLRIENUM 0x1FDC +#define APLIC_SETIPNUM_LE 0x2000 +#define APLIC_SETIPNUM_BE 0x2004 +#define APLIC_GENMSI 0x3000 +#define APLIC_IDC_BASE 0x4000 + +#define APLIC_SETIE_BASE 0x1E00 +#define APLIC_CLRIE_BASE 0x1F00 + +/* Interrupt delivery control structure */ +#define APLIC_IDC_IDELIVERY_OFFS 0x0000 +#define APLIC_IDC_IFORCE_OFFS 0x0004 +#define APLIC_IDC_ITHRESHOLD_OFFS 0x0008 +#define APLIC_IDC_TOPI_OFFS 0x0018 +#define APLIC_IDC_CLAIMI_OFFS 0x001C + +#define APLIC_IDC_SZ 0x20 + +#define APLIC_IDC_IDELIVERY_DISABLE 0 +#define APLIC_IDC_IDELIVERY_ENABLE 1 +#define APLIC_IDC_ITHRESHOLD_DISABLE 0 + +#define APLIC_IDC_CLAIMI_PRIO_MASK 0xff +#define APLIC_IDC_CLAIMI_IRQ_SHIFT 16 +#define APLIC_IDC_CLAIMI_IRQ_MASK 0x3ff + +#define APLIC_IDC_CLAIMI_IRQ(_claimi) \ + (((_claimi) >> APLIC_IDC_CLAIMI_IRQ_SHIFT) \ + & APLIC_IDC_CLAIMI_IRQ_MASK) + +#define APLIC_IDC_CLAIMI_PRIO(_claimi) ((_claimi) & APLIC_IDC_CLAIMI_PRIO_MASK) + +#define APLIC_IDC_REG(_sc, _cpu, _field) \ + (APLIC_IDC_BASE + APLIC_IDC_##_field##_OFFS + \ + ((_sc->hart_indices[_cpu]) * APLIC_IDC_SZ)) + +#define APLIC_IDC_IDELIVERY(_sc, _cpu) \ + APLIC_IDC_REG(_sc, _cpu, IDELIVERY) + +#define APLIC_IDC_IFORCE(_sc, _cpu) \ + APLIC_IDC_REG(_sc, _cpu, IFORCE) + +#define APLIC_IDC_ITHRESHOLD(_sc, _cpu) \ + APLIC_IDC_REG(_sc, _cpu, ITHRESHOLD) + +#define APLIC_IDC_TOPI(_sc, _cpu) \ + APLIC_IDC_REG(_sc, _cpu, TOPI) + +#define APLIC_IDC_CLAIMI(_sc, _cpu) \ + APLIC_IDC_REG(_sc, _cpu, CLAIMI) + +#define APLIC_MK_IRQ_TARGET(_sc, _cpu, _prio) \ + (_sc->hart_indices[_cpu] << 18 | ((_prio) & 0xff)) + +#define aplic_read(sc, reg) bus_read_4(sc->mem_res, (reg)) +#define aplic_write(sc, reg, val) bus_write_4(sc->mem_res, (reg), (val)) + +static u_int aplic_irq_cpu; + +static inline int +riscv_cpu_to_hartid(int cpu) +{ + return pcpu_find(cpu)->pc_hart; +} + +static inline int +riscv_hartid_to_cpu(int hartid) +{ + int cpu; + + CPU_FOREACH(cpu) { + if (riscv_cpu_to_hartid(cpu) == hartid) + return cpu; + } + + return (-1); +} + +static int +fdt_get_hartid(device_t dev, phandle_t aplic) +{ + int hartid; + + /* Check the interrupt controller layout. */ + if (OF_searchencprop(aplic, "#interrupt-cells", &hartid, + sizeof(hartid)) == -1) { + device_printf(dev, + "Could not find #interrupt-cells for phandle %u\n", aplic); + return (-1); + } + + /* + * The parent of the interrupt-controller is the CPU we are + * interested in, so search for its hart ID. + */ + if (OF_searchencprop(OF_parent(aplic), "reg", (pcell_t *)&hartid, + sizeof(hartid)) == -1) { + device_printf(dev, "Could not find hartid\n"); + return (-1); + } + + return (hartid); +} + +static inline void +aplic_irq_dispatch(struct aplic_softc *sc, u_int irq, u_int prio, + struct trapframe *tf) +{ + struct aplic_irqsrc *src; + + src = &sc->isrcs[irq]; + + if (intr_isrc_dispatch(&src->isrc, tf) != 0) + if (bootverbose) + device_printf(sc->dev, "Stray irq %u detected\n", irq); +} + +static int +aplic_intr(void *arg) +{ + struct aplic_softc *sc; + struct trapframe *tf; + u_int claimi, prio, irq; + int cpu; + + sc = arg; + cpu = PCPU_GET(cpuid); + + /* Claim any pending interrupt. */ + claimi = aplic_read(sc, APLIC_IDC_CLAIMI(sc, cpu)); + prio = APLIC_IDC_CLAIMI_PRIO(claimi); + irq = APLIC_IDC_CLAIMI_IRQ(claimi); + + KASSERT((irq != 0), ("Invalid IRQ 0")); + + tf = curthread->td_intr_frame; + aplic_irq_dispatch(sc, irq, prio, tf); + + return (FILTER_HANDLED); +} + +static void +aplic_disable_intr(device_t dev, struct intr_irqsrc *isrc) +{ + struct aplic_softc *sc; + struct aplic_irqsrc *src; + + sc = device_get_softc(dev); + src = (struct aplic_irqsrc *)isrc; + + /* Disable the interrupt source */ + aplic_write(sc, APLIC_CLRIENUM, src->irq); +} + +static void +aplic_enable_intr(device_t dev, struct intr_irqsrc *isrc) +{ + struct aplic_softc *sc; + struct aplic_irqsrc *src; + + sc = device_get_softc(dev); + src = (struct aplic_irqsrc *)isrc; + + /* Enable the interrupt source */ + aplic_write(sc, APLIC_SETIENUM, src->irq); +} + +static int +aplic_map_intr(device_t dev, struct intr_map_data *data, + struct intr_irqsrc **isrcp) +{ + struct intr_map_data_fdt *daf; + struct aplic_softc *sc; + + sc = device_get_softc(dev); + + if (data->type != INTR_MAP_DATA_FDT) + return (ENOTSUP); + + daf = (struct intr_map_data_fdt *)data; + if (daf->ncells != 2 || daf->cells[0] > sc->ndev) { + device_printf(dev, "Invalid cell data\n"); + return (EINVAL); + } + + *isrcp = &sc->isrcs[daf->cells[0]].isrc; + + return (0); +} + +static int +aplic_probe(device_t dev) +{ + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (!ofw_bus_is_compatible(dev, "riscv,aplic")) + return (ENXIO); + + device_set_desc(dev, "Advanced Platform-Level Interrupt Controller"); + + return (BUS_PROBE_DEFAULT); +} + +/* + * Setup APLIC in direct mode. + */ +static int +aplic_setup_direct_mode(device_t dev) +{ + struct aplic_irqsrc *isrcs; + struct aplic_softc *sc; + struct intr_pic *pic; + const char *name; + phandle_t node, xref, iparent; + pcell_t *cells, cell; + int error = ENXIO; + u_int irq; + int cpu, hartid, rid, i, nintr, idc; + + sc = device_get_softc(dev); + node = ofw_bus_get_node(dev); + + sc->dev = dev; + + if ((OF_getencprop(node, "riscv,num-sources", &sc->ndev, + sizeof(sc->ndev))) < 0) { + device_printf(dev, "Error: could not get number of devices\n"); + return (error); + } + + if (sc->ndev > APLIC_MAX_IRQS) { + device_printf(dev, "Error: invalid ndev (%d)\n", sc->ndev); + return (error); + } + + /* Request memory resources */ + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) { + device_printf(dev, + "Error: could not allocate memory resources\n"); + return (error); + } + + /* Set APLIC in direct mode and enable all interrupts */ + aplic_write(sc, APLIC_DOMAIN_CFG, + APLIC_MODE_DIRECT | APLIC_DOMAIN_CFG_IE); + + /* Register the interrupt sources */ + isrcs = sc->isrcs; + name = device_get_nameunit(sc->dev); + for (irq = 1; irq <= sc->ndev; irq++) { + isrcs[irq].irq = irq; + + error = intr_isrc_register(&isrcs[irq].isrc, sc->dev, + 0, "%s,%u", name, irq); + if (error != 0) + goto fail; + + aplic_write(sc, APLIC_SRC_CFG(irq), + APLIC_SRC_CFG_SM_DETACHED); + } + + nintr = OF_getencprop_alloc_multi(node, "interrupts-extended", + sizeof(uint32_t), (void **)&cells); + if (nintr <= 0) { + device_printf(dev, "Could not read interrupts-extended\n"); + goto fail; + } + + /* interrupts-extended is a list of phandles and interrupt types. */ + for (i = 0, idc = 0; i < nintr; i += 2, idc++) { + /* Skip M-mode external interrupts */ + if (cells[i + 1] != IRQ_EXTERNAL_SUPERVISOR) + continue; + + /* Get the hart ID from the CLIC's phandle. */ + hartid = fdt_get_hartid(dev, OF_node_from_xref(cells[i])); + if (hartid < 0) { + OF_prop_free(cells); + goto fail; + } + + /* Get the corresponding cpuid. */ + cpu = riscv_hartid_to_cpu(hartid); + if (cpu < 0) { + device_printf(dev, "Invalid cpu for hart %d\n", hartid); + OF_prop_free(cells); + goto fail; + } + + sc->hart_indices[cpu] = idc; + } + OF_prop_free(cells); + + /* Turn off the interrupt delivery for all CPUs within or out domain */ + CPU_FOREACH(cpu) { + aplic_write(sc, APLIC_IDC_IDELIVERY(sc, cpu), + APLIC_IDC_IDELIVERY_DISABLE); + aplic_write(sc, APLIC_IDC_ITHRESHOLD(sc, cpu), + APLIC_IDC_ITHRESHOLD_DISABLE); + } + + iparent = OF_xref_from_node(ofw_bus_get_node(intr_irq_root_dev)); + cell = IRQ_EXTERNAL_SUPERVISOR; + irq = ofw_bus_map_intr(dev, iparent, 1, &cell); + error = bus_set_resource(dev, SYS_RES_IRQ, 0, irq, 1); + if (error != 0) { + device_printf(dev, "Unable to register IRQ resource\n"); + return (ENXIO); + } + + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->irq_res == NULL) { + device_printf(dev, + "Error: could not allocate IRQ resources\n"); + return (ENXIO); + } + + xref = OF_xref_from_node(node); + pic = intr_pic_register(sc->dev, xref); + if (pic == NULL) { + error = ENXIO; + goto fail; + } + + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_CLK, + aplic_intr, NULL, sc, &sc->ih); + if (error != 0) { + device_printf(dev, "Unable to setup IRQ resource\n"); + return (ENXIO); + } + +fail: + return (error); +} + +static int +aplic_attach(device_t dev) +{ + int rc; + + /* APLIC with IMSIC on hart is not supported */ + if (ofw_bus_has_prop(dev, "msi-parent")) { + device_printf(dev, "APLIC with IMSIC is unsupported\n"); + return (ENXIO); + } + + rc = aplic_setup_direct_mode(dev); + + return (rc); +} + +static void +aplic_pre_ithread(device_t dev, struct intr_irqsrc *isrc) +{ + aplic_disable_intr(dev, isrc); +} + +static void +aplic_post_ithread(device_t dev, struct intr_irqsrc *isrc) +{ + aplic_enable_intr(dev, isrc); +} + +static int +aplic_setup_intr(device_t dev, struct intr_irqsrc *isrc, struct resource *res, + struct intr_map_data *data) +{ + struct aplic_irqsrc *src; + struct aplic_softc *sc; + + CPU_ZERO(&isrc->isrc_cpu); + + sc = device_get_softc(dev); + src = (struct aplic_irqsrc *)isrc; + + aplic_write(sc, APLIC_SRC_CFG(src->irq), APLIC_SRC_CFG_SM_EDGE_RSE); + + /* + * In uniprocessor system, bind_intr will not be called. + * So bind the interrupt on this CPU. If secondary CPUs + * are present, then bind_intr will be called again and + * interrupts will rebind to those CPUs. + */ + aplic_bind_intr(dev, isrc); + + return (0); +} + +static int +aplic_bind_intr(device_t dev, struct intr_irqsrc *isrc) +{ + struct aplic_softc *sc; + struct aplic_irqsrc *src; + uint32_t cpu, hartid; + + sc = device_get_softc(dev); + src = (struct aplic_irqsrc *)isrc; + + /* Disable the interrupt source */ + aplic_write(sc, APLIC_CLRIENUM, src->irq); + + if (CPU_EMPTY(&isrc->isrc_cpu)) { + cpu = aplic_irq_cpu = intr_irq_next_cpu(aplic_irq_cpu, + &all_cpus); + CPU_SETOF(cpu, &isrc->isrc_cpu); + } else { + cpu = CPU_FFS(&isrc->isrc_cpu) - 1; + } + + hartid = riscv_cpu_to_hartid(cpu); + + if (bootverbose) + device_printf(dev, "Bind irq %d to cpu%d (hart %d)\n", src->irq, + cpu, hartid); + + aplic_write(sc, APLIC_TARGET(src->irq), + APLIC_MK_IRQ_TARGET(sc, cpu, APLIC_INTR_DEF_PRIO)); + aplic_write(sc, APLIC_IDC_IDELIVERY(sc, cpu), + APLIC_IDC_IDELIVERY_ENABLE); + aplic_enable_intr(dev, isrc); + + return (0); +} + +static device_method_t aplic_methods[] = { + DEVMETHOD(device_probe, aplic_probe), + DEVMETHOD(device_attach, aplic_attach), + + DEVMETHOD(pic_disable_intr, aplic_disable_intr), + DEVMETHOD(pic_enable_intr, aplic_enable_intr), + DEVMETHOD(pic_map_intr, aplic_map_intr), + DEVMETHOD(pic_pre_ithread, aplic_pre_ithread), + DEVMETHOD(pic_post_ithread, aplic_post_ithread), + DEVMETHOD(pic_post_filter, aplic_post_ithread), + DEVMETHOD(pic_setup_intr, aplic_setup_intr), + DEVMETHOD(pic_bind_intr, aplic_bind_intr), + + DEVMETHOD_END +}; + +DEFINE_CLASS_0(aplic, aplic_driver, aplic_methods, sizeof(struct aplic_softc)); + +EARLY_DRIVER_MODULE(aplic, simplebus, aplic_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); From nobody Wed Feb 14 17:55: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 4TZm813xPPz518Lb; Wed, 14 Feb 2024 17: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 4TZm813NkZz4M1P; Wed, 14 Feb 2024 17: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=1707933345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pi7BPbBPcO7QYYKGEZgXV9aZHSEdVGZb94EyfhPbre0=; b=gFsnb6ux/uNIVYwExjtXfXr8zHg1hQYsj1z/wJZgz0zUOsItAXsgKzp07X5cMfqP2azBER bFBCBwmOfdfBHGnJ2+BYV0XLsIx1VP26V7AtvIkdTWEvNjkL5sfZ1DAt9FAVcYxi6uk4Ys MEdNi/nCH0Fzjnqbk2ortrFjWU7AOq5Wx0q8AYkXKjQ7w++5wZOn7+P++PyAJHCIU84fPH Zcj75gIyYxdlpZclJ2C0dTAW9dKnmT9OUvgKX3WPrNQEx7sCvk6kJmFCGiuIpTYQehZONK zDNjGNr7aig8CN92hLkEBr2vuFhIibqxQ9veMU6vHhK3LgVeSzbglfqQZnEsiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707933345; a=rsa-sha256; cv=none; b=LKQuq40Rtlig3dI5aRDXGkMdGrxjrYSgcUR9MqknIw69kJTlSMsYqrw4yTP22qyrN0cxS9 u/TX0lmKgYFCPYQ1CxHIYu2rk8bYEdSrqrEiycyABBgp76tyMRZvH+CeYx5lppPf0Phbwk 1mFv8MIfjZLFa9tBjdWdUskALzk3ELSlM8zr7eouoEMpMMZ4fXYiCmdYfv58WKbPTyHhhH IMFxWu9RUiCrRpGF6Tm+2G219kB3UzfhvsXugxSpNsqjI4ZDqICZthbTT1LSAcdyYAYASn GACKfdd544ePnNbsI+R0sfvhDfTJEsEQYCC7d4+pvBKn7E+e0XgXGNPBW3qcBQ== 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=1707933345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pi7BPbBPcO7QYYKGEZgXV9aZHSEdVGZb94EyfhPbre0=; b=aTZj8ZhaIkUECELagFY9xGlF1uVgZ/3I50AdQ/YGXi9yIISS8yfT0SuNXQV7Q6NVcNkW0R M5FQq08+1uXx8EdVwFSQ9iUNCMs+j6uWDeLJtb0P09UhTEyYU0CzaVIvaPt1DXmZikzWb9 Au9fSRfpO79XCwNLMCOfC3BIP5+KS67kTcUjV8MF3z4U2zaB4N7N0700xJqhMtAZ2m3+4F x8IaDhjrI86APjiegS49dtTTSSHU0aC4ABW/uq6U0AsEvZO3v5bVd+5p2faDqtLWN8DrQC KEA5cjyW6KcbtBngkRLUVWnJTZtWjByTAwoYzKhgfG4aZeLsJG7cISRg6j6XhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZm812R4kz17S1; Wed, 14 Feb 2024 17: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 41EHtjaP083003; Wed, 14 Feb 2024 17: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 41EHtjNc083000; Wed, 14 Feb 2024 17:55:45 GMT (envelope-from git) Date: Wed, 14 Feb 2024 17:55:45 GMT Message-Id: <202402141755.41EHtjNc083000@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: cd147a2a0243 - main - loader: Fetch initial script from loader_lua env 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd147a2a024301a796f307c7bae686305d2bf302 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd147a2a024301a796f307c7bae686305d2bf302 commit cd147a2a024301a796f307c7bae686305d2bf302 Author: Warner Losh AuthorDate: 2024-02-14 17:51:38 +0000 Commit: Warner Losh CommitDate: 2024-02-14 17:55:38 +0000 loader: Fetch initial script from loader_lua env Sometimes it is nice to override the initial script that we run. Make it possible by fetching loader_lua from the env and using that instead of the default if prsent. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43819 --- stand/common/interp_lua.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stand/common/interp_lua.c b/stand/common/interp_lua.c index db58d80b2048..3f758baebc2d 100644 --- a/stand/common/interp_lua.c +++ b/stand/common/interp_lua.c @@ -123,7 +123,9 @@ interp_init(void) lua_pop(luap, 1); /* remove lib */ } - filename = LOADER_LUA; + filename = getenv("loader_lua"); + if (filename == NULL) + filename = LOADER_LUA; if (interp_include(filename) != 0) { const char *errstr = lua_tostring(luap, -1); errstr = errstr == NULL ? "unknown" : errstr; From nobody Wed Feb 14 17: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 4TZm824zCxz51dcw; Wed, 14 Feb 2024 17: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 4TZm8242z9z4MBg; Wed, 14 Feb 2024 17: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=1707933346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58SzIsSMUHnxQUqFNtM7jrLEbh3lvYj/EqPlE4tJR2c=; b=jIXc5OuaFPpkz4PfMebi2yGuUwBU7G5aocNCgd3SHQrd5tegNMiEVNjP5KHCbIb1O95POd JjGxZg+lPjT52KRkZmwSTYvhNw+u+G/WoLlo/jirR48EGXc2tvjAubL/R45h2VuSU93TtH eqleQqT8Y0X89KK2k4ETDaCJMGytgAWOZzfWfg183Pz2yzkhzUGiekar7C0G+3/2mL/aMV Qdc2or7wokeDc/H0esYJsH9chlxcsA7xntOWBf8A14BRLtHwxSpMBf5PbhbPHNhIqeMFm7 s1YqHGLRNKNoOYsBDHklNzdd/1AH5V14Z6Ub5VMwFltHkegnCP/29Hht8965yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707933346; a=rsa-sha256; cv=none; b=K1oPRU2J2d/S6odMFr2bfVvWd4ceveQOkQO9qsytOp8xXhzMPwnxpBDfQQEElVLscNtycI 1EVzq2VRS2U79E7XgSaBWVpSfaJPfXr4Vc+gNIGBzFXeFRaq+u23G6wxd57oMvp15JXVWF OEh4G+O3a5hn7jSEbrdpih5DQd8xw8mwwKKDJCmWZ2fSZQp7hq+cSxueSWEwfos60R5hbZ 1vFE9we6sYV5UlwVujAZoqCYxkvOf7uRQPZF222sTaeholDTWylTxyvtf7cbkMtHrATn21 9G9kAIWDWFICCM9oyCCyeUIWuOTXXmArmSc54W8TCxPHRzu/9IOnQrfAjFS0hw== 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=1707933346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58SzIsSMUHnxQUqFNtM7jrLEbh3lvYj/EqPlE4tJR2c=; b=ohsN+EwHWzD7nUI6761GdRngMbpVd3B6zeZw6Sz295NU1uIeqWHvvRpgK1uqhutypDrU6Q dNmkQPGi/DlojudZ6fw37bRSCdQhjiw/FUmcHz1rMF/oPcqxPxz6LSOTTw2AHWx3MpuzcR KpDcAGZMuhuoVBerfBgNqSP/dOTCzgwX+BbORPILEeehxnD4IM5BqqNS6wZBdHoajbZoyE n0NybyvzZ37ZUUPvjLi5wIsbI6Ceqga2akxj56vlSGOMJUg5NfnZeJjJkA9O0Ry/w/EAHg MA9vAs1pUhNmD/68DQOZ+g0QY/9RXF3BG/GcEBo0/0t5j6Q5Nu5jDqrW0JtAJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZm8238Cnz17S2; Wed, 14 Feb 2024 17: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 41EHtkkF083054; Wed, 14 Feb 2024 17: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 41EHtk2T083051; Wed, 14 Feb 2024 17:55:46 GMT (envelope-from git) Date: Wed, 14 Feb 2024 17:55:46 GMT Message-Id: <202402141755.41EHtk2T083051@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: 62a52c154224 - main - loader: export the CMD_ constants in loader table 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62a52c15422470f97fc7b311d89c83f910bcc1b1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=62a52c15422470f97fc7b311d89c83f910bcc1b1 commit 62a52c15422470f97fc7b311d89c83f910bcc1b1 Author: Warner Losh AuthorDate: 2024-02-14 17:51:58 +0000 Commit: Warner Losh CommitDate: 2024-02-14 17:55:38 +0000 loader: export the CMD_ constants in loader table Export the CMD_OK, etc constants in the loader table. They are the return values of loader.perform, etc. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43821 --- stand/liblua/lutils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c index 274d9a39da21..8066d3f685f7 100644 --- a/stand/liblua/lutils.c +++ b/stand/liblua/lutils.c @@ -639,6 +639,16 @@ luaopen_loader(lua_State *L) lua_setfield(L, -2, "lua_path"); lua_pushinteger(L, bootprog_rev); lua_setfield(L, -2, "version"); + lua_pushinteger(L, CMD_OK); + lua_setfield(L, -2, "CMD_OK"); + lua_pushinteger(L, CMD_WARN); + lua_setfield(L, -2, "CMD_WARN"); + lua_pushinteger(L, CMD_ERROR); + lua_setfield(L, -2, "CMD_ERROR"); + lua_pushinteger(L, CMD_CRIT); + lua_setfield(L, -2, "CMD_CRIT"); + lua_pushinteger(L, CMD_FATAL); + lua_setfield(L, -2, "CMD_FATAL"); lua_add_features(L); /* Set global printc to loader.printc */ lua_register(L, "printc", lua_printc); From nobody Wed Feb 14 18:36: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 4TZn2V1QV8z51l8h; Wed, 14 Feb 2024 18:36: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 4TZn2V0zdQz4Y5N; Wed, 14 Feb 2024 18:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707935762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZxYfhI8gzslcOYCrYiZ8cyU1+USNH1qBrdcrQGsi0I=; b=dHVF5CDqKDxkk9bVTPw+xQ09NWCOmmbain+51itLRqSlaP+naTSLl1aCbAi0tKD7RFn/HR W+IPgqBWapWAm20H16TA0LL5ldqVJ6RrIttIN/Sk8giKv6pauNII53McfHqcIFyyeHCfts OzbBLqFOB+10aed8vKprft/TbgoXTuksm1wHE13mFipbtn4j+oR1LDiucnY580U/yvX8dy Ih71H2JTC2UlB8BiMQQlYISoOyzSw5Qq2kk1NmPIZC7TJKHDmEm9G8eoOR1EUBIE0ux/oz MLPQ/NJblZ07fljOxXGZ8CyDofLMn9TCDab1dwspibKczQJ3N1sC1xio8DY4tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707935762; a=rsa-sha256; cv=none; b=Rm68BO0MWBJMpdEp/sRoJWBHmb2N3cfXfCmGPKa4lV0KyFBOaLzGNkpaoet6R5dKDqub46 Pphy/39/YQJfnvKC7yQL9Zbt4fqXscpXdB3WpEjXxr1fQRQC+qbio64eGT/CERyyaudRRS ZXHSrfuhg5yOs02UfOkBSR251VfcttEid4HNvo/pjjn0jBIJx8dNwq7qa38CZtvBY/Hyen Uhn4TX41GEYNfvvd9nCKEolz6dE3uxJBG2g3fSQ73y2QtkmpWAQvPJWvEq3IGlZ2nRac/G GeIhBo28dj0GwyAY+6IiKhD8eT8mz/rYrZrxIDIPQicSqPSYgzlsuV8VybSpqg== 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=1707935762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZxYfhI8gzslcOYCrYiZ8cyU1+USNH1qBrdcrQGsi0I=; b=PZ3Z0tj2Rh0ZPL4oj+f4GoatxkE1J5QhLqIacb+O00Cw1Fj5ibSEDG8XaVjhDnLTZQRsVJ V5MWjEAgAyODkS0yq4vS7XgUUV9RVXN3JtU/I04F7onLrfPca0uOZKpW3Lrsa5GPiCP1we Nb56t+JrahUseqWhM16pPjt2UlfJaA7gT/dBHF8SIzb6hdz7i5gqMcZfQJyPLzWDIHHMUE FmzGzXhXZ5cyJlKtSUB6BHF2Y/MGPuhz1m3jJV3AogGmXPpRVMyY0N4jvCLncV1DHmw7Er Spp8bIAeFElMVJ/BC0wGDqPyLvbNax8KRFXha5opku6aL2IZ7lPohSG+mpSTmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZn2V0294z1844; Wed, 14 Feb 2024 18:36: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 41EIa1oN050878; Wed, 14 Feb 2024 18:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EIa1dl050875; Wed, 14 Feb 2024 18:36:01 GMT (envelope-from git) Date: Wed, 14 Feb 2024 18:36:01 GMT Message-Id: <202402141836.41EIa1dl050875@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: a27c1350e43a - main - loader: Make vidc_biosputchar static 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a27c1350e43a863fbe2bf0927ef762a20babe5d5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a27c1350e43a863fbe2bf0927ef762a20babe5d5 commit a27c1350e43a863fbe2bf0927ef762a20babe5d5 Author: Warner Losh AuthorDate: 2024-02-14 18:07:10 +0000 Commit: Warner Losh CommitDate: 2024-02-14 18:22:57 +0000 loader: Make vidc_biosputchar static It's currently unused outside of vidconsole.c. Gerald Hicks' fix to the beep code from de37e4a6d2333/1998 introduced the funciton as static. Maxim Sobolev (sobomax) made it non-static since his spinconsole called it in c4c3b35172d67/2009. When sobomax dropped the direct call after making spinconsole console independent in b35172d67/2017, vidc_biosputchar remained a harmless unreferenced global. Make it static once again. Fixes: c7e10205ae0d Sponsored by: Netflix --- stand/i386/libi386/vidconsole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c index aec41a6373d6..f8a6bf34acad 100644 --- a/stand/i386/libi386/vidconsole.c +++ b/stand/i386/libi386/vidconsole.c @@ -1046,7 +1046,7 @@ vidc_init(int arg) return (0); /* XXX reinit? */ } -void +static void vidc_biosputchar(int c) { From nobody Wed Feb 14 19:49: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 4TZpg70zKmz52h24; Wed, 14 Feb 2024 19:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZpg70HGkz4jgv; Wed, 14 Feb 2024 19:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8D7XkGSh/TGKJt+JIRsEoIRCzCK52KZ7tkQWIfkP+ds=; b=bj4iuxpUg/PLjyXL+dknn6aWGznNrIefecH9ifJo7zl71aXugODn6Ng+Tyjn8psZitBXhK +0IAOJcJOwjxHdlrpCQbpwZayiRxvpzYxix94IWBUA6G+Qeyc7p3ADxL6SB0tLH6EHb1wM T/bKcTxGxpvmG3TeDX3/bQh6R3/MvjCJvvSyEF+RZN6GT3tIpxH/uvcyDZ7m/K4Tw88zt2 w9Oi0Cfv3vOKlWsvtPLuDqUDKbonYJN0XNWmDYn9t89d1y8K9QZ29PurTGj1a3TActBFf6 +dkaEAAJY6FJ9QEAcJHZViFevyk/+WLVuGyuZXgPliIWyoDbixNGVP5Oa4NY3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707940163; a=rsa-sha256; cv=none; b=nTbSQ0TrH4nrXT7DkDfCXL8NORkhoU85iIoKLXqvw05r3Ak/NPxKCSseAilkMWB9ufqxS0 GKQ+oFnJxNJgNFFgUzxgYPqYKK+CAcqgZGNkSE764hUVWq9/HG+fNscp0aDjTc9jXpn+VY UBM4jQMGUoshk6I9C4SFoD9gpBp3gTC63TfUa27IIvMqpwkT9kWk6cFUUTNmiMHvQg48yf GeAVkhovWGGaBiNlvMyyNvXxHXJxtRdOJBVcIzdjZhuoSyUHIRnCkvXclZZIHMgUP0fgRC /zlevBi6eTGe9kio7azS1Zi/HFma1hRhPMYrmKqnH5HYFe2oOLL22OVzO4gpHQ== 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=1707940163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8D7XkGSh/TGKJt+JIRsEoIRCzCK52KZ7tkQWIfkP+ds=; b=mmECEF1wOcnOf056gxGTi6519gG78RkcNO/TjbSZNu0uVKWl53pdCKa49ICTrZqkrPlywr mGTTTHUMeUSV9G0ZXxnNVY91GIxVSznK9hQOIWrk84X/oOb2rW3CxDdAP5FK0QC0tTMghq BDzdNHWrUQYYXdn77gS7VHxdRXssRvPjWBhmmxiO1XwlVMu9GKPReCX3c438LjX/Z2GZ7e FcugxceE6qSBneXuy7wmJoVfBEOwHyIC0tIhIwTI/69Vs8WpWN/uyl4YkDkR5gx8X6tCxr +Q3yYdH7DiVACA3L4Iwi6GzlxDwT1CBzttFAm9GA3LV59hNWYXK+VaVZvUv3NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZpg66RkCz19V8; Wed, 14 Feb 2024 19:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EJnMsR068415; Wed, 14 Feb 2024 19:49:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJnM7V068412; Wed, 14 Feb 2024 19:49:22 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:49:22 GMT Message-Id: <202402141949.41EJnM7V068412@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: 48d689d6cabe - main - net80211: fix checks for (*iv_preamble_update)/(*iv_ht_protmode_update) 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48d689d6cabe41f9c04e75b774ef5b3e45b94469 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=48d689d6cabe41f9c04e75b774ef5b3e45b94469 commit 48d689d6cabe41f9c04e75b774ef5b3e45b94469 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 20:59:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 19:36:29 +0000 net80211: fix checks for (*iv_preamble_update)/(*iv_ht_protmode_update) Both vap_update_preamble() and vap_update_ht_protmode() also check for (*iv_erp_protmode_update)() rather than (*iv_preamble_update)() or (*iv_ht_protmode_update)() before calling the later. Use the appropriate NULL-function-pointer checks before calling it. All seem unused currently so no functional changes expected. MFC after: 3 days Fixes: f1481c8d3b58e Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43655 --- sys/net80211/ieee80211_proto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index c0f24344a982..b42ad4e6d14f 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1047,7 +1047,7 @@ vap_update_preamble(void *arg, int npending) IEEE80211_UNLOCK(ic); /* Driver notification */ - if (vap->iv_erp_protmode_update != NULL) + if (vap->iv_preamble_update != NULL) vap->iv_preamble_update(vap); } @@ -1187,7 +1187,7 @@ vap_update_ht_protmode(void *arg, int npending) ic->ic_curhtprotmode); /* Driver update */ - if (vap->iv_erp_protmode_update != NULL) + if (vap->iv_ht_protmode_update != NULL) vap->iv_ht_protmode_update(vap); } From nobody Wed Feb 14 19:49: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 4TZpg81w8Dz52h1Q; Wed, 14 Feb 2024 19:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZpg81Hghz4jdP; Wed, 14 Feb 2024 19:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G5KvkbkvuLNIoZphDfVHgHHETPofsGg/plcolYsZQ38=; b=tY2uU3dD7XbsEeNen/Zz5l2jbk6aDayfs1waC6O+tytDew9ZaQniEepEsjPeYUFiw17wYI huUQrB5DUymnLLNbGFTGesK2jXooP7ClLX7HxheXYsKGVHmiaXP/WgzYY13jUjf5n5d9Fi nVbtu6Kxzkq6pPYhCeZWMRLVfqFf9kNbJQoynoLKDhGrTWCICKHXzIVO5KuklWuCexjz/Q tmARtl/s2u74jtJ2cmHD56vGQrKB2d6N10Mvr9wgjlv8rB1PJte57t5iXn2TuBYwPa93Ne A11JUEqjeu4CRb+tGR9WA+YVFaic0Yh3JCqu1XsiVs0wjvkUBvq2NRF/xGWAxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707940164; a=rsa-sha256; cv=none; b=YDO384y5OITcZZFlJFz+N3R4sJEMlDWXneg2QzXzQgHo+AMGx9tnrLUVNpYtVgurvZNI2U QlhcT9uXPV7oOjVSKsqwzN2Mxhj53CaVqU+kGnobX1L4qMcNYfcgMdmWaajKx0rNA7WArm IVpreC7VxYuIsf6KLiqjYZSv2CXQnXk3aDRZvHRnHXkIDXZa/9XntCO0EZnJUlYbMXSEOD rTtBiYL7vXVU9fLmxuI05Z4tMyYcBslIIR7L8mMfsaxeBkzcGUkk15IwwGYkIWhLJcSK6O 6OGYgvUXsgF2L+31Cr5eIbOkQAD5tFYRi9RygAyFvJJjA87Jy1njqjt4HjUquw== 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=1707940164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G5KvkbkvuLNIoZphDfVHgHHETPofsGg/plcolYsZQ38=; b=tpGtq2pUZoZGX0NGCqsEUFzJrER75Q6pGps7P1N0tl/e9E45m6n6E4lqPY4dRERCDr/dIr kGDHFExE5xyhNNE32jDnPdTDPcbxqvrLo68BVRvfvZNsLTMbvgGaNcqiAYiyWhqdlo02rt xV7IKrE/A+p07WyoP+L3vLIqPhNlTaYKxMs/+cmPhpsrghrG1t/AGevwzCwVghyQjzKza9 4bsaSx7mx3AyqMe6JdPoKJPIdslRTLFez/Et+2NTyMd8/tnRyxN582Mpdm0XqsIu2vwRl8 A9/6oJnV85tebNjlpajLgSCeA9mHDUihqaOXW+DiCGCb5obqTbjKXzvpow11cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZpg803sBz19kG; Wed, 14 Feb 2024 19:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EJnNYZ068467; Wed, 14 Feb 2024 19:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJnNFc068464; Wed, 14 Feb 2024 19:49:23 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:49:23 GMT Message-Id: <202402141949.41EJnNFc068464@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: 53eb2c63c962 - main - LinuxKPI: 802.11: correct HT protection fields 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53eb2c63c9628f7f19d88d759e1932c10c9f08af Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=53eb2c63c9628f7f19d88d759e1932c10c9f08af commit 53eb2c63c9628f7f19d88d759e1932c10c9f08af Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 22:35:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 19:36:30 +0000 LinuxKPI: 802.11: correct HT protection fields It seems during the initial buildup of the file, the defines were either mixed or not flagged as "FIXME". Define the values through to the net80211 definitions and also annotate them by at least some standards reference. MFC after: 3 days Fixes: 6b4cac814e32f Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43658 --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 09487a318811..2000e7480ff8 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -197,11 +197,12 @@ enum ieee80211_min_mpdu_start_spacing { #define IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK 8 /* TODO FIXME ax? */ #define IEEE80211_HE_PPE_THRES_INFO_HEADER_SIZE 16 /* TODO FIXME ax? */ -#define IEEE80211_HT_OP_MODE_PROTECTION 0x03 /* MASK */ -#define IEEE80211_HT_OP_MODE_PROTECTION_NONE 0x00 -#define IEEE80211_HT_OP_MODE_PROTECTION_20MHZ 0x01 -#define IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED 0x02 -#define IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER 0x03 +/* 802.11-2012, Table 8-130-HT Operation element fields and subfields, HT Protection */ +#define IEEE80211_HT_OP_MODE_PROTECTION IEEE80211_HTINFO_OPMODE /* Mask. */ +#define IEEE80211_HT_OP_MODE_PROTECTION_NONE IEEE80211_HTINFO_OPMODE_PURE /* No protection */ +#define IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER IEEE80211_HTINFO_OPMODE_PROTOPT /* Nonmember protection */ +#define IEEE80211_HT_OP_MODE_PROTECTION_20MHZ IEEE80211_HTINFO_OPMODE_HT20PR /* 20 MHz protection */ +#define IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED IEEE80211_HTINFO_OPMODE_MIXED /* Non-HT mixed */ /* 9.6.13.1, Table 9-342 TDLS Action field values. */ From nobody Wed Feb 14 19:49:25 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 4TZpg94jSvz52gvn; Wed, 14 Feb 2024 19:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZpg92C2dz4jdg; Wed, 14 Feb 2024 19:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHrCo5v39QX1WGb6ysvxrn6Unozem50/yJuTfrbv3Zc=; b=kwIIyC3dF7VKDqtECkC2cb7mHd2F1Hm04dIKULHmQtUfFCub/+G8ixAUNCG5F55y/mZ/+q b+TY/89fDjhxUTc16B6wM01+Kg07X6FJVt88Os4GVDWGyF2UWfuVMNuUoj/izelvwfX+Ft CF9mPZ5m1/DB6oJHaw4HcPTwg65D+jKK5oJ/wZhMX2O8QlazzsWMy68mvNXNVv0Xj/9i87 E7bFPTEp7McmItNGxLY3FmYn/Cqg/Icqv0l/kJgketE87HMn1xkZIT8tKpJhllhyGIGAmQ tAEquOAYXEQHA7Ttaq83OHSnb8kn/C3qs7TH6VCPNL737j9xZayhcghNOoERcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707940165; a=rsa-sha256; cv=none; b=R93v40Sw0HuV8QOOYHpfCLtFOFFxYH5YiGXVBkBNn8u9Rz1GJQV73tCNE5qmzZlAnFl5bE jn3iusCF1vXuBnQ3g9SIUpAwyxluPC2nK2cVjihuzlphgugzqCnDPj8O7ASAXmhz8fQCIG feyqLM+bPzrdAsDQbQG+Ef11KprXswVeUOJoIEu3gdiXY2LM7h3G8xTpvkjQSPacT25YRj 2fnqx/A/7fxgspMBPaFEIXWZpdta/yJ4WYEAMxv6f2KChMA4mBCDeRgan/ooDTuyVKN+yM tBUcI2exqbhxeL1aM4jU5g7JqStRxXHOV+H5eP35FrplzKdH6F8GVHBKdDzuaA== 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=1707940165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UHrCo5v39QX1WGb6ysvxrn6Unozem50/yJuTfrbv3Zc=; b=RAjX+Fh+BDnf2KOOxJpc3H1A2Pacudlqw2/d/Xe9efiMWILYB59QzuYoQEh9Ize9Roj+p+ gZvEtXfcYCN/R13jE9KlmdKmG5pYyoWjS3chCX8DBqUsk4GsCtMsoTV9JlRUK2qiA62sRM /VuGwEK0P2W7ivBzNIj72GzUuspkLXPcuGPC7J6f+nkcB9LiKA7FnccyJhV5a1Ye5fvsKb ZmU4ZEHRHNXiTgKhaTbTuDxHiQB//vyz6j9lu7flI43WfCR0J5UOIdK5wuqtQTHj2Pl869 d8zgyAzrQ3oWf+FMOwXg5HpQ7cURaZfSM4Wlh3D9JDN70a16jn/v7XNyM5Ej8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZpg9135Nz19rB; Wed, 14 Feb 2024 19:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EJnPRs068509; Wed, 14 Feb 2024 19:49:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJnPqf068506; Wed, 14 Feb 2024 19:49:25 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:49:25 GMT Message-Id: <202402141949.41EJnPqf068506@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: df9d7d1e0eb6 - main - iwlwifi: improve 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df9d7d1e0eb6004c5f5fde78bcc7c28cc27950fb Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=df9d7d1e0eb6004c5f5fde78bcc7c28cc27950fb commit df9d7d1e0eb6004c5f5fde78bcc7c28cc27950fb Author: Bjoern A. Zeeb AuthorDate: 2024-02-12 16:09:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 19:36:30 +0000 iwlwifi: improve error message In case we cannot identify the firmware monitor buf_location, print the type (usually 0 = invalid) so we have an idea at least of what was set (or not). MFC after: 3 days --- sys/contrib/dev/iwlwifi/pcie/ctxt-info-gen3.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/pcie/ctxt-info-gen3.c b/sys/contrib/dev/iwlwifi/pcie/ctxt-info-gen3.c index fa4a14546860..5919346a059f 100644 --- a/sys/contrib/dev/iwlwifi/pcie/ctxt-info-gen3.c +++ b/sys/contrib/dev/iwlwifi/pcie/ctxt-info-gen3.c @@ -68,7 +68,11 @@ iwl_pcie_ctxt_info_dbg_enable(struct iwl_trans *trans, } break; default: +#if defined(__linux__) IWL_ERR(trans, "WRT: Invalid buffer destination\n"); +#elif defined(__FreeBSD__) + IWL_ERR(trans, "WRT: Invalid buffer destination: %d\n", le32_to_cpu(fw_mon_cfg->buf_location)); +#endif } out: if (dbg_flags) From nobody Wed Feb 14 19:49: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 4TZpgB5m32z52h2H; Wed, 14 Feb 2024 19:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZpgB36X9z4jmS; Wed, 14 Feb 2024 19:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=80rIGuptL3ZXCpjA1L8HjyhulgFTYsL0p8173CvI+ow=; b=jSB+YNjAzhA06fWMTahgLYE1lajrvz9JRXcwx2BsFz4pnYk/KKYRowGkmsLdxW0Wl8mBXn gJ6zCxkd6VJzsdf83Jxnl1aW0oXsDaDWje3v/BDLimvVKrwar+tjQaGK4V3mzQ18/xx/HX hSHVFsrejflLtXEoww78eN1UpQyS5Eu2l3jyetwnhn05mpR5+7NvDFAIUMyT9ohqnoZe9f zr4W4RHTXh/OKyOaaCJcHxDMplvaDPqcr6TE7PKqUVgnh22+9tyishhf+/TdGeqv77VqON 6upUN386gOoRSuoeuqH+fO8fGW/0GGMjEfiuglkWymcd4g8UJgMtdvniLSB4iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707940166; a=rsa-sha256; cv=none; b=wcpcH8K3qarFi3wcTQBb3VmMpgKjiSL2LN3Qo+Gd/qYy0XoyYWfBULQWzEMfA/1xq3y9d8 4KfPsisHYJkjwU9ppG2eyR60YIrdu4k+jwbk0hPL+rZEERX+ZksjBVSRHe/tl+glakOsKK z+FzyYXtWB82sOxM/6kNoN+roPKJVqa5AorLGr5iiQpHWkZ7V9NR8Zzb1vSCcAvw0LxqGd HxotwlhqyPMvlZTI9xp715rE/XS1oUzTo08dcExZqYbke0pSSchcPM8+xTvY355UBx2U6q VCg0LWSQOHZxhNN69Phj8kMNhbAutjZkYjZxKgo1ovE2wbXjNgGqksETxk3RtQ== 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=1707940166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=80rIGuptL3ZXCpjA1L8HjyhulgFTYsL0p8173CvI+ow=; b=R9yfGjBhvuf+134JfNETUXXNAX3AmKzhEdPnC+kOvV3B1yohEJERCl2bhbUk+Njg+7QtRb 9XMhAp7bwDpNv2mWZPG9DptaenlqoSu1nJnP+FN8Df++Lf45Q5++rHFULRLpFM3h/MLQu9 TbaXJqMN21JB2C3jIQT+4Of5Wra8CvgeBi2I1/lkjhosI6AXwU6z+RWrYGifOcHK1SRL1O 87+J7TrBBTkUv8VnwjPyyEY0VAl9KNqFvuYXkDGrg+o1lsQUZMFiMX3vSjlOcx1y7aDZAD ZQ0aoVmVMtR7/xBxESGiOLLGb5MPl+s1QHJPihQ6l+jJnKQUKbo/MbRqwhmi+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 4TZpgB28R6z19t3; Wed, 14 Feb 2024 19:49:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EJnQBB068564; Wed, 14 Feb 2024 19:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJnQxZ068561; Wed, 14 Feb 2024 19:49:26 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:49:26 GMT Message-Id: <202402141949.41EJnQxZ068561@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: 713db49d06de - main - net80211: deal with lost state transitions 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 713db49d06deee90dd358b2e4b9ca05368a5eaf6 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=713db49d06deee90dd358b2e4b9ca05368a5eaf6 commit 713db49d06deee90dd358b2e4b9ca05368a5eaf6 Author: Bjoern A. Zeeb AuthorDate: 2024-01-10 10:14:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 19:47:21 +0000 net80211: deal with lost state transitions Since 5efea30f039c4 we can possibly lose a state transition which can cause trouble further down the road. The reproducer from 643d6dce6c1e can trigger these for example. Drivers for firmware based wireless cards have worked around some of this (and other) problems in the past. Add an array of tasks rather than a single one as we would simply get npending > 1 and lose order with other tasks. Try to keep state changes updated as queued in case we end up with more than one at a time. While this is not ideal either (call it a hack) it will sort the problem for now. We will queue in ieee80211_new_state_locked() and do checks there and dequeue in ieee80211_newstate_cb(). If we still overrun the (currently) 8 slots we will drop the state change rather than overwrite the last one. When dequeing we will update iv_nstate and keep it around for historic reasons for the moment. The longer term we should make the callers of ieee80211_new_state[_locked]() actually use the returned errors and act appropriately but that will touch a lot more places and drivers (possibly incl. changed behaviour for ioctls). rtwn(4) and rum(4) should probably be revisted and net80211 internals removed (for rum(4) at least the current logic still seems prone to races). PR: 271979, 271988, 275255, 263613, 274003 Sponsored by: The FreeBSD Foundation (in 2023) MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43389 --- sys/dev/rtwn/if_rtwn.c | 4 +- sys/dev/usb/wlan/if_rum.c | 4 +- sys/net80211/ieee80211.c | 4 +- sys/net80211/ieee80211_ddb.c | 13 ++++- sys/net80211/ieee80211_proto.c | 124 ++++++++++++++++++++++++++++++++++------- sys/net80211/ieee80211_var.h | 13 ++++- 6 files changed, 134 insertions(+), 28 deletions(-) diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c index baf427b4aafc..4334d5700e51 100644 --- a/sys/dev/rtwn/if_rtwn.c +++ b/sys/dev/rtwn/if_rtwn.c @@ -614,10 +614,12 @@ rtwn_vap_delete(struct ieee80211vap *vap) struct ieee80211com *ic = vap->iv_ic; struct rtwn_softc *sc = ic->ic_softc; struct rtwn_vap *uvp = RTWN_VAP(vap); + int i; /* Put vap into INIT state + stop device if needed. */ ieee80211_stop(vap); - ieee80211_draintask(ic, &vap->iv_nstate_task); + for (i = 0; i < NET80211_IV_NSTATE_NUM; i++) + ieee80211_draintask(ic, &vap->iv_nstate_task[i]); ieee80211_draintask(ic, &ic->ic_parent_task); RTWN_LOCK(sc); diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index 4e053c1c2433..2720f2ffedcb 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -719,10 +719,12 @@ rum_vap_delete(struct ieee80211vap *vap) struct rum_vap *rvp = RUM_VAP(vap); struct ieee80211com *ic = vap->iv_ic; struct rum_softc *sc = ic->ic_softc; + int i; /* Put vap into INIT state. */ ieee80211_new_state(vap, IEEE80211_S_INIT, -1); - ieee80211_draintask(ic, &vap->iv_nstate_task); + for (i = 0; i < NET80211_IV_NSTATE_NUM; i++) + ieee80211_draintask(ic, &vap->iv_nstate_task[i]); RUM_LOCK(sc); /* Cancel any unfinished Tx. */ diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 3809b7e6596c..15785a8f0966 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -730,6 +730,7 @@ ieee80211_vap_detach(struct ieee80211vap *vap) { struct ieee80211com *ic = vap->iv_ic; struct ifnet *ifp = vap->iv_ifp; + int i; CURVNET_SET(ifp->if_vnet); @@ -744,7 +745,8 @@ ieee80211_vap_detach(struct ieee80211vap *vap) /* * Flush any deferred vap tasks. */ - ieee80211_draintask(ic, &vap->iv_nstate_task); + for (i = 0; i < NET80211_IV_NSTATE_NUM; i++) + ieee80211_draintask(ic, &vap->iv_nstate_task[i]); ieee80211_draintask(ic, &vap->iv_swbmiss_task); ieee80211_draintask(ic, &vap->iv_wme_task); ieee80211_draintask(ic, &ic->ic_parent_task); diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c index 0042d5d4aeb6..eca893fa6810 100644 --- a/sys/net80211/ieee80211_ddb.c +++ b/sys/net80211/ieee80211_ddb.c @@ -470,7 +470,8 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) if (vap->iv_opmode == IEEE80211_M_MBSS) db_printf("(%p)", vap->iv_mesh); #endif - db_printf(" state %s", ieee80211_state_name[vap->iv_state]); + db_printf(" state %#x %s", vap->iv_state, + ieee80211_state_name[vap->iv_state]); db_printf(" ifp %p(%s)", vap->iv_ifp, if_name(vap->iv_ifp)); db_printf("\n"); @@ -482,6 +483,16 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs) struct sysctllog *iv_sysctl; /* dynamic sysctl context */ #endif db_printf("\n"); + + db_printf("\tiv_nstate %#x %s iv_nstate_b %d iv_nstate_n %d\n", + vap->iv_nstate, ieee80211_state_name[vap->iv_nstate], /* historic */ + vap->iv_nstate_b, vap->iv_nstate_n); + for (i = 0; i < NET80211_IV_NSTATE_NUM; i++) { + db_printf("\t [%d] iv_nstates %#x %s _task %p _args %d\n", i, + vap->iv_nstates[i], ieee80211_state_name[vap->iv_nstates[i]], + &vap->iv_nstate_task[i], vap->iv_nstate_args[i]); + } + db_printf("\tdebug=%b\n", vap->iv_debug, IEEE80211_MSG_BITS); db_printf("\tflags=%b\n", vap->iv_flags, IEEE80211_F_BITS); diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index b42ad4e6d14f..823f1ab3f486 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -336,7 +336,8 @@ ieee80211_proto_vattach(struct ieee80211vap *vap) vap->iv_bmiss_max = IEEE80211_BMISS_MAX; callout_init_mtx(&vap->iv_swbmiss, IEEE80211_LOCK_OBJ(ic), 0); callout_init(&vap->iv_mgtsend, 1); - TASK_INIT(&vap->iv_nstate_task, 0, ieee80211_newstate_cb, vap); + for (i = 0; i < NET80211_IV_NSTATE_NUM; i++) + TASK_INIT(&vap->iv_nstate_task[i], 0, ieee80211_newstate_cb, vap); TASK_INIT(&vap->iv_swbmiss_task, 0, beacon_swmiss, vap); TASK_INIT(&vap->iv_wme_task, 0, vap_update_wme, vap); TASK_INIT(&vap->iv_slot_task, 0, vap_update_slot, vap); @@ -2493,6 +2494,51 @@ wakeupwaiting(struct ieee80211vap *vap0) } } +static int +_ieee80211_newstate_get_next_empty_slot(struct ieee80211vap *vap) +{ + int nstate_num; + + IEEE80211_LOCK_ASSERT(vap->iv_ic); + + if (vap->iv_nstate_n >= NET80211_IV_NSTATE_NUM) + return (-1); + + nstate_num = vap->iv_nstate_b + vap->iv_nstate_n; + nstate_num %= NET80211_IV_NSTATE_NUM; + vap->iv_nstate_n++; + + return (nstate_num); +} + +static int +_ieee80211_newstate_get_next_pending_slot(struct ieee80211vap *vap) +{ + int nstate_num; + + IEEE80211_LOCK_ASSERT(vap->iv_ic); + + KASSERT(vap->iv_nstate_n > 0, ("%s: vap %p iv_nstate_n %d\n", + __func__, vap, vap->iv_nstate_n)); + + nstate_num = vap->iv_nstate_b; + vap->iv_nstate_b++; + if (vap->iv_nstate_b >= NET80211_IV_NSTATE_NUM) + vap->iv_nstate_b = 0; + vap->iv_nstate_n--; + + return (nstate_num); +} + +static int +_ieee80211_newstate_get_npending(struct ieee80211vap *vap) +{ + + IEEE80211_LOCK_ASSERT(vap->iv_ic); + + return (vap->iv_nstate_n); +} + /* * Handle post state change work common to all operating modes. */ @@ -2502,17 +2548,25 @@ ieee80211_newstate_cb(void *xvap, int npending) struct ieee80211vap *vap = xvap; struct ieee80211com *ic = vap->iv_ic; enum ieee80211_state nstate, ostate; - int arg, rc; + int arg, rc, nstate_num; + KASSERT(npending == 1, ("%s: vap %p with npending %d != 1\n", + __func__, vap, npending)); IEEE80211_LOCK(ic); - nstate = vap->iv_nstate; - arg = vap->iv_nstate_arg; + nstate_num = _ieee80211_newstate_get_next_pending_slot(vap); + + /* + * Update the historic fields for now as they are used in some + * drivers and reduce code changes for now. + */ + vap->iv_nstate = nstate = vap->iv_nstates[nstate_num]; + arg = vap->iv_nstate_args[nstate_num]; IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s:%d: running state update %s -> %s (%d)\n", __func__, __LINE__, ieee80211_state_name[vap->iv_state], - ieee80211_state_name[vap->iv_nstate], + ieee80211_state_name[nstate], npending); if (vap->iv_flags_ext & IEEE80211_FEXT_REINIT) { @@ -2523,9 +2577,10 @@ ieee80211_newstate_cb(void *xvap, int npending) /* Deny any state changes while we are here. */ vap->iv_nstate = IEEE80211_S_INIT; IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, - "%s: %s -> %s arg %d\n", __func__, + "%s: %s -> %s arg %d -> %s arg %d\n", __func__, ieee80211_state_name[vap->iv_state], - ieee80211_state_name[vap->iv_nstate], arg); + ieee80211_state_name[vap->iv_nstate], 0, + ieee80211_state_name[nstate], arg); vap->iv_newstate(vap, vap->iv_nstate, 0); IEEE80211_LOCK_ASSERT(ic); vap->iv_flags_ext &= ~(IEEE80211_FEXT_REINIT | @@ -2666,7 +2721,7 @@ ieee80211_new_state_locked(struct ieee80211vap *vap, struct ieee80211com *ic = vap->iv_ic; struct ieee80211vap *vp; enum ieee80211_state ostate; - int nrunning, nscanning; + int nrunning, nscanning, nstate_num; IEEE80211_LOCK_ASSERT(ic); @@ -2688,14 +2743,6 @@ ieee80211_new_state_locked(struct ieee80211vap *vap, ieee80211_state_name[nstate], ieee80211_state_name[vap->iv_nstate]); return -1; - } else if (vap->iv_state != vap->iv_nstate) { - /* Warn if the previous state hasn't completed. */ - IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, - "%s:%d: pending %s -> %s (now to %s) transition lost\n", - __func__, __LINE__, - ieee80211_state_name[vap->iv_state], - ieee80211_state_name[vap->iv_nstate], - ieee80211_state_name[nstate]); } } @@ -2718,7 +2765,16 @@ ieee80211_new_state_locked(struct ieee80211vap *vap, nscanning++; } } - ostate = vap->iv_state; + /* + * Look ahead for the "old state" at that point when the last queued + * state transition is run. + */ + if (vap->iv_nstate_n == 0) { + ostate = vap->iv_state; + } else { + nstate_num = (vap->iv_nstate_b + vap->iv_nstate_n - 1) % NET80211_IV_NSTATE_NUM; + ostate = vap->iv_nstates[nstate_num]; + } IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (arg %d) (nrunning %d nscanning %d)\n", __func__, ieee80211_state_name[ostate], ieee80211_state_name[nstate], arg, @@ -2812,11 +2868,37 @@ ieee80211_new_state_locked(struct ieee80211vap *vap, default: break; } - /* defer the state change to a thread */ - vap->iv_nstate = nstate; - vap->iv_nstate_arg = arg; + /* + * Defer the state change to a thread. + * We support up-to NET80211_IV_NSTATE_NUM pending state changes + * using a separate task for each. Otherwise, if we enqueue + * more than one state change they will be folded together, + * npedning will be > 1 and we may run then out of sequence with + * other events. + * This is kind-of a hack after 10 years but we know how to provoke + * these cases now (and seen them in the wild). + */ + nstate_num = _ieee80211_newstate_get_next_empty_slot(vap); + if (nstate_num == -1) { + /* + * This is really bad and we should just go kaboom. + * Instead drop it. No one checks the return code anyway. + */ + ic_printf(ic, "%s:%d: pending %s -> %s (now to %s) " + "transition lost. %d/%d pending state changes:\n", + __func__, __LINE__, + ieee80211_state_name[vap->iv_state], + ieee80211_state_name[vap->iv_nstate], + ieee80211_state_name[nstate], + _ieee80211_newstate_get_npending(vap), + NET80211_IV_NSTATE_NUM); + + return (EAGAIN); + } + vap->iv_nstates[nstate_num] = nstate; + vap->iv_nstate_args[nstate_num] = arg; vap->iv_flags_ext |= IEEE80211_FEXT_STATEWAIT; - ieee80211_runtask(ic, &vap->iv_nstate_task); + ieee80211_runtask(ic, &vap->iv_nstate_task[nstate_num]); return EINPROGRESS; } diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index f42ebb4fa261..b69bb5f7ad87 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -410,9 +410,16 @@ struct ieee80211vap { uint32_t iv_com_state; /* com usage / detached flag */ enum ieee80211_opmode iv_opmode; /* operation mode */ enum ieee80211_state iv_state; /* state machine state */ - enum ieee80211_state iv_nstate; /* pending state */ - int iv_nstate_arg; /* pending state arg */ - struct task iv_nstate_task; /* deferred state processing */ + + /* Deferred state processing. */ + enum ieee80211_state iv_nstate; /* next pending state (historic) */ +#define NET80211_IV_NSTATE_NUM 8 + int iv_nstate_b; /* First filled slot. */ + int iv_nstate_n; /* # of filled slots. */ + enum ieee80211_state iv_nstates[NET80211_IV_NSTATE_NUM]; /* queued pending state(s) */ + int iv_nstate_args[NET80211_IV_NSTATE_NUM]; /* queued pending state(s) arg */ + struct task iv_nstate_task[NET80211_IV_NSTATE_NUM]; + struct task iv_swbmiss_task;/* deferred iv_bmiss call */ struct callout iv_mgtsend; /* mgmt frame response timer */ /* inactivity timer settings */ From nobody Wed Feb 14 19:49: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 4TZpgD0Cdpz52hHh; Wed, 14 Feb 2024 19:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZpgC3T9zz4jkK; Wed, 14 Feb 2024 19:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LnqogN9v7dIxsv5SBtc+187YvuFtxnseSiW6lcLbZ5w=; b=SYR00hZe5XRy3aMugsNA6Kap+dWiGXJlnSlRcUyF5i20uFOJwuazT8OkwLOwc8iGdnnU6x 13oC4i+zQ2O1EE+rLT5nKcIbWosE2WrT2LTFe1TH3f73HXT0nlQBOd4/6PtxlyGhhXh7Nl KWy164JmKQdR8/JO0MJIr32aOlkOQqJU54TgOdxNcgBfvHW8rMzstx6LqdJyX20L4PACU6 +/3dkCNlkJW2gdqhvHo+4fWbTln+Dh4F6pSP7eSDytqpTCdk2uQXQ3+Mf9a9SxL0rxv7ZM Eo6hlhP4PmOqVPDYXgxuek+0Lcn98T/1rFuTEvVtAUtww7nq0567TGV0hAYNew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707940167; a=rsa-sha256; cv=none; b=MqpM/O4LtnHJAmJ0IKlgmfNdgnELsEp/bx9ei+aJ1qsfWtxQDPbHXn7BU2gl07d6+4ZNdA Vp0ofQQI3KneCqlmFDsdBLShAaXKUJP4MeXGVs+zEstGmuSfPHCxr2q2ogzonNouDY8Ztn ikoGyD2QRERpaMDlVGIPtaGli+tA3Gy5j/GIVoJXytv+3CcAMxWoG47dVOf5WiFAxNENvs X2yGpF+XqHWaMdO70U6sypvym9SalSexS0Gbj64cAVo1/T4YsHIOsDv6P6xPphuNpiY0dZ rApMTry4pDmUjNe6VIdKBHoeBQQZw/vf15WhqTrwkCCB4hPru9b4nVnkioxxrQ== 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=1707940167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LnqogN9v7dIxsv5SBtc+187YvuFtxnseSiW6lcLbZ5w=; b=ZG0MQVPz11LFhvaFo6hqRZhOKgNCBYJt4kndPEyy7qeBtOrNA/J+Rj5no9X8GSz+a1HbkG wgzeW4UML5FOxuyU4LyNo6Ejj+7xqGwaQkZYR+rzzwR965MNj7scLsEerX6E1jSsxArTBv AOd1kC6kc/NLUssbbGhPByn1/N70lE0IQ4tIgI/GRyJF+8pfebRCivQhnHrmxm4I/uENgy NSbkcpG6IAXaoSxtudPsrBimlwTR493obZaaYTECc3vveAnZuzHXZNCS+GxxFOvynTl3k9 tqUiswPNkFzAuh5tEfMiTdtx6SwaJ8DiMR7xzA/q3mM1L1F9Quw8aSd+SLoztg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZpgC2b6Lz19nF; Wed, 14 Feb 2024 19:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EJnRDw068621; Wed, 14 Feb 2024 19:49:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJnRdW068618; Wed, 14 Feb 2024 19:49:27 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:49:27 GMT Message-Id: <202402141949.41EJnRdW068618@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: 2ac8a2189ac6 - main - LinuxKPI: 802.11: band-aid for invalid state changes after (*iv_update_bss) 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ac8a2189ac6707f48f77ef2e36baf696a0d2f40 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2ac8a2189ac6707f48f77ef2e36baf696a0d2f40 commit 2ac8a2189ac6707f48f77ef2e36baf696a0d2f40 Author: Bjoern A. Zeeb AuthorDate: 2024-02-03 16:33:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 19:47:53 +0000 LinuxKPI: 802.11: band-aid for invalid state changes after (*iv_update_bss) With firmware based solutions we cannot just jump from an active session to a new iv_bss node without tearing down state for the old and bringing up the new node. This likely used to work on softmac based cards/drivers where one could essentially set the state and fire at will. We track (*iv_update_bss) calls from net80211 and set a local flag that we are out of synch and do not allow any further operations up the state machine until we hit INIT or SCAN. That means someone will take the state down, clean up firmware state and then we can join again and build up state. Apparently this problem has been "known" for a while as native iwm(4) and others have similar workarounds (though less strict) and can be equally pestered into bad states. For LinuxKPI all the KASSERTs just massively brought this problem out. The solution will be some rewrites in net80211. Until then, try to keep us more stable at least and not die on second join1() calls triggered by service netif start wlan0 and similar. PR: 271979, 271988, 275255, 263613, 274003 Sponsored by: The FreeBSD Foundation (2023, partial) MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43725 --- sys/compat/linuxkpi/common/src/linux_80211.c | 309 +++++++++++++++++++-------- sys/compat/linuxkpi/common/src/linux_80211.h | 2 + 2 files changed, 216 insertions(+), 95 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index edd2423c59b5..ea742371f797 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -610,6 +610,7 @@ lkpi_find_lkpi80211_chan(struct lkpi_hw *lhw, return (NULL); } +#if 0 static struct linuxkpi_ieee80211_channel * lkpi_get_lkpi80211_chan(struct ieee80211com *ic, struct ieee80211_node *ni) { @@ -634,6 +635,7 @@ lkpi_get_lkpi80211_chan(struct ieee80211com *ic, struct ieee80211_node *ni) return (chan); } +#endif struct linuxkpi_ieee80211_channel * linuxkpi_ieee80211_get_channel(struct wiphy *wiphy, uint32_t freq) @@ -1039,19 +1041,37 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int uint32_t changed; int error; - chan = lkpi_get_lkpi80211_chan(vap->iv_ic, vap->iv_bss); + /* + * In here we use vap->iv_bss until lvif->lvif_bss is set. + * For all later (STATE >= AUTH) functions we need to use the lvif + * cache which will be tracked even through (*iv_update_bss)(). + */ + + if (vap->iv_bss == NULL) { + ic_printf(vap->iv_ic, "%s: no iv_bss for vap %p\n", __func__, vap); + return (EINVAL); + } + ni = ieee80211_ref_node(vap->iv_bss); + if (ni->ni_chan == NULL || ni->ni_chan == IEEE80211_CHAN_ANYC) { + ic_printf(vap->iv_ic, "%s: no channel set for iv_bss ni %p " + "on vap %p\n", __func__, ni, vap); + ieee80211_free_node(ni); + return (EINVAL); + } + + lhw = vap->iv_ic->ic_softc; + chan = lkpi_find_lkpi80211_chan(lhw, ni->ni_chan); if (chan == NULL) { - ic_printf(vap->iv_ic, "%s: failed to get channel\n", __func__); + ic_printf(vap->iv_ic, "%s: failed to get LKPI channel from " + "iv_bss ni %p on vap %p\n", __func__, ni, vap); + ieee80211_free_node(ni); return (ESRCH); } - lhw = vap->iv_ic->ic_softc; hw = LHW_TO_HW(lhw); lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); - ni = ieee80211_ref_node(vap->iv_bss); - IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); @@ -1076,6 +1096,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int conf->def.center_freq1 = chan->center_freq; conf->def.center_freq2 = 0; IMPROVE("Check vht_cap from band not just chan?"); + KASSERT(ni->ni_chan != NULL && ni->ni_chan != IEEE80211_CHAN_ANYC, + ("%s:%d: ni %p ni_chan %p\n", __func__, __LINE__, ni, ni->ni_chan)); #ifdef LKPI_80211_HT if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) { if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { @@ -1186,6 +1208,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int * workflow so live with this. It is a compat layer after all. */ if (ni->ni_drv_data == NULL) { + ic_printf(vap->iv_ic, "%s:%d: lkpi_lsta_alloc to be called: " + "ni %p lsta %p\n", __func__, __LINE__, ni, ni->ni_drv_data); lsta = lkpi_lsta_alloc(vap, ni->ni_macaddr, hw, ni); if (lsta == NULL) { error = ENOMEM; @@ -1198,8 +1222,22 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta = ni->ni_drv_data; } - /* Insert the [l]sta into the list of known stations. */ LKPI_80211_LVIF_LOCK(lvif); + /* XXX-BZ KASSERT later? */ + /* XXX-BZ this should have caught the upper lkpi_lsta_alloc() too! */ + if (lvif->lvif_bss_synched || lvif->lvif_bss != NULL) + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d, ni %p lsta %p\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched, ni, lsta); + + /* Reference the ni for this cache of lsta. */ + ieee80211_ref_node(vap->iv_bss); + lvif->lvif_bss = lsta; + lvif->lvif_bss_synched = true; + + /* Insert the [l]sta into the list of known stations. */ TAILQ_INSERT_TAIL(&lvif->lsta_head, lsta, lsta_entry); LKPI_80211_LVIF_UNLOCK(lvif); @@ -1271,9 +1309,23 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); - /* Keep ni around. */ - ni = ieee80211_ref_node(vap->iv_bss); - lsta = ni->ni_drv_data; + LKPI_80211_LVIF_LOCK(lvif); +#ifdef LINUXKPI_DEBUG_80211 + /* XXX-BZ KASSERT later; state going down so no action. */ + if (lvif->lvif_bss == NULL) + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); +#endif + + lsta = lvif->lvif_bss; + LKPI_80211_LVIF_UNLOCK(lvif); + KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " + "lvif %p vap %p\n", __func__, + lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); + ni = lsta->ni; /* Reference held for lvif_bss. */ sta = LSTA_TO_STA(lsta); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1323,6 +1375,13 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + LKPI_80211_LVIF_LOCK(lvif); + /* Remove ni reference for this cache of lsta. */ + lvif->lvif_bss = NULL; + lvif->lvif_bss_synched = false; + LKPI_80211_LVIF_UNLOCK(lvif); + ieee80211_free_node(ni); /* was lvif->lvif_bss->ni */ + lkpi_lsta_remove(lsta, lvif); /* conf_tx */ @@ -1346,8 +1405,6 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int out: LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); - if (ni != NULL) - ieee80211_free_node(ni); return (error); } @@ -1369,7 +1426,6 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in struct ieee80211_hw *hw; struct lkpi_vif *lvif; struct ieee80211_vif *vif; - struct ieee80211_node *ni; struct lkpi_sta *lsta; struct ieee80211_prep_tx_info prep_tx_info; int error; @@ -1381,15 +1437,30 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); - ni = NULL; + + LKPI_80211_LVIF_LOCK(lvif); + /* XXX-BZ KASSERT later? */ + if (!lvif->lvif_bss_synched || lvif->lvif_bss == NULL) { +#ifdef LINUXKPI_DEBUG_80211 + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); +#endif + error = ENOTRECOVERABLE; + LKPI_80211_LVIF_UNLOCK(lvif); + goto out; + } + lsta = lvif->lvif_bss; + LKPI_80211_LVIF_UNLOCK(lvif); + + KASSERT(lsta != NULL, ("%s: lsta %p\n", __func__, lsta)); /* Finish auth. */ IMPROVE("event callback"); /* Update sta_state (NONE to AUTH). */ - ni = ieee80211_ref_node(vap->iv_bss); - lsta = ni->ni_drv_data; - KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " "NONE: %#x\n", __func__, lsta, lsta->state)); error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_AUTH); @@ -1433,8 +1504,6 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in out: LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); - if (ni != NULL) - ieee80211_free_node(ni); return (error); } @@ -1446,20 +1515,37 @@ lkpi_sta_a_to_a(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) struct ieee80211_hw *hw; struct lkpi_vif *lvif; struct ieee80211_vif *vif; - struct ieee80211_node *ni; struct lkpi_sta *lsta; struct ieee80211_prep_tx_info prep_tx_info; + int error; lhw = vap->iv_ic->ic_softc; hw = LHW_TO_HW(lhw); lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); - ni = ieee80211_ref_node(vap->iv_bss); - IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); - lsta = ni->ni_drv_data; + + LKPI_80211_LVIF_LOCK(lvif); + /* XXX-BZ KASSERT later? */ + if (!lvif->lvif_bss_synched || lvif->lvif_bss == NULL) { +#ifdef LINUXKPI_DEBUG_80211 + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); +#endif + LKPI_80211_LVIF_UNLOCK(lvif); + error = ENOTRECOVERABLE; + goto out; + } + lsta = lvif->lvif_bss; + LKPI_80211_LVIF_UNLOCK(lvif); + + KASSERT(lsta != NULL, ("%s: lsta %p! lvif %p vap %p\n", __func__, + lsta, lvif, vap)); IMPROVE("event callback?"); @@ -1481,12 +1567,12 @@ lkpi_sta_a_to_a(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) lsta->in_mgd = true; } + error = 0; +out: LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); - if (ni != NULL) - ieee80211_free_node(ni); - return (0); + return (error); } static int @@ -1508,16 +1594,30 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); - /* Keep ni around. */ - ni = ieee80211_ref_node(vap->iv_bss); - lsta = ni->ni_drv_data; + IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); + + LKPI_80211_LVIF_LOCK(lvif); +#ifdef LINUXKPI_DEBUG_80211 + /* XXX-BZ KASSERT later; state going down so no action. */ + if (lvif->lvif_bss == NULL) + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); +#endif + lsta = lvif->lvif_bss; + LKPI_80211_LVIF_UNLOCK(lvif); + KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " + "lvif %p vap %p\n", __func__, + lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); + + ni = lsta->ni; /* Reference held for lvif_bss. */ sta = LSTA_TO_STA(lsta); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - IEEE80211_UNLOCK(vap->iv_ic); - LKPI_80211_LHW_LOCK(lhw); - /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); @@ -1613,6 +1713,13 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i bss_changed |= BSS_CHANGED_BSSID; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + LKPI_80211_LVIF_LOCK(lvif); + /* Remove ni reference for this cache of lsta. */ + lvif->lvif_bss = NULL; + lvif->lvif_bss_synched = false; + LKPI_80211_LVIF_UNLOCK(lvif); + ieee80211_free_node(ni); /* was lvif->lvif_bss->ni */ + lkpi_lsta_remove(lsta, lvif); /* conf_tx */ @@ -1638,8 +1745,6 @@ out: LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); outni: - if (ni != NULL) - ieee80211_free_node(ni); return (error); } @@ -1697,16 +1802,34 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); - ni = NULL; + + LKPI_80211_LVIF_LOCK(lvif); + /* XXX-BZ KASSERT later? */ + if (!lvif->lvif_bss_synched || lvif->lvif_bss == NULL) { +#ifdef LINUXKPI_DEBUG_80211 + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); +#endif + LKPI_80211_LVIF_UNLOCK(lvif); + error = ENOTRECOVERABLE; + goto out; + } + lsta = lvif->lvif_bss; + LKPI_80211_LVIF_UNLOCK(lvif); + KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " + "lvif %p vap %p\n", __func__, + lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); + + ni = lsta->ni; /* Reference held for lvif_bss. */ IMPROVE("ponder some of this moved to ic_newassoc, scan_assoc_success, " "and to lesser extend ieee80211_notify_node_join"); /* Finish assoc. */ /* Update sta_state (AUTH to ASSOC) and set aid. */ - ni = ieee80211_ref_node(vap->iv_bss); - lsta = ni->ni_drv_data; - KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not " "AUTH: %#x\n", __func__, lsta, lsta->state)); sta = LSTA_TO_STA(lsta); @@ -1819,8 +1942,6 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int out: LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); - if (ni != NULL) - ieee80211_free_node(ni); return (error); } @@ -1856,9 +1977,23 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); - /* Keep ni around. */ - ni = ieee80211_ref_node(vap->iv_bss); - lsta = ni->ni_drv_data; + LKPI_80211_LVIF_LOCK(lvif); +#ifdef LINUXKPI_DEBUG_80211 + /* XXX-BZ KASSERT later; state going down so no action. */ + if (lvif->lvif_bss == NULL) + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); +#endif + lsta = lvif->lvif_bss; + LKPI_80211_LVIF_UNLOCK(lvif); + KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " + "lvif %p vap %p\n", __func__, + lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); + + ni = lsta->ni; /* Reference held for lvif_bss. */ sta = LSTA_TO_STA(lsta); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); @@ -1954,8 +2089,6 @@ out: LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); outni: - if (ni != NULL) - ieee80211_free_node(ni); return (error); } @@ -1978,16 +2111,30 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); - /* Keep ni around. */ - ni = ieee80211_ref_node(vap->iv_bss); - lsta = ni->ni_drv_data; + IEEE80211_UNLOCK(vap->iv_ic); + LKPI_80211_LHW_LOCK(lhw); + + LKPI_80211_LVIF_LOCK(lvif); +#ifdef LINUXKPI_DEBUG_80211 + /* XXX-BZ KASSERT later; state going down so no action. */ + if (lvif->lvif_bss == NULL) + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); +#endif + lsta = lvif->lvif_bss; + LKPI_80211_LVIF_UNLOCK(lvif); + KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " + "lvif %p vap %p\n", __func__, + lsta, (lsta != NULL) ? lsta->ni : NULL, lvif, vap)); + + ni = lsta->ni; /* Reference held for lvif_bss. */ sta = LSTA_TO_STA(lsta); lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - IEEE80211_UNLOCK(vap->iv_ic); - LKPI_80211_LHW_LOCK(lhw); - /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); @@ -2107,6 +2254,13 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed |= BSS_CHANGED_BSSID; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + LKPI_80211_LVIF_LOCK(lvif); + /* Remove ni reference for this cache of lsta. */ + lvif->lvif_bss = NULL; + lvif->lvif_bss_synched = false; + LKPI_80211_LVIF_UNLOCK(lvif); + ieee80211_free_node(ni); /* was lvif->lvif_bss->ni */ + lkpi_lsta_remove(lsta, lvif); /* conf_tx */ @@ -2132,8 +2286,6 @@ out: LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); outni: - if (ni != NULL) - ieee80211_free_node(ni); return (error); } @@ -2306,53 +2458,18 @@ static struct ieee80211_node * lkpi_iv_update_bss(struct ieee80211vap *vap, struct ieee80211_node *ni) { struct lkpi_vif *lvif; - struct ieee80211_node *obss; - struct lkpi_sta *lsta; - struct ieee80211_sta *sta; - - obss = vap->iv_bss; - -#ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE) - ic_printf(vap->iv_ic, "%s: obss %p ni_drv_data %p " - "ni %p ni_drv_data %p\n", __func__, - obss, (obss != NULL) ? obss->ni_drv_data : NULL, - ni, (ni != NULL) ? ni->ni_drv_data : NULL); -#endif + struct ieee80211_node *rni; - /* Nothing to copy from. Just return. */ - if (obss == NULL || obss->ni_drv_data == NULL) - goto out; - - /* Nothing to copy to. Just return. */ - IMPROVE("clearing the obss might still be needed?"); - if (ni == NULL) - goto out; + IEEE80211_LOCK_ASSERT(vap->iv_ic); - /* Nothing changed? panic? */ - if (obss == ni) - goto out; + lvif = VAP_TO_LVIF(vap); - lsta = obss->ni_drv_data; - obss->ni_drv_data = ni->ni_drv_data; - ni->ni_drv_data = lsta; - if (lsta != NULL) { - lsta->ni = ni; - sta = LSTA_TO_STA(lsta); - IEEE80211_ADDR_COPY(sta->addr, lsta->ni->ni_macaddr); - IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); - } - lsta = obss->ni_drv_data; - if (lsta != NULL) { - lsta->ni = obss; - sta = LSTA_TO_STA(lsta); - IEEE80211_ADDR_COPY(sta->addr, lsta->ni->ni_macaddr); - IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); - } + LKPI_80211_LVIF_LOCK(lvif); + lvif->lvif_bss_synched = false; + LKPI_80211_LVIF_UNLOCK(lvif); -out: - lvif = VAP_TO_LVIF(vap); - return (lvif->iv_update_bss(vap, ni)); + rni = lvif->iv_update_bss(vap, ni); + return (rni); } #ifdef LKPI_80211_WME @@ -2473,6 +2590,8 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], lvif = malloc(len, M_80211_VAP, M_WAITOK | M_ZERO); mtx_init(&lvif->mtx, "lvif", NULL, MTX_DEF); TAILQ_INIT(&lvif->lsta_head); + lvif->lvif_bss = NULL; + lvif->lvif_bss_synched = false; vap = LVIF_TO_VAP(lvif); vif = LVIF_TO_VIF(lvif); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index c9ac19321ab3..4aeca414973c 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -156,6 +156,8 @@ struct lkpi_vif { struct ieee80211_node * (*iv_update_bss)(struct ieee80211vap *, struct ieee80211_node *); TAILQ_HEAD(, lkpi_sta) lsta_head; + struct lkpi_sta *lvif_bss; + bool lvif_bss_synched; bool added_to_drv; /* Driver knows; i.e. we called add_interface(). */ bool hw_queue_stopped[IEEE80211_NUM_ACS]; From nobody Wed Feb 14 19:49: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 4TZpgD6Rmtz52gvq; Wed, 14 Feb 2024 19:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZpgD4jB6z4jbn; Wed, 14 Feb 2024 19:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGeFvfimV9pKPADbRaBH/XqTNP3x2a3lxzHvYxXy/Nc=; b=QthcpguPVK6WUzQW9ceFGofNX3mP7yKqWfLrkHcxuH5gsBLYrgDx0eAixDZjRi8tt0dCvS 7cwVXIJlp6mv1Gjx5JB1L25YU3cdqDmQNmkA6l9r2pZcz3K1Jw28p9myY0tM0Zpxf/XynY g5HcH0fdyh7yZtg8Ku4c61FDy3sz8XQERr9129vlrJ/3fd0tkJScE9Y9Rmo18UziCaX+ut tCp7kH95UQXd/JpTHEpP4b8Egp2wwJeaph4zwBI5SzMN/Julingc3Zqwbc3+L23fLiU/9W EKFvrYLaYbvd01Mb6YcC14uhWHxuhKHbUexyjcRtFu3rm3qGoipOmUWUB2483w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707940168; a=rsa-sha256; cv=none; b=DEpeEG7Pk8+tYqxkC3t3lcueWU6IpWLLG3BeLu/S5FQ/sA0TRtA2NCbmo3WnberH64eloM 4glsWc1d5REHu5a47SdN9HoO05zWXtPt6N9uSLetOKg+r1ETpWYtINzbo947dnMZXptz3r m0D4BCu+4OjoEbLYw2OoRBa5bkR05uNqbWSxXdsM/MYZ8ErGJnftOZpoSGUym+/mkDZ9JL /mwqlLz+Q8MZdNEBnwBpH6v1q8zHTo1AiVOUYpAS1Uwl2G5lRrpfi6Glttqs0d18cQAcZ+ o+WFp9pcwaT+xpI9aAcFiHPJQNAYXZzMYappfFObU1t+UVdwVPZxoem/KIKirQ== 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=1707940168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGeFvfimV9pKPADbRaBH/XqTNP3x2a3lxzHvYxXy/Nc=; b=soo41CVwSzVHcpmccOzddbzRxL51p05nvOrPxQca5P6UVbxI65XonhWYuhvVISW4VV/vOM TSbHyelBnpDWxyiCGA5k6IdFqrSaAGfGyWM2XyeHtPSb6A9LaayMPbEzlm7YEdwkHxAfOA AcprzBtjTkJDAXhVZjZPOQfypWab7TLtVtb83hoR+LrH7wXGpB9aiauwChIKoRiY7ymE5C c28VTNtxV237FTy6SodDyOYzw+ZP8ZKEKlVYV1gqEA3T+l98KbnfDeriIfnKMrrx2HlQ2V +c8LmTYr25F/SnJrGtelN3PgUfa9dElOa3lGrUiwHw2zkOJIezO8Pggloqe+Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZpgD3h60z19kH; Wed, 14 Feb 2024 19:49: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 41EJnS18068672; Wed, 14 Feb 2024 19:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJnShA068669; Wed, 14 Feb 2024 19:49:28 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:49:28 GMT Message-Id: <202402141949.41EJnShA068669@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: 0936c648ad0e - main - LinuxKPI: 802.11: update the ni/lsta reference cycle 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0936c648ad0ee5152dc19f261e77fe9c1833fe05 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0936c648ad0ee5152dc19f261e77fe9c1833fe05 commit 0936c648ad0ee5152dc19f261e77fe9c1833fe05 Author: Bjoern A. Zeeb AuthorDate: 2024-02-05 14:51:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 19:48:04 +0000 LinuxKPI: 802.11: update the ni/lsta reference cycle Update the ni/lsta reference cycle, add extra checks and assertions. This is to accomodate problems we were seeing based on net80211 behaviour (join1() and (*iv_update_bss)() as well as state changes for new iv_bss nodes during an active session). This should hopefully help to stabilise behaviour until the underlying problems gets properly addressed (for this and all other device drivers). PR: 272607, 273985, 274003 MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43753 --- sys/compat/linuxkpi/common/src/linux_80211.c | 209 +++++++++++++++++---------- sys/compat/linuxkpi/common/src/linux_80211.h | 1 + 2 files changed, 130 insertions(+), 80 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index ea742371f797..99984569f35e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -246,25 +246,14 @@ lkpi_lsta_dump(struct lkpi_sta *lsta, struct ieee80211_node *ni, static void lkpi_lsta_remove(struct lkpi_sta *lsta, struct lkpi_vif *lvif) { - struct ieee80211_node *ni; - - IMPROVE("XXX-BZ remove tqe_prev check once ni-sta-state-sync is fixed"); - ni = lsta->ni; LKPI_80211_LVIF_LOCK(lvif); - if (lsta->lsta_entry.tqe_prev != NULL) - TAILQ_REMOVE(&lvif->lsta_head, lsta, lsta_entry); + KASSERT(lsta->lsta_entry.tqe_prev != NULL, + ("%s: lsta %p lsta_entry.tqe_prev %p ni %p\n", __func__, + lsta, lsta->lsta_entry.tqe_prev, lsta->ni)); + TAILQ_REMOVE(&lvif->lsta_head, lsta, lsta_entry); LKPI_80211_LVIF_UNLOCK(lvif); - - lsta->ni = NULL; - ni->ni_drv_data = NULL; - if (ni != NULL) - ieee80211_free_node(ni); - - IMPROVE("more from lkpi_ic_node_free() should happen here."); - - free(lsta, M_LKPI80211); } static struct lkpi_sta * @@ -286,13 +275,16 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], lsta->added_to_drv = false; lsta->state = IEEE80211_STA_NOTEXIST; -#if 0 /* - * This needs to be done in node_init() as ieee80211_alloc_node() - * will initialise the refcount after us. + * Link the ni to the lsta here without taking a reference. + * For one we would have to take the reference in node_init() + * as ieee80211_alloc_node() will initialise the refcount after us. + * For the other a ni and an lsta are 1:1 mapped and always together + * from [ic_]node_alloc() to [ic_]node_free() so we are essentally + * using the ni references for the lsta as well despite it being + * two separate allocations. */ - lsta->ni = ieee80211_ref_node(ni); -#endif + lsta->ni = ni; /* The back-pointer "drv_data" to net80211_node let's us get lsta. */ ni->ni_drv_data = lsta; @@ -377,6 +369,7 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], mtx_init(&lsta->txq_mtx, "lsta_txq", NULL, MTX_DEF); TASK_INIT(&lsta->txq_task, 0, lkpi_80211_txq_task, lsta); mbufq_init(&lsta->txq, IFQ_MAXLEN); + lsta->txq_ready = true; return (lsta); @@ -392,6 +385,54 @@ cleanup: return (NULL); } +static void +lkpi_lsta_free(struct lkpi_sta *lsta, struct ieee80211_node *ni) +{ + struct mbuf *m; + + if (lsta->added_to_drv) + panic("%s: Trying to free an lsta still known to firmware: " + "lsta %p ni %p added_to_drv %d\n", + __func__, lsta, ni, lsta->added_to_drv); + + /* XXX-BZ free resources, ... */ + IMPROVE(); + + /* XXX locking */ + lsta->txq_ready = false; + + /* Drain taskq, won't be restarted until added_to_drv is set again. */ + while (taskqueue_cancel(taskqueue_thread, &lsta->txq_task, NULL) != 0) + taskqueue_drain(taskqueue_thread, &lsta->txq_task); + + /* Flush mbufq (make sure to release ni refs!). */ + m = mbufq_dequeue(&lsta->txq); + while (m != NULL) { + struct ieee80211_node *nim; + + nim = (struct ieee80211_node *)m->m_pkthdr.rcvif; + if (nim != NULL) + ieee80211_free_node(nim); + m_freem(m); + m = mbufq_dequeue(&lsta->txq); + } + KASSERT(mbufq_empty(&lsta->txq), ("%s: lsta %p has txq len %d != 0\n", + __func__, lsta, mbufq_len(&lsta->txq))); + + /* Drain sta->txq[] */ + mtx_destroy(&lsta->txq_mtx); + + /* Remove lsta from vif; that is done by the state machine. Should assert it? */ + + IMPROVE("Make sure everything is cleaned up."); + + /* Free lsta. */ + lsta->ni = NULL; + ni->ni_drv_data = NULL; + free(lsta, M_LKPI80211); +} + + static enum nl80211_band lkpi_net80211_chan_to_nl80211_band(struct ieee80211_channel *c) { @@ -1051,11 +1092,17 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int ic_printf(vap->iv_ic, "%s: no iv_bss for vap %p\n", __func__, vap); return (EINVAL); } + /* + * Keep the ni alive locally. In theory (and practice) iv_bss can change + * once we unlock here. This is due to net80211 allowing state changes + * and new join1() despite having an active node as well as due to + * the fact that the iv_bss can be swapped under the hood in (*iv_update_bss). + */ ni = ieee80211_ref_node(vap->iv_bss); if (ni->ni_chan == NULL || ni->ni_chan == IEEE80211_CHAN_ANYC) { ic_printf(vap->iv_ic, "%s: no channel set for iv_bss ni %p " "on vap %p\n", __func__, ni, vap); - ieee80211_free_node(ni); + ieee80211_free_node(ni); /* Error handling for the local ni. */ return (EINVAL); } @@ -1064,7 +1111,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (chan == NULL) { ic_printf(vap->iv_ic, "%s: failed to get LKPI channel from " "iv_bss ni %p on vap %p\n", __func__, ni, vap); - ieee80211_free_node(ni); + ieee80211_free_node(ni); /* Error handling for the local ni. */ return (ESRCH); } @@ -1072,6 +1119,18 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); + LKPI_80211_LVIF_LOCK(lvif); + /* XXX-BZ KASSERT later? */ + if (lvif->lvif_bss_synched || lvif->lvif_bss != NULL) { + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " + "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + lvif, vap, vap->iv_bss, lvif->lvif_bss, + (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, + lvif->lvif_bss_synched); + return (EBUSY); + } + LKPI_80211_LVIF_UNLOCK(lvif); + IEEE80211_UNLOCK(vap->iv_ic); LKPI_80211_LHW_LOCK(lhw); @@ -1199,32 +1258,17 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); /* - * This is a bandaid for now. If we went through (*iv_update_bss)() - * and then removed the lsta we end up here without a lsta and have - * to manually allocate and link it in as lkpi_ic_node_alloc()/init() - * would normally do. - * XXX-BZ I do not like this but currently we have no good way of - * intercepting the bss swap and state changes and packets going out - * workflow so live with this. It is a compat layer after all. + * Given ni and lsta are 1:1 from alloc to free we can assert that + * ni always has lsta data attach despite net80211 node swapping + * under the hoods. */ - if (ni->ni_drv_data == NULL) { - ic_printf(vap->iv_ic, "%s:%d: lkpi_lsta_alloc to be called: " - "ni %p lsta %p\n", __func__, __LINE__, ni, ni->ni_drv_data); - lsta = lkpi_lsta_alloc(vap, ni->ni_macaddr, hw, ni); - if (lsta == NULL) { - error = ENOMEM; - ic_printf(vap->iv_ic, "%s:%d: lkpi_lsta_alloc " - "failed: %d\n", __func__, __LINE__, error); - goto out; - } - lsta->ni = ieee80211_ref_node(ni); - } else { - lsta = ni->ni_drv_data; - } + KASSERT(ni->ni_drv_data != NULL, ("%s: ni %p ni_drv_data %p\n", + __func__, ni, ni->ni_drv_data)); + lsta = ni->ni_drv_data; LKPI_80211_LVIF_LOCK(lvif); - /* XXX-BZ KASSERT later? */ - /* XXX-BZ this should have caught the upper lkpi_lsta_alloc() too! */ + /* Re-check given (*iv_update_bss) could have happened. */ + /* XXX-BZ KASSERT later? or deal as error? */ if (lvif->lvif_bss_synched || lvif->lvif_bss != NULL) ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " "lvif_bss->ni %p synched %d, ni %p lsta %p\n", __func__, __LINE__, @@ -1232,8 +1276,13 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, lvif->lvif_bss_synched, ni, lsta); - /* Reference the ni for this cache of lsta. */ - ieee80211_ref_node(vap->iv_bss); + /* + * Reference the ni for this cache of lsta/ni on lvif->lvif_bss + * essentially out lsta version of the iv_bss. + * Do NOT use iv_bss here anymore as that may have diverged from our + * function local ni already and would lead to inconsistencies. + */ + ieee80211_ref_node(ni); lvif->lvif_bss = lsta; lvif->lvif_bss_synched = true; @@ -1286,6 +1335,10 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int out: LKPI_80211_LHW_UNLOCK(lhw); IEEE80211_LOCK(vap->iv_ic); + /* + * Release the reference that keop the ni stable locally + * during the work of this function. + */ if (ni != NULL) ieee80211_free_node(ni); return (error); @@ -1380,9 +1433,13 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif->lvif_bss = NULL; lvif->lvif_bss_synched = false; LKPI_80211_LVIF_UNLOCK(lvif); - ieee80211_free_node(ni); /* was lvif->lvif_bss->ni */ - lkpi_lsta_remove(lsta, lvif); + /* + * The very last release the reference on the ni for the ni/lsta on + * lvif->lvif_bss. Upon return from this both ni and lsta are invalid + * and potentially freed. + */ + ieee80211_free_node(ni); /* conf_tx */ @@ -1718,9 +1775,13 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lvif->lvif_bss = NULL; lvif->lvif_bss_synched = false; LKPI_80211_LVIF_UNLOCK(lvif); - ieee80211_free_node(ni); /* was lvif->lvif_bss->ni */ - lkpi_lsta_remove(lsta, lvif); + /* + * The very last release the reference on the ni for the ni/lsta on + * lvif->lvif_bss. Upon return from this both ni and lsta are invalid + * and potentially freed. + */ + ieee80211_free_node(ni); /* conf_tx */ @@ -2259,9 +2320,13 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif->lvif_bss = NULL; lvif->lvif_bss_synched = false; LKPI_80211_LVIF_UNLOCK(lvif); - ieee80211_free_node(ni); /* was lvif->lvif_bss->ni */ - lkpi_lsta_remove(lsta, lvif); + /* + * The very last release the reference on the ni for the ni/lsta on + * lvif->lvif_bss. Upon return from this both ni and lsta are invalid + * and potentially freed. + */ + ieee80211_free_node(ni); /* conf_tx */ @@ -3408,7 +3473,6 @@ lkpi_ic_node_init(struct ieee80211_node *ni) { struct ieee80211com *ic; struct lkpi_hw *lhw; - struct lkpi_sta *lsta; int error; ic = ni->ni_ic; @@ -3420,11 +3484,6 @@ lkpi_ic_node_init(struct ieee80211_node *ni) return (error); } - lsta = ni->ni_drv_data; - - /* Now take the reference before linking it to the table. */ - lsta->ni = ieee80211_ref_node(ni); - /* XXX-BZ Sync other state over. */ IMPROVE(); @@ -3457,30 +3516,15 @@ lkpi_ic_node_free(struct ieee80211_node *ni) ic = ni->ni_ic; lhw = ic->ic_softc; lsta = ni->ni_drv_data; - if (lsta == NULL) - goto out; - /* XXX-BZ free resources, ... */ - IMPROVE(); + /* KASSERT lsta is not NULL here. Print ni/ni__refcnt. */ - /* Flush mbufq (make sure to release ni refs!). */ -#ifdef __notyet__ - KASSERT(mbufq_empty(&lsta->txq), ("%s: lsta %p has txq len %d != 0\n", - __func__, lsta, mbufq_len(&lsta->txq))); -#endif - /* Drain taskq. */ - - /* Drain sta->txq[] */ - mtx_destroy(&lsta->txq_mtx); - - /* Remove lsta if added_to_drv. */ - - /* Remove lsta from vif */ - /* Remove ref from lsta node... */ - /* Free lsta. */ - lkpi_lsta_remove(lsta, VAP_TO_LVIF(ni->ni_vap)); + /* + * Pass in the original ni just in case of error we could check that + * it is the same as lsta->ni. + */ + lkpi_lsta_free(lsta, ni); -out: if (lhw->ic_node_free != NULL) lhw->ic_node_free(ni); } @@ -3492,6 +3536,11 @@ lkpi_ic_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, struct lkpi_sta *lsta; lsta = ni->ni_drv_data; + /* XXX locking */ + if (!lsta->txq_ready) { + m_free(m); + return (ENETDOWN); + } /* Queue the packet and enqueue the task to handle it. */ LKPI_80211_LSTA_LOCK(lsta); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 4aeca414973c..b36b27168566 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -134,6 +134,7 @@ struct lkpi_sta { struct ieee80211_key_conf *kc; enum ieee80211_sta_state state; + bool txq_ready; /* Can we run the taskq? */ bool added_to_drv; /* Driver knows; i.e. we called ...(). */ bool in_mgd; /* XXX-BZ should this be per-vif? */ From nobody Wed Feb 14 20:53: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 4TZr4x3JkKz52sVy; Wed, 14 Feb 2024 20:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZr4x2nxsz4tYJ; Wed, 14 Feb 2024 20:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707944001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZMheKOdb+wb9ScQ60XzkbKfA/2TstGzWraeOBLdmwBQ=; b=kjE+Gz/MI7vh3s9uehA2rZVqs0qfMyeGV/AQiWmSqF1QOrMhxUh98VsHjN7yOrqZBw4ODW 9jvGDxTmv8gZPjjObbXKsEbI4qbxstbDwKgdXIqzDXOlWhAIOo0+Ztu/Vdkq5kx1NXT+vj 0hhbSf2B4uvyc7P93hgTCweDpA6iOuylPSSvWNjy10Q+LLrYCZUkbUuF7oWqZQwxCMKq0m ayBA/fUOdv5GQSqxEkect1p1klKacsPOLG7ToB0o8Hh/1zgrFG3MwfEq/1nCrDb5oquXiQ nT6RJ8AdhQxOEPsDaOk1CLVS7JLHCaFVWZDi6W7OF6WWnBjPNkR3jP4d9YEX8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707944001; a=rsa-sha256; cv=none; b=MvojYy5q7sjjkQfjvBN2QJh5UGAHNgXGTruCJn9XD/897LIgiBrTP2fKLdEbhgwg8xgtb2 7RNdR3EGoRwuMdpAybwFN4n62BN0rYjREqgVPv+xh7hin7Iy56d5rjtcfjvzWWG339qQU1 XgsW+LOWd+uG2Q8p8loTC20O/xCx29Uy+unr4vAEE/HfF1Ej17x6LivikJS9GSjBiNooYV TlmhVw9F8I6BuLWnUaMK+xAWUvcdNSbAae2WMdZ+lPMX9ZCyVZx6f/UVh/K4PK/4Ao0vpg LIZYN9sNPRO0DQtDifJ7w7WUQQBRVHVpfA616/00N6VP0e7wX2UlFSwC63R1sw== 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=1707944001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZMheKOdb+wb9ScQ60XzkbKfA/2TstGzWraeOBLdmwBQ=; b=rSkGZwjF2bUSYzs1uIuFirdkVwOf8Q1AIz9KZTcLwqN4jRbLT6BQm2+HU5VA+0/gdvT0lA 9l6hmYVKD84SNciBnpo3FhbEkJeA+LLTbXuaZfgDTC9rrr4PFlk2k9iCYQxOAf2AIEbRBK NZWVEq9cOVHVohY9CxBpqMyAYqNb+Um2CFg06nsqS4NQ6PcyuV/AxSCCbibGkpvgcLJIyf ViBD8/vPkAJPX7lPN4Aj2pre2jM5HM4AKk9JWwdfCGSF9f4bBANw+L9LdwzwfovdaEkRX7 yfvUYcDTrDcwB3x9UivKU9FxgttGIMM5UMCN9/Yk1JX8pvI0YvfrZ5+CIhN9lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZr4x1rnZz1Cmp; Wed, 14 Feb 2024 20:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EKrLYQ085132; Wed, 14 Feb 2024 20:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EKrLW2085129; Wed, 14 Feb 2024 20:53:21 GMT (envelope-from git) Date: Wed, 14 Feb 2024 20:53:21 GMT Message-Id: <202402142053.41EKrLW2085129@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: 95ca89cda1a6 - main - ctfmerge: demote "No ctf sections found" to a warning 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95ca89cda1a6c4e0ef0b3f765c6563f1db0d23fa Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=95ca89cda1a6c4e0ef0b3f765c6563f1db0d23fa commit 95ca89cda1a6c4e0ef0b3f765c6563f1db0d23fa Author: Ed Maste AuthorDate: 2024-02-14 14:48:42 +0000 Commit: Ed Maste CommitDate: 2024-02-14 20:53:11 +0000 ctfmerge: demote "No ctf sections found" to a warning If there are no CTF sections then ctfmerge just has nothing to do; it should not be an error. Note that ctfmerge has an option to require CTF: -t Make sure that all object files have a CTF section. Before this change, this option explicitly exited without error if none of the object files have CTF sections, with the comment: If we're verifying that C files have CTF, it's safe to assume that in this case, we're building only from assembly inputs. PR: 276930 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43878 --- cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c index 27aa4d01b03d..c5be22ecfa1b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c @@ -912,14 +912,8 @@ main(int argc, char **argv) */ if (read_ctf(ifiles, nifiles, NULL, merge_ctf_cb, &wq, require_ctf) == 0) { - /* - * If we're verifying that C files have CTF, it's safe to - * assume that in this case, we're building only from assembly - * inputs. - */ - if (require_ctf) - exit(0); - terminate("No ctf sections found to merge\n"); + warning("No ctf sections found to merge\n"); + exit(0); } pthread_mutex_lock(&wq.wq_queue_lock); From nobody Wed Feb 14 22:05: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 4TZshM25j3z53ZQ1; Wed, 14 Feb 2024 22:05: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 4TZshM1Sppz46nV; Wed, 14 Feb 2024 22:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707948339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cgf7W0YDbSxIEDH3bx7okOdigTxIymaYmQ20SXdPACc=; b=s7iQCt1O269oOVTWXJNlIXNn1YP77CHVejB1aptSnR1f9+1lcb1YL1GY79/pxcYgYKXfO2 B4uqqIds0+aFNgoLMaoOYEQmsxM8Mf4OcUlZYDux67BIvCfDtAz9uI7lz9zQSih+D8LmSd IUqr89CzVK6Eh+5xHvA0XjoKPR/RuqcHnWwW4ltDh1F/iplGuOPFHqOmE1a/Bj7IIDc7Gg zk0Xre3OhSHap2t/F22fEQXWHVOUEk5Altm0v7cBSHNVmcfF1tfVoCgrd1QSJJZENodKZN pdj+o1VGojfJAcxT8vShURWV+aJ3PvfeKj7LVdItuIF88s0Ee5asQIwqBqKKiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707948339; a=rsa-sha256; cv=none; b=IT7SWlWwqqL30e+hfGTR1GZp+nmYTIhpRzMbxy4U6p47PCOKT5oCib2f8sxXbGiRt3/fFk Iuc8bnrMtUbnKFoT1R5cd1+Kqnz9AeLooSyaOEMgpo6pDr++wf9hPXIZsTjaNrLYKm42pd Xjl/xnvtARU3PPh+shLjs+3X2yMYmnmF/AsW/WEu77UpdhwudM33/XYqLhsBLXLFle9aIp jxqHb22CLbUpK3fqfMJUKRPQksJlT4co+rWH/PLLjuSreG8p0dATQs5mNf+C1YFT4BNmGd 02/Dr4Dc1q8oTpCWr60q/YhHW7auSym3wwrAjVwb7j36RhetlMP38BFIwJP0eg== 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=1707948339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cgf7W0YDbSxIEDH3bx7okOdigTxIymaYmQ20SXdPACc=; b=L8/a4Tqdap81wqnuBSWL5txLO2b1fzaq2144mGbLAjJo8mUQRjxRCkWDs/51GPsTcGf/vJ n+qeY1f8v51Yy9xH7NoPmIoQ/syeRuVab9cdCk1KyzcM8Q0Q00ik/ez62NQurKPE/R8IXS YWHmnIRjb58wHYnx0Dvf96LRIGbPKdJk572WIsup3T44MMr98UcWTjvOUvU+gaW64Au1IQ fjM7x1HxqZBllEKqmZ5TaTkZcnvcFClWGfytTpnNWW/X1pqYnbwvNvgDQyRdYrL5A3mDX6 DMi6IU4X1/Z2XWr0Nw/NleYmORuQuBcvmzhkIVYOvLvKYpeSCd9DepluR2i6Nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZshM0RC2zG5k; Wed, 14 Feb 2024 22:05: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 41EM5cfr003446; Wed, 14 Feb 2024 22:05:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EM5cxN003443; Wed, 14 Feb 2024 22:05:38 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:05:38 GMT Message-Id: <202402142205.41EM5cxN003443@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: 70617458676e - main - LinuxKPI: sort dev_() functions 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70617458676eb0b0076aa19657d21f2a9f3b704a Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=70617458676eb0b0076aa19657d21f2a9f3b704a commit 70617458676eb0b0076aa19657d21f2a9f3b704a Author: Bjoern A. Zeeb AuthorDate: 2024-02-01 23:56:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 22:05:21 +0000 LinuxKPI: sort dev_() functions Sort the dev_ functions by loglevel order, add the dev_alert() version and an indentation change. No functional changes. MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43719 --- sys/compat/linuxkpi/common/include/linux/device.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 142003c5ca8c..b4cd97931672 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -188,15 +188,17 @@ show_class_attr_string(struct class *class, struct class_attribute_string class_attr_##_name = \ _CLASS_ATTR_STRING(_name, _mode, _str) -#define dev_err(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_crit(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_warn(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_info(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_notice(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_emerg(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) -#define dev_dbg(dev, fmt, ...) do { } while (0) #define dev_printk(lvl, dev, fmt, ...) \ - device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) + device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) + +#define dev_emerg(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_alert(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_crit(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_err(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_warn(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_notice(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_info(dev, fmt, ...) device_printf((dev)->bsddev, fmt, ##__VA_ARGS__) +#define dev_dbg(dev, fmt, ...) do { } while (0) #define dev_WARN(dev, fmt, ...) \ device_printf((dev)->bsddev, "%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__) From nobody Wed Feb 14 22:52: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 4TZtkZ3SZBz53xHy; Wed, 14 Feb 2024 22:52: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 4TZtkZ2hCPz4FCn; Wed, 14 Feb 2024 22:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707951158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gV8IRlv7muv6Wx1ee/34b7nMA12JDx0HG+dn4hkSToI=; b=Lauu+8DCV8MtbG6C923boOMC2926X6DPOIXoHQMRj8ZgcGlSAJVRz9v+NMTFxS8PiqDy2u OIyFahYUK+sA5wbhgm3kyPZR5lPhhrZT6G5luTvoQd5AfSnsA0sxwp4gqBrfUelwIvnA7D GxjT2f2iftsbrqARmsSpMvh/IlVO/LmUZ9791UbxKA8ifuFAblsdAI4jq4RY5dUdJg1VR+ ATpoZLNo8KNEnFjQLMJcU79K316RGX6dndBRpjgtZeyhXEsq9NMAKaXlbngoyjFEberv8I 5zxMesplJvxdQ1JjvcicoZ6RPdzDLh4OFDDmZImrWnnVM2sv+bMLEKODyAU+9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707951158; a=rsa-sha256; cv=none; b=dOgwRdALyJBwnKURFJw6b5LW380CqpJWHs0bsGXtX7ZURfrVgt9JgnppVktZrR4kJIsH7O nZ8nt/99Td3D9Okrx5EY2Jjg4sxiqYJJMQEq51oZpqmzVtzXvjIOAGldO6BesgtEPISqad ar6Zs+//W7G/EA7GwScUQdFBiwGsu78KYmTKqnFM6XFuzp5n8f+k9a9sMB//o1RxvSna1f S7LBqA6PtUT+5vhCuVosaqgHDtJu8xBSlzSH6imcd1/EkLIXxxjOl+QQX1suiu2ZdOaFLR VozchQOiwoyeEY9Lzx9vBk/ahiNMUvootK6yrgoB+Zv73o3kl/LZrQd7MURUkQ== 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=1707951158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gV8IRlv7muv6Wx1ee/34b7nMA12JDx0HG+dn4hkSToI=; b=M8AWLCDrY1EsVNAqNK1VG8HWM4IWLxdPZGJTfHz1pY63Ri6ofwzG5Z/6EYyrITqnBNO17n 45Ew2hAkihE6wmNeJYXg52O61wBsOfcTozFG+0QaWv9NnAJdZg4alC0uBFZR26x7AFB+nE vDYAWThu6CRGduj298pjTC4rjGjWTgNaJ9NGTQzWISmOSQ7IjUwg0rHpHzBulq+jppmeOA DWMDkPauNBrDnLk7BGZehXCaTcrV1ijcxWKWjf0CkyekJFkrswWSaHYqinPlzuozprSjW2 35HSP3r7LEcW0T6ScSKbpOtDeojGKntY9iwJO46Drroy0NUF09kAFo1is0OSZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZtkZ1lVszHKd; Wed, 14 Feb 2024 22:52: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 41EMqck0086074; Wed, 14 Feb 2024 22:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EMqcLK086071; Wed, 14 Feb 2024 22:52:38 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:52:38 GMT Message-Id: <202402142252.41EMqcLK086071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5bda26333a8e - main - gpiobus: Use bus_generic_rman_* 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bda26333a8ebf34190e3a9124895e6a18e58e93 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5bda26333a8ebf34190e3a9124895e6a18e58e93 commit 5bda26333a8ebf34190e3a9124895e6a18e58e93 Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2024-02-14 22:07:32 +0000 gpiobus: Use bus_generic_rman_* Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43887 --- sys/dev/gpio/gpiobus.c | 57 +++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 99d3114d51da..6d739597b759 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -809,20 +809,29 @@ gpiobus_write_ivar(device_t dev, device_t child, int which, uintptr_t value) return (0); } +static struct rman * +gpiobus_get_rman(device_t bus, int type, u_int flags) +{ + struct gpiobus_softc *sc; + + sc = device_get_softc(bus); + switch (type) { + case SYS_RES_IRQ: + return (&sc->sc_intr_rman); + default: + return (NULL); + } +} + static struct resource * gpiobus_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { - struct gpiobus_softc *sc; - struct resource *rv; struct resource_list *rl; struct resource_list_entry *rle; int isdefault; - if (type != SYS_RES_IRQ) - return (NULL); isdefault = (RMAN_IS_DEFAULT_RANGE(start, end) && count == 1); - rle = NULL; if (isdefault) { rl = BUS_GET_RESOURCE_LIST(bus, child); if (rl == NULL) @@ -830,40 +839,12 @@ gpiobus_alloc_resource(device_t bus, device_t child, int type, int *rid, rle = resource_list_find(rl, type, *rid); if (rle == NULL) return (NULL); - if (rle->res != NULL) - panic("%s: resource entry is busy", __func__); start = rle->start; count = rle->count; end = rle->end; } - sc = device_get_softc(bus); - rv = rman_reserve_resource(&sc->sc_intr_rman, start, end, count, flags, - child); - if (rv == NULL) - return (NULL); - rman_set_rid(rv, *rid); - if ((flags & RF_ACTIVE) != 0 && - bus_activate_resource(child, type, *rid, rv) != 0) { - rman_release_resource(rv); - return (NULL); - } - - return (rv); -} - -static int -gpiobus_release_resource(device_t bus __unused, device_t child, int type, - int rid, struct resource *r) -{ - int error; - - if (rman_get_flags(r) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, r); - if (error) - return (error); - } - - return (rman_release_resource(r)); + return (bus_generic_rman_alloc_resource(bus, child, type, rid, start, + end, count, flags)); } static struct resource_list * @@ -1060,9 +1041,9 @@ static device_method_t gpiobus_methods[] = { DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_alloc_resource, gpiobus_alloc_resource), - DEVMETHOD(bus_release_resource, gpiobus_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_release_resource, bus_generic_rman_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_rman_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_rman_deactivate_resource), DEVMETHOD(bus_get_resource_list, gpiobus_get_resource_list), DEVMETHOD(bus_add_child, gpiobus_add_child), DEVMETHOD(bus_rescan, gpiobus_rescan), From nobody Wed Feb 14 22:52: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 4TZtkb44WZz53xTV; Wed, 14 Feb 2024 22:52: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 4TZtkb3MWKz4FCs; Wed, 14 Feb 2024 22:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707951159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ES8ql9y99GHXRJcgK1fnWVsETcDjDwNfn5lIu5q2U8A=; b=vlC1CLvotqo0OmC/JELultIUjzbj8x/fQc0u8/9y7sDIVQrGiRrsjgdtwuvWTVpjYmrUKk RC6NXh8AlzOOPpyOFCgyr91wG7s/Dg0hTgo9DGpdEgIqoaaaIPk7po5VY0bb8oczbQTC7b v+Hhq13TPUnyPVjClecz5/amYI6ig8Zb9Hxqvz+xr+R5GZM3ZNA3ClM8Hu/oUZOYcAkfMi 1tWY/XMMTAUEbhEOO3yRdV1AZqRCs87GU2l4cEXDprJX050RIZSLLx65POVR/MVld/o0lR Ulc0rOcH+7Y2XaoEWe1Q4NQRo7SWR6RzUOTjleIc3C8D+3vgQ3uWdCiXjVT37Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707951159; a=rsa-sha256; cv=none; b=Xb32klZkxF54gzSTCk8fiDINWhtMShpZG2x/MKiqJjzaRL4DbwfcL787/9kF/eaMLyG28+ M162fLJglBpJZNxok4bcIMc1gLtYV1lu9PukGOGmtgsUlNvXFfC9NQCKudmoYuXBU4dPFO wGXApavvxgHgiccsfL+HCYekSFfD4gwgw2ZeZ88wakSBajfn9xxY3lXZPmqCBS5cF5dy8X 4U+DqSDEq25tYygpHYBojCqdWxEnrgr/gVXRxxNHmqvNjm5LjD4HWPR6pVxfYEhAHNSVWQ dA7B/RJ/qgfIEX4oDX05X+Q0AAxNM8ZjEpDuTbRf+dLEgEnedHd4WJJIMSd6FQ== 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=1707951159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ES8ql9y99GHXRJcgK1fnWVsETcDjDwNfn5lIu5q2U8A=; b=Oqd4scgP/cUhKIawTtwSC6BbyVYiU0rQpZ72OsYJXOzXbjNk8sBjvPOmmCgKLLRlJQ4bZS sOPPZQ+QBqQBAhnarXT4gbxYubqqqbzNLPUlW3TnCPmMQcjoZ8uVhYKkXDUjzBGS8O0+w8 EqaMcNWPGV1eB5ycPFjiH2M0jikzFdBpiccPXA2xiexxu+8gNPn9mmMnh0axyOri4i+KLW nl94wDTHwsOJjyKS9B3UPKBzIbobNUprTFE5YU7NVSTzhgQwtmUnAJd52IpttpBZvMdHfl rnzOGSMuhISJpnLsDDvpve7MlX2Q9Hjm+hcOD0NpRQDDoEMYcN/K1q7CvOSFLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZtkb2TB7zHdF; Wed, 14 Feb 2024 22:52: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 41EMqdCF086116; Wed, 14 Feb 2024 22:52:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EMqd9c086113; Wed, 14 Feb 2024 22:52:39 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:52:39 GMT Message-Id: <202402142252.41EMqd9c086113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 93923685d35d - main - pci_host_generic_fdt: Remove duplicate DEVMETHOD entries 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93923685d35d95e76bd2c125c007e13354b9428c Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=93923685d35d95e76bd2c125c007e13354b9428c commit 93923685d35d95e76bd2c125c007e13354b9428c Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2024-02-14 22:07:32 +0000 pci_host_generic_fdt: Remove duplicate DEVMETHOD entries These are already inherited from generic_pcie_core_driver. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43888 --- sys/dev/pci/pci_host_generic_fdt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c index e910e946421f..bcee6057ff3c 100644 --- a/sys/dev/pci/pci_host_generic_fdt.c +++ b/sys/dev/pci/pci_host_generic_fdt.c @@ -480,8 +480,6 @@ generic_pcie_ofw_bus_attach(device_t dev) static device_method_t generic_pcie_fdt_methods[] = { DEVMETHOD(device_probe, generic_pcie_fdt_probe), DEVMETHOD(device_attach, pci_host_generic_fdt_attach), - DEVMETHOD(bus_alloc_resource, pci_host_generic_core_alloc_resource), - DEVMETHOD(bus_release_resource, pci_host_generic_core_release_resource), /* pcib interface */ DEVMETHOD(pcib_route_interrupt, generic_pcie_fdt_route_interrupt), From nobody Wed Feb 14 22: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 4TZtkd0nSXz53xNW; Wed, 14 Feb 2024 22: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 4TZtkc4g7mz4Fbb; Wed, 14 Feb 2024 22:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707951160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMQwgCf+OhOyspjWU6eynirwPMYlBmV4pG4IT4ZH5wU=; b=JYCDGJ56FM33i8rvgglMUqvjA99DXENqm/8stZ9KcJiybS+GnlnoO8OE+MkrtfsuZKPv3/ 7TFpj4apOij6h4woIryXeOvzeKkc0A5pW6fB1u99WYpF5LLDJPFQ4WsHLTZ267STUs83fu AQSnSGAubToEhDjAtggSNIfWC7s+qey8KAQUA4FSH3Gj6K9AQxIxujOU0mIB3+cJs7BDNO lvcdMqWAiDn7MYtkNo+skqj4Zs2wv7kNxWgAHB7ZH0otE6iWku9CfJAQ2xQY8IRzOEwTyh DYiWzMZrml0WbnCxC0DyP4gBH+LxrFA4yIkVLooYRv6qzpwh3Fk+89/R+xU93A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707951160; a=rsa-sha256; cv=none; b=g+AJCfAr5Qtr/ADMjsjTcEShRhIQib5aHdkK47fbt0qJNlls8sslBez04v25uIRPSPNE4D ythmxa2Px8Azg/Cw8TULgxveEtNxxH3p/l77I5eG8hpvBsPJd1FRmxu7gOGwKsSq4j1fwg p+rgfUDqtPkBXgnTZE9xLnNghQDoi9tHpdhNg7m4MoOgw4fB5WvEaLfqCdfVE11ipal5Eg Uwv1+dCr6KENMcIvu2w3cpXicxqTR1SBJJrQIm6BB7H/fiTJIqCt2IVKiPSr5xsjbHuGpw yz0gkD54wgxlyzuyiONNM9YTwmlOc+sLXpPPxRp523t/nSoFSwkEq4j4uO0DQw== 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=1707951160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMQwgCf+OhOyspjWU6eynirwPMYlBmV4pG4IT4ZH5wU=; b=CNS58jPj/3wy7wDjZYilYyiQYUk9Wnm9foQuUwIdhY/vbZwF0Lb/jPuJ0SHEmSmK2j+A2K AFxJQxMhi1YU6XhZuYSStEbiH6WnU3JeIO54uPNcBBj6tJdCa6N0XtmBGHtXYnlPoR+jsb a1y9zs55BFqMPvBBsU3L72L8Kay3c7Uqy4OxKRgmzpeZtABqwcsD/zN7MUm76/WoGYgDrk w6gH+uDdOjwb/LXzcgZtHWx8n4EHxXAkSu6AF2FhnEY2djI9zO575I6OgpbRQCQ7l7VOVr g6jBofjPm5qdMHW8Tg7PzsMjEdAi6F3wDHzQeM8CVPdw7YsmnYdUhh1ADFkiCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZtkc3kZ2zGwC; Wed, 14 Feb 2024 22: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 41EMqeCA086171; Wed, 14 Feb 2024 22: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 41EMqeIp086168; Wed, 14 Feb 2024 22:52:40 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:52:40 GMT Message-Id: <202402142252.41EMqeIp086168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: eac46b9dd7dd - main - pci_host_generic: Remove unused res1 field from softc 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eac46b9dd7dd831d41645b734060fc8c039ff77b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eac46b9dd7dd831d41645b734060fc8c039ff77b commit eac46b9dd7dd831d41645b734060fc8c039ff77b Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2024-02-14 22:07:32 +0000 pci_host_generic: Remove unused res1 field from softc Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43889 --- sys/dev/pci/pci_host_generic.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h index a408ef9d56fd..8e72ac6e5cef 100644 --- a/sys/dev/pci/pci_host_generic.h +++ b/sys/dev/pci/pci_host_generic.h @@ -74,7 +74,6 @@ struct generic_pcie_core_softc { struct rman mem_rman; struct rman io_rman; struct resource *res; - struct resource *res1; int bus_start; int bus_end; int ecam; From nobody Wed Feb 14 22: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 4TZtkf0pJTz53xNY; Wed, 14 Feb 2024 22: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 4TZtkd5tdnz4FDM; Wed, 14 Feb 2024 22: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=1707951161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cvhIOjOc22FHUKNgZGDgT58OQ+Al+ZW0iwmr68Qb0A=; b=UstA99eVtY6EvdCbeFVZowBa1aXvsE5nrmRF8pGnZilwOickjkDOirR5Tiu/EblSavWJjf 18wOwXV4fyffuIlvlyA4HgliIPyrNfhA40FtVlql86x9vtayqjmrE5Vhk67r5ECeWgR2lv 7QvG2qXAHJHudNORF71EIKoMTUiBIYbo0+Sz3E3WD1fE9BtdC+3LJygUrxG8HjRvq/Rm22 CYL6hIGcZS+klVGeuxo7HwUG7QTjISKtLEGuUNowZ6OyOrnSyEcXXyP60z8rexaJNcocnv 4t+c658DaLrY4LqGbIIWq+Q5jgdDpIiifDWJcBxHEerdk60SADeh3dZ3+CcsFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707951161; a=rsa-sha256; cv=none; b=rO/iNFIYTe6vT20QNPAd4A3+OZHX7tGYLIT5DaUwVE04Tr8ho8WEK3RNlDIsE0jhTVzEoj efJuNwBPz1tk4HugVmgUddqpufQQ6JK+jhOtqhXj5r41gtYep6toTBPw4yGQAwEXIEYmIl ekB4XMCPlliR2MV/9moZO8Qnf/b9B6iJKV1yszLNwbkTGCeGZZ0IHDtKyHxrZvnqGl6bZs I51gaWNRzmAvvzZBevyMJuIGld1q2LUFJZlBv+rJTBTcCMMW7V67JjmCKl62teZ2G6Sj+a YCUlvQ4cHRc65hNCL1op6HZ2ftGzrCQVazlbsGHps95QKJLV3ZKbQtRyqKLEGA== 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=1707951161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8cvhIOjOc22FHUKNgZGDgT58OQ+Al+ZW0iwmr68Qb0A=; b=AMnoXKEottF58ths1K5OITzTtTfQGBM4s8KRejfTr0T+hsi2pRXObh0d4ioTFxwvuWurbk fMelGBOWVI0orV4VS3b+W/wu5ik3pB7cZpkMfcbOcz5A23n4lpSnUelzhfAY1dUGBVjAc7 95pfJqL6slYKbpkclVq3TR1VepbW5Z5omop03EpU0JFVRlFU4TvTChegt4erDjpHzvzw6b Z0e94Rvf/LR1/05fzxTLvGeEtRifqUu356cSfU4HHQEelXTg8Ig0H+ynU3iD7qTaqMoXws RF98KXCo0NUBUxZMRdvYH/0+IjlbQdUFFvwliD9uOan3T2wDItPnSyT9My3hWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZtkd4hlZzH7w; Wed, 14 Feb 2024 22: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 41EMqfPq086226; Wed, 14 Feb 2024 22: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 41EMqfNj086223; Wed, 14 Feb 2024 22:52:41 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:52:41 GMT Message-Id: <202402142252.41EMqfNj086223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 51f8ac224f3b - main - pci_host_generic: Include the bridge's device name in rman 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51f8ac224f3b87555ea17c7e7c4015a2a2b8b191 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=51f8ac224f3b87555ea17c7e7c4015a2a2b8b191 commit 51f8ac224f3b87555ea17c7e7c4015a2a2b8b191 Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2024-02-14 22:07:32 +0000 pci_host_generic: Include the bridge's device name in rman descriptions The rman description strings now match those used in the PCI-PCI bridge driver. Using more specific names removes ambiguity in devinfo -u output on systems with multiple host to PCI bridges. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43890 --- sys/dev/pci/pci_host_generic.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 43b6d26e9217..02ca010a14d7 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -83,6 +83,7 @@ pci_host_generic_core_attach(device_t dev) uint64_t phys_base; uint64_t pci_base; uint64_t size; + char buf[64]; int domain, error; int rid, tuple; @@ -135,13 +136,19 @@ pci_host_generic_core_attach(device_t dev) sc->has_pmem = false; sc->pmem_rman.rm_type = RMAN_ARRAY; - sc->pmem_rman.rm_descr = "PCIe Prefetch Memory"; + snprintf(buf, sizeof(buf), "%s prefetch window", + device_get_nameunit(dev)); + sc->pmem_rman.rm_descr = strdup(buf, M_DEVBUF); sc->mem_rman.rm_type = RMAN_ARRAY; - sc->mem_rman.rm_descr = "PCIe Memory"; + snprintf(buf, sizeof(buf), "%s memory window", + device_get_nameunit(dev)); + sc->mem_rman.rm_descr = strdup(buf, M_DEVBUF); sc->io_rman.rm_type = RMAN_ARRAY; - sc->io_rman.rm_descr = "PCIe IO window"; + snprintf(buf, sizeof(buf), "%s I/O port window", + device_get_nameunit(dev)); + sc->io_rman.rm_descr = strdup(buf, M_DEVBUF); /* Initialize rman and allocate memory regions */ error = rman_init(&sc->pmem_rman); @@ -201,6 +208,9 @@ err_io_rman: err_mem_rman: rman_fini(&sc->pmem_rman); err_pmem_rman: + free(__DECONST(char *, sc->io_rman.rm_descr), M_DEVBUF); + free(__DECONST(char *, sc->mem_rman.rm_descr), M_DEVBUF); + free(__DECONST(char *, sc->pmem_rman.rm_descr), M_DEVBUF); if (sc->res != NULL) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); err_resource: @@ -223,6 +233,9 @@ pci_host_generic_core_detach(device_t dev) rman_fini(&sc->io_rman); rman_fini(&sc->mem_rman); rman_fini(&sc->pmem_rman); + free(__DECONST(char *, sc->io_rman.rm_descr), M_DEVBUF); + free(__DECONST(char *, sc->mem_rman.rm_descr), M_DEVBUF); + free(__DECONST(char *, sc->pmem_rman.rm_descr), M_DEVBUF); if (sc->res != NULL) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); bus_dma_tag_destroy(sc->dmat); From nobody Wed Feb 14 22: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 4TZtkg1Bm6z53xlh; Wed, 14 Feb 2024 22:52: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 4TZtkf6dHvz4FDj; Wed, 14 Feb 2024 22: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=1707951162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOp3gwOuNxm97KbOvEkKcNGOzX5kOkyPD1z2TCIp7w0=; b=Y1il0VMsm9VuVcdGAVuGRaFyNSjntH2D61ZHD1mn6YmXwKjYH4nBDtvFKn3PqpukaqFIJZ AQktkvedgjOPURF7vOKo3mNwGipliBVH5IRp46+x4RSRLXdOm23sOS+MzKk9cFo2kkh6X9 ggZCTUj3xMZ7cj05OjhA+Y3Qk6/He0jJYzvydo+uKV1o4R+WisNjqvSo20BsGsRJ9BbygL ld6vuLadR1z/WBbVhD4lzxKMQTRNS6AX1XgFVnp7IKo8khAuQMXfnKahW/jDFjURnfXZ3V ggkt3vD0bGMii5XMRcV9CwWFXEsGQJa5X+vN3AhwVnbnaCmZLLnYf6e31h7UBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707951162; a=rsa-sha256; cv=none; b=w1gd4CVd5bEnyn/4KzEr/4cl8hertIcpujvd1Q6pjODjByXe1+Ss8XyiDD3TQfnI2XPgD2 d25nZnEhKTyY7VWAJaS1/48/E4Tanvo72tt88IHmqFR8PjugMM0HP1LTovdLoz2U7eh3vK 1EyixsoGuboXAqKbRlh/Toz9gQHl1Fz/BVCXvOSDzEvdJ3g2llRYQEhVCLJrODYepEwMHO rspAD2D7Y/C+7AG0FbH6QDQAnFrOKsY/2cqRJCk8OU/UaXPJkr+0CllM3tyhc3BA8uvc/H RfcB7k2lvYypqE92oN0PMcRJ1TURNPjiIxIIHCrt0s8HUx6H7qWVxfqzG0GfNg== 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=1707951162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OOp3gwOuNxm97KbOvEkKcNGOzX5kOkyPD1z2TCIp7w0=; b=vcmc8xiT6J1cxBpDosTVO0r/S1faPAXSFt3SU5abI+NDmd8IXNcAKEEtSjcWk1cAjgAsxD A4VKN7p9WJ0m7Y0PK9nOmCGg51ahAj+lcNvm2/3N631AGtQSg2MzwZwMP/wSS6o0KhdIUk YwAFdMJbtBP99rxVR2vizyCA85eA/c+jcaxVN4URHJ1HgMb3hUDJXeS1zwsSlKG6w5v4Ic hq5pLtY/Vqy4U72AjoOzkeKI6FZmwwy/5K63jKTyQjqdV+1nU9R1KP5W8f6LsiOOcyElTr lqtCMxR2ltgan6fDDI9npmAfk/K766+tFykBa5YPvQ1BqN/vM6RbkstVPuvvcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZtkf5lNrzHZm; Wed, 14 Feb 2024 22: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 41EMqgvB086280; Wed, 14 Feb 2024 22: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 41EMqgEF086277; Wed, 14 Feb 2024 22:52:42 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:52:42 GMT Message-Id: <202402142252.41EMqgEF086277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e05436d577de - main - acpi: Don't assume a resource is reserved in acpi_delete_resource 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e05436d577de98944b97b9cf510b29c4d2091b3f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e05436d577de98944b97b9cf510b29c4d2091b3f commit e05436d577de98944b97b9cf510b29c4d2091b3f Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2024-02-14 22:07:32 +0000 acpi: Don't assume a resource is reserved in acpi_delete_resource This fixes a panic if a driver uses bus_set_resource to add a resource that fails to reserve and then deletes the resource via bus_delete_resource. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43891 --- sys/dev/acpica/acpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 9cd809761b8e..46e9fe084fce 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1629,7 +1629,8 @@ acpi_delete_resource(device_t bus, device_t child, int type, int rid) " (type=%d, rid=%d)\n", type, rid); return; } - resource_list_unreserve(rl, bus, child, type, rid); + if (resource_list_reserved(rl, type, rid)) + resource_list_unreserve(rl, bus, child, type, rid); resource_list_delete(rl, type, rid); } From nobody Wed Feb 14 22: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 4TZtkh1RQNz53xWX; Wed, 14 Feb 2024 22: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 4TZtkh0dDMz4FNx; Wed, 14 Feb 2024 22: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=1707951164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JkQkIwkLUMWjHSLQzFwIWZyw6QcqcM2CeDm67LZfzOg=; b=rH2FPnCeeraMjqE1HgtnzY+EiV/ShwUVYCaQf6FeEuD3+0/5xC/PWCL1NtULdhxTVmhdEg Lx7HmZTYSU/ImcH7N79x5Li7z44ns/jf2OfnujQ8IufIypXmhlCEKfH7pueFMyhnhuAh+S 8hzO4BZJ4LSpp7eXICnII71ZkMVK/6dQn6uqiLh5c7lAFuXN3QAILlkBYS8ZR4sSJWYGtQ 5CfJxlXcaSKn02NXsau526HAuv8sl7NIYQOnx4CD5I5gsEoG4kMCt5NhhDXBM3Tsv+HZpq mAxrE3YXM1EoRGaFiQqZY18Kg7p07qwaZb39RulrousptPH08hb4Y6z1g8V9dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707951164; a=rsa-sha256; cv=none; b=wW6B3I6JwCG2+Km8heO6TAEvtyH+D9m3zY6ZCgaUsr/tszYc4hq1pZJoz2Akj7xFud9zkp kBAKCnEpIp0IN26hS3SDKE4HspyjipbaeMbDIvYYSJ8zkFOm/R2zRUeWFC6WrFJglmokMU lfXnGR9cN6a3yBcIDP+JOMpAxOvRzMvGFuGvXo31PMZU77NtULLRGooku/+I9B63W0SRI6 RJR/pM9zfQjo+D4a5jMcf/cyEtr/70CcOllnE/JgtlWTmM4gAgXyyM5YLWwjVNkrAq/qDO FoDv/Zpe/bucaLtE0La17YLj5on2bMNYel+0foQGM5oLI+WGr8r82U+KOEng1Q== 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=1707951164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JkQkIwkLUMWjHSLQzFwIWZyw6QcqcM2CeDm67LZfzOg=; b=lQaHWJaRGs5rud672P5DlBdIyK3ju6YN9WK+d1ZmpS5u7K1nEnwk/iYf+dbttEuJe852Va 81GwdcXyAlLWC+uTMuzOn5OPfF1a3+lSaEW5dhJqL/cj4C7FVfZ6abRlT3oMVO1SgcZ99i 7f9Vvc1E2N+z9jiRjsNDv4zTLjpHhgHmWsUWiI0JKcV8Iz4LQiv4fO1WvYeOuhhXGm8mEB BeOd1VwvbvgQJNdcxjNazFIlaRCMEHY4ZvCueFev198FByk8BV/ty+LdfIWn4wFcDxt3Pu pHYt5ycllfBApfs8W3DUMNqCx37h8KWRPzNS+qpY9OaMKTLXcUrdAd9exgK/Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZtkg6bYHzGwD; Wed, 14 Feb 2024 22: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 41EMqhNX086337; Wed, 14 Feb 2024 22: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 41EMqhAD086334; Wed, 14 Feb 2024 22:52:43 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:52:43 GMT Message-Id: <202402142252.41EMqhAD086334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 055c1fe230ce - main - acpi: Allow child drivers to use bus_set_resource for more resources 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 055c1fe230ce5a2997c03a3cc2431baea1594566 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=055c1fe230ce5a2997c03a3cc2431baea1594566 commit 055c1fe230ce5a2997c03a3cc2431baea1594566 Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2024-02-14 22:07:32 +0000 acpi: Allow child drivers to use bus_set_resource for more resources acpi_set_resource excludes certain types of resources for certain devices. The intention of this is to avoid adding resource entries for bogus resources enumerated via _CRS. However, this also prevents drivers from adding those resources explicitly if needed. To fix this, move the logic to exclude these resources into an ignore hook used when parsing _CRS to create the initial set of resources for each device. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43892 --- sys/dev/acpica/acpi.c | 34 --------------------- sys/dev/acpica/acpi_resource.c | 69 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 36 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 46e9fe084fce..43aed279ab35 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -97,7 +97,6 @@ struct acpi_interface { }; static char *sysres_ids[] = { "PNP0C01", "PNP0C02", NULL }; -static char *pcilink_ids[] = { "PNP0C0F", NULL }; /* Global mutex for locking access to the ACPI subsystem. */ struct mtx acpi_mutex; @@ -1431,40 +1430,7 @@ acpi_set_resource(device_t dev, device_t child, int type, int rid, { struct acpi_device *ad = device_get_ivars(child); struct resource_list *rl = &ad->ad_rl; - ACPI_DEVICE_INFO *devinfo; rman_res_t end; - int allow; - - /* Ignore IRQ resources for PCI link devices. */ - if (type == SYS_RES_IRQ && - ACPI_ID_PROBE(dev, child, pcilink_ids, NULL) <= 0) - return (0); - - /* - * Ignore most resources for PCI root bridges. Some BIOSes - * incorrectly enumerate the memory ranges they decode as plain - * memory resources instead of as ResourceProducer ranges. Other - * BIOSes incorrectly list system resource entries for I/O ranges - * under the PCI bridge. Do allow the one known-correct case on - * x86 of a PCI bridge claiming the I/O ports used for PCI config - * access. - */ - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - if (ACPI_SUCCESS(AcpiGetObjectInfo(ad->ad_handle, &devinfo))) { - if ((devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) != 0) { -#if defined(__i386__) || defined(__amd64__) - allow = (type == SYS_RES_IOPORT && start == CONF1_ADDR_PORT); -#else - allow = 0; -#endif - if (!allow) { - AcpiOsFree(devinfo); - return (0); - } - } - AcpiOsFree(devinfo); - } - } #ifdef INTRNG /* map with default for now */ diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index 6b77e74d95f1..87b82a574beb 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -34,6 +34,9 @@ #include #include +#if defined(__i386__) || defined(__amd64__) +#include +#endif #include #include #include @@ -62,6 +65,8 @@ struct lookup_irq_request { int pol; }; +static char *pcilink_ids[] = { "PNP0C0F", NULL }; + static ACPI_STATUS acpi_lookup_irq_handler(ACPI_RESOURCE *res, void *context) { @@ -582,6 +587,52 @@ struct acpi_res_context { void *ar_parent; }; +/* + * Some resources reported via _CRS should not be added as bus + * resources. This function returns true if a resource reported via + * _CRS should be ignored. + */ +static bool +acpi_res_ignore(device_t dev, int type, rman_res_t start, rman_res_t count) +{ + struct acpi_device *ad = device_get_ivars(dev); + ACPI_DEVICE_INFO *devinfo; + bool allow; + + /* Ignore IRQ resources for PCI link devices. */ + if (type == SYS_RES_IRQ && + ACPI_ID_PROBE(device_get_parent(dev), dev, pcilink_ids, NULL) <= 0) + return (true); + + /* + * Ignore most resources for PCI root bridges. Some BIOSes + * incorrectly enumerate the memory ranges they decode as plain + * memory resources instead of as ResourceProducer ranges. Other + * BIOSes incorrectly list system resource entries for I/O ranges + * under the PCI bridge. Do allow the one known-correct case on + * x86 of a PCI bridge claiming the I/O ports used for PCI config + * access. + */ + if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { + if (ACPI_SUCCESS(AcpiGetObjectInfo(ad->ad_handle, &devinfo))) { + if ((devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) != 0) { +#if defined(__i386__) || defined(__amd64__) + allow = (type == SYS_RES_IOPORT && start == CONF1_ADDR_PORT); +#else + allow = false; +#endif + if (!allow) { + AcpiOsFree(devinfo); + return (true); + } + } + AcpiOsFree(devinfo); + } + } + + return (false); +} + static void acpi_res_set_init(device_t dev, void *arg, void **context) { @@ -612,6 +663,8 @@ acpi_res_set_ioport(device_t dev, void *context, uint64_t base, if (cp == NULL) return; + if (acpi_res_ignore(dev, SYS_RES_IOPORT, base, length)) + return; bus_set_resource(dev, SYS_RES_IOPORT, cp->ar_nio++, base, length); } @@ -637,6 +690,8 @@ acpi_res_set_iorange(device_t dev, void *context, uint64_t low, device_printf(dev, "_CRS has fixed I/O port range defined as relocatable\n"); + if (acpi_res_ignore(dev, SYS_RES_IOPORT, low, length)) + return; bus_set_resource(dev, SYS_RES_IOPORT, cp->ar_nio++, low, length); return; } @@ -652,6 +707,8 @@ acpi_res_set_memory(device_t dev, void *context, uint64_t base, if (cp == NULL) return; + if (acpi_res_ignore(dev, SYS_RES_MEMORY, base, length)) + return; bus_set_resource(dev, SYS_RES_MEMORY, cp->ar_nmem++, base, length); } @@ -676,8 +733,11 @@ acpi_res_set_irq(device_t dev, void *context, uint8_t *irq, int count, if (cp == NULL || irq == NULL) return; - for (i = 0; i < count; i++) + for (i = 0; i < count; i++) { + if (acpi_res_ignore(dev, SYS_RES_IRQ, irq[i], 1)) + continue; bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, irq[i], 1); + } } static void @@ -690,8 +750,11 @@ acpi_res_set_ext_irq(device_t dev, void *context, uint32_t *irq, int count, if (cp == NULL || irq == NULL) return; - for (i = 0; i < count; i++) + for (i = 0; i < count; i++) { + if (acpi_res_ignore(dev, SYS_RES_IRQ, irq[i], 1)) + continue; bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, irq[i], 1); + } } static void @@ -706,6 +769,8 @@ acpi_res_set_drq(device_t dev, void *context, uint8_t *drq, int count) if (count != 1) return; + if (acpi_res_ignore(dev, SYS_RES_DRQ, *drq, 1)) + return; bus_set_resource(dev, SYS_RES_DRQ, cp->ar_ndrq++, *drq, 1); } From nobody Wed Feb 14 22: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 4TZtkj3nTfz53xTd; Wed, 14 Feb 2024 22: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 4TZtkj1lTnz4FLS; Wed, 14 Feb 2024 22: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=1707951165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZRB/GM8Mm2p/FWytDAQf/vNtdAIGecGiuxNL3Uxtc4=; b=cG3iAIGHHdK8o1Lj7rac5xsFGR2PpKhD5NBv4oP28KFjG77v3zYA/RltL0PAZhBaX6Px2U EikJfRsRb8W+fjOh783/zlseET0+k2xiHhdDfCcx0dRs6tlfXLk2p5B/33tulGCOs7BTOi st3qSJBNGPsGQZh6eOa5cM47ltZhKVk51mwpPGqoy8gF8e/hakA+zcjovMvE2NX8tBRiUq ef9bKe0oJ3VnyhBI+ROId6Tm6vMhvznqP/NKoEt6Yd3Wjk74s/OHODYd5krCqJEIfSbFw6 55XsMEUekeNYRB31UrcbkUNuOOYuSENSQyjOb6LVteMoqAZlpgom6Xe5o43Tkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707951165; a=rsa-sha256; cv=none; b=S63agDcEjusMMdlOqaxSEMZ1bcKu5G61JplGwFJg1qPfef59OplPP4T1Z/RzV4IN60rkF/ ByDgCOew/39UGZ1Kzrw/cX/bPhjbmmcGg+zfLoztEQKulGpS3biZZnGQYKMOAHNVHdJoQw C+0q96uWlfXHww05xebcDtNUT9aN43N11nlT+yZjYkyzumBRNGdBoEjcmW/bYPKBQmEwXd WLhzOV/WlcrGSubM6z7LIvR8VeVxTsn37jnjv8QNWiPR0DzJEE4XVFE7KH2RX8J3RdSG/g UXyT2SNSJ7U0PYcotp0k+hlGJjGzXK6ju7SxDcfnkmlSjk1sgDER5G6z2QK6AA== 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=1707951165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZRB/GM8Mm2p/FWytDAQf/vNtdAIGecGiuxNL3Uxtc4=; b=a62W22IugoVN2dAMtzrqjQhi/N9B7sGxjaU1VTxd+hzkmb8M2PmgbkOFvMQ2gfWkY28BG0 53KuezHyd8VfzVJzJWQYg+B3VkV+hHgZ6acpOkal2bnkLlpKmvphdF7JhcI0yki9iFcooK JsCxs1XWLzhS0T3H705H6R3sEkK2qnjNK1R5N2ZhR/vq5+pMOrWXjao2bfoSR73mwtlFbP D7hfo+nytrolXrQPdfoAJQ0PoN6p49k8xWDsRIa9T7DxP/CHV/oALkzcmEODh/zE8HnbQO f138c6BKMb3aLyy7WrwTaBqw4x5lMNFDg0lFvBVRw+RaM59j+v3L+G9JrQJTLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZtkj0m0bzGwF; Wed, 14 Feb 2024 22: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 41EMqjWV086388; Wed, 14 Feb 2024 22: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 41EMqj8w086385; Wed, 14 Feb 2024 22:52:45 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:52:45 GMT Message-Id: <202402142252.41EMqj8w086385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: add99c9c4bae - main - physmem ram: Don't reserve excluded regions 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: add99c9c4bae2769cba14a88b83377ec9c04cad9 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=add99c9c4bae2769cba14a88b83377ec9c04cad9 commit add99c9c4bae2769cba14a88b83377ec9c04cad9 Author: John Baldwin AuthorDate: 2024-02-14 22:07:33 +0000 Commit: John Baldwin CommitDate: 2024-02-14 22:07:33 +0000 physmem ram: Don't reserve excluded regions These regions can conflict with I/O resources and prevent allocation of those regions by other drivers. It may make sense to reserve them after the boot-time probe of devices has concluded (or after an initial pass to reserve firmware-assigned resources before "wildcard" resources are allocated), but that would require additional changes. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43893 --- sys/kern/subr_physmem.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c index 79fedf58d66d..fda47d4ef697 100644 --- a/sys/kern/subr_physmem.c +++ b/sys/kern/subr_physmem.c @@ -582,7 +582,6 @@ ram_attach(device_t dev) { vm_paddr_t avail_list[PHYS_AVAIL_COUNT]; rman_res_t start, end; - struct region *hwp; int rid, i; rid = 0; @@ -608,30 +607,6 @@ ram_attach(device_t dev) rid++; } - /* Now, reserve the excluded memory regions. */ - for (i = 0, hwp = exregions; i < excnt; i++, hwp++) { - start = hwp->addr; - end = hwp->addr + hwp->size; - - if (bootverbose) - device_printf(dev, - "reserving excluded region: %jx-%jx\n", - (uintmax_t)start, (uintmax_t)(end - 1)); - - /* - * Best-effort attempt to reserve the range. This may fail, as - * sometimes the excluded ranges provided by the device tree - * will cover or overlap some I/O range. - */ - if (bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, start, end, - end - start, 0) == NULL) { - if (bootverbose) - device_printf(dev, "failed to reserve region\n"); - continue; - } - rid++; - } - return (0); } From nobody Wed Feb 14 22:52: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 4TZtkk4dbCz53xYl; Wed, 14 Feb 2024 22: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 4TZtkk2b5Pz4Fcl; Wed, 14 Feb 2024 22:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707951166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LDJHmW0OF9JQZK8LTcUmAUvuT0DlLl3qPHJscMXS0YI=; b=FwHZToxAKwpoDCZs6uY8LL3/yynE6KCg66G6CS32+M8W2Ck84oT1yCBFrJoFDjBwSz0SxJ D7Hy7WRwCv0UKrRJb/fGBu6Z0upTc932bH1k5+w22PVWvVdAuF2NuqDIapld3fk4SuvjHk 8Hbv/jIAqLFX8OjwO3kqMQxU0PB7gFrfBjvGW07Nhxx9AUleFis2WEpIcpsZ0V3D7CEje/ ZSFPsrXnSnWIuEHDDwnzTftLNWbOUZNSV2IIUl+dgviyUm/h4nIsLT/WgduaS4fpds0w+H EZCXXiqAfIC3BvAs9PksYp6IjkECshIHQR7kBHUAA3dgrb/sLw88juHiNOYCTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707951166; a=rsa-sha256; cv=none; b=lQ31RZhaO4kK5bcJRoQvBC/lm1wMBJK5f9VxxKPXslHTk+HfkLkQ6HtDkoDzkmy1NxVq4G 1ZnSCyghYU+H2VcKek+77nbeNjDeMExSoW2+C5sw5nYxYWGNIKDEJNTkNbNLzTuY0ZneqE shAUf5eOK98KVWxADL0u75ZvYGnY7Io2xN1MQTVkrnblWp/Qfd0+fohx9ZTQYhFeJbM+Kz 6RbakM1FE9Z4KBgrpleduVxjKKJi9Jd1p0OY0GlKRTwfNYZqP1fFCuXqupEplPaGdKtUTR 4WF9fWgnnngk3BPrSDaksHP9iNZlO0nFFzd/633HaSekfR7hPYp5Qm+XFTz49A== 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=1707951166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LDJHmW0OF9JQZK8LTcUmAUvuT0DlLl3qPHJscMXS0YI=; b=LHqldZGg6NwbxzEuOc7vDeSMFzt8D27lzCTi16ixEzoNAOoxyc9KUiZExc2SwBFwcsRUma LbUWT8vkYBzJP+ZCfpO+gpc7XPgzzDtgRb5sCvUHObzIdSigoglWH0/e8KYx5kine9tBQW vOKha322YXO8AseWWiLJ/H1wwFCoqvvqawQexCfYuM/KdeoSH3G80pX/bErmHi73g06lRR mxmdqtjOZfvPHIShQrF+lb7/8690Msjar5HgoCDOYcpyF/hUkav2cemYheMk9bZPMgox1h BkMrc1ezTk1JNeld7LCw/HuB1qsZdBFmZzwUH+SFU7QWJKsI53H2yICjc7MvqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZtkk1ccJzHRs; Wed, 14 Feb 2024 22:52: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 41EMqkaQ086441; Wed, 14 Feb 2024 22:52:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EMqkli086438; Wed, 14 Feb 2024 22:52:46 GMT (envelope-from git) Date: Wed, 14 Feb 2024 22:52:46 GMT Message-Id: <202402142252.41EMqkli086438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d79b6b8ec267 - main - pci_host_generic: Don't rewrite resource start address for translation 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d79b6b8ec267e7eef6e07cf4245159705e24acd5 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d79b6b8ec267e7eef6e07cf4245159705e24acd5 commit d79b6b8ec267e7eef6e07cf4245159705e24acd5 Author: John Baldwin AuthorDate: 2024-02-14 22:07:33 +0000 Commit: John Baldwin CommitDate: 2024-02-14 22:07:33 +0000 pci_host_generic: Don't rewrite resource start address for translation Allocate resources from the parent device for decoded physical address ranges. When child resources suballocated from rman's are mapped, translate those mapping requests into a mapping request of the associated physical address range in a bus_map_resource method. While here, convert generic_pcie_rman to a bus_get_rman method and use bus_generic_rman_* for operations on child resources. Factor out a generic_pcie_containing_range to share logic between bus_translate_resource and bus_*map_resource. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43894 --- sys/dev/pci/pci_host_generic.c | 366 ++++++++++++++++++++++++++--------------- sys/dev/pci/pci_host_generic.h | 1 + 2 files changed, 235 insertions(+), 132 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 02ca010a14d7..45a478634d20 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -85,7 +85,7 @@ pci_host_generic_core_attach(device_t dev) uint64_t size; char buf[64]; int domain, error; - int rid, tuple; + int flags, rid, tuple, type; sc = device_get_softc(dev); sc->dev = dev; @@ -173,19 +173,26 @@ pci_host_generic_core_attach(device_t dev) phys_base = sc->ranges[tuple].phys_base; pci_base = sc->ranges[tuple].pci_base; size = sc->ranges[tuple].size; - if (phys_base == 0 || size == 0) + rid = tuple + 1; + if (size == 0) continue; /* empty range element */ switch (FLAG_TYPE(sc->ranges[tuple].flags)) { case FLAG_TYPE_PMEM: sc->has_pmem = true; + flags = RF_PREFETCHABLE; + type = SYS_RES_MEMORY; error = rman_manage_region(&sc->pmem_rman, pci_base, pci_base + size - 1); break; case FLAG_TYPE_MEM: + flags = 0; + type = SYS_RES_MEMORY; error = rman_manage_region(&sc->mem_rman, pci_base, pci_base + size - 1); break; case FLAG_TYPE_IO: + flags = 0; + type = SYS_RES_IOPORT; error = rman_manage_region(&sc->io_rman, pci_base, pci_base + size - 1); break; @@ -197,11 +204,44 @@ pci_host_generic_core_attach(device_t dev) "error = %d\n", error); goto err_rman_manage; } + error = bus_set_resource(dev, type, rid, phys_base, size); + if (error != 0) { + device_printf(dev, + "failed to set resource for range %d: %d\n", tuple, + error); + goto err_rman_manage; + } + sc->ranges[tuple].res = bus_alloc_resource_any(dev, type, &rid, + RF_ACTIVE | RF_UNMAPPED | flags); + if (sc->ranges[tuple].res == NULL) { + device_printf(dev, + "failed to allocate resource for range %d\n", tuple); + goto err_rman_manage; + } } return (0); err_rman_manage: + for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) { + if (sc->ranges[tuple].size == 0) + continue; /* empty range element */ + switch (FLAG_TYPE(sc->ranges[tuple].flags)) { + case FLAG_TYPE_PMEM: + case FLAG_TYPE_MEM: + type = SYS_RES_MEMORY; + break; + case FLAG_TYPE_IO: + type = SYS_RES_IOPORT; + break; + default: + continue; + } + if (sc->ranges[tuple].res != NULL) + bus_release_resource(dev, type, tuple + 1, + sc->ranges[tuple].res); + bus_delete_resource(dev, type, tuple + 1); + } rman_fini(&sc->io_rman); err_io_rman: rman_fini(&sc->mem_rman); @@ -222,7 +262,7 @@ int pci_host_generic_core_detach(device_t dev) { struct generic_pcie_core_softc *sc; - int error; + int error, tuple, type; sc = device_get_softc(dev); @@ -230,6 +270,25 @@ pci_host_generic_core_detach(device_t dev) if (error != 0) return (error); + for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) { + if (sc->ranges[tuple].size == 0) + continue; /* empty range element */ + switch (FLAG_TYPE(sc->ranges[tuple].flags)) { + case FLAG_TYPE_PMEM: + case FLAG_TYPE_MEM: + type = SYS_RES_MEMORY; + break; + case FLAG_TYPE_IO: + type = SYS_RES_IOPORT; + break; + default: + continue; + } + if (sc->ranges[tuple].res != NULL) + bus_release_resource(dev, type, tuple + 1, + sc->ranges[tuple].res); + bus_delete_resource(dev, type, tuple + 1); + } rman_fini(&sc->io_rman); rman_fini(&sc->mem_rman); rman_fini(&sc->pmem_rman); @@ -349,8 +408,9 @@ generic_pcie_write_ivar(device_t dev, device_t child, int index, } static struct rman * -generic_pcie_rman(struct generic_pcie_core_softc *sc, int type, int flags) +generic_pcie_get_rman(device_t dev, int type, u_int flags) { + struct generic_pcie_core_softc *sc = device_get_softc(dev); switch (type) { case SYS_RES_IOPORT: @@ -371,8 +431,6 @@ pci_host_generic_core_release_resource(device_t dev, device_t child, int type, int rid, struct resource *res) { struct generic_pcie_core_softc *sc; - struct rman *rm; - int error; sc = device_get_softc(dev); @@ -381,76 +439,79 @@ pci_host_generic_core_release_resource(device_t dev, device_t child, int type, return (pci_domain_release_bus(sc->ecam, child, rid, res)); } #endif + return (bus_generic_rman_release_resource(dev, child, type, rid, res)); +} - rm = generic_pcie_rman(sc, type, rman_get_flags(res)); - if (rm != NULL) { - KASSERT(rman_is_region_manager(res, rm), ("rman mismatch")); - if (rman_get_flags(res) & RF_ACTIVE) { - error = bus_deactivate_resource(child, type, rid, res); - if (error) - return (error); - } - return (rman_release_resource(res)); +static struct pcie_range * +generic_pcie_containing_range(device_t dev, int type, rman_res_t start, + rman_res_t end) +{ + struct generic_pcie_core_softc *sc = device_get_softc(dev); + uint64_t pci_base; + uint64_t size; + int i, space; + + switch (type) { + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: + return (NULL); } - return (bus_generic_release_resource(dev, child, type, rid, res)); + for (i = 0; i < MAX_RANGES_TUPLES; i++) { + pci_base = sc->ranges[i].pci_base; + size = sc->ranges[i].size; + if (size == 0) + continue; /* empty range element */ + + if (start < pci_base || end >= pci_base + size) + continue; + + switch (FLAG_TYPE(sc->ranges[i].flags)) { + case FLAG_TYPE_MEM: + case FLAG_TYPE_PMEM: + space = SYS_RES_MEMORY; + break; + case FLAG_TYPE_IO: + space = SYS_RES_IOPORT; + break; + default: + continue; + } + + if (type == space) + return (&sc->ranges[i]); + } + return (NULL); } static int generic_pcie_translate_resource_common(device_t dev, int type, rman_res_t start, rman_res_t end, rman_res_t *new_start, rman_res_t *new_end) { - struct generic_pcie_core_softc *sc; - uint64_t phys_base; - uint64_t pci_base; - uint64_t size; - int i, space; - bool found; + struct pcie_range *range; - sc = device_get_softc(dev); /* Translate the address from a PCI address to a physical address */ switch (type) { case SYS_RES_IOPORT: case SYS_RES_MEMORY: - found = false; - for (i = 0; i < MAX_RANGES_TUPLES; i++) { - pci_base = sc->ranges[i].pci_base; - phys_base = sc->ranges[i].phys_base; - size = sc->ranges[i].size; - - if (start < pci_base || start >= pci_base + size) - continue; - - switch (FLAG_TYPE(sc->ranges[i].flags)) { - case FLAG_TYPE_MEM: - case FLAG_TYPE_PMEM: - space = SYS_RES_MEMORY; - break; - case FLAG_TYPE_IO: - space = SYS_RES_IOPORT; - break; - default: - space = -1; - continue; - } - - if (type == space) { - *new_start = start - pci_base + phys_base; - *new_end = end - pci_base + phys_base; - found = true; - break; - } + range = generic_pcie_containing_range(dev, type, start, end); + if (range == NULL) + return (ENOENT); + if (range != NULL) { + *new_start = start - range->pci_base + range->phys_base; + *new_end = end - range->pci_base + range->phys_base; } break; default: /* No translation for non-memory types */ *new_start = start; *new_end = end; - found = true; break; } - return (found ? 0 : ENOENT); + return (0); } static int @@ -469,48 +530,32 @@ pci_host_generic_core_alloc_resource(device_t dev, device_t child, int type, { struct generic_pcie_core_softc *sc; struct resource *res; - struct rman *rm; sc = device_get_softc(dev); + switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) - if (type == PCI_RES_BUS) { - return (pci_domain_alloc_bus(sc->ecam, child, rid, start, end, - count, flags)); - } + case PCI_RES_BUS: + res = pci_domain_alloc_bus(sc->ecam, child, rid, start, end, + count, flags); + break; #endif - - rm = generic_pcie_rman(sc, type, flags); - if (rm == NULL) - return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child, - type, rid, start, end, count, flags)); - - if (bootverbose) { - device_printf(dev, - "rman_reserve_resource: start=%#jx, end=%#jx, count=%#jx\n", - start, end, count); + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + res = bus_generic_rman_alloc_resource(dev, child, type, rid, + start, end, count, flags); + break; + default: + res = bus_generic_alloc_resource(dev, child, type, rid, start, + end, count, flags); + break; + } + if (res == NULL) { + device_printf(dev, "%s FAIL: type=%d, rid=%d, " + "start=%016jx, end=%016jx, count=%016jx, flags=%x\n", + __func__, type, *rid, start, end, count, flags); } - - res = rman_reserve_resource(rm, start, end, count, flags, child); - if (res == NULL) - goto fail; - - rman_set_rid(res, *rid); - - if (flags & RF_ACTIVE) - if (bus_activate_resource(child, type, *rid, res)) { - rman_release_resource(res); - goto fail; - } - return (res); - -fail: - device_printf(dev, "%s FAIL: type=%d, rid=%d, " - "start=%016jx, end=%016jx, count=%016jx, flags=%x\n", - __func__, type, *rid, start, end, count, flags); - - return (NULL); } static int @@ -519,33 +564,22 @@ generic_pcie_activate_resource(device_t dev, device_t child, int type, { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct generic_pcie_core_softc *sc; -#endif - rman_res_t start, end; - int res; -#if defined(NEW_PCIB) && defined(PCI_RES_BUS) sc = device_get_softc(dev); - if (type == PCI_RES_BUS) { +#endif + switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: return (pci_domain_activate_bus(sc->ecam, child, rid, r)); - } #endif - - if ((res = rman_activate_resource(r)) != 0) - return (res); - - start = rman_get_start(r); - end = rman_get_end(r); - res = generic_pcie_translate_resource_common(dev, type, start, end, - &start, &end); - if (res != 0) { - rman_deactivate_resource(r); - return (res); + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_activate_resource(dev, child, type, + rid, r)); + default: + return (bus_generic_activate_resource(dev, child, type, rid, + r)); } - rman_set_start(r, start); - rman_set_end(r, end); - - return (BUS_ACTIVATE_RESOURCE(device_get_parent(dev), child, type, - rid, r)); } static int @@ -554,50 +588,115 @@ generic_pcie_deactivate_resource(device_t dev, device_t child, int type, { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct generic_pcie_core_softc *sc; -#endif - int res; -#if defined(NEW_PCIB) && defined(PCI_RES_BUS) sc = device_get_softc(dev); - if (type == PCI_RES_BUS) { - return (pci_domain_deactivate_bus(sc->ecam, child, rid, r)); - } #endif - if ((res = rman_deactivate_resource(r)) != 0) - return (res); - switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: + return (pci_domain_deactivate_bus(sc->ecam, child, rid, r)); +#endif case SYS_RES_IOPORT: case SYS_RES_MEMORY: - case SYS_RES_IRQ: - res = BUS_DEACTIVATE_RESOURCE(device_get_parent(dev), child, - type, rid, r); - break; + return (bus_generic_rman_deactivate_resource(dev, child, type, + rid, r)); default: - break; + return (bus_generic_deactivate_resource(dev, child, type, rid, + r)); } - - return (res); } static int generic_pcie_adjust_resource(device_t dev, device_t child, int type, struct resource *res, rman_res_t start, rman_res_t end) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct generic_pcie_core_softc *sc; - struct rman *rm; sc = device_get_softc(dev); +#endif + switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) - if (type == PCI_RES_BUS) + case PCI_RES_BUS: return (pci_domain_adjust_bus(sc->ecam, child, res, start, end)); #endif + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_adjust_resource(dev, child, type, res, + start, end)); + default: + return (bus_generic_adjust_resource(dev, child, type, res, + start, end)); + } +} + +static int +generic_pcie_map_resource(device_t dev, device_t child, int type, + struct resource *r, struct resource_map_request *argsp, + struct resource_map *map) +{ + struct resource_map_request args; + struct pcie_range *range; + rman_res_t length, start; + int error; + + switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: + return (EINVAL); +#endif + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + break; + default: + return (bus_generic_map_resource(dev, child, type, r, argsp, + map)); + } - rm = generic_pcie_rman(sc, type, rman_get_flags(res)); - if (rm != NULL) - return (rman_adjust_resource(res, start, end)); - return (bus_generic_adjust_resource(dev, child, type, res, start, end)); + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); + + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); + + range = generic_pcie_containing_range(dev, type, rman_get_start(r), + rman_get_end(r)); + if (range == NULL || range->res == NULL) + return (ENOENT); + + args.offset = start - range->pci_base; + args.length = length; + return (bus_generic_map_resource(dev, child, type, range->res, &args, + map)); +} + +static int +generic_pcie_unmap_resource(device_t dev, device_t child, int type, + struct resource *r, struct resource_map *map) +{ + struct pcie_range *range; + + switch (type) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) + case PCI_RES_BUS: + return (EINVAL); +#endif + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + range = generic_pcie_containing_range(dev, type, + rman_get_start(r), rman_get_end(r)); + if (range == NULL || range->res == NULL) + return (ENOENT); + r = range->res; + break; + default: + break; + } + return (bus_generic_unmap_resource(dev, child, type, r, map)); } static bus_dma_tag_t @@ -613,6 +712,7 @@ static device_method_t generic_pcie_methods[] = { DEVMETHOD(device_attach, pci_host_generic_core_attach), DEVMETHOD(device_detach, pci_host_generic_core_detach), + DEVMETHOD(bus_get_rman, generic_pcie_get_rman), DEVMETHOD(bus_read_ivar, generic_pcie_read_ivar), DEVMETHOD(bus_write_ivar, generic_pcie_write_ivar), DEVMETHOD(bus_alloc_resource, pci_host_generic_core_alloc_resource), @@ -621,6 +721,8 @@ static device_method_t generic_pcie_methods[] = { DEVMETHOD(bus_deactivate_resource, generic_pcie_deactivate_resource), DEVMETHOD(bus_release_resource, pci_host_generic_core_release_resource), DEVMETHOD(bus_translate_resource, generic_pcie_translate_resource), + DEVMETHOD(bus_map_resource, generic_pcie_map_resource), + DEVMETHOD(bus_unmap_resource, generic_pcie_unmap_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), diff --git a/sys/dev/pci/pci_host_generic.h b/sys/dev/pci/pci_host_generic.h index 8e72ac6e5cef..2d7583b861c8 100644 --- a/sys/dev/pci/pci_host_generic.h +++ b/sys/dev/pci/pci_host_generic.h @@ -63,6 +63,7 @@ struct pcie_range { #define FLAG_TYPE_IO 0x1 #define FLAG_TYPE_MEM 0x2 #define FLAG_TYPE_PMEM 0x3 + struct resource *res; }; struct generic_pcie_core_softc { From nobody Thu Feb 15 00:38: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 4TZx541sprz54ytQ; Thu, 15 Feb 2024 00:38: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 4TZx540f25z4SjL; Thu, 15 Feb 2024 00:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707957528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2rotSoldAqOWStJWZKEP+C0/3osFt6+a23Dqs+yLuc=; b=yR24dFjbEEZznDb0DEPcBHNxW8y+ZoQshj+/nYcMKCY04bS0YF8k8YcdgBPYzkvTDOzp36 V08Ay6es2U1HQzLeAuN/PaBTMIxpS74KIAK5JLbI7UDYrmq2zIz0Cr3cHmzG+thR/YO6vA tzSNowlLYd0RyxOm1/uKRoNd2AlVMd/Zzk+l3zX0tTHHy+9q/KeHyJy8kBV4P2sknCcIRT 1fUcDGAKrPIiMCMGoglNgvuAIXUC2+cjzSVkXOnMzSXdcLMYx1f8qPRkObaZu7WvTnEPro 95x4etLZIuDzXO9YGD69Li0/e8ksaf1+XsMdaZuNpYXRdp6yF5eBKEwQxi5mYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707957528; a=rsa-sha256; cv=none; b=n1RnyHSs4lMfDMsQGRH61fAS/wbNgiVniXd/0l+DPQFTBgxYz+aofQicpU8kcSiWy/Bc8C oLAecspxz0YvLlV5gI480/rVfN0aRwPFZ0YzhF9OYMGrMYkxZ9nLWrK2ooJKbqOdlvIowj P/2ci18dxZw4yK5IB7QqyPS4OKraxBLjMprSpFWq3DSV+JmvV29Q79zDFxMqddN8AbKuUu d4iuaGqABSswuAX2dwrMMeVEDssZ1m7rWrHvsB4OFDBxiRk6Bcamd6UjpHFp6fcVk0IpVA GXc/FkQR/b6uNdB/YwYH1/bTLrDiO16aotklUUsGmWuEDHKhdAINIxrQIiht2A== 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=1707957528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2rotSoldAqOWStJWZKEP+C0/3osFt6+a23Dqs+yLuc=; b=R1KvQ7jgt2IOR1tdoM1g1+qBe7N8VjlnQSCDTOVxQukuHwD3Cg8flGsLL2pwuywm61ixlc tBdHe653mkyxFz7ib/p630Tq8YzA/d/lfNqSDrUtqYkbcRm9dHghVCOdq2sWf37k8V+mGA /+5qoCy7YljEf15H9A+R6LMNNkPVqXU/Ian5zBF7WyOUYjakHun8DWuSRUjgTAJPMlstDT uWDuBvdBRhT2CwoPky4wdUmLxlu/Uk7ty3S5fZjH/l5EK9z5Ws46e0Mwo41NFXiSEsq/JZ el0RNKg1+zi4H+VvE/PUxuluG89+0K6iw/8hhWfUbr8I+YL2u6AEtVen4WfmKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZx536Y8zzKch; Thu, 15 Feb 2024 00:38: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 41F0clbp054779; Thu, 15 Feb 2024 00:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41F0clRI054776; Thu, 15 Feb 2024 00:38:47 GMT (envelope-from git) Date: Thu, 15 Feb 2024 00:38:47 GMT Message-Id: <202402150038.41F0clRI054776@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: 05f530f4d2bb - main - cat: fix cap_rights_init usage 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05f530f4d2bb15fda3d258b3bd92d4515d9ef39f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=05f530f4d2bb15fda3d258b3bd92d4515d9ef39f commit 05f530f4d2bb15fda3d258b3bd92d4515d9ef39f Author: Ed Maste AuthorDate: 2024-02-15 00:03:40 +0000 Commit: Ed Maste CommitDate: 2024-02-15 00:37:54 +0000 cat: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Reported by: asomers, markj --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index c3812c6d9ca4..5dceb1cad94b 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -141,7 +141,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL, CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Thu Feb 15 01:03: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 4TZxf55zkDz553SR; Thu, 15 Feb 2024 01:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZxf55SVjz4cS2; Thu, 15 Feb 2024 01:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707959037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JXMOg0zCFVElafxi7NLzvoQ+Y7SSGhaO7YbEssW9VoI=; b=JXYNB3X86G72FxV48a5YW/ng4Gv9bW4WXuYizqOpmPSwMVH6WnSH4duUhdysqr9m75ArUU keRXAsAK739r+v5x2p/xk4/mh1touPFf8qh3IEL3zF6HbjqHrg0UuskAImH84JK7WQQyVy U7VLXYclnz4tR9GamyVh//a4fJAfUu++xgd0xThuy3sChpkpunl8TjqLEAsyP+7dQySOi/ zUeuPhEFhlMb9ngB5jDYnDsC1JSUN/b+ThZ/Vh6x9QJ3n7bE1oEmziRBubFq8YqpnR5z50 nq3ftYqjskHQLYlOq/1us/Ss4yIxJAa9yqpsDII6mbwi4Kk2B1QodtUmvefvfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707959037; a=rsa-sha256; cv=none; b=amauivKLpczWfhwZlH4QFOjECsFLVQOAl4sqYDqdBuhAuaf1ksAWN6ADqt7uP1Sns51OvX 25yeN+jugufjcDkvbGOMaQ0zO0LHJ+bmMKoqEnp6YcQ1PKPKGn98XdiV2aOPdUejG2iAGc xwNt436LvLjMBpbmwY03t7nxP/BpXaqEowTKzVfQFEDsmA8ufjz8oAVZ3ttDWOZg+jiagt heEJZ17oOD1//0VSvE+hibSc1cEUewzQ7nEz8yHjM76v62y/VUBQyhWPgOJ8pfbmx4+6Gi Z/kxqOZzJxP5W70kwDJsMAr0pI7NBK8vxytjHMmZ1FJzLnMB04pZ3vAidjSytQ== 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=1707959037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JXMOg0zCFVElafxi7NLzvoQ+Y7SSGhaO7YbEssW9VoI=; b=slAeGipQqY123sSsg9NnhmjlFY75D2iMiION/1vnb8sWt3gqPbBqEGQJihfiJBkt0j5rVc Fox58niH1jAZxz+T3OFxvgP0kUvzmefHhq+wbWM5gNYepp+ea5F7Wd4H991H6QhRMz/sNx E8VlsWQn2RcVc58mNQ9mcTpUB7w8Jwgw/WCUtk7HpwwYbusG4HRou2jp6RYB1NxHQd2WlO PruLz+wL0olGncED+DVYahYANmhV4vaiw4BySXG5w3Q7U1pjLOBorcDRZVILHHg7NMbCz/ 701i+M4iBM5FasWItiNBPW0zhPRLxBy6WXqtnvlDOx5s8mpVqGaBIVHhfzCGLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZxf54Ch4zLcm; Thu, 15 Feb 2024 01:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41F13vIU005786; Thu, 15 Feb 2024 01:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41F13vvp005783; Thu, 15 Feb 2024 01:03:57 GMT (envelope-from git) Date: Thu, 15 Feb 2024 01:03:57 GMT Message-Id: <202402150103.41F13vvp005783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tai-hwa Liang Subject: git: 25a5bb731805 - main - net: bandaid for plugging a fw_com leak in fwip_detach() 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: Sender: owner-dev-commits-src-main@freebsd.org 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: avatar X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25a5bb7318052322190a2880e0e7ef18e06d54bd Auto-Submitted: auto-generated The branch main has been updated by avatar: URL: https://cgit.FreeBSD.org/src/commit/?id=25a5bb7318052322190a2880e0e7ef18e06d54bd commit 25a5bb7318052322190a2880e0e7ef18e06d54bd Author: Tai-hwa Liang AuthorDate: 2024-02-15 01:00:49 +0000 Commit: Tai-hwa Liang CommitDate: 2024-02-15 01:00:49 +0000 net: bandaid for plugging a fw_com leak in fwip_detach() Adding a temporary workaround for plugging a fw_com upon if_fwip unloading. Steps to reproduce(needs two hosts connected with firewire): while true; do ifconfig fwip0 10.0.0.5 up fwcontrol -r ping -c 10.0.0.3 kldunload if_fwip done There's a chance that the unloading of if_fwip.ko triggers following warning: Warning: memory type fw_com leaked memory on destroy (1 allocations, 64 bytes leaked). commit d79b6b8ec267e7eef6e07cf4245159705e24acd5 (origin/main, origin/HEAD) --- sys/net/if_fwsubr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index 2349ac35fc16..bf3362fc975c 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -802,6 +802,7 @@ firewire_ifdetach(struct ifnet *ifp) { bpfdetach(ifp); if_detach(ifp); + NET_EPOCH_DRAIN_CALLBACKS(); } void From nobody Thu Feb 15 03:33: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 4Tb0z23bklz59v0y; Thu, 15 Feb 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 4Tb0z22jPQz43Gp; Thu, 15 Feb 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=1707968030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EhWwd6D9jmKF8CDv2rV2XP/y/GaD6vMtX3nOZacYVhs=; b=GTEX4ClInfjEKsqHwlsVdh0Y1kiETGYdCRXrcRUs9MofhSP3/EuEix//h6eQJZDdUcQhld ILufV1fOtzQWLotMKjJKSR0aaz5yn+fnS9a00HzSQ+VfYF5HbQLJdZBDAPKCpYC4cU32rU kxmzFEpyLMph0gO7mHC+MztLg2jzMNqGrAW9kyI7iQPdCHtDV7EDn2pd+Rz8qTRHFAYRNd wJzImO+uXoLCQTlH0X/dp8y5gkyiiichMNnv13QtTMyk7tTonDts0v+Tc/SXMCmyBnFTrh YpwcwgknZjOg6JcK/uRZW9IJOYXfGhsh/0r1aU8cZzRUylwZL443Vx+b3nvAxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707968030; a=rsa-sha256; cv=none; b=Oj4y6HC1ekMF32LM7E+8/DNL2hhtHktNDuHGlSuEUTphfnP5BQWre/s4+TOqPE43n0AjLv yCGo4x+yRmBfCPnXJzYHBpqgUFFIBbKdoU2KSJQDk4/ftQ9qwxzkz//LSpIkbxGuuz5MaD G5+U+mOVo2OronYvfLyhdJ+udHF87K4U0dl3Urh7qt8CE8/eLPUjt+znuF6EOHwROwymXo 7cUrmycTY7z0WssDdVsM64EC9wfJ4bAluBsAlthAFV+/vJPRTuxEsfesoc3dHqtHDXoD83 cfZbCqpIU8rL3S01S6VRUKmTVzkazT4oyg6iWhBKZUInCOzVpGOp/AdfXZC//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=1707968030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EhWwd6D9jmKF8CDv2rV2XP/y/GaD6vMtX3nOZacYVhs=; b=l3YCoDRSg5vm0Rqk+6iDiQEd4vh+h0BLI6f0nQFP2cV3xEvV4J1ipY9UVFKU6I8pra5uDQ li4a4t1sbxvywNR4oztXA6zpsGb+BYavIA7pMDGshzCpf76kZNBJDOTkZCtDJqGU3AgeAd 03ogZvxjeAou8n/s+Gx945uXKfR2258A3tI07sqw4X4POiiAORY4sRUju/mnTNhvd9azrN wvVszj6pORlzUycoxnIB49/fK1IZqy9WO54Q0UGzlNu0kGVK17+1HOgJGfp7hqgSI0wfW3 753F8PeuQvvWUSI5VgMGrd6yRjrJhTef/1z7Gguoo9CGfhahd7xom3u7eS6sgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tb0z21mpwzQgQ; Thu, 15 Feb 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 41F3XoQS057377; Thu, 15 Feb 2024 03:33:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41F3XooF057374; Thu, 15 Feb 2024 03:33:50 GMT (envelope-from git) Date: Thu, 15 Feb 2024 03:33:50 GMT Message-Id: <202402150333.41F3XooF057374@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: 3733d82c4deb - main - libcasper: fix cap_rights_init usage 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3733d82c4deb49035a39e18744085d1e3e9b8dc5 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3733d82c4deb49035a39e18744085d1e3e9b8dc5 commit 3733d82c4deb49035a39e18744085d1e3e9b8dc5 Author: Ed Maste AuthorDate: 2024-02-15 00:42:48 +0000 Commit: Ed Maste CommitDate: 2024-02-15 03:33:24 +0000 libcasper: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: faaf43b2a750 ("fileargs: add tests") Sponsored by: The FreeBSD Foundation --- .../services/cap_fileargs/tests/fileargs_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c index 7d499542abe9..088edaaa294d 100644 --- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c +++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c @@ -291,7 +291,7 @@ ATF_TC_BODY(fileargs__open_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -338,7 +338,7 @@ ATF_TC_BODY(fileargs__open_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -385,7 +385,7 @@ ATF_TC_BODY(fileargs__open_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL | CAP_READ); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL, CAP_READ); cap_rights_init(&norights, CAP_FCHMOD); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 666, &rights, FA_OPEN); @@ -466,7 +466,7 @@ ATF_TC_BODY(fileargs__fopen_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -516,7 +516,7 @@ ATF_TC_BODY(fileargs__fopen_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -566,7 +566,7 @@ ATF_TC_BODY(fileargs__fopen_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_READ | CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FCNTL); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 0, &rights, FA_OPEN); ATF_REQUIRE(fa != NULL); @@ -672,7 +672,7 @@ ATF_TC_BODY(fileargs__open_lstat, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_LSTAT); @@ -720,7 +720,7 @@ ATF_TC_BODY(fileargs__open_realpath, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_REALPATH); From nobody Thu Feb 15 09:22: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 4Tb8jY2plhz51gYZ; Thu, 15 Feb 2024 09:22: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 4Tb8jY24WZz4gGJ; Thu, 15 Feb 2024 09:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707988961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kL8MAD7BAvK08AiqRGovpTW6pv7H8rnev/SByPOWj50=; b=i6PUnPcA93gY9Qj7+GnIFw9E9DFM/AuwhmIjSJwi+EBc82/nIUfAWR8mZjBFkgowSscfQ6 0Od7PpFFc6i12FqxqA+KcM9vxdr+G2EAIca2AvqQEeH+kNJ8TJqqZktxXi6RbFhElQ1ucm 4eCjYTfRMoKjuVPan4fhvjuV2Pkiq4xJd37aHTWnoQEgGSsuLOmV7b90luwLh2/e+Xl6Ai xuCq7VBpZoPxkUffsBxfKwZ1cYWGdquRtwfAGiA3nl5V7fzZyM11z1q0AAQH+22LCBUFWl hYmw50OYs9EgBzh4YSGqv+vXcazIfJNXjXs4npSuIx+yy6u8K4a8D6jbHCjIfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707988961; a=rsa-sha256; cv=none; b=VNpODM8pzgd2sqDX4kb4AjN850h4RJN1tpTYwyntqVf/QvrYBHAfHZQW5m/jmklIYGbtdv NXrVnxghW+flk69L9/fXAR2FCFd+Zaq982cwkLTv/7V5pDIcEvKMMrqv7mNw08DB9auE7/ UJHFKsDTZo9gAOmSqiNoT4z9FpGUcICYmxkzI9b2Yahn4F363SkqIa4qPjNpGMBQSvqmaa lbAuZusaTEhj76XAvXxE5aqdYf5XDy1RzpuolF84Gc7bqTcN+AvdIgRlhjEg/QmVrQT5Wp MhPRBH+CtCT+uFEPcWXPfapHEPCaDsRCd0QOS6k+bX6lFR6wLthFtIRMbMbdCg== 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=1707988961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kL8MAD7BAvK08AiqRGovpTW6pv7H8rnev/SByPOWj50=; b=OyxM5p7DdYOn1eITKfC3HVUfvlWSUQF0ZQ6Pu0phF6ephgO7fYUc4kiAAJ/9hA8GGghV+V VQda2zeDlVNV0fT4Ttex82Hl9M23+1OjYHvUy0Sd8iIpPol23gqHEny+9TjkTBVheZKlNy QXtNsqyYFhBkxJYQHcmQZnwqV3XRw4Qg45IORUIDqwpiHSx73vDCRms9N+3FMkBvXIvFad TroGKAoG8YSbmFIOPzoK1ugbi04UnvPwgeOEeg45Mu+1/1rkxi/Z91aEA6opdazfqb6qoI 9h1u5shpx5LCF/rLs5+Q9GGfRpwTO25Zq+ZFTRs+k0a8QIh6YAPfwrHVr5ylFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tb8jY15dWzc85; Thu, 15 Feb 2024 09:22: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 41F9Mfve043716; Thu, 15 Feb 2024 09:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41F9McK3043712; Thu, 15 Feb 2024 09:22:38 GMT (envelope-from git) Date: Thu, 15 Feb 2024 09:22:38 GMT Message-Id: <202402150922.41F9McK3043712@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: e2257b3168fc - main - zfs: merge openzfs/zfs@e0bd8118d 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: Sender: owner-dev-commits-src-main@freebsd.org 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2257b3168fc1697518265527e5d817eca6c43b8 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e2257b3168fc1697518265527e5d817eca6c43b8 commit e2257b3168fc1697518265527e5d817eca6c43b8 Merge: 3733d82c4deb e0bd8118d04b Author: Martin Matuska AuthorDate: 2024-02-15 09:21:13 +0000 Commit: Martin Matuska CommitDate: 2024-02-15 09:22:15 +0000 zfs: merge openzfs/zfs@e0bd8118d Notable upstream pull request merges: #15469 cbe882298 Add slow disk diagnosis to ZED #15857 d0d273320 Update zfs-snapshot.8 #15864 a5a725440 zfs list: add '-t fs' and '-t vol' options #15874 6cc93ccde BRT: Fix slop space calculation with block cloning #15882 a0635ae73 zdb: Fix false leak report for BRT objects Obtained from: OpenZFS OpenZFS commit: e0bd8118d04b55b7adf3d9ba256ad4bb53e66512 sys/contrib/openzfs/cmd/zdb/zdb.c | 11 ++ sys/contrib/openzfs/cmd/zed/agents/fmd_api.c | 57 +++--- sys/contrib/openzfs/cmd/zed/agents/fmd_api.h | 3 +- sys/contrib/openzfs/cmd/zed/agents/fmd_serd.c | 3 +- sys/contrib/openzfs/cmd/zed/agents/fmd_serd.h | 2 +- sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c | 143 +++++++++++--- sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c | 3 + sys/contrib/openzfs/cmd/zfs/zfs_main.c | 22 ++- sys/contrib/openzfs/cmd/zinject/zinject.c | 16 ++ sys/contrib/openzfs/cmd/zpool/zpool_main.c | 8 +- .../openzfs/include/os/linux/spl/sys/taskq.h | 2 +- sys/contrib/openzfs/include/sys/fm/fs/zfs.h | 2 + sys/contrib/openzfs/include/sys/fs/zfs.h | 2 + sys/contrib/openzfs/include/sys/vdev_impl.h | 5 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 2 + sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 4 +- sys/contrib/openzfs/man/man4/spl.4 | 18 +- sys/contrib/openzfs/man/man7/vdevprops.7 | 4 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 4 +- sys/contrib/openzfs/man/man8/zfs-list.8 | 11 +- sys/contrib/openzfs/man/man8/zfs-snapshot.8 | 16 +- sys/contrib/openzfs/man/man8/zinject.8 | 1 + .../openzfs/module/os/linux/spl/spl-taskq.c | 85 +++------ sys/contrib/openzfs/module/zcommon/zpool_prop.c | 6 + sys/contrib/openzfs/module/zfs/spa_misc.c | 3 +- sys/contrib/openzfs/module/zfs/vdev.c | 30 +++ sys/contrib/openzfs/module/zfs/zfs_fm.c | 26 +++ sys/contrib/openzfs/module/zfs/zio_inject.c | 4 + sys/contrib/openzfs/tests/runfiles/linux.run | 3 +- .../openzfs/tests/zfs-tests/include/default.cfg.in | 2 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + .../functional/cli_root/zpool_get/vdev_get.cfg | 2 + .../zfs-tests/tests/functional/events/cleanup.ksh | 4 +- .../tests/functional/events/zed_slow_io.ksh | 205 +++++++++++++++++++++ .../functional/events/zed_slow_io_many_vdevs.ksh | 177 ++++++++++++++++++ .../zfs-tests/tests/functional/fault/cleanup.ksh | 1 + .../zfs-tests/tests/functional/fault/setup.ksh | 1 + sys/modules/zfs/zfs_config.h | 7 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 40 files changed, 746 insertions(+), 157 deletions(-) diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_slow_io.ksh index 000000000000,d9fabb2c3bc9..d9fabb2c3bc9 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_slow_io.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_slow_io.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_slow_io_many_vdevs.ksh index 000000000000,3357ae2e3510..3357ae2e3510 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_slow_io_many_vdevs.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_slow_io_many_vdevs.ksh diff --cc sys/modules/zfs/zfs_config.h index f452cffa20c8,000000000000..5a3e421ab67e mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1191 -1,0 +1,1194 @@@ +/* + */ + +/* 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_*_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() is available */ ++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC */ ++ +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* 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_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 */ + +/* 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 */ + +/* 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 HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* strscpy() exists */ +/* #undef HAVE_KERNEL_STRSCPY */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ *** 298 LINES SKIPPED *** From nobody Thu Feb 15 12:55: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 4TbFQZ11KHz53XVr; Thu, 15 Feb 2024 12:55: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 4TbFQZ0WpHz59Q7; Thu, 15 Feb 2024 12:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708001702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w2Sh6gLToQuQel42YGmi6zNcdNcKRNT78yX9w21281g=; b=Fb8Rt0pw+4uBS4WHXF0IC5KVVBrrEiFveeOkkOsJBTaeg127YU2tV5JmKZzVtNmSVLuwHq wb24OfCqyCfNUUyoewTHBXQD2JlpJu/Ly+A5ransMYZdtCM2QS/b+DuyBlL9UzsIE3CVjV 7EZkb0o01dgjjDm7ZgJ/weOa4Goa1uLhn6Yx+MKvi2LVPT+xyW2xPhewIvzqZ5PWqzJegz luoJKeWgmGoStDRtubhj4+OqqHBduKtEhRIwKbRBEeHiQKWrEVfD8NYKyRv3qAdkS6aYzb +Oj8EPkKRhe14LmpzDtHR8BcuZqkv2Z6x+opBI4doRGuSlz4Nw0t0MMFvy6Vrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708001702; a=rsa-sha256; cv=none; b=TPM0Mz7M3Koa3+TcsiPyknOqdBnRBBMZzLko1QYtJDfbwBjr61FfZ8/6fZCXpOhV/1MIR/ or+zjqa5aBVrWkrdHgsdPS5CT2hGDDG7jJhauwBva5zwbOEcGPXtHiRj/REayFcqPlwd5g 6KboKBEAQYVf3QAuZ4SiiSwIjz04cBkKHNLjhhJqg7VoZkUwwhKwcfIyE7bq4tyieXOgjH HAOIQT+dWL4GenIMQjRF4MXqH8sURpFWnByezj1195PawP/9g+Vv/yvAfUB9LJdfpyPQiQ H9A5YofuyHx3dTXtxQU61hpToDh7STLGO8JYkiUH2OUwXId/klQnThU32fWrOg== 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=1708001702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w2Sh6gLToQuQel42YGmi6zNcdNcKRNT78yX9w21281g=; b=eWVI42xNMYwNgJyfGlAkLAs+eC1O9gB2ecq6CQSAkg9K3Pdb7v0Gmb4fk/zJ1pLwayGfF4 xe4m2fvY8rfb5LG+kRptJm+kWRG3nweLL2dlLM6ON0rYLQzjN+gpM1D9a/bJrvCyfA8WgE 796gpO6nhHNJMXeHrXiv6OHDmXkLhwlmDxhToJ/7bSX08/3t5neSSjOlrcBIpRv+Am7MB4 MsSCPDMUoGezJ5BRsMz92KzfNWg4t30jJQgaRv600P2FKCUeQmNoOD+6Uc2sq3Q+zd722o inhJIgmjEb01SZdomm21qBX7RYFen/OK9Fyp6TRo0lElvsAWk3VsyAfH4aeT+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 4TbFQY6hxhzj4R; Thu, 15 Feb 2024 12:55: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 41FCt1vO095738; Thu, 15 Feb 2024 12:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FCt1Pd095735; Thu, 15 Feb 2024 12:55:01 GMT (envelope-from git) Date: Thu, 15 Feb 2024 12:55:01 GMT Message-Id: <202402151255.41FCt1Pd095735@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: 50edc6307198 - main - pfsync: Fix offset calculation 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: Sender: owner-dev-commits-src-main@freebsd.org 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50edc630719827b6c58dd515328997fd196b1d78 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=50edc630719827b6c58dd515328997fd196b1d78 commit 50edc630719827b6c58dd515328997fd196b1d78 Author: Kajetan Staszkiewicz AuthorDate: 2024-02-13 19:41:14 +0000 Commit: Kristof Provost CommitDate: 2024-02-15 11:54:02 +0000 pfsync: Fix offset calculation Even though message version is automatically recognized and the top of the struct is identical for different versions, when iterating over multiple messages proper message length must be used. That's the length of an union member for given version, not of the union itself. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D43862 --- sys/netpfil/pf/if_pfsync.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index c57a89ea052a..e90bc60b85fa 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1002,15 +1002,17 @@ pfsync_in_ins(struct mbuf *m, int offset, int count, int flags, int action) { struct mbuf *mp; union pfsync_state_union *sa, *sp; - int i, offp, len, msg_version; + int i, offp, total_len, msg_version, msg_len; switch (action) { case PFSYNC_ACT_INS_1301: - len = sizeof(struct pfsync_state_1301) * count; + msg_len = sizeof(struct pfsync_state_1301); + total_len = msg_len * count; msg_version = PFSYNC_MSG_VERSION_1301; break; case PFSYNC_ACT_INS_1400: - len = sizeof(struct pfsync_state_1400) * count; + msg_len = sizeof(struct pfsync_state_1400); + total_len = msg_len * count; msg_version = PFSYNC_MSG_VERSION_1400; break; default: @@ -1018,7 +1020,7 @@ pfsync_in_ins(struct mbuf *m, int offset, int count, int flags, int action) return (-1); } - mp = m_pulldown(m, offset, len, &offp); + mp = m_pulldown(m, offset, total_len, &offp); if (mp == NULL) { V_pfsyncstats.pfsyncs_badlen++; return (-1); @@ -1026,7 +1028,7 @@ pfsync_in_ins(struct mbuf *m, int offset, int count, int flags, int action) sa = (union pfsync_state_union *)(mp->m_data + offp); for (i = 0; i < count; i++) { - sp = &sa[i]; + sp = (union pfsync_state_union *)((char *)sa + msg_len * i); /* Check for invalid values. */ if (sp->pfs_1301.timeout >= PFTM_MAX || @@ -1046,7 +1048,7 @@ pfsync_in_ins(struct mbuf *m, int offset, int count, int flags, int action) break; } - return (len); + return (total_len); } static int @@ -1127,15 +1129,17 @@ pfsync_in_upd(struct mbuf *m, int offset, int count, int flags, int action) union pfsync_state_union *sa, *sp; struct pf_kstate *st; struct mbuf *mp; - int sync, offp, i, len, msg_version; + int sync, offp, i, total_len, msg_len, msg_version; switch (action) { case PFSYNC_ACT_UPD_1301: - len = sizeof(struct pfsync_state_1301) * count; + msg_len = sizeof(struct pfsync_state_1301); + total_len = msg_len * count; msg_version = PFSYNC_MSG_VERSION_1301; break; case PFSYNC_ACT_UPD_1400: - len = sizeof(struct pfsync_state_1400) * count; + msg_len = sizeof(struct pfsync_state_1400); + total_len = msg_len * count; msg_version = PFSYNC_MSG_VERSION_1400; break; default: @@ -1143,7 +1147,7 @@ pfsync_in_upd(struct mbuf *m, int offset, int count, int flags, int action) return (-1); } - mp = m_pulldown(m, offset, len, &offp); + mp = m_pulldown(m, offset, total_len, &offp); if (mp == NULL) { V_pfsyncstats.pfsyncs_badlen++; return (-1); @@ -1151,7 +1155,7 @@ pfsync_in_upd(struct mbuf *m, int offset, int count, int flags, int action) sa = (union pfsync_state_union *)(mp->m_data + offp); for (i = 0; i < count; i++) { - sp = &sa[i]; + sp = (union pfsync_state_union *)((char *)sa + msg_len * i); /* check for invalid values */ if (sp->pfs_1301.timeout >= PFTM_MAX || @@ -1214,7 +1218,7 @@ pfsync_in_upd(struct mbuf *m, int offset, int count, int flags, int action) PF_STATE_UNLOCK(st); } - return (len); + return (total_len); } static int From nobody Thu Feb 15 13:50: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 4TbGf31Vx0z53wJW; Thu, 15 Feb 2024 13:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbGf30Xl0z44rw; Thu, 15 Feb 2024 13:50:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708005003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LLfXUtw9dOFxGs3jnrAftqxqv2UNnMMxhh/OnIqWOSs=; b=UvQwCXu7RzZ7+NQpfh2sgkP4Ro8k/Vc+cq6pMiE3ERYfjbbRPlQq5+wA8naGRml+iO8Mz7 KHZNlP7Y0e2DObxug+47av2+mNpDqgcdVztV572YXI5UDSY8KmUoz/fprIl4gh/OPAkbKE 1bz1SqIF38vV+VUVtDugD27+HlP/RzOVdSO+nL7dIDDrlaceFgaaGZHIMZIoli67V+uS1j Sjr8eIu5Sd+1b8QfDukArJwEoN0ZSDCGt8kUHhYMyveefK2946O6CtXiqA8PL5UL80pdwK y51dKZfXHTTpRr5N3LOOSNExJB/wOPknFgqxZ7pc5wLhbsjZDLwP6VGw3gbpeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708005003; a=rsa-sha256; cv=none; b=xlQg5J4d3e7XiCDIRe+s7MzV0zgX2JMPr+aTDrNvpa222WSludi/tzhIT0j/dyva1Xg+b5 hn1HTT5mkCo6+/6hkt4hQfQgE46HTngcln46L1WAvztlwMk2TifndljpIKpfEuPAbHowVz GzLLoQIEp4+pyjm4PXyA1y1PEu8tbZ+i3v8srDz3QaREVYBVNrRyVj28WwY7Nr1gbazn3z T7SwlkPTY07Fwh9JRpuyQl8Z92wmv7YvH1Jh1XVMPX/QgINItaqFa8a4v6jOI9/a3MezLO p3ExDwiijPqo1QFAMbKW9arXzplnGfbnhVxf7jc4lj4Ih1BWjDbRILNSNtXAFw== 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=1708005003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LLfXUtw9dOFxGs3jnrAftqxqv2UNnMMxhh/OnIqWOSs=; b=Xw5+sNQWwqSY5wq05CUYmj+wdVAnwAUsmtltNwHSb62a2NYVin2pmIpCx5f/n5XPzEzqeO LWeWjVHgHjdNN2GlzyRotZ7bDgaFYqG9AyezBB985oyi7eVWHd+uaKbINE3KvZ0XtUeyOD G4a57Z/53+Cr3QxfeOO47fDlsk2B2+gTzx/593lGFnTHlqkmwkyYB5OxJ9ph74ZRFeltK9 CtiZhqw7UmeffOtw8F3bo6aM2fvBrXKnd+LtEl/eKJy5xe8J7xeZ/0ejPRC5zXGjkrOGwW /sPBi2zLXKHRjDfTJ8ypF5OEg/g87BiTRNXObcWSzFfpChwvZO9NUrAypkOE/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 4TbGf26j2gzjm8; Thu, 15 Feb 2024 13:50: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 41FDo2QW083099; Thu, 15 Feb 2024 13:50:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FDo2t7083094; Thu, 15 Feb 2024 13:50:02 GMT (envelope-from git) Date: Thu, 15 Feb 2024 13:50:02 GMT Message-Id: <202402151350.41FDo2t7083094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 9c59988175ff - main - bsdinstall: prefer HTTP 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: Sender: owner-dev-commits-src-main@freebsd.org 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c59988175ffd6b42c6927c0939e13abc43f7344 Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=9c59988175ffd6b42c6927c0939e13abc43f7344 commit 9c59988175ffd6b42c6927c0939e13abc43f7344 Author: Philip Paeps AuthorDate: 2024-02-15 13:49:33 +0000 Commit: Philip Paeps CommitDate: 2024-02-15 13:49:33 +0000 bsdinstall: prefer HTTP In 2024, users are more likely to have working HTTP than working FTP. Present http://ftp.FreeBSD.org as the first option in the installer. Keep ftp://ftp.FreeBSD.org as the second option. MFC after: 3 weeks --- usr.sbin/bsdinstall/scripts/mirrorselect | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 901f816206ba..8dd50199977d 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -40,7 +40,8 @@ MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ --title "Mirror Selection" --extra-button --extra-label "Other" \ --menu "Please select the best suitable site for you or \"other\" if you want to specify a different choice. The \"Main Site\" directs users to the nearest project managed mirror via GeoDNS (they carry the full range of possible distributions and support both IPv4 and IPv6). All other sites are known as \"Community Mirrors\"; not every site listed here carries more than the base distribution kits. Select a site!" \ 0 0 16 \ - ftp://download.freebsd.org "Main Site (GeoDNS)"\ + http://ftp.freebsd.org "Main Site (GeoDNS, HTTP)"\ + ftp://ftp.freebsd.org "Main Site (GeoDNS, FTP)"\ http://ftp.au.freebsd.org "Australia - IPv6"\ ftp://ftp3.au.freebsd.org "Australia #3"\ ftp://ftp.at.freebsd.org "Austria - IPv6"\ From nobody Thu Feb 15 13:50:03 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 4TbGf42RBqz53wCb; Thu, 15 Feb 2024 13:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbGf411T4z455k; Thu, 15 Feb 2024 13:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708005004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DyWyNDdbZDQY2/6j32pFkl1r0Cz3ftuRTmMSihuVZP8=; b=DagCxbXB1T5MKStVRbyeIGDzl/uIAuap3okMHK+X9+5ximTG5iJx6l7vL3kuBG8dZ39fMb wLufGtPMpEaZM8dBcZx2QV4cE8KJ6PyrlX9KmFwILqZ4KpNSIs9ag6VP1U3ki9tMiE/L7F W8zUVcj4avwEx1d6H/X7N/cEDsVpAHAC6Pgl/uV6CzREazd3FN6CRlav1U+xINNTB/mCdJ XGf9SIob1OY4dLB5YIWF4ocaGnEtXA5t5Dg1UkOBIUHlP0uiaLwoPaGr5Qt10D0N0whxpu F1lInhtIQFWA8qXXrMaKhjkYDyAS1uZk/o02ka19m8nVdOxxVJflt41ZunHeuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708005004; a=rsa-sha256; cv=none; b=rPA/lHJ4aEyVsB6aAneAJHgR9U/Ux27NRmAe38iVx/j9yhrl8LifmO0tWZnjl56ZJGCPxA 1FSi6KTEcZNWuSJFsWa70uAPiAesHW7+fGXG3NVLtgQEwFvHYbMPT73kHdzBzrS1fwtjJY BOv78u/CIwN/Gr8WKggDkh10QWRPpllpUSdPgnLkJvVlJfpbmlzzz+bvEohNS/3yrxwsH3 3HjbtKCaBwlCXmknVOoZDcDr1m12x8wsj2ErIcYAaBIRW9QcUJNOzORjx+FiTuTDv9p6ih Rtv1aTePuQOuJPMPYZtt69gUb6hmK9ncc6xBOJ2ybyYxWtxnunLLZ/tVJN+uNg== 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=1708005004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DyWyNDdbZDQY2/6j32pFkl1r0Cz3ftuRTmMSihuVZP8=; b=LZuEZr/zqVJmD9v/wyUYu778vo5byW+VP0EmmVurjykuwPaFzz7UD6hPZ+dwmgOm43RKdH xSqNXQwoRrps7hGaB59hYsG8n+VwWDhd967iYrAXw6iOhdCmAfpl63OxcEY9Im3O36j6Qq hJt7jvghMgLGngOvX3b4MzRoUOS7DSmChEkBwh7dirtAZ9bcGkkQmzg91TxpRK+wG/e7c4 T5wtf2uxmPC92+URvNKsI1fS23G/N2M9ky45V9VkcgU8+PuZqBQOmVX0R2VTU8wCTQ3iIf kcg9Z4utQPA4ydUVpGZSQs0NC32B4RyI5/PB88mpjbmL3Js+NbWHQiCfYK/ppQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbGf405ZnzkLB; Thu, 15 Feb 2024 13:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FDo3ZR083372; Thu, 15 Feb 2024 13:50:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FDo3W3083368; Thu, 15 Feb 2024 13:50:03 GMT (envelope-from git) Date: Thu, 15 Feb 2024 13:50:03 GMT Message-Id: <202402151350.41FDo3W3083368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 2911c44bafa7 - main - bsdinstall: remove two dead mirrors 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: Sender: owner-dev-commits-src-main@freebsd.org 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2911c44bafa7daef67f528aa9af251d134f8f8ea Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=2911c44bafa7daef67f528aa9af251d134f8f8ea commit 2911c44bafa7daef67f528aa9af251d134f8f8ea Author: Philip Paeps AuthorDate: 2024-02-15 13:49:33 +0000 Commit: Philip Paeps CommitDate: 2024-02-15 13:49:33 +0000 bsdinstall: remove two dead mirrors --- usr.sbin/bsdinstall/scripts/mirrorselect | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 8dd50199977d..05eff9fee56e 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -87,8 +87,6 @@ MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ ftp://ftp2.uk.freebsd.org "UK #2 - IPv6"\ ftp://ftp.ua.FreeBSD.org "Ukraine - IPv6"\ ftp://ftp5.us.freebsd.org "USA #5 - IPv6"\ - ftp://ftp11.us.freebsd.org "USA #11 - IPv6"\ - ftp://ftp14.us.freebsd.org "USA #14"\ 2>&1 1>&5` MIRROR_BUTTON=$? exec 5>&- From nobody Thu Feb 15 13:59: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 4TbGrP2Dxfz53xmv; Thu, 15 Feb 2024 13:59: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 4TbGrP1QmKz46QH; Thu, 15 Feb 2024 13:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708005541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r7Nlp3u6Vjxg7nFFKBKuHRvr3exB1YQ9WhFEbGsp1Vw=; b=EWQUuZM6Kkqw4HhGxRshr2/l7hFdhlgYJAIi2iOk/iu7Fc0HBP946GelPpKrg719p72nAe /zYLNuHl5NKH/gBNER1enHwvrz1wo3A27YtZP+cmx73km1F6NGAyK1zFWOar5EgYO7ZH5u oCObwBoFUpeSyt7WF+kYmnkBQHpKkecSjTXjJ3cOyBaF6dyU5P+jkARPadjalFiWYTywQG b7UbBva9qB5pFwfef6SXBjl+dK4okqMxuYeEPakYnJcZpaZ+tRc5SOMxddZ6n6efI6VdB6 nn7oNWLdI5qOnhBOgpOkOuyg2+wB3Bp9abGVdrI6yLUqhKlL38TkZhYDCOoCnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708005541; a=rsa-sha256; cv=none; b=JTaDjIFQDRQKkePIpdzScsLDpgjdQAq8wVhg0oHreXoHqkLmpSOKhgcZnSCSUagyAxnem3 1svoTB2pAAVmvI65jhcyi/e7unX5MH/GSXKPtnUuc9XxtD/KUgMkfc1lvj/auXhmAQ6yZG utmqMEjcfQ4HmcdKJaKN8sYlnAa+rX/HfbXexihWT2L0LkeSQkUiLobGKoMbHS3/o+z41H VxwV3dt8nVxMiLbuwRdC7uDeDpVMbVDm+l2jcx9cfXB5JASG4wyoZJ9kIEe8hg6jECRULh yjVqT1YrLPttMpMPBc+KQXdAFB4sZvscci/BcTH/DdbiFwxFDYA+bIkbsWqgew== 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=1708005541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r7Nlp3u6Vjxg7nFFKBKuHRvr3exB1YQ9WhFEbGsp1Vw=; b=iqybFvlM63UOooNDx2dzpJ3LMmBl4QasDSrchaPhk3u6BadzvQhVXDBRHBPc1Sz2Wk+int i0wBKnPtJlsv34jcrAh1Vq7tFNmm/WjXM1V7ixswj59+6wjLHSu/2hs/pK0fL5RGIztgB2 Y+GMEIlE9t+iGcaUj5HueRfhOTlSiPAFp5OsD6LbCKQ/YDmIl221VA6CDbP80YCi/Y8V/H 9FtJbDCguWSaTcpGb1zLaQFVFI5PaSLwm529sracOuFNfxFHXqwnyww/19wSXEsoL4BdDD SHv45nXjmtfnTaRyCIs13CcW3WE0GTcJ+DcXy1ruCXmL5M3lB05EqNJMkNE6Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbGrP0PjTzkwH; Thu, 15 Feb 2024 13:59: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 41FDx0Dk097150; Thu, 15 Feb 2024 13:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FDx0uN097147; Thu, 15 Feb 2024 13:59:00 GMT (envelope-from git) Date: Thu, 15 Feb 2024 13:59:00 GMT Message-Id: <202402151359.41FDx0uN097147@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: 8d1348f55aed - main - path_test: fix cap_rights_init usage 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d1348f55aed6873f34f54bc3b275b73ef0ff66d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8d1348f55aed6873f34f54bc3b275b73ef0ff66d commit 8d1348f55aed6873f34f54bc3b275b73ef0ff66d Author: Ed Maste AuthorDate: 2024-02-15 00:45:42 +0000 Commit: Ed Maste CommitDate: 2024-02-15 13:58:39 +0000 path_test: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: e5e1d9c7b781 ("path_test: Add a test case for...") Sponsored by: The FreeBSD Foundation --- tests/sys/file/path_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index bd98d7a6955a..911c7c7075f0 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -235,7 +235,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_READ and CAP_LOOKUP should be sufficient to open a directory. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP); ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); ATF_REQUIRE(dfd >= 0); @@ -256,7 +256,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) ATF_REQUIRE(fd >= 0); CHECKED_CLOSE(fd); - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH | O_APPEND); ATF_REQUIRE(fd >= 0); @@ -265,7 +265,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_SEEK is needed to open a file for writing without O_APPEND. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); From nobody Thu Feb 15 14:06: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 4TbH0n2b9lz53yYy; Thu, 15 Feb 2024 14:06:17 +0000 (UTC) (envelope-from SRS0=/NNK=JY=klop.ws=ronald-lists@realworks.nl) Received: from smtp-relay-int.realworks.nl (smtp-relay-int.realworks.nl [194.109.157.24]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbH0m5fcfz47VX; Thu, 15 Feb 2024 14:06:16 +0000 (UTC) (envelope-from SRS0=/NNK=JY=klop.ws=ronald-lists@realworks.nl) Authentication-Results: mx1.freebsd.org; none Date: Thu, 15 Feb 2024 15:06:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1708005969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to; bh=O6Kx0bbHXYHYAgue7JRnGa/LxEBGQqCiY9SElJt/gjo=; b=RYlET1mbigG/aCIgF0TRUpiZ5xVSBPNFShO8hNFkXaM8LIXNvhU7yuYePrLFFzgT7ylQyD 3fVhdbQWGAca32RLIkU5x2HPs2htvqzdZDferpZyaymNMMDubCMLvAPyGCyVzE3rGozAYB SWbS6GQjIpPYRFs+K0izuhn3gDPj5fFWtOKawsl12nUyXOGiHyWuBaWYRgCcCyn+oltgPG tnueW7K2wW7IJrXSjKddMN4Cx3C+5Mgq4doVXvH7IYETUpSWzxdf/Xr+WZqZV6JPh7OkVZ 99QiNdIz23Dqhzf6v6HhcrTtwieVXGKhaI8vHJXc1Y6THyQzdGyo922qN5J6RQ== From: Ronald Klop To: Philip Paeps Cc: dev-commits-src-main@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org Message-ID: <901819076.6938.1708005969197@localhost> In-Reply-To: <202402151350.41FDo2t7083094@gitrepo.freebsd.org> Subject: Re: git: 9c59988175ff - main - bsdinstall: prefer HTTP 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_6937_739935540.1708005969142" X-Mailer: Realworks (690.27) Importance: Normal X-Priority: 3 (Normal) X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] X-Rspamd-Queue-Id: 4TbH0m5fcfz47VX X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated ------=_Part_6937_739935540.1708005969142 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Shouldn=E2=80=99t this be https://download.freebsd.org/ ? Regards, Ronald ------=_Part_6937_739935540.1708005969142 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable Shouldn=E2=80=99t this be

https://download.freebsd.org/
<= /div>

?

Regards,
Rona= ld

------=_Part_6937_739935540.1708005969142-- From nobody Thu Feb 15 14:28: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 4TbHVx4sD1z542DX; Thu, 15 Feb 2024 14:28:57 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbHVx4JKrz4F2k; Thu, 15 Feb 2024 14:28:57 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708007337; 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=zMwFmkykTyf/9QwhMnZLwQugLB1jVVpM/S9JC2nwKFE=; b=y4pMvRmF0sHJHy0fwgqEy5CkjbL3G6x6uBo3zGRJbmc7rEigLQRsdyWeIvjTYy9LkuWjHV x8qOtN8reZnjFX7rTbgRTepAS+ZP26q4W4mSob4ZZ8oDvBO87ZQklO7IYu/J8J7wAsS0VN 2RFES/T/R9+9vesxFDGd6gPmjgFhQAiPLHOl4BT0aJOw3sIutNLsYH5HafkLN7jOc6EG3H 0Y4XaeLUtCQjtkCYm9ILoDJH0Ecr9s6aiRCi/7fsRqGEms1cLzqPphiGgubMyleOGKidYY oLSebkXRSoLR6vf08MgbJMseA0RDlTgrhfPZ6bR+GAzHZa6pa8NVZxKEfwCnqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708007337; a=rsa-sha256; cv=none; b=fWvY7kgeahbIjEAI5mG/0jQZ4SPolPwpieSXS+xtpiuajJ3QMM9iwFbUoNs3NkGcphXPMw HsVNX8WW2SvcmNylJ0r/g/eSzgk47kHVd7017gtn2h7/rf6AxpVFUOW1aUfQXb/PHG9VgW zjGaXvBt7ggYgb0xqrs/GE43x2G8eLoAVrSHtrBLqqC+ENb4RlVUbbIVfkNjc+VH+iapIj GNxhHQo8BtpDKvGpwHHQUEQvaTPG5Xwu71LtuCyaK2BqRdC6GI98HZJn5h3RZkmf6gN4L8 au5nrBwJj4Un/ZeYIoh7KQoON6b0HVV7iS0VDy2kR9frSoXKJFwM3aY+b1ou2w== 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=1708007337; 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=zMwFmkykTyf/9QwhMnZLwQugLB1jVVpM/S9JC2nwKFE=; b=MPXxWGAkzfXH/aLUwjFeLM4e3J2fMUjSHYa0mkIZc21kVcuJuauyTKBc6hvUezj/T2z0pG Xg5KMgJodWLAaM2k4DdbedIyHq+07S/TjqZhS64r6BM+//5dZE4R32ObLIkxfBboi8859q +U/xG+FXb1m/Dql/EVFwso8NKFZBVrYjYiqLwvZC+xpEpGuAMSlamS9UVWqPvn9NuGJnsM /vN0LjNnXUXpdXZ9iB+RSgngXIo+6rn53WxkBvuxG0d9NAGm3Dh4WF0vrpG+gPRe7xdRTO k+SF+oKBB9tWSKH/bbiMqwBIN2nwMoQPTE/Sw0kHIPmoZQG7X/XX/aqWBsoprQ== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TbHVx30XGz163Q; Thu, 15 Feb 2024 14:28:57 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id 2107D27C005B; Thu, 15 Feb 2024 09:28:57 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 15 Feb 2024 09:28:57 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvddtgdeiiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffokfgjfhggtgfgsehtke hmtdertdejnecuhfhrohhmpefrhhhilhhiphcurfgrvghpshcuoehphhhilhhiphesfhhr vggvsghsugdrohhrgheqnecuggftrfgrthhtvghrnhepfeeukeekieduieeludethedtie evueefleehtefgkeeigfelfeeigeefkeefgfeunecuffhomhgrihhnpehfrhgvvggsshgu rdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epphhhihhlihhpodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdduudeiiedv iedvgeekqddvfeehudektddtkedqphhhihhlihhppeepfhhrvggvsghsugdrohhrghesth hrohhusghlvgdrihhs X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 15 Feb 2024 09:28:55 -0500 (EST) From: Philip Paeps To: Ronald Klop Cc: dev-commits-src-main@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org Subject: Re: git: 9c59988175ff - main - bsdinstall: prefer HTTP Date: Thu, 15 Feb 2024 22:28:53 +0800 X-Mailer: MailMate (1.14r6016) Message-ID: <7B54789B-90DD-4A85-8E2B-84E13DAE54B5@freebsd.org> In-Reply-To: <901819076.6938.1708005969197@localhost> References: <901819076.6938.1708005969197@localhost> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2024-02-15 22:06:09 (+0800), Ronald Klop wrote: > Shouldn’t this be > > https://download.freebsd.org/ No. For hysterical raisins, FTP sites conventionally put FreeBSD under /pub/FreeBSD. HTTP mirrors (including http://ftp.FreeBSD.org) have followed that convention. http://download.FreeBSD.org is a more recent addition, and it has FreeBSD under /, not under /pub/FreeBSD. We could teach nginx to put it under /pub/FreeBSD too, but spelling it ftp.FreeBSD.org was less work. Philip From nobody Thu Feb 15 14:40: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 4TbHm9377Gz5447w for ; Thu, 15 Feb 2024 14:40:25 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (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 4TbHm8638Gz4GVh for ; Thu, 15 Feb 2024 14:40:24 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-36423c819a3so3932945ab.0 for ; Thu, 15 Feb 2024 06:40:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1708008022; x=1708612822; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Ozu1MeC0biMw6Qct8ch8dRRZdN621QyCkDhzdFXaBMU=; b=Rz/nJsPJntt/F07Lj0HSapxLhl83wBjyEig/PtIIwlE2d/6QlSsZALoy31JW8qFriz 9NpXfWHWKE1PjdIXaB5GZ8FvGsPFIOOUx6XOD9iFueG0N3ZgiLXWzwKETByam8ePTolm hZg+ZxGIUhMUL0xdGc2QpXK4SaNsfsrrls90/QZinvUG2rVVfJBxsSh1LemW8OYk5TFF 0DAEkHciPJ4hlsWGCPLNho/yvcRhO6y6mEUPp1Dj7WA7QAsQLApVlZYU4EaA/3e0aWym JYwYd6RtGIHEv0qV44eFi/HoI2fq0r2qUdh7dabjpsCCcmFNOnnPvBlY8JXC8C2wEyK/ QP7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708008022; x=1708612822; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Ozu1MeC0biMw6Qct8ch8dRRZdN621QyCkDhzdFXaBMU=; b=FTxGOX2jNJvc6DL31xjC6tOHKFaQ8WjpStFhoIZayYor1BOHUfPuDtLCyCrXJSFoAz yUzXKJ/TEQjtILdCzYLs7/AKawCndHa+EpjbU0Uci/bi1WAFYr2vEtJVwys8iGU0iscG 25ZAZAKf/5XMdBtnUyEnG/W1LUbXyhTX4cijnt5B2jRKDK7/RlquqgOilPoQxYprt2cj Zq7UnJs5vRE6wZAQztP1Fw12V83H7Fs8+NDlLRm63R1nxS9uxZFODzPgj3fzWVzabi8b Mq2SkSLAcrPZWq/jGrf8Pc6hClK0tCXitEuWirGIrFNK4jbfnhflzJaIM7fUIp7a8Kak pHKA== X-Forwarded-Encrypted: i=1; AJvYcCXs54aTTv7tm0NFgjy1IL0tpiAeYOemOLSfeCWRjtMYykUHcjkA+PtkFRGfj9Q0oCGX9H4SJIxSfwg9slnjtaO2todbvBCGBylb1yfsZI2PsA== X-Gm-Message-State: AOJu0Yw3NeSUMRXp1wqoE9pSPJcmVH6KnSDB0W9Kndar+iA1OK+cm1jA aMDHM4qLDt1uv9/fYWimfHUHfZqegLmEzPfuA/371ppj5vGL86KVZawTu1jbq4lQK+g3cIyBHEj Y X-Google-Smtp-Source: AGHT+IEX/26fc/dQMxwgd4AoNfheqZwzl8LO+v39mc/fFuzbu/viSEES9AFozQugOD79kOIRhwajFg== X-Received: by 2002:a92:c98c:0:b0:364:1af1:a49e with SMTP id y12-20020a92c98c000000b003641af1a49emr1698035iln.27.1708008022237; Thu, 15 Feb 2024 06:40:22 -0800 (PST) Received: from mutt-hbsd (174-24-72-211.clsp.qwest.net. [174.24.72.211]) by smtp.gmail.com with ESMTPSA id bb17-20020a056e02001100b00364f695d3d6sm320853ilb.14.2024.02.15.06.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 06:40:21 -0800 (PST) Date: Thu, 15 Feb 2024 14:40:19 +0000 From: Shawn Webb To: Philip Paeps Cc: Ronald Klop , dev-commits-src-main@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org Subject: Re: git: 9c59988175ff - main - bsdinstall: prefer HTTP Message-ID: X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD 15.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <901819076.6938.1708005969197@localhost> <7B54789B-90DD-4A85-8E2B-84E13DAE54B5@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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="yax4k7axvi3c57pq" Content-Disposition: inline In-Reply-To: <7B54789B-90DD-4A85-8E2B-84E13DAE54B5@freebsd.org> X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4TbHm8638Gz4GVh X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --yax4k7axvi3c57pq Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 15, 2024 at 10:28:53PM +0800, Philip Paeps wrote: > On 2024-02-15 22:06:09 (+0800), Ronald Klop wrote: > > Shouldn=E2=80=99t this be > >=20 > > https://download.freebsd.org/ >=20 > No. >=20 > For hysterical raisins, FTP sites conventionally put FreeBSD under > /pub/FreeBSD. HTTP mirrors (including http://ftp.FreeBSD.org) have follo= wed > that convention. >=20 > http://download.FreeBSD.org is a more recent addition, and it has FreeBSD > under /, not under /pub/FreeBSD. We could teach nginx to put it under > /pub/FreeBSD too, but spelling it ftp.FreeBSD.org was less work. I'm curious to learn why you chose http:// rather than https://. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --yax4k7axvi3c57pq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmXOIjwACgkQ/y5nonf4 4fqQVA//c94rRRZi2/01Oqc5mI/gD976cg6opOnsUQMUZb38AoYZNbEA4oV8b2qf uE9ElCOwcGWqRmHzaAMFenYEQK4ki1xmNPys+28moRWICo1s3VMcmSfZm2zyvUzk BZ3pvFx0lBsvL5u3YjzSFmaeKQt6TiCyMF/1SYV0hwbXT39PRh3yOyV/SKtExXpo I9l+1zceE8fHtPpTGveH/hy8O6UbzrneGLgA6GJFl5puUE8qHuqU/J5qdGjkdgGJ PJkKF66IbIGA9s7t8a5sHqhplntkBokglnzTO6YJfMt818Sb9l2++nfEOAadmtrF qQEWd5+j0aK0WR++tCSTh2N/J0QWNWyp99xSktKSB5LTNpIob/nu3l6nvHSEwnaa n/OCeINax/r8zJ1G37d2yw7mgRVoSIIgUG+bU0djHRVYPAthQaTtx+gcBleKEs3t WLDccf2Lpqo8ugP/lVbcYhVltrHltH2/58PBOG6cpBvmgTY5o1n7vEi3E1VlCTsB aVA+YBIPwYDUQwlR3iqxCCKfT0+41YRvG+NrrGsLx8qy9Fp6K4L1E0/Ff+wPk8KI 34stY5bqz/mbiwCHZvYPlkpmrjhEvBEjmtm0MO77/XU6UuEMprokhma2P6fTvfTX 6WvQiIiZLdLPNAHhn5nLp9lh+vk20vF+aGxDhcx9D/hTmZ1zQ1E= =1to2 -----END PGP SIGNATURE----- --yax4k7axvi3c57pq-- From nobody Thu Feb 15 14:50: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 4TbHzg6gb9z545FL; Thu, 15 Feb 2024 14:50:23 +0000 (UTC) (envelope-from philip@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 4TbHzg68S2z4Hdh; Thu, 15 Feb 2024 14:50:23 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708008623; 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=J8AHubML11UQLMzCvkuKeAzbIPp5vZMAkgu7lFP42vI=; b=vTz8TJHOhloQZ+QO29hv7P25wzf+VTzkZMI9qHkU/6nPGUukKK9FVRslmCx6Tn0axkNNPU WXIxZY0j5DtuWWdH6S0axAMy5vfDIvQG8U3+WoQm776xhwfcSkEG1mCjphpsiqTc7WLxjf +JZtl5Ok8/bZQ5/AWu9WsGmzKwpFTEoch07QLoQ0mhoNAJjaHjU/DS+T+v6Bp2QYdTbXPL zFG4RT0Uy7WxJQzxQpT4T43R45l65WN1Y2u6kPB1G7SfzH9qPq2M29ywOth1dpcCGuxcZL nLhUS+MljAKlPkt2E2iC1xBV8Ra1PS4lNmFfD9vkpfE3vQq7ZA2cqsc2PKrFUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708008623; a=rsa-sha256; cv=none; b=rVZiw3mqkCNF/OtF7PYnYUc4I0Q2GaYcCBGUkM294k2piz+usf3vY5Q4XUz0kKEk9DQ+oY ZfFFpz2ECxjErYfimK8huvSVUQmiouDXaesOtZj8oHyVezEGiHHnVnPkmXTSrzvHO8zS1X h+4cYRNeELkXhtd5VAdTYV9hKvBzct2mPmXssE0/3y88oGUqUuIByNZnehnXmCecYZqMX6 aKoCQN9PAKI23gCbrseEbjkdQo6dXZdWWM4rF2lc4marHa8v2wJa9QNmpE9AtPTkKWsCzq 7sDO6ROjxS1/tKHoDmtIRWTZiUMGnsOqmGSztfwqFEZCwgqTqbgGneZFf6uwvA== 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=1708008623; 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=J8AHubML11UQLMzCvkuKeAzbIPp5vZMAkgu7lFP42vI=; b=PSq0nGiu50gKLaQUWCK71eDaNvOlGONtVWBa8a/F5wSVw+1Z2cJXlIQFrlbcoz/R9cqN6K 9wMZbTbPZ+Lmx2vG/c59RBWYrBFuv4894H95D6fSb+c0MxOVKtefKM/3i3X1FesH8OB0XU bN7e6u1IuexHI3I0ujTSZSgzjLuAmkI97QBWrDXlstvL5T2/FQRr9LSlm3BpwoqO5mdHex Y/0SFIqzRYtpp9xlReJWKJFzvD8DMKjqgV9veQHSK15uomTeGz++Mjx3azEC5ZSl9/sMbD HCeGr38qRT6X+cQaF2GHLXd35F3AOYYsR+6KsAWUTE3L6au7zEfscwZazDFdsQ== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TbHzg4wkvz16ND; Thu, 15 Feb 2024 14:50:23 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailauth.nyi.internal (Postfix) with ESMTP id 88DB527C0064; Thu, 15 Feb 2024 09:50:23 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 15 Feb 2024 09:50:23 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvddtgdejtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffoffkjghfgggtgfesthekmhdtredtjeenucfhrhhomheprfhhihhl ihhpucfrrggvphhsuceophhhihhlihhpsehfrhgvvggsshgurdhorhhgqeenucggtffrrg htthgvrhhnpeefueekkeeiudeileduteehtdeiveeufeelheetgfekiefgleefieegfeek fefgueenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphdomhgvshhmthhprghu thhhphgvrhhsohhnrghlihhthidqudduieeivdeivdegkedqvdefhedukedttdekqdhphh hilhhipheppehfrhgvvggsshgurdhorhhgsehtrhhouhgslhgvrdhish X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 15 Feb 2024 09:50:21 -0500 (EST) From: Philip Paeps To: Shawn Webb Cc: Ronald Klop , dev-commits-src-main@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org Subject: Re: git: 9c59988175ff - main - bsdinstall: prefer HTTP Date: Thu, 15 Feb 2024 22:50:19 +0800 X-Mailer: MailMate (1.14r6016) Message-ID: <4A6EC239-4B9B-442C-ACFB-8F99A951630A@freebsd.org> In-Reply-To: References: <901819076.6938.1708005969197@localhost> <7B54789B-90DD-4A85-8E2B-84E13DAE54B5@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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2024-02-15 22:40:19 (+0800), Shawn Webb wrote: > On Thu, Feb 15, 2024 at 10:28:53PM +0800, Philip Paeps wrote: >> On 2024-02-15 22:06:09 (+0800), Ronald Klop wrote: >>> Shouldn’t this be >>> >>> https://download.freebsd.org/ >> >> No. >> >> For hysterical raisins, FTP sites conventionally put FreeBSD under >> /pub/FreeBSD. HTTP mirrors (including http://ftp.FreeBSD.org) have >> followed >> that convention. >> >> http://download.FreeBSD.org is a more recent addition, and it has >> FreeBSD >> under /, not under /pub/FreeBSD. We could teach nginx to put it >> under >> /pub/FreeBSD too, but spelling it ftp.FreeBSD.org was less work. > > I'm curious to learn why you chose http:// rather than https://. Because https:// only adds work. And work is heat. bsdinstall uses the MANIFEST to confirm integrity. If your bsdinstall and MANIFEST are from a trustworthy source, anything downloaded over http:// will be trustworthy. Just as trustworthy, in fact, as anything downloaded over ftp://. Philip From nobody Thu Feb 15 14:55:03 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 4TbJ570ZMpz5467g for ; Thu, 15 Feb 2024 14:55:07 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (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 4TbJ5666Fnz4JKm for ; Thu, 15 Feb 2024 14:55:06 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-7c4359c5d33so34801439f.1 for ; Thu, 15 Feb 2024 06:55:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1708008905; x=1708613705; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=byQ9YHgVa5zpxNbKPTZU0lbyEdYDsjV1usNQccpTCAg=; b=EtKNAVaVDJ9hFdKWRTqEcacB4VsH1AlRn3wok2rwC7UONaevFJO4TJPskqm6SeUG5W ySTy0o0zuypPnMgsBvpHo9cgSSGqxseKVmtMbzNohpYGKdngKa+UckNnwTjMR7uMmVoe 7ouhvWbZwOtzy/9AFNheNf298N2vLUhxX5/toRWyDErzLTdU90g3pqfhSrYEcQFABRnH PbtS8gPBOoQtGLbFAOikZhoZA603CDDt1iTu+ahhk1l+rGnyK3UuxZ9m3WOA3qcP6mVA ekXhwFyd6d5N98RGZm3p1sqZ0L8OyGu0hYGJhik/nQ2wrIGCua03Jq6OR6dfYbNOyAGX 02UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708008905; x=1708613705; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=byQ9YHgVa5zpxNbKPTZU0lbyEdYDsjV1usNQccpTCAg=; b=KuO/Ctk4e/K7Q6lrMsAl+u2Rk9OZIdeX9R2ZeMbjK/6s9MN5/9ffUrM9j4Z5xr/OzI OTGHYdr8PBqHgxg55VRhfeOKkx24TKAiyQr+HHYsYgl8O2SagauTWEs1/pa6vOmG2W2x gFiabp2XxtQ3pMEIJ/ATr2HHNvZI1Og37SvjrWIm7U+zOHxKLEExvmOQG31aRqfYcKUy P978AlcYM+SGtozfUcwAn8e+jC7Iujsgoj5YZg63wi9XmGf2ZtzllAxOXAMln262dqEn CnDmEMKgwbtYlAtfppBYaGquqp9bokFa5dwAoMkqTVjQBAERGNilmzAGOq1n30Lm+SS1 O/Mw== X-Forwarded-Encrypted: i=1; AJvYcCVbVLZhcqDn5URjfaw5UXyP2bmKHpejw1kb1L5kkQbytc7FrV2V+Pbf1l0j84q1J+yvNEECtt5UNuw9YG7hjDL/RGKCYc1MQRtmWiG23hioJA== X-Gm-Message-State: AOJu0YzhlmGQjPDLKc08HTq2iHMcpqJk6i2RIRt+dkK+Myz3Pm30B3gh v89qcJUXROeqV6vzCmQ4ntOWyg1DCGsqRk+HwDfxk2hxzP39vnlgH5DTG+OQil0= X-Google-Smtp-Source: AGHT+IGR8jLttfRyLWQyfr4g4mUV+A14esEibBdABglU7Zw9r90WdvxJ3z7+h0DWhopf6ghMwxmGcA== X-Received: by 2002:a5e:9901:0:b0:7c4:7a26:60fd with SMTP id t1-20020a5e9901000000b007c47a2660fdmr2148715ioj.16.1708008905505; Thu, 15 Feb 2024 06:55:05 -0800 (PST) Received: from mutt-hbsd (174-24-72-211.clsp.qwest.net. [174.24.72.211]) by smtp.gmail.com with ESMTPSA id v27-20020a056602059b00b007c407999103sm350057iox.53.2024.02.15.06.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 06:55:04 -0800 (PST) Date: Thu, 15 Feb 2024 14:55:03 +0000 From: Shawn Webb To: Philip Paeps Cc: Ronald Klop , dev-commits-src-main@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org Subject: Re: git: 9c59988175ff - main - bsdinstall: prefer HTTP Message-ID: X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD 15.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <901819076.6938.1708005969197@localhost> <7B54789B-90DD-4A85-8E2B-84E13DAE54B5@freebsd.org> <4A6EC239-4B9B-442C-ACFB-8F99A951630A@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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="evakntyqaitg5ijt" Content-Disposition: inline In-Reply-To: <4A6EC239-4B9B-442C-ACFB-8F99A951630A@freebsd.org> X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4TbJ5666Fnz4JKm X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --evakntyqaitg5ijt Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 15, 2024 at 10:50:19PM +0800, Philip Paeps wrote: > On 2024-02-15 22:40:19 (+0800), Shawn Webb wrote: > > On Thu, Feb 15, 2024 at 10:28:53PM +0800, Philip Paeps wrote: > > > On 2024-02-15 22:06:09 (+0800), Ronald Klop wrote: > > > > Shouldn=E2=80=99t this be > > > >=20 > > > > https://download.freebsd.org/ > > >=20 > > > No. > > >=20 > > > For hysterical raisins, FTP sites conventionally put FreeBSD under > > > /pub/FreeBSD. HTTP mirrors (including http://ftp.FreeBSD.org) have > > > followed > > > that convention. > > >=20 > > > http://download.FreeBSD.org is a more recent addition, and it has > > > FreeBSD > > > under /, not under /pub/FreeBSD. We could teach nginx to put it > > > under > > > /pub/FreeBSD too, but spelling it ftp.FreeBSD.org was less work. > >=20 > > I'm curious to learn why you chose http:// rather than https://. >=20 > Because https:// only adds work. And work is heat. >=20 > bsdinstall uses the MANIFEST to confirm integrity. >=20 > If your bsdinstall and MANIFEST are from a trustworthy source, anything > downloaded over http:// will be trustworthy. Just as trustworthy, in fac= t, > as anything downloaded over ftp://. There is the problem of metadata leakage, which HTTPS helps to address (though not completely.) Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --evakntyqaitg5ijt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmXOJbwACgkQ/y5nonf4 4fok6A//XmTNIc+pYhy2zWAAIHXGrdlqCENi+GI/IBTqXQDF4YtdPLw6TrjOBz15 jzWTt6mdrKpqDSJkFEU7z/ctr3LIOi5dMQ2+netXABjwQgg1we4Aq1M7IHgjEokA ug/0Vv0TuwKgAA956ImDN6ia1go+KNsUBg+DnkHiwgqSOxTHdJKLzdzhHJAJBZcP WI7kC5LTNUUfAqNQsnJt/RPu1beRpvB+SoxMXDsMyY9s6Ei8D119kIaSwWLughbK pqars+YxtAW5SULNpk8JNQzZrkZirlR2Rmvn2VVe4kV53KyIM7wvl1tGsbkfr2w2 x3+EDf2Xl5auFMEVXC2WX7lSL2S1A8wxjWynoP4oeflc+TdY1bUuvMdhvbL/qd6r dZmlBdvaz0POVKPv+w587nvk5eXnKuJj5L4a6t32kzDBsc3t/3vX9SV1W5WO2jxJ J0/YArMxHeZyPMkFRf8Vcpq1MvzZ1EPWR4vWsyvOt1e3J/UcAmxgjTV0dndyR9TJ wXEzqsOilEMMkgAVJdFhWvwIiw0GtkZaaj4wuoeATB6TYgDxPmYExcu0jP7xlVJv AB/rMZXsRqoA4JvrQcKyDLuo0HIuOugogAS3rQR8h220ZmGsYfKi+o4zGTIruUO+ Ux1uywAZpKm3n9cVnGVaySz7LsN0qw6T3KvSMef+5oa9Xp9ktFg= =wD1R -----END PGP SIGNATURE----- --evakntyqaitg5ijt-- From nobody Thu Feb 15 15:01: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 4TbJDV39Bsz54rSg; Thu, 15 Feb 2024 15:01: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 4TbJDV2hlGz4K6l; Thu, 15 Feb 2024 15:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708009290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a11FdLyByk8qkORcxpR4D1+4iUyv9nStMAAQQf7waYQ=; b=GNeQIY//NGGWevUFOYyxRoYl1QwJ1zJJy9X8raTwjXRVXWDbOWsJGtMX8b0jZh1/4SjAWJ QN5QN+/L0A8CFQptQ/C1Yje3x9AxgQMw6DLim9ADG8iBStXRGjA28zLwA2aaeRkCUAKKX9 THmKHFeOYYxVpKoFQOxnWUm1Z0WFF07tJXKF2UqyOqiJG33VOvxeKGbpmkVOBs2qhztVpr F5dLthMp5/MBs/SACF7HJ4gkoHvj+7VtMgSGTVIbtB1gaZxCfrYd8hGvcwhkQPu4m9Dn+z NxlY1B15IaH/MqY6kV+zsJvzAvkk+JYBoj8b2IWdZ/43CMZ2JyqwJ/RPXeeo0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708009290; a=rsa-sha256; cv=none; b=b/oaCjM5jWXTGiLLd8uO2BZv9Ir3JGKcY22NtHpJ0ltR0aLi8mVeWJOIXgc1Q8GjCXRjOU O+s/JlbeoRvJXWTHhieIC3oBHDoEecW5YH5Q9N5N/gmd2d+lv9bjGAZnW09q0aBnr+uq+t 90McGLLMUdJKpjSRrWb75m2Xhy8FM1vrNJc18/ZdMWLU5AnLfOag0xWKNFVTixGfKljF8v YDlDvWydouQwdXJ38EUG6fX0RwPYlvAOitzuzQm4MA4fG4J6MmWHs1rsnetRFOp3vwxuDN oyq9kHh5hOpqjJQbq+Bz2XJffdYAenJOZuSgnmirGoNMg32RGG9jtE+/FObUvw== 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=1708009290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a11FdLyByk8qkORcxpR4D1+4iUyv9nStMAAQQf7waYQ=; b=jfTh7Njdc7iGOZf4kK2PpukWRDMq4pTF2LZxE82NQyPnwra5TgMnnilLVK5o+3lS9ExOrZ LqKquYB4A5rE/qnejr8nsxmxJe+U2fp2iOo3uSkJaAJu0AvZ65Cl+puI3tJVL6xDJcHLnv f0AUZ9HrmX9N5+tmoQ40l55bWhCliaBAzsBjF8pXszYOC5gpuIhGmLca5TMJcEbZ4ft9Am 6xSl41PPXulkABj5K3Wzpt4vBswQ6VFL9c8cvw3sWVhGTKfxDq67G6/jkBW67pdkSEOPFh VIE6BBuKBdfcsyweD61gNGJLJfsKEEIz6t+K0AcTu9BuzNgOfUg/KrDFkfeMJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbJDV1fy2zmS8; Thu, 15 Feb 2024 15:01: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 41FF1Urf011607; Thu, 15 Feb 2024 15:01:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FF1UPd011604; Thu, 15 Feb 2024 15:01:30 GMT (envelope-from git) Date: Thu, 15 Feb 2024 15:01:30 GMT Message-Id: <202402151501.41FF1UPd011604@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: 2c5ff9118c1e - main - rights.4: Remove sentence implying that rights are a mask 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: Sender: owner-dev-commits-src-main@freebsd.org 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c5ff9118c1ed8483a9477db3595b1d154615e2c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2c5ff9118c1ed8483a9477db3595b1d154615e2c commit 2c5ff9118c1ed8483a9477db3595b1d154615e2c Author: Ed Maste AuthorDate: 2024-02-15 14:55:39 +0000 Commit: Ed Maste CommitDate: 2024-02-15 15:00:52 +0000 rights.4: Remove sentence implying that rights are a mask Capability rights passed to cap_rights_* are (now) not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). Remove sentence that implied rights are masks. We already have the sentence "The complete list of capability rights is provided below" so listing the rights without an introductory sentence seems fine. PR: 277057 --- share/man/man4/rights.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index b9fb5e15cf4f..770f9ea5c979 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -68,7 +68,6 @@ The .Xr cap_rights_init 3 family of functions should be used to manage the structure. .Sh RIGHTS -The following rights may be specified in a rights mask: .Bl -tag -width CAP_RENAMEAT_SOURCE .It Dv CAP_ACCEPT Permit From nobody Thu Feb 15 18:49:03 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 4TbPH41GKxz59t9V; Thu, 15 Feb 2024 18:49: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 4TbPH40h5Kz4tQk; Thu, 15 Feb 2024 18:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708022944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6BLEUVc3EBLL4eAqJoaB6g8EaY2MJbtWsvTHRGCHAM=; b=QfsprVFKmfwX1EsGafrJI1ah4rLOgDX5wkDhcr//Us1aDCNuJBsyZzNUnhNphJZqGDe4Fk ZxE6pnOZVTjmVozlRo6N8TIpy3IUiNngoRBQYREYrN8XcvLk2+j8VbTCvb+YcW4O4MlRnk yVW4ORUsJKuLjkjJCfb5J4tIq9WG5MurQJ36udsoq8wCHXSM+RxeNDREc2CquCxy/VD+pi az7khYgI7ggCbEikDjvZ8+6O+hWBmrDLmNZGQPfu0jSv3QYjMcg7nqIPu3ZsuXyxK64+BJ w2uqkAk3MhJgkI0OALmzggme4JFl2cD1GLzY5hrUIwaIIhvdJGrqwOamHBcj7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708022944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6BLEUVc3EBLL4eAqJoaB6g8EaY2MJbtWsvTHRGCHAM=; b=HBoMZ9Xje8XcNzJtbGWYaik4j1qfl6GZIhUD5TMTsUcN5jbHMN/kYd5NIsEoMP8ha0DsxW xGRl249+2Xfx4FigkEJ4dKcrGBdOpOD4NrFrIWGSkxf78EMfdBIOtLmtLQm/3TEtA4IjEN gA4XwKapH9Ff2pGBwAaoHJbR5Jg0iS4flZo7Y51T81FBxAkUMVCPGRCfs8myRhvGlOXPtj vhswkiat+QIkavs4Ntfmo6eUi2hLenNlVNGj9EZ3CEdOzJ+1HBpJgkeHBtNWIyYx+i8Awm x+dA/8wAhp4E0l/0EwiCoMNNM+fGU2qKYfVHuMs0UMBiOWviWHU/bD6bqOgRUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708022944; a=rsa-sha256; cv=none; b=r83tSfnrxiYGssxLlLq45iekj7kwo+hZpCRWn8P/mKfzFZxjFIrY4Pu1i7sZm8aaGIr+nZ Tgx+RwMsWyYeuP47130uykw513vznVxvSPAaOgZfkIzTAhTtpoD4HcNk4zTjYIoasd342t oYOetStE3fLU8tkCBRFjeAzl4rpDi6pdsEEIixvW0rcPCoCYTHXVaX/SYmRwujF0uL6Jkg a4L9BLof5nkk1qsgiYrt4F++u8eNw7s5IbPuUgAkQo7FZ+vOs9D3PNkK8aVKg3+6I+BPDw CxV4zA0IjtPjbtFHgr8FtDbZqPVt7AC5ZF8o2e+S9ZpcAjXTTmvstPqBw0tpaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbPH36rsHzsrq; Thu, 15 Feb 2024 18:49: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 41FIn3IE085008; Thu, 15 Feb 2024 18:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FIn3dm085005; Thu, 15 Feb 2024 18:49:03 GMT (envelope-from git) Date: Thu, 15 Feb 2024 18:49:03 GMT Message-Id: <202402151849.41FIn3dm085005@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: abe8379b4f24 - main - sockets: repair wakeup of accept(2) by shutdown(2) 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: Sender: owner-dev-commits-src-main@freebsd.org 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abe8379b4f244aa12f13a603124eb6b41faabec5 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=abe8379b4f244aa12f13a603124eb6b41faabec5 commit abe8379b4f244aa12f13a603124eb6b41faabec5 Author: Gleb Smirnoff AuthorDate: 2024-02-15 18:48:44 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-15 18:48:44 +0000 sockets: repair wakeup of accept(2) by shutdown(2) That was lost in transition from one-for-all soshutdown() to protocol specific methods. Only protocols that listen(2) were affected. This is not a documented or specified feature, but some software relies on it. At least the FreeSWITCH telephony software uses this behavior on PF_INET/SOCK_STREAM. Fixes: 5bba2728079ed4da33f727dbc2b6ae1de02ba897 --- sys/kern/uipc_usrreq.c | 17 ++++++++--------- sys/netinet/sctp_usrreq.c | 11 +++++------ sys/netinet/tcp_usrreq.c | 11 +++++------ 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index db226a16674e..20facd9b0a44 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1669,7 +1669,14 @@ uipc_shutdown(struct socket *so, enum shutdown_how how) int error; SOCK_LOCK(so); - if ((so->so_state & + if (SOLISTENING(so)) { + if (how != SHUT_WR) { + so->so_error = ECONNABORTED; + solisten_wakeup(so); /* unlocks so */ + } else + SOCK_UNLOCK(so); + return (ENOTCONN); + } else if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) == 0) { /* * POSIX mandates us to just return ENOTCONN when shutdown(2) is @@ -1691,14 +1698,6 @@ uipc_shutdown(struct socket *so, enum shutdown_how how) } } else error = 0; - if (SOLISTENING(so)) { - if (how != SHUT_WR) { - so->so_error = ECONNABORTED; - solisten_wakeup(so); /* unlocks so */ - } else - SOCK_UNLOCK(so); - return (0); - } SOCK_UNLOCK(so); switch (how) { diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 70fe021be766..3b0da87edce3 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -794,18 +794,17 @@ sctp_shutdown(struct socket *so, enum shutdown_how how) return (EOPNOTSUPP); SOCK_LOCK(so); - if ((so->so_state & - (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) == 0) { - SOCK_UNLOCK(so); - return (ENOTCONN); - } if (SOLISTENING(so)) { if (how != SHUT_WR) { so->so_error = ECONNABORTED; solisten_wakeup(so); /* unlocks so */ } else SOCK_UNLOCK(so); - return (0); + return (ENOTCONN); + } else if ((so->so_state & + (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) == 0) { + SOCK_UNLOCK(so); + return (ENOTCONN); } SOCK_UNLOCK(so); diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index a283d308801f..9bb953617d99 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -807,18 +807,17 @@ tcp_usr_shutdown(struct socket *so, enum shutdown_how how) int error = 0; SOCK_LOCK(so); - if ((so->so_state & - (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) == 0) { - SOCK_UNLOCK(so); - return (ENOTCONN); - } if (SOLISTENING(so)) { if (how != SHUT_WR) { so->so_error = ECONNABORTED; solisten_wakeup(so); /* unlocks so */ } else SOCK_UNLOCK(so); - return (0); + return (ENOTCONN); + } else if ((so->so_state & + (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) == 0) { + SOCK_UNLOCK(so); + return (ENOTCONN); } SOCK_UNLOCK(so); From nobody Thu Feb 15 18:49: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 4TbPH52ZG0z59tCj; Thu, 15 Feb 2024 18:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbPH51wBHz4tPH; Thu, 15 Feb 2024 18:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708022945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UvZHnjjT7IWwHB+s1O1C70AsJpQRqGfYDdxgUxSEg9k=; b=I6YLwxnTDhq+HaQxsU8NOTtN5vB+YX4aih/2+lh3nwRpJT6rNaEoPdyvqSsaD67lUvSUi8 o78TSPBsRL05/Km3jdCR2T/mUszX5V6hcOSpprsAZl+k8F1pfBp8nTrCEhm+i5crteRj37 PFihS12CAr23LRFwN0Beok3y+rvZAzjJmY/Pcrhcbp6OXHchRRh11QZMB2C1qTVD0ojqYK zHPBwv7vIacMRKUIda970ZtaUFItHYk3viG/8R1WZJgNvA9h8R6XpM0DSuYxMvrRdQyWC+ vOcPBeaN6GIbGt3do337fTGQY1zBSkfcMR2MnZjeyInhYqMAKYTiZ2xw5hnHKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708022945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UvZHnjjT7IWwHB+s1O1C70AsJpQRqGfYDdxgUxSEg9k=; b=W2UbPnlkxZUWzwm2loHJENyiwWoMHNdOX/CQFGkfk2tSCuDarB1t2vifWINI+VCCpvbgjf fQHc6uqSfur4w85VPp57XRUroUjBijK5C1ZKdfbSol3RnnFkUNkFSTMm9nOL7+/kloq/WU H5fScxbXnq1R3GzMZVqAUMai0NzbxXvJKdYPIxqkI7OLd/D5FJhq5WN3e/9YCHmGcEleVp 982e78zgMXKNAwo5jYXVD3HvpgitoLRvBta8rEMxzK5e5ij4YUpkCXfEmNRvaMUIyTPCsc fqOU4Fx0MyUEpjFnO8OAaE5kOzK+lap09QAWNsrIW8+T5jz7FIpL1ok6PJnfJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708022945; a=rsa-sha256; cv=none; b=KMCJPVpJ4HY56/KcducjThKeOdeReTUwz5biPKblhqR/ZunlOiSEll3USsCvzGUQdwDznS ZVr4S7zRaEXP/IPpP8xVvshq5C+og3B0aaXrZSfDk12kHAUbcWRTnWC75/p8xX0jxAmkEy pkXRtMp4Y6GdGZHMn3x1wUYsRcalhmo8WSgSVxX2bSZBHoNjpcI5nLCAah2lkq8vgDqicJ z/YG/8ESmeMB2Jf2O0A4c8ICU845sbYaegZkdLuwYCiWyrSN5qsIvtDnn98ap4yZUUeAVN 2FAuFUMn1eNgqGNU7O3gT+Xv0kUj5lUXSSWF5iXSXgFYllI9F1/+K8kH5mYaSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbPH50yYGztBl; Thu, 15 Feb 2024 18:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FIn5qV085047; Thu, 15 Feb 2024 18:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FIn5q6085044; Thu, 15 Feb 2024 18:49:05 GMT (envelope-from git) Date: Thu, 15 Feb 2024 18:49:05 GMT Message-Id: <202402151849.41FIn5q6085044@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: bc9107f8c405 - main - socket tests: add listener_wakeup 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: Sender: owner-dev-commits-src-main@freebsd.org 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc9107f8c405ce83f47abc915ae95baadb770d6d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=bc9107f8c405ce83f47abc915ae95baadb770d6d commit bc9107f8c405ce83f47abc915ae95baadb770d6d Author: Gleb Smirnoff AuthorDate: 2024-02-15 18:48:44 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-15 18:48:44 +0000 socket tests: add listener_wakeup This test runs several scenarios when sleep(9) on a listen(2)ing socket is interrupted by shutdown(2) or by close(2). What should happen in that case is not specified, neither is documented. However, there is certain behavior that we have and this test makes sure it is preserved. There is software that relies on it, see bug 227259. This test is based on submission with this bug, bugzilla attachment 192260. The test checks TCP and unix(4) stream socket behavior and SCTP can be added easily if needed. The test passes on FreeBSD 11 to 15. It won't pass on FreeBSD 10, although the wakeup behavior of shutdown(2) is the same, but it doesn't return error. PR: 227259 --- tests/sys/kern/Makefile | 2 + tests/sys/kern/listener_wakeup.c | 293 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 295 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 5a7e27319ddb..e54a43b5fd83 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -21,6 +21,7 @@ ATF_TESTS_C+= kill_zombie .if ${MK_OPENSSL} != "no" ATF_TESTS_C+= ktls_test .endif +ATF_TESTS_C+= listener_wakeup ATF_TESTS_C+= module_test ATF_TESTS_C+= ptrace_test TEST_METADATA.ptrace_test+= timeout="15" @@ -79,6 +80,7 @@ LIBADD.unix_seqpacket_test+= pthread LIBADD.kcov+= pthread CFLAGS.ktls_test+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD.ktls_test+= crypto util +LIBADD.listener_wakeup+= pthread LIBADD.shutdown_dgram+= pthread LIBADD.socket_msg_waitall+= pthread LIBADD.sendfile_helper+= pthread diff --git a/tests/sys/kern/listener_wakeup.c b/tests/sys/kern/listener_wakeup.c new file mode 100644 index 000000000000..39e8596c335e --- /dev/null +++ b/tests/sys/kern/listener_wakeup.c @@ -0,0 +1,293 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Gleb Smirnoff + * Copyright (c) 2018 Rozhuk Ivan + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * This test runs several scenarios when sleep(9) on a listen(2)ing socket is + * interrupted by shutdown(2) or by close(2). What should happen in that case + * is not specified, neither is documented. However, there is certain behavior + * that we have and this test makes sure it is preserved. The known software + * to rely on the behavior is FreeSWITCH telephony software (see bug 227259). + * There might be more. This test is based on submission with the bug, bugzilla + * attachment 192260. + */ + +static const struct test { + enum { + SLEEP_ACCEPT = 0, + SLEEP_SELECT, + SLEEP_POLL, + SLEEP_KQUEUE, + NSLEEP + } sleep; + enum { + WAKEUP_SHUTDOWN, + WAKEUP_CLOSE, + } wakeup; + enum { + AFTER, + BEFORE, + } when; + bool nonblock; + int result; +} tests[] = { + { SLEEP_ACCEPT, WAKEUP_SHUTDOWN, AFTER, false, ECONNABORTED }, + { SLEEP_SELECT, WAKEUP_SHUTDOWN, AFTER, false, 0 }, + { SLEEP_POLL, WAKEUP_SHUTDOWN, AFTER, false, 0 }, + { SLEEP_KQUEUE, WAKEUP_SHUTDOWN, AFTER, false, 0 }, + { SLEEP_ACCEPT, WAKEUP_CLOSE, AFTER, false, ETIMEDOUT }, + { SLEEP_SELECT, WAKEUP_CLOSE, AFTER, false, EBADF }, + { SLEEP_POLL, WAKEUP_CLOSE, AFTER, false, 0 }, + { SLEEP_KQUEUE, WAKEUP_CLOSE, AFTER, false, 0 }, + { SLEEP_ACCEPT, WAKEUP_SHUTDOWN, BEFORE, false, ECONNABORTED }, + { SLEEP_SELECT, WAKEUP_SHUTDOWN, BEFORE, false, 0 }, + { SLEEP_POLL, WAKEUP_SHUTDOWN, BEFORE, false, 0 }, + { SLEEP_KQUEUE, WAKEUP_SHUTDOWN, BEFORE, false, 0 }, + { SLEEP_SELECT, WAKEUP_SHUTDOWN, AFTER, true, 0 }, + { SLEEP_POLL, WAKEUP_SHUTDOWN, AFTER, true, 0 }, + { SLEEP_KQUEUE, WAKEUP_SHUTDOWN, AFTER, true, 0 }, + { SLEEP_SELECT, WAKEUP_SHUTDOWN, BEFORE, true, 0 }, + { SLEEP_POLL, WAKEUP_SHUTDOWN, BEFORE, true, 0 }, + { SLEEP_KQUEUE, WAKEUP_SHUTDOWN, BEFORE, true, 0 }, +}; + +static int +tcp_listen(void) +{ + struct sockaddr_in sin = { + .sin_family = PF_INET, + .sin_len = sizeof(sin), + }; + int s; + + ATF_REQUIRE((s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) != -1); + ATF_REQUIRE(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); + ATF_REQUIRE(listen(s, -1) == 0); + + return (s); +} + +static int +unix_listen(void) +{ + struct sockaddr_un sun = { + .sun_family = AF_UNIX, + .sun_len = sizeof(sun), + .sun_path = "listen-shutdown-test.sock", + }; + int s; + + ATF_REQUIRE((s = socket(PF_UNIX, SOCK_STREAM, 0)) != -1); + (void)unlink(sun.sun_path); + ATF_REQUIRE(bind(s, (struct sockaddr *)&sun, sizeof(sun)) == 0); + ATF_REQUIRE(listen(s, -1) == 0); + + return (s); +} + +static const struct proto { + const char *name; + int (*listen)(void); +} protos[] = { + { "PF_INET", tcp_listen }, + { "PF_UNIX", unix_listen }, +}; + +static int +sleep_accept(int s) +{ + int rv; + + rv = accept(s, NULL, NULL); + + return (rv == -1 ? errno : 0); +} + +static int +sleep_select(int s) +{ + fd_set fds; + int rv; + + FD_ZERO(&fds); + FD_SET(s, &fds); + rv = select(s + 1, &fds, &fds, &fds, NULL); + + return (rv == -1 ? errno : 0); +} + +static int +sleep_poll(int s) +{ + struct pollfd fds = { + .fd = s, + .events = (POLLIN | POLLPRI | POLLRDNORM | POLLWRNORM | + POLLRDBAND | POLLWRBAND), + .revents = 0, + }; + int rv; + + rv = poll(&fds, 1, INFTIM); + + return (rv == -1 ? errno : 0); +} + +static int +sleep_kqueue(int s) +{ + struct kevent kev; + int kq, error; + + ATF_REQUIRE((kq = kqueue()) != -1); + EV_SET(&kev, s, EVFILT_READ, EV_ADD, 0, 0, NULL); + if (kevent(kq, &kev, 1, NULL, 0, NULL) == -1) { + error = errno; + } else { + if (kev.flags & EV_ERROR) + error = (int)kev.data; + else + error = 0; + } + ATF_REQUIRE(close(kq) == 0); + + return (error); +} + +typedef int sleep_syscall_t(int); +static sleep_syscall_t *sleep_syscalls[NSLEEP] = { + [SLEEP_ACCEPT] = sleep_accept, + [SLEEP_SELECT] = sleep_select, + [SLEEP_POLL] = sleep_poll, + [SLEEP_KQUEUE] = sleep_kqueue, +}; + +struct test_ctx { + struct test const *test; + int s; + int result; +}; + +static void * +sleep_syscall_thread(void *data) { + struct test_ctx *ctx = data; + + ctx->result = sleep_syscalls[ctx->test->sleep](ctx->s); + + return (NULL); +} + +static void +run_tests(const struct proto *pr) +{ + pthread_t tid; + struct timespec ts; + int error; + + for (u_int i = 0; i < nitems(tests); i ++) { + struct test const *t = &tests[i]; + struct test_ctx ctx = { + .test = t, + /* Note: tested syscalls don't return this. */ + .result = ETIMEDOUT, + }; + + ctx.s = pr->listen(); + if (t->nonblock) + ATF_REQUIRE(fcntl(ctx.s, F_SETFL, O_NONBLOCK) != -1); + + if (t->when == AFTER) { + ATF_REQUIRE(pthread_create(&tid, NULL, + sleep_syscall_thread, &ctx) == 0); + usleep(100000); + } + + switch (t->wakeup) { + case WAKEUP_SHUTDOWN: + ATF_REQUIRE(shutdown(ctx.s, SHUT_RDWR) == -1); + ATF_REQUIRE(errno == ENOTCONN); + break; + case WAKEUP_CLOSE: + ATF_REQUIRE(close(ctx.s) == 0); + break; + } + + if (t->when == BEFORE) { + ATF_REQUIRE(pthread_create(&tid, NULL, + sleep_syscall_thread, &ctx) == 0); + usleep(100000); + } + + clock_gettime(CLOCK_REALTIME, &ts); + ts.tv_sec++; + if ((error = pthread_timedjoin_np(tid, NULL, &ts)) != 0) { + ATF_REQUIRE(pthread_cancel(tid) == 0); + ATF_REQUIRE(error == ETIMEDOUT); + ATF_REQUIRE(ctx.result == ETIMEDOUT); + } + + ATF_REQUIRE_MSG(ctx.result == t->result, + "proto %s sleeping syscall #%d wakeup #%d nb %d, " + "expected %d, got %d", pr->name, t->sleep, t->wakeup, + t->nonblock, t->result, ctx.result); + + if (t->wakeup == WAKEUP_SHUTDOWN) + ATF_REQUIRE(close(ctx.s) == 0); + } +} + +ATF_TC_WITHOUT_HEAD(all); +ATF_TC_BODY(all, tc) +{ + for (u_int f = 0; f < nitems(protos); f++) + run_tests(&protos[f]); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, all); + + return (atf_no_error()); +} From nobody Thu Feb 15 19:24: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 4TbQ3s1PMPz59ycr; Thu, 15 Feb 2024 19:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbQ3s0gfBz42L4; Thu, 15 Feb 2024 19:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708025065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ocxct8d+zOdyRvORFyGbJ3jc0+OUbvA703NmJ9TNqFs=; b=c/w0AxKcvYDHTcWRb+V/5bGF0seBcL3h4vHOueJ4PpM4Rg/Vtu4gshyZK+M+Jc4GzlKoBP 7yLgr2YBP7nPcoWWqfT1wu6sLXSM41DAVAV0DlcNJbkf2tEGoBUNSWrZeZ5E6iecdtWw83 qoaVPvuWcDo89imuGDUDP1tKTjET6FvewfTqci37GF5mVUykRQTWU2ENMfMCDt/9LG2m+F jU5Kg62uKM+dneL54OZmpvEnVSgk2oZ67ZigQYK0IshX/Q/x5XG7Ee28qVJ5qYjPbwyXd0 ypYts9cXlQ7xvJHvaxqP3fW/V4zQH55TgLE/2NcWvfrTYOIvksg6h6PRtVJNkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708025065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ocxct8d+zOdyRvORFyGbJ3jc0+OUbvA703NmJ9TNqFs=; b=fRm1fVOBPvEK89QGADO+0tb5pjMce9g/ijb5JBIRK9VCwhBqOnZgb2gp3zAPIYc37fdgLg CWgTEJ40lOEPtLYD2+MlnHJEV8Gd/2UrJvuuqz2r1XOFtPPpDEdOeX4blDDQ9hEXkEGgcw vsTMvTdt+LzLHkIW83/vcdTJnizyN1430UMmA8fgE5qX5z4K00ZVyqHRvPJH2yCKwfKKJv wpuNz5/XwsIQAOoW5NtgqMwGhnr68FWv8ZNXdIqaVqQ0EjnDA14hRxNqK9D58U+JVd85kp pAe4gHWJUE6mPEJjbYG93wAmDUupSUlOhGqPPNAZrSoSJBPGjhu0yKmH4N2/dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708025065; a=rsa-sha256; cv=none; b=H3VwqEktiQqg3gxxzyglrfPU0VdpHIT8GehGj03DE+d8aRFISjnxVuVv88/22q5GCTSUgh 9HrER6xTKgTqHSrBXc2E6ObuiDgPC/gOeLdp+SQ6T9T3244zCiemk3hjg9BDep+b/erHlx isxowLNMpl2d3qHvNMCrayn11VeOSZa3j8JZ9kBPEko3D2Spi6eAsaEFeNKbsyjHhHgChX UOHLIl4PU+fJp4w6z4nUxjVyQQH4K52ySa1FAjnh9XEDdjefAkB8NyFecwBcqj/nTli0mL WgtEN0EvL3ZOnvG3uJXOsHleNghVOY1pycwe/87Q4QhEjC7zb6TIoqu8MZ8Y5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbQ3r6qTtzv0N; Thu, 15 Feb 2024 19:24: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 41FJOOox052288; Thu, 15 Feb 2024 19:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FJOOUG052285; Thu, 15 Feb 2024 19:24:24 GMT (envelope-from git) Date: Thu, 15 Feb 2024 19:24:24 GMT Message-Id: <202402151924.41FJOOUG052285@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: 53670ee165f4 - main - psci: Add FDT node status 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: Sender: owner-dev-commits-src-main@freebsd.org 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53670ee165f428fd7d27b9e2d1efb4ab2c9caec6 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=53670ee165f428fd7d27b9e2d1efb4ab2c9caec6 commit 53670ee165f428fd7d27b9e2d1efb4ab2c9caec6 Author: Stephen J. Kiernan AuthorDate: 2024-02-15 16:57:32 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-02-15 19:24:15 +0000 psci: Add FDT node status check Consider the PSCI missing if the FDT node status says it is not okay. Reviewed by: andrew Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D43920 --- sys/dev/psci/psci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/psci/psci.c b/sys/dev/psci/psci.c index 46d7a2f07181..0c8f094e0037 100644 --- a/sys/dev/psci/psci.c +++ b/sys/dev/psci/psci.c @@ -386,6 +386,9 @@ psci_fdt_callfn(psci_callfn_t *callfn) return (PSCI_MISSING); } + if (!ofw_bus_node_status_okay(node)) + return (PSCI_MISSING); + *callfn = psci_fdt_get_callfn(node); return (0); } From nobody Thu Feb 15 20:20: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 4TbRJt2Dlgz5B6Sc; Thu, 15 Feb 2024 20:20: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 4TbRJt1l2Mz47X8; Thu, 15 Feb 2024 20:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRvBv3uLQlTGVW8M3/JVWpzuJagH/Pgy19Khi6vKTpo=; b=M2P9CkpOTrVkY7NY31UK8D3rZnFfgq/itAbDh3UQLxqKSimXvv8c2fgcVBsbA5RAHvgi+O 84Nm1CqnnjOy8wtr5sHUHqIKD5SDbP9BihX97HiC+gFQc8lzNEGtTuOfn/is0Z59b/Yw9i jYruRBcnGvKrmmZmeFHnfz2wf9/zA4MUBF74getW7l99RT1oYxB0Npc9/6Vs9dPCeDsAXt kFovtY4pJ4v905lxYJGKlpqEjFIGaOGumOcWv9g+ECdpGoY7vgn/cJQYYDkSdoCnbQvH1v gnT5WE2zcTTuI9aiWyrnTV7el/yov9qotRWPtoaKlK2nA0E3k8L4F4/KYP2F+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRvBv3uLQlTGVW8M3/JVWpzuJagH/Pgy19Khi6vKTpo=; b=Bi7521P/ggcD77RLIHey+MWB0hTxqFvdr8DHdlzesTrkhJsaTHPHPPmHF58WW2goqtGLrY HexCWnytTNFNcJOGA2znpj0Wk3IiKre5pHZP8WGVcAP222BmrbIotzG+ASS6AVzS4rJghF K9wrsHzb6hft94CCYfDcODRj/LzLflXYf4zMn9bQD8jfCTpcClyYp8GVcKzyqaQLMlIt8J kCPlymBQdWINRkk1UC7yRUye01wQDHcFFuZibluybICfICMptYZempIamTa3JhH8iSjYPF NGQgjYxrE08h+Cy9UruWu4kmLG0f3+YOmclr3gs2jYuG/3ZpBYl6iG5OxHes6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708028446; a=rsa-sha256; cv=none; b=UHU5Go7Ktbz4d7iqS8WYgnjqttxDKeHApWPIEMKGwYCUoWEfTk59/IaQFUPYyYcU/I/kw6 zqD5DPYyzmLLz64RmAR8Ao7ft38CPYS4ETWva6loYystN3RrE2rynnW74fWQ3ngbEdsbIj 2xWK/AVvvpXKTUmX7SSTtxL4GLZrMyfG+VKh/vmz3zh7sAvnVAMoTMCwBLVAfSAJ8Ue25+ Jj5iaC9vVNWOe4A7NA+DhFTpq6aegJDQDb78FxnuBrXM6/VTSIrDQjCw0d3GsnblK4IHCj uT5rSNGhE5EPwy/fSJMoj87HsR9iiHU52LFssJJKhzh7PIRTBe5aQLjzUnC3hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbRJt0r3Zzw7m; Thu, 15 Feb 2024 20:20: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 41FKKk1d046698; Thu, 15 Feb 2024 20:20:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FKKk28046695; Thu, 15 Feb 2024 20:20:46 GMT (envelope-from git) Date: Thu, 15 Feb 2024 20:20:46 GMT Message-Id: <202402152020.41FKKk28046695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 962b0bcbd924 - main - riscv: Add missing includes for DDB 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 962b0bcbd924d308016237abc991280f15777e7f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=962b0bcbd924d308016237abc991280f15777e7f commit 962b0bcbd924d308016237abc991280f15777e7f Author: John Baldwin AuthorDate: 2024-02-15 20:20:30 +0000 Commit: John Baldwin CommitDate: 2024-02-15 20:20:30 +0000 riscv: Add missing includes for DDB The #ifdef DDB code in parse_metadata was dead code without opt_ddb.h. While here, update the call to db_fetch_ksymtab for changes in commit 02bc014a200a. Reviewed by: mhorne Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D43919 --- sys/riscv/riscv/machdep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index a0ed59cfef87..4e3564b11c9e 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -33,6 +33,7 @@ * SUCH DAMAGE. */ +#include "opt_ddb.h" #include "opt_kstack_pages.h" #include "opt_platform.h" @@ -91,6 +92,10 @@ #include #include +#ifdef DDB +#include +#endif + #ifdef FDT #include #include @@ -455,7 +460,7 @@ parse_metadata(void) #ifdef DDB ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t); - db_fetch_ksymtab(ksym_start, ksym_end); + db_fetch_ksymtab(ksym_start, ksym_end, 0); #endif #ifdef FDT try_load_dtb(kmdp); From nobody Thu Feb 15 20:28: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 4TbRV200vGz5B7jB; Thu, 15 Feb 2024 20:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbRV14sThz49bP; Thu, 15 Feb 2024 20:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OBI2XhYnqDO/iVqX8oPX+hCcX5CjItSyyQAlQcYO0BE=; b=qqQjQm8nlZYviE3C5dXFSVFfSLIbd/ZuWpcxRlyFaJROLd850SXuD/EfdXX5crweLdy0DV Pa541hYTMRGOWaB98a0R2ImlitNYoSyWvFVcRg7HpKJuHhge909iE6eGEGbmL3j38d2yBW J52aQjemYgpSUBSh/pnZBpP+RcNDti19vX4Asc86+h4eVXIwI32mZBwM22Em1iEfGFX0Kh migXWtXftrwMtaMkNCdkjAsrMla9BtOtbh4AsknUZNndalJc6mv5t9nrvt3xdYGCAjEesQ /HqXVSr83Nw0IyJemz43m79J4dcphpHrwnLwurlIR0ciAnrZjdWkePJhAnTr9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OBI2XhYnqDO/iVqX8oPX+hCcX5CjItSyyQAlQcYO0BE=; b=SEXOp/gdxRbpmNDGn6tMwqqkX2I5x4NxdEovPLnHfQuCRRyZvqod3ntuo7J2FGffDLlkS8 /MPJxuaeMX9xLgW3zRc1A1JX7S5dMmJz6x4y/ophp2QSQ3U414qUSRoDspqFYeOJ3ZufLx brq+B2ipLWBtGyp+lifF1ssa5FJHmUwc3pLdq2Eub/vwb+5HxhPxl3lUKiNJqSymR4pbUr HF1vZM5X4N0NYC4pMC0huRdnV6Vk5RnXWOaZuyufj9rzTLg8lqPrj4OBhdCuZEJMiHpe84 5hfp1s45YUCXRSDa3ld+F8lemzyfrCL7pMkEInZKhlzA0AE0+5YT7pSKq7i/uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708028921; a=rsa-sha256; cv=none; b=UcK+SHL20LGkdL6BoVxMNu5T4JbleYWQHzZe2R7WKEvhQb3h5ZzI+LzlXVEKcBDZp1N1s5 6rAibt5KoXvH/8Vl8tsxdrb2xMZ07nQN8/DKoMuXyQJL234XE5v3z4aAJYNrobNgKp1jwQ klEJ2vNJ7oa/hHuENw7y7/Ot0z/w2wmTgB/86qbUdGiz1SwWRrj9xC7hmiGqFM0fkqzJg1 FonD2EV6oGp2kERpwEMkTG7q/8F28HFOVUN2TKF5Tu8n9JTw+SG94Nax/OUoclbq5jxe2b ZDY/0lG2/Ptp0GrXb6Cgpsm6QLcIt/5ZRlpgax+iu44KkBcCvuPfCcD1d9EUQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbRV13gMszwC9; Thu, 15 Feb 2024 20:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FKSfYj053234; Thu, 15 Feb 2024 20:28:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FKSfDA053231; Thu, 15 Feb 2024 20:28:41 GMT (envelope-from git) Date: Thu, 15 Feb 2024 20:28:41 GMT Message-Id: <202402152028.41FKSfDA053231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 76c678688634 - main - vmd: Use bus_read/write_* instead of bus_space_read/write_* 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76c678688634e9e2ea5f6369fb979aabddbfe426 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=76c678688634e9e2ea5f6369fb979aabddbfe426 commit 76c678688634e9e2ea5f6369fb979aabddbfe426 Author: John Baldwin AuthorDate: 2024-02-15 20:26:19 +0000 Commit: John Baldwin CommitDate: 2024-02-15 20:26:19 +0000 vmd: Use bus_read/write_* instead of bus_space_read/write_* Using an explicit bus space tag and handle is deprecated. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43885 --- sys/dev/vmd/vmd.c | 21 ++++++--------------- sys/dev/vmd/vmd.h | 2 -- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 1563d707c6b4..d9afe5746421 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -184,14 +184,11 @@ vmd_read_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, int width) switch (width) { case 4: - return (bus_space_read_4(sc->vmd_btag, sc->vmd_bhandle, - offset)); + return (bus_read_4(sc->vmd_regs_res[0], offset)); case 2: - return (bus_space_read_2(sc->vmd_btag, sc->vmd_bhandle, - offset)); + return (bus_read_2(sc->vmd_regs_res[0], offset)); case 1: - return (bus_space_read_1(sc->vmd_btag, sc->vmd_bhandle, - offset)); + return (bus_read_1(sc->vmd_regs_res[0], offset)); default: __assert_unreachable(); return (0xffffffff); @@ -213,14 +210,11 @@ vmd_write_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, switch (width) { case 4: - return (bus_space_write_4(sc->vmd_btag, sc->vmd_bhandle, - offset, val)); + return (bus_write_4(sc->vmd_regs_res[0], offset, val)); case 2: - return (bus_space_write_2(sc->vmd_btag, sc->vmd_bhandle, - offset, val)); + return (bus_write_2(sc->vmd_regs_res[0], offset, val)); case 1: - return (bus_space_write_1(sc->vmd_btag, sc->vmd_bhandle, - offset, val)); + return (bus_write_1(sc->vmd_regs_res[0], offset, val)); default: __assert_unreachable(); } @@ -282,9 +276,6 @@ vmd_attach(device_t dev) } } - sc->vmd_btag = rman_get_bustag(sc->vmd_regs_res[0]); - sc->vmd_bhandle = rman_get_bushandle(sc->vmd_regs_res[0]); - vid = pci_get_vendor(dev); did = pci_get_device(dev); for (t = vmd_devs; t->vmd_name != NULL; t++) { diff --git a/sys/dev/vmd/vmd.h b/sys/dev/vmd/vmd.h index a8156ba88a17..2ab943c07a6d 100644 --- a/sys/dev/vmd/vmd.h +++ b/sys/dev/vmd/vmd.h @@ -53,8 +53,6 @@ struct vmd_softc { #define VMD_MAX_BAR 3 int vmd_regs_rid[VMD_MAX_BAR]; struct resource *vmd_regs_res[VMD_MAX_BAR]; - bus_space_handle_t vmd_bhandle; - bus_space_tag_t vmd_btag; struct vmd_irq *vmd_irq; LIST_HEAD(,vmd_irq_user) vmd_users; int vmd_fist_vector; From nobody Thu Feb 15 20:28: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 4TbRV32LD6z5B7gd; Thu, 15 Feb 2024 20:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbRV25bX2z49qM; Thu, 15 Feb 2024 20:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6fURIxoxAel2JH3/k+P6y4B94q7LivpO43cSa874G0=; b=xeTQeW//6N4mT+olqfOBzng6COaOIScvByJsS2WqFvody8SR6d7EB/jC9V/l6cZxnt/X/Z NPLFruMuJ1gb+hvaPumnftMAzlp13qhXAxRbMfDby64bIm683kEbL0GDHoFAKcDN/XZHZl m+haWmErjBQjbBfO8qj9W7rrUwjiL3dZJ5CMlPNNbQzgN0RPelEBLi8rIAn8t00ap2s3QJ 1GaAAVTkp01hdlcEFMvlGS9ySPx7DD+gmnawKkiP07sIvCtfEIpFtm71W3O6dKh/EePAcZ 3onkNcKlyhVBFRqz5GnrqLZVlffKGOz6R+EmtFWDnD+6k50krxz/6tCdnmTJOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6fURIxoxAel2JH3/k+P6y4B94q7LivpO43cSa874G0=; b=f38dSDit0wWyMTyVbBiWqS8uM32qEB1WLQziRS0+tgI67hispDRrfRA4ea09s++1HpEudI POLzTv0w22/1HwSuezJTdRLlnJMzgvtEePNitYegBUVAvxyg38mI91GRExZI5nWl+kgv3r z2Qg9vqX08OHc/9chjhXQ0Q839SOXhPr94KQqXdLGjU58jIMiDHt9HlT0FTOQah29AtIgs KTuid9xZRGbMJ1PtvKejdhgZ1bnWV3Ea7NezSyQPMkGvKKZt/LGIpGT3DpbVYInZmX530T fJyEIHCWavUQGCnnMaU9PeSpIZahyk6S3Iot955wmmstEIMNNpJ8r68oO8bN3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708028922; a=rsa-sha256; cv=none; b=WqA99eB//9XZwRtjK91id1QUy0eHgCeLPmdO9prLJgl/9eI7GCPNlMtm4vZ8FughvrmmtF 6PE8y3m751vgThwjNVeYTtsHGDy5kCEyW85d361zMR5ZsRAJbwLVJMmqlmfAZxBZi7RXd3 YBFdKc3if2iSh3S3Suc5/eAo88lfysaj2Tdq29bBTHq08yB9Nsj/X3bPF1jX+Q/F1gQthT Xyzd2flN9DCl+yml6QO/M0qzyujbm1SlWn61WJbn6RMFOPafInIN2JyUapdjx5qImc+R1F zGsRLNh4EY++7G+FHZO+bQFvxWAHrJVOGUWdBVXiUJt96PFhacoWNfwyuCufxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbRV24j21zwCB; Thu, 15 Feb 2024 20:28: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 41FKSg3v053290; Thu, 15 Feb 2024 20:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FKSgbQ053287; Thu, 15 Feb 2024 20:28:42 GMT (envelope-from git) Date: Thu, 15 Feb 2024 20:28:42 GMT Message-Id: <202402152028.41FKSgbQ053287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d714e73f7895 - main - vmd: Use bus_generic_rman_* for PCI bus and memory resources 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d714e73f789515963a22fe64417bf3883cdb599c Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d714e73f789515963a22fe64417bf3883cdb599c commit d714e73f789515963a22fe64417bf3883cdb599c Author: John Baldwin AuthorDate: 2024-02-15 20:26:40 +0000 Commit: John Baldwin CommitDate: 2024-02-15 20:26:40 +0000 vmd: Use bus_generic_rman_* for PCI bus and memory resources While here, add custom bus_map/unmap_resource methods to request mappings via the window memory resources allocated from the parent bus. Tested by: emaste Differential Revision: https://reviews.freebsd.org/D43886 --- sys/dev/vmd/vmd.c | 133 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 108 insertions(+), 25 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index d9afe5746421..d885cd15ac26 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -418,47 +418,53 @@ vmd_get_dma_tag(device_t dev, device_t child) return (sc->vmd_dma_tag); } +static struct rman * +vmd_get_rman(device_t dev, int type, u_int flags) +{ + struct vmd_softc *sc = device_get_softc(dev); + + switch (type) { + case SYS_RES_MEMORY: + return (&sc->psc.mem.rman); + case PCI_RES_BUS: + return (&sc->psc.bus.rman); + default: + /* VMD hardware does not support I/O ports. */ + return (NULL); + } +} + static struct resource * vmd_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { - struct vmd_softc *sc = device_get_softc(dev); struct resource *res; - switch (type) { - case SYS_RES_IRQ: + if (type == SYS_RES_IRQ) { /* VMD hardware does not support legacy interrupts. */ if (*rid == 0) return (NULL); return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags | RF_SHAREABLE)); - case SYS_RES_MEMORY: - res = rman_reserve_resource(&sc->psc.mem.rman, start, end, - count, flags, child); - if (res == NULL) - return (NULL); - if (bootverbose) + } + res = bus_generic_rman_alloc_resource(dev, child, type, rid, start, + end, count, flags); + if (bootverbose && res != NULL) { + switch (type) { + case SYS_RES_MEMORY: device_printf(dev, "allocated memory range (%#jx-%#jx) for rid %d of %s\n", rman_get_start(res), rman_get_end(res), *rid, pcib_child_name(child)); - break; - case PCI_RES_BUS: - res = rman_reserve_resource(&sc->psc.bus.rman, start, end, - count, flags, child); - if (res == NULL) - return (NULL); - if (bootverbose) + break; + case PCI_RES_BUS: device_printf(dev, "allocated bus range (%ju-%ju) for rid %d of %s\n", rman_get_start(res), rman_get_end(res), *rid, pcib_child_name(child)); - break; - default: - /* VMD hardware does not support I/O ports. */ - return (NULL); + break; + } } - rman_set_rid(res, *rid); return (res); } @@ -471,7 +477,8 @@ vmd_adjust_resource(device_t dev, device_t child, int type, return (bus_generic_adjust_resource(dev, child, type, r, start, end)); } - return (rman_adjust_resource(r, start, end)); + return (bus_generic_rman_adjust_resource(dev, child, type, r, start, + end)); } static int @@ -483,7 +490,80 @@ vmd_release_resource(device_t dev, device_t child, int type, int rid, return (bus_generic_release_resource(dev, child, type, rid, r)); } - return (rman_release_resource(r)); + return (bus_generic_rman_release_resource(dev, child, type, rid, r)); +} + +static int +vmd_activate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + if (type == SYS_RES_IRQ) { + return (bus_generic_activate_resource(dev, child, type, rid, + r)); + } + return (bus_generic_rman_activate_resource(dev, child, type, rid, r)); +} + +static int +vmd_deactivate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + if (type == SYS_RES_IRQ) { + return (bus_generic_deactivate_resource(dev, child, type, rid, + r)); + } + return (bus_generic_rman_deactivate_resource(dev, child, type, rid, r)); +} + +static struct resource * +vmd_find_parent_resource(struct vmd_softc *sc, struct resource *r) +{ + for (int i = 1; i < 3; i++) { + if (rman_get_start(sc->vmd_regs_res[i]) <= rman_get_start(r) && + rman_get_end(sc->vmd_regs_res[i]) >= rman_get_end(r)) + return (sc->vmd_regs_res[i]); + } + return (NULL); +} + +static int +vmd_map_resource(device_t dev, device_t child, int type, struct resource *r, + struct resource_map_request *argsp, struct resource_map *map) +{ + struct vmd_softc *sc = device_get_softc(dev); + struct resource_map_request args; + struct resource *pres; + rman_res_t length, start; + int error; + + /* Resources must be active to be mapped. */ + if (!(rman_get_flags(r) & RF_ACTIVE)) + return (ENXIO); + + resource_init_map_request(&args); + error = resource_validate_map_request(r, argsp, &args, &start, &length); + if (error) + return (error); + + pres = vmd_find_parent_resource(sc, r); + if (pres == NULL) + return (ENOENT); + + args.offset = start - rman_get_start(pres); + args.length = length; + return (bus_generic_map_resource(dev, child, type, pres, &args, map)); +} + +static int +vmd_unmap_resource(device_t dev, device_t child, int type, struct resource *r, + struct resource_map *map) +{ + struct vmd_softc *sc = device_get_softc(dev); + + r = vmd_find_parent_resource(sc, r); + if (r == NULL) + return (ENOENT); + return (bus_generic_unmap_resource(dev, child, type, r, map)); } static int @@ -647,13 +727,16 @@ static device_method_t vmd_pci_methods[] = { /* Bus interface */ DEVMETHOD(bus_get_dma_tag, vmd_get_dma_tag), + DEVMETHOD(bus_get_rman, vmd_get_rman), DEVMETHOD(bus_read_ivar, pcib_read_ivar), DEVMETHOD(bus_write_ivar, pcib_write_ivar), DEVMETHOD(bus_alloc_resource, vmd_alloc_resource), DEVMETHOD(bus_adjust_resource, vmd_adjust_resource), DEVMETHOD(bus_release_resource, vmd_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_activate_resource, vmd_activate_resource), + DEVMETHOD(bus_deactivate_resource, vmd_deactivate_resource), + DEVMETHOD(bus_map_resource, vmd_map_resource), + DEVMETHOD(bus_unmap_resource, vmd_unmap_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), From nobody Thu Feb 15 20:28: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 4TbRV43Y90z5B7m2; Thu, 15 Feb 2024 20:28: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 4TbRV41Tffz49qQ; Thu, 15 Feb 2024 20:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRy9rW4QVD+vWHYzWN/pc8aNi9W0cIcouDlDl+UVe+8=; b=IQcZDKKZIJTl65vKKYukmwX11PYaavp/XnJE4j23ZkziPhwZOBSzObkHViPOlBADXvjYq6 x+5zuEgdbIZAmQuzsyF5KU/zFWLej9bat482fsr8UkoiUTXwq8ZEu1rPCC2BA9eIHCym5D b3ji6U+ZnrRyfCGGMYxzNreqgj1vcJH5EbZ9X1azH0X2DganNywksxyDhbBmBMsJJYajId gP3CcbRv0TqmC9/rSoDtX+0vV0btTApVJLfXk7rYytnwAkRoAvWwpLrGSv30LnvTmwzY0z WLpNk2983FbC/CEZxQ5aPQg6yT4E1k+eDy+7aFiNq+dqDJghiHl9pvQa1GO97w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708028924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRy9rW4QVD+vWHYzWN/pc8aNi9W0cIcouDlDl+UVe+8=; b=D2fQiUadPwQkrId3h6EdGVICoO2NL5oaJU+tNToWVoAQb1UJxdrg/mbty/UOARfVwQ4Jf/ LUff8F/PKnPZJUvZ6Hl8pMAIHDJ3V4IODLRDYLYURe4J7CTIxmVHVnXRPq4ZQxWcNVUs46 YLGXsOHJ3Kjjru5QAd//DvRPvXkVxVG+RgWuerID/bxT654ZBIuFslcs+N+dVX8mLsyrIK 7ShcHBKH5kpbjldsKODqsOPx2tgJUkUwLNGI5hYEievbKMyF9POkk3+YnSZT5Od2ZER9HA Uapd/hfH6pMLCPQhYALsefqwJrusKU8SmDoZm/UqFuDtHGdFOR6Ns5fCSOYfHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708028924; a=rsa-sha256; cv=none; b=WFVoLQVPxZ5yTyF9Y9baxNKl66oWj0F1SNGINkVK4IuykrukNS/H4Y1fAfSF0hBB8eEJBB znmr1vWHu+/Pv9q1pfrP5WhT8OTptl0POERphgi1bQa9GcVnXBmmNivRsoCwPpzjAcCgLX fhczkerJqxJkUVftQQ6FEio2iOli0kauyYCBeMLXVwnUQRfz1Jeejkgc4q8tEJNyEmOYd2 SJKXBXTaVVLQHWaMF0OYJbqXXnEqiaOaBhbjEopPXNr7ixSSFU3Kosjii4m4l/R7ZSbok3 r7vviEEliChwR2Rdx2YwGEAV0gcN8q9EZVoVJVih/kPb3I4sRsSkHK9xhIFpMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbRV35jJNzwDv; Thu, 15 Feb 2024 20:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FKShKv053330; Thu, 15 Feb 2024 20:28:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FKShsA053327; Thu, 15 Feb 2024 20:28:43 GMT (envelope-from git) Date: Thu, 15 Feb 2024 20:28:43 GMT Message-Id: <202402152028.41FKShsA053327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 57d312b8eac9 - main - pci_pci: Remove obsolete 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57d312b8eac9862ae60da32a9aecb6d9ccf08171 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=57d312b8eac9862ae60da32a9aecb6d9ccf08171 commit 57d312b8eac9862ae60da32a9aecb6d9ccf08171 Author: John Baldwin AuthorDate: 2024-02-15 02:04:34 +0000 Commit: John Baldwin CommitDate: 2024-02-15 20:27:45 +0000 pci_pci: Remove obsolete comment This comment referred to the layering violation fixed in commit b377ff8110e3489eb6e6b920b51a2384dfc4eb0b. --- sys/dev/pci/pci_pci.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 02fa8cf1fb9e..cda1597ac76e 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -1931,11 +1931,6 @@ pcib_suballoc_resource(struct pcib_softc *sc, struct pcib_window *w, pcib_child_name(child)); rman_set_rid(res, *rid); - /* - * If the resource should be active, pass that request up the - * tree. This assumes the parent drivers can handle - * activating sub-allocated resources. - */ if (flags & RF_ACTIVE) { if (bus_activate_resource(child, type, *rid, res) != 0) { rman_release_resource(res); From nobody Thu Feb 15 21:30: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 4TbSsQ3sqkz5BHXQ; Thu, 15 Feb 2024 21:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbSsQ2d9nz4Sjg; Thu, 15 Feb 2024 21:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpMuPGssXV7JWsR/yrhrwce2tDP+Ehb+Whzc+mKNl4U=; b=i5TU/dqJ6mT2gUDaos/ITYlg00iDEvSfjhppNfraaJj1dwRt/NJUpyScsanGBlmzEWFoKo 1lo3SWh/mZtnJb0GFWbzH6+FETGt7LcUVfUi3rUCyXnf0yMmxQV4QweAvWjlUey+oeXNeP 9qIX9osAZgFk+Mp1LigfKKrhk2iqAX9a0b2HCyCCGl/wRKm5OLe2y0mHmQ5jmRme5dR+Xb qS84C6eCZd2h/6IPbr+hxE8pzNMshR6zMjEYcZwz3tWo+3iCUgVy1o0batetdDKV/tpvB+ EIwVpjhKoOQ+I/SliqE7qXGgcf0RAQbenZxc5/jSL9bTGpTFPE7TeXMwbUO2SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpMuPGssXV7JWsR/yrhrwce2tDP+Ehb+Whzc+mKNl4U=; b=Uq4QE605bolp8uTZ1z3LrOaQL5tlJ6Rbqr5lQqMw/nAjIEQDlp/B6AsuEUU8ccFrnJqsaA Ui9DmQTXyiQuATkibenIH4Dg1ohRniOYUM1A+vw9rfN0oZl+GSnOPdVyGpcJwWwHaJbAcy SgqdtysIPiiDJxWpwC4pqspuDHEIZ9Zq3s8EcplsJkRI/xzaShO2hBcplrBCWikSy31YA7 wZ85x8ytFKm9dakBPGEpXU93vh95q8Lh7iE+MNfqSkr7nWkYXKuAdFzhxgauD0fx1J2FrB TVGOiWWVK8XLRSB0tyWBVXjBx4ofVtZqzV/yUca/Ja8BFFMGZB9raHz1owyjzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708032634; a=rsa-sha256; cv=none; b=RIoqxphPRpTrR86A0eq43mm3mqYtTovubGzJ39REXI/jyT7C9eyY/I2pLbr+tspgjEUsxX Z+4QgO0WddXztYKqVq2LZGZZZu7/Xex7z2SUMoi3TWthxGt3ZumBGfLyRIYSnWHRsf+kVC DYiLS99rotE7Ki5SjWlaclTsN6EcsyZXffu0/iwiZ5YhCxYy/XBYy72YlmkxEES4jAqvdM oDesBvFA3xTyRJeCCv/YC+5/bKcbZw8xePDaH0dj0atK42peXr9YDfORThuk7dRooaxzLB Mr1wASfGX2HXOSC5DByuh6thZlOzPRfd+8+uiMnJxBGvjB83rXhTQD5dPmVKVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbSsQ1hSczy3V; Thu, 15 Feb 2024 21:30: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 41FLUYIf063422; Thu, 15 Feb 2024 21:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FLUYfZ063419; Thu, 15 Feb 2024 21:30:34 GMT (envelope-from git) Date: Thu, 15 Feb 2024 21:30:34 GMT Message-Id: <202402152130.41FLUYfZ063419@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: f8041e3628bd - main - Heimdal: Fix transit path validation CVE-2017-6594 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: Sender: owner-dev-commits-src-main@freebsd.org 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8041e3628bd70cf5562a9c13eb3d6af8463e720 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f8041e3628bd70cf5562a9c13eb3d6af8463e720 commit f8041e3628bd70cf5562a9c13eb3d6af8463e720 Author: Cy Schubert AuthorDate: 2024-02-14 19:56:18 +0000 Commit: Cy Schubert CommitDate: 2024-02-15 21:27:54 +0000 Heimdal: Fix transit path validation CVE-2017-6594 Apply upstream b1e699103. This fixes a bug introduced by upstream f469fc6 which may in some cases enable bypass of capath policy. Upstream writes in their commit log: Note, this may break sites that rely on the bug. With the bug some incomplete [capaths] worked, that should not have. These may now break authentication in some cross-realm configurations. Reported by: emaste Security: CVE-2017-6594 Obtained from: upstream b1e699103 MFC after: 1 week --- crypto/heimdal/kdc/krb5tgs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/crypto/heimdal/kdc/krb5tgs.c b/crypto/heimdal/kdc/krb5tgs.c index 19d669798830..cde869522e23 100644 --- a/crypto/heimdal/kdc/krb5tgs.c +++ b/crypto/heimdal/kdc/krb5tgs.c @@ -655,8 +655,12 @@ fix_transited_encoding(krb5_context context, "Decoding transited encoding"); return ret; } + + /* + * If the realm of the presented tgt is neither the client nor the server + * realm, it is a transit realm and must be added to transited set. + */ if(strcmp(client_realm, tgt_realm) && strcmp(server_realm, tgt_realm)) { - /* not us, so add the previous realm to transited set */ if (num_realms + 1 > UINT_MAX/sizeof(*realms)) { ret = ERANGE; goto free_realms; @@ -737,6 +741,7 @@ tgs_make_reply(krb5_context context, const char *server_name, hdb_entry_ex *client, krb5_principal client_principal, + const char *tgt_realm, hdb_entry_ex *krbtgt, krb5_enctype krbtgt_etype, krb5_principals spp, @@ -798,7 +803,7 @@ tgs_make_reply(krb5_context context, &tgt->transited, &et, krb5_principal_get_realm(context, client_principal), krb5_principal_get_realm(context, server->entry.principal), - krb5_principal_get_realm(context, krbtgt->entry.principal)); + tgt_realm); if(ret) goto out; @@ -1494,6 +1499,8 @@ tgs_build_reply(krb5_context context, krb5_keyblock sessionkey; krb5_kvno kvno; krb5_data rspac; + const char *tgt_realm = /* Realm of TGT issuer */ + krb5_principal_get_realm(context, krbtgt->entry.principal); hdb_entry_ex *krbtgt_out = NULL; @@ -2240,6 +2247,7 @@ server_lookup: spn, client, cp, + tgt_realm, krbtgt_out, krbtgt_etype, spp, From nobody Thu Feb 15 21:30: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 4TbSsR4Xmfz5BHGy; Thu, 15 Feb 2024 21:30: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 4TbSsR3yjDz4SQM; Thu, 15 Feb 2024 21:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SdQZCR3x40C7tkvC3XH2ill+wLRb9gnYRxIhgvN08zM=; b=Ct9/k2S/zDWzVJG1cFYpoRuiS7pimr8QpJGFTUGhUOAEvlvFHQQX5YMYwDQmA+A+ac96I4 /zycxbmsOeBJgtXmvZYrMhpp2gvmzied2Do0qBnT50zj+pNTZCKXCSqfsg8xS8sX+mV7FR c/99ZNwVVHwYet1/oHqggdj9+ZqjSdqt/yUnNWXSmI/V92wBWSlOzzviMUNg44qfe7eNXd DOkYFsopi/GQSDYkLWVUFtaFyRZWOwYslrPzKuDgPkhs/g6bOE+bHHQG6Is8RFVdMOXsJX ZnHoVsi1J0/BOvGB9UxphJQwmcF9wNfm4UnyDmTZKCILULDY5oe0CgTb3tIlCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SdQZCR3x40C7tkvC3XH2ill+wLRb9gnYRxIhgvN08zM=; b=AyiOjY4qr/JaF0hDPDoj4+lj7IFctarmrUR/+ERFj7WheOmajfDw0tn6dKMXqL+JNVqgtl P5Rkz76cBZh5da7iHYnnMMm+W+EVGlv64kLxYyb9NH7t5qCrjKZyDSdJu3c1cQr5BDw9we Ts5Y8fKa1NuV7ChW05usIdVS4GCULS6/LBDHe1lXHBHfTCF+AW/D5Y5UOM+R10C9rqlupc +GetJF3I3aksJPaAaqGFECCiYIps015sgi5GJtorG0nbqqTZgFnhuww93ueJYfhLkBJIkA v4XAqyC8tQP0FMEYY45AvJHn+dv5vzcHWcIaM1TINTGikwPZVT2kkpAnFmMCQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708032635; a=rsa-sha256; cv=none; b=lDP8ViTOxO7tk8/H8tvVjpKQ4iLr3ytzquIkwKnIqc8yWWKDyIxZ3VgED2PGT3LxG8YSBI 13+9WkHB/JNhV6QzA2bIF3pMOrKFiP0mJoMXWj1t+z6B+VDqGSh7UGfvh5ex3qZTaQ9Z1/ 9EnQ4asrFqrnhLzBkWv2J5g6M18E3pNaH25gkU438zg9o5y00ntDH9mEeZfAcLEeJJlByU AqY8MgzElJVkKGagSu7F0cNx/1KUEV1YqftZ4T7htWTWjfZrGzXNnQljK4iRxhjVwa+sXO GUi8kCWmqgMyebwuyG7tW22p6w3SDLi79jiL0g7wTssS3cSHNAta4ekZNtABBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbSsR2kPJzyC5; Thu, 15 Feb 2024 21:30: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 41FLUZo4063476; Thu, 15 Feb 2024 21:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FLUZJA063473; Thu, 15 Feb 2024 21:30:35 GMT (envelope-from git) Date: Thu, 15 Feb 2024 21:30:35 GMT Message-Id: <202402152130.41FLUZJA063473@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: 24339377490f - main - Heimdal: CVE-2018-16860 Heimdal KDC: Reject PA-S4U2Self with unkeyed checksum 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: Sender: owner-dev-commits-src-main@freebsd.org 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24339377490f9e362d040712b534d2963decd2d7 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=24339377490f9e362d040712b534d2963decd2d7 commit 24339377490f9e362d040712b534d2963decd2d7 Author: Cy Schubert AuthorDate: 2024-02-14 20:04:30 +0000 Commit: Cy Schubert CommitDate: 2024-02-15 21:27:54 +0000 Heimdal: CVE-2018-16860 Heimdal KDC: Reject PA-S4U2Self with unkeyed checksum Upstream's explanation of the problem: S4U2Self is an extension to Kerberos used in Active Directory to allow a service to request a kerberos ticket to itself from the Kerberos Key Distribution Center (KDC) for a non-Kerberos authenticated user (principal in Kerboros parlance). This is useful to allow internal code paths to be standardized around Kerberos. S4U2Proxy (constrained-delegation) is an extension of this mechanism allowing this impersonation to a second service over the network. It allows a privileged server that obtained a S4U2Self ticket to itself to then assert the identity of that principal to a second service and present itself as that principal to get services from the second service. There is a flaw in Samba's AD DC in the Heimdal KDC. When the Heimdal KDC checks the checksum that is placed on the S4U2Self packet by the server to protect the requested principal against modification, it does not confirm that the checksum algorithm that protects the user name (principal) in the request is keyed. This allows a man-in-the-middle attacker who can intercept the request to the KDC to modify the packet by replacing the user name (principal) in the request with any desired user name (principal) that exists in the KDC and replace the checksum protecting that name with a CRC32 checksum (which requires no prior knowledge to compute). This would allow a S4U2Self ticket requested on behalf of user name (principal) user@EXAMPLE.COM to any service to be changed to a S4U2Self ticket with a user name (principal) of Administrator@EXAMPLE.COM. This ticket would then contain the PAC of the modified user name (principal). Reported by: emaste Security: CVE-2018-16860 Obtained from: Upstream c6257cc2c MFC after: 1 week --- crypto/heimdal/kdc/krb5tgs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/crypto/heimdal/kdc/krb5tgs.c b/crypto/heimdal/kdc/krb5tgs.c index cde869522e23..cf1cd3dc1ad0 100644 --- a/crypto/heimdal/kdc/krb5tgs.c +++ b/crypto/heimdal/kdc/krb5tgs.c @@ -1892,6 +1892,13 @@ server_lookup: goto out; } + if (!krb5_checksum_is_keyed(context, self.cksum.cksumtype)) { + free_PA_S4U2Self(&self); + kdc_log(context, config, 0, "Reject PA-S4U2Self with unkeyed checksum"); + ret = KRB5KRB_AP_ERR_INAPP_CKSUM; + goto out; + } + ret = _krb5_s4u2self_to_checksumdata(context, &self, &datack); if (ret) goto out; From nobody Thu Feb 15 21:30: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 4TbSsS6xbCz5BHMH; Thu, 15 Feb 2024 21:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbSsS4h9Wz4Sdp; Thu, 15 Feb 2024 21:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gycz8+/iBHndwYYh7Qdv2EeBIFaRJVOhZ47nR3KXOA=; b=EGKiLKCaLU/CzUu6oU7rqNGck2u4eWIVSI9bA1B7CX58hnWAZysiF1sSnSZ6cTqNxQkgAU fwVahg4JUClUBWcOCWNEa/tydW/g0BGkpF7u+7Nk8QydFNJJuhlyqotAHxQsQX+wnKNmFu 71OfAxrG5akThch2YWiY/q0d7heaxGdMr+/NXJqOlG/hJjrSrftdxXpq8wwUuDODvDZU5q iLAB/FkU48ncxVSduLGdAKQyGE8SngWSsJb9AiFzaCJehgL9wACJb9t/pLbSSrsMTn2DRY hAe5KM9G+6O6LEKzFUf3F779HlVCm3IGyV0kXGGGE9zYjlllhS3xEa3wEePWwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gycz8+/iBHndwYYh7Qdv2EeBIFaRJVOhZ47nR3KXOA=; b=kDq66oDFUhOPIt3HBDzZtr/RBYUxarEx/PCMibp3PR8jyxBhyI5fQGeIzVlIKa5t6NHS1k dBLj7GeUlzwI+3K1QhgTPRAaUl0slH3/xcyWm2kMqCGaZuK3Rl9Jh6JVnp3wIoPTowTEJX uNYcZgbr/myNPl0esUnUG0HGQQZEbI0fPMyi4RDLFQBC00U6B9nPeVqAih5GXVkD4VUoZY aD7VSmgl4/Fkd0KhFmZoTRUD/N1nHIezUM59npZXlisjvY+yfoy1Z8uU5pY2igWFmx51pz O5yb7mte4k/vjlw2TljRgBv74qd3GiOKHUeOJ2UKo9nNMSGxytLcnaCTNYz7og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708032636; a=rsa-sha256; cv=none; b=QbfzvvRXOF4pNnTJ9T8TATozGXGvcwtlENO6gviY1Rj2V7NoPUzPK0HkztNUjwRGetI/L6 1hdQrH4nzFJPLvRtkFWu4Wr53aZJYCUfLVeQDNeSKGcTALIVT4kXTl755Ey+cEXMcglHmM BkgmAAZsevbp8umVq+I1dOKg+8TrAZfHA6fzzjE6q7BCjo8fwtoEDtulZIclVOov64tPiY mDgxXsVliOHyqpHU/6Rv5tSdFrC27q3XA/UdLsFKvB0U906L9F4rQfnMV06KFvPoGBsJwQ 9slg7n/E3eEWk6MwqLujM7m/+OYrVjmkFqYxc/H78z993ulpSNc0HBJUe4LjUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbSsS3lkFzy0d; Thu, 15 Feb 2024 21:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FLUaRK063527; Thu, 15 Feb 2024 21:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FLUac3063524; Thu, 15 Feb 2024 21:30:36 GMT (envelope-from git) Date: Thu, 15 Feb 2024 21:30:36 GMT Message-Id: <202402152130.41FLUac3063524@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: 9286d46a794f - main - heimdal: CVE-2022-41916: Check for overflow in _gsskrb5_get_mech() 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: Sender: owner-dev-commits-src-main@freebsd.org 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9286d46a794f25482880d29864a8901ef6666fae Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9286d46a794f25482880d29864a8901ef6666fae commit 9286d46a794f25482880d29864a8901ef6666fae Author: Cy Schubert AuthorDate: 2024-02-15 00:54:46 +0000 Commit: Cy Schubert CommitDate: 2024-02-15 21:27:55 +0000 heimdal: CVE-2022-41916: Check for overflow in _gsskrb5_get_mech() Apply upstream 22749e918 to fix a buffer overflow. Upstream notes: If len_len is equal to total_len - 1 (i.e. the input consists only of a 0x60 byte and a length), the expression 'total_len - 1 - len_len - 1', used as the 'len' parameter to der_get_length(), will overflow to SIZE_MAX. Then der_get_length() will proceed to read, unconstrained, whatever data follows in memory. Add a check to ensure that doesn't happen This is similar to samba CVE-2022-3437. Reported by: emaste Security: CVE-2022-41916 Obtained from: upstream 22749e918 MFC after: 1 week --- crypto/heimdal/lib/gssapi/krb5/decapsulate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c b/crypto/heimdal/lib/gssapi/krb5/decapsulate.c index 343a3d7acb97..7a18708a633a 100644 --- a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c +++ b/crypto/heimdal/lib/gssapi/krb5/decapsulate.c @@ -56,6 +56,8 @@ _gsskrb5_get_mech (const u_char *ptr, return -1; if (total_len < 1 + len_len + 1) return -1; + if (total_len < 1 + len_len + 1) + return -1; p += len_len; if (*p++ != 0x06) return -1; From nobody Thu Feb 15 21:30: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 4TbSsV0gmhz5BHMK; Thu, 15 Feb 2024 21:30: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 4TbSsT53myz4Sdy; Thu, 15 Feb 2024 21:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGAtK/wUqVvLz4SAscGdicGvcey2QEPBYsQKiKYmS8o=; b=MkeEtqFmHNako68o1YkQqUNdgVDozXSk9qXv5svZpFYOU/P5bktWsY4pFO9azv2NhkhG8j JOr1XnwjDzfrkH+Ep95Vnb3jlyEtrltBqnFsXX+HHbVfDBTXV/RK2b2k9ivrOLJcFfYJBi kuo8FuLHJ18VTOFoUTCKQM/Ewu+/NXwyfKDbf98xhd11SGQ9nnr5CyAkZNX8qVFB039Ev6 fIQljQdomCr3JJ61ibojEmdbTeZRpijpRz3e9zegz73jrtxT9UhMPU9jvwxp4cAaS+TZWo IHV7LcoSSV+nDvx3rvwmshEVKQjEQCFOJkYujGrOKnO7ak6P94CC1EdhiAF4rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGAtK/wUqVvLz4SAscGdicGvcey2QEPBYsQKiKYmS8o=; b=lLzqVUW1dB5ghaTQ8LnpYjb2rVYxcARMtRbNAGyT9ZTWvD6efhuCOywT/0CooSGa3iQCUb lwslVAoXeJ1y+FEe7229l8DsBLxz7PUks84kCGV2Zdr2YG4IfTv/q0knw+RhrE/zV2ud19 m9l6H3GyMTnq/S06nQCJW1g5BKWGeauxQq37XSc51x+S9EP/r2sHbniMlHwC8xhyp+Zho3 0LcH2ZHf4g7D7aNYmsOkaBpAhBfnSmS68kL58xyFpeBroMYUfC6tOjWMQg+ziGMC2KzevQ /Zknuu82n7N6tELppQlCHxBQEBSCH6ByQ1cRY4CQuzU0N1bb9ptPYNE0kBHKlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708032637; a=rsa-sha256; cv=none; b=D1L/qXrDlrgifviXay2ldmrLF46g/9O4Ag39+BUB1eJkhbF3EZoZoSehemEAOzOFalPAyW jUcGvpFqE39exHRcDy1iXtRQVYNsZSbJa+LZ5RVKMxoSU0SBt5HRRQSiPTH+ZPmu+4L84q Om4pgXRvkNh2H4LjNNuf/mGahNfPav64PzZdCxX/EyuOQH2bMKJRnfddD99jXgxmecoTAv LjEQs8P28Lg5THUGciNOUJC1J5fUR4OhjzCbrRLwBCJx7AGrs5mPCPFCx9qaKWbMoQ8ezu g7r4jJ+5aB6wInSY/UI20S+TGYxZKPPJAMBm75xH5REwwd6W7tFlKO9byRU8IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbSsT49GTzxxr; Thu, 15 Feb 2024 21:30: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 41FLUbGG063582; Thu, 15 Feb 2024 21:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FLUbnO063579; Thu, 15 Feb 2024 21:30:37 GMT (envelope-from git) Date: Thu, 15 Feb 2024 21:30:37 GMT Message-Id: <202402152130.41FLUbnO063579@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: 60616b445eb5 - main - heimdal: always confirm PA-PKINIT-KX for anon PKINIT 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: Sender: owner-dev-commits-src-main@freebsd.org 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60616b445eb5b01597092fef5b14549f95000130 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=60616b445eb5b01597092fef5b14549f95000130 commit 60616b445eb5b01597092fef5b14549f95000130 Author: Cy Schubert AuthorDate: 2024-02-15 01:58:06 +0000 Commit: Cy Schubert CommitDate: 2024-02-15 21:27:55 +0000 heimdal: always confirm PA-PKINIT-KX for anon PKINIT Import upstream 38c797e1a. Upstream notes: RFC8062 Section 7 requires verification of the PA-PKINIT-KX key excahnge when anonymous PKINIT is used. Failure to do so can permit an active attacker to become a man-in-the-middle. Reported by: emaste Obtained from: upstream 38c797e1a Security: CVE-2019-12098 MFC after: 1 week --- crypto/heimdal/lib/krb5/krb5_locl.h | 1 + crypto/heimdal/lib/krb5/pkinit.c | 92 +++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/crypto/heimdal/lib/krb5/krb5_locl.h b/crypto/heimdal/lib/krb5/krb5_locl.h index d0c68927ffbd..0ea132f94c82 100644 --- a/crypto/heimdal/lib/krb5/krb5_locl.h +++ b/crypto/heimdal/lib/krb5/krb5_locl.h @@ -240,6 +240,7 @@ struct _krb5_get_init_creds_opt_private { #define KRB5_INIT_CREDS_CANONICALIZE 1 #define KRB5_INIT_CREDS_NO_C_CANON_CHECK 2 #define KRB5_INIT_CREDS_NO_C_NO_EKU_CHECK 4 +#define KRB5_INIT_CREDS_PKINIT_KX_VALID 32 struct { krb5_gic_process_last_req func; void *ctx; diff --git a/crypto/heimdal/lib/krb5/pkinit.c b/crypto/heimdal/lib/krb5/pkinit.c index 7164a118c34a..3c914bb31f35 100644 --- a/crypto/heimdal/lib/krb5/pkinit.c +++ b/crypto/heimdal/lib/krb5/pkinit.c @@ -1306,6 +1306,98 @@ pk_rd_pa_reply_enckey(krb5_context context, return ret; } +/* + * RFC 8062 section 7: + * + * The client then decrypts the KDC contribution key and verifies that + * the ticket session key in the returned ticket is the combined key of + * the KDC contribution key and the reply key. + */ +KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL +_krb5_pk_kx_confirm(krb5_context context, + krb5_pk_init_ctx ctx, + krb5_keyblock *reply_key, + krb5_keyblock *session_key, + PA_DATA *pa_pkinit_kx) +{ + krb5_error_code ret; + EncryptedData ed; + krb5_keyblock ck, sk_verify; + krb5_crypto ck_crypto = NULL; + krb5_crypto rk_crypto = NULL; + size_t len; + krb5_data data; + krb5_data p1 = { sizeof("PKINIT") - 1, "PKINIT" }; + krb5_data p2 = { sizeof("KEYEXCHANGE") - 1, "KEYEXCHANGE" }; + + heim_assert(ctx != NULL, "PKINIT context is non-NULL"); + heim_assert(reply_key != NULL, "reply key is non-NULL"); + heim_assert(session_key != NULL, "session key is non-NULL"); + + /* PA-PKINIT-KX is optional unless anonymous */ + if (pa_pkinit_kx == NULL) + return ctx->anonymous ? KRB5_KDCREP_MODIFIED : 0; + + memset(&ed, 0, sizeof(ed)); + krb5_keyblock_zero(&ck); + krb5_keyblock_zero(&sk_verify); + krb5_data_zero(&data); + + ret = decode_EncryptedData(pa_pkinit_kx->padata_value.data, + pa_pkinit_kx->padata_value.length, + &ed, &len); + if (ret) + goto out; + + if (len != pa_pkinit_kx->padata_value.length) { + ret = KRB5_KDCREP_MODIFIED; + goto out; + } + + ret = krb5_crypto_init(context, reply_key, 0, &rk_crypto); + if (ret) + goto out; + + ret = krb5_decrypt_EncryptedData(context, rk_crypto, + KRB5_KU_PA_PKINIT_KX, + &ed, &data); + if (ret) + goto out; + + ret = decode_EncryptionKey(data.data, data.length, + &ck, &len); + if (ret) + goto out; + + ret = krb5_crypto_init(context, &ck, 0, &ck_crypto); + if (ret) + goto out; + + ret = krb5_crypto_fx_cf2(context, ck_crypto, rk_crypto, + &p1, &p2, session_key->keytype, + &sk_verify); + if (ret) + goto out; + + if (sk_verify.keytype != session_key->keytype || + krb5_data_ct_cmp(&sk_verify.keyvalue, &session_key->keyvalue) != 0) { + ret = KRB5_KDCREP_MODIFIED; + goto out; + } + +out: + free_EncryptedData(&ed); + krb5_free_keyblock_contents(context, &ck); + krb5_free_keyblock_contents(context, &sk_verify); + if (ck_crypto) + krb5_crypto_destroy(context, ck_crypto); + if (rk_crypto) + krb5_crypto_destroy(context, rk_crypto); + krb5_data_free(&data); + + return ret; +} + static krb5_error_code pk_rd_pa_reply_dh(krb5_context context, const heim_octet_string *indata, From nobody Thu Feb 15 21:30: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 4TbSsW0DXfz5BHRd; Thu, 15 Feb 2024 21:30: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 4TbSsV6HyQz4Smq; Thu, 15 Feb 2024 21:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNSlEEhwZ5m0tSCEB1bIi7x3K1DCo03iNaXD988YXMs=; b=YITpZMFHHxkvI+C5PHa0UqF37w+/jQJrBEAeDlUxfIDd7q4zzt2QU0wc9Yottlgy44X1pg j9kDGrWhXrgIvfOShEL72Z2HPFHFSp0cqwTxzeszwAt35RIE3Em5g6RAP6eVY0XoqwBqS2 fGRL7FOTG9n/saB0uPO4RhI1bgVjNNjQY8UqlPFfcqB5jdw4QTDc+jEUct3d0QzNi/JUGo 6yzmNdXFOk+hcUsiT/6uK802usxdbvOiBlU/ps8adXkJktQRAMtRCHJnx0H6LJQktDdWLc u1jvyq+6VsL7uxaeu6yDEydFE/TWqjtN9dsU2FVoetsZYY9J2nsLpF3UGw91sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNSlEEhwZ5m0tSCEB1bIi7x3K1DCo03iNaXD988YXMs=; b=sDN5WVFkPcdKiaHfIDKmBrYMtTS8wEOzUOndujizYXi6Q17ECXpi7EV95KkR61KUcoMaQ1 5LfZwsEK030XE5PFLWcWJUm2X8ikE5khebUNqwKi5Wn0QPXM+Um1rEIW47Psm1fKeAf/KE uS0xOtpbqAkekDYmb2vA4dTFC6gES3+Z5m125xSvfFNslDhnKwsU9RQqFtPsxAZ3WHKyn1 XZJ670b36d6kHPHNf3rWHc2zfapMZ033Xq0Kw8q7SdtGt8u5OghSzjjXU4CUDvBk7Ir/pL FJEZarmMHkArEYSSH9HIYX/WUdIORgLcssogNvi13C0b2+R9oRJiJPxPt12DdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708032638; a=rsa-sha256; cv=none; b=ly2ylg8g6F/yVT/+CwjYSPhEFTmOxAqNxI2JvS+dyEyMN0JPnv2gSZgx235UIOn+uN3S1T VTei/ZASRHNdCTgHmJTGg6RgpZljBkgOuAOYb2i5x9YwXbWGmhET1JSTTG+l2/wIneE2sW 0jI58kX11u80siQgVrkzP7z0Lnrkd7sUHfOnZEX80w7ugVg/q7NHCIl06WsfXzU5H8X/R2 jMtb4OrEL5m4jTne202IA4nOOO7q+FzccU2uYM/lYIFFzovCEucqU3EceGyS8/RuL/bLgq TJls35VgvhFDnI4S4K1W8+vjJKZ7iu9/l1xsHuLAhrFyaPFF49a39QDhg5yEKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbSsV5PdMzyDr; Thu, 15 Feb 2024 21:30: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 41FLUcfW063629; Thu, 15 Feb 2024 21:30:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FLUcAK063626; Thu, 15 Feb 2024 21:30:38 GMT (envelope-from git) Date: Thu, 15 Feb 2024 21:30:38 GMT Message-Id: <202402152130.41FLUcAK063626@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: fc773115fa2d - main - heimdal: Fix NULL deref 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: Sender: owner-dev-commits-src-main@freebsd.org 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc773115fa2dbb6c01377f2ed47dabf79a4e361a Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fc773115fa2dbb6c01377f2ed47dabf79a4e361a commit fc773115fa2dbb6c01377f2ed47dabf79a4e361a Author: Cy Schubert AuthorDate: 2024-02-15 15:41:07 +0000 Commit: Cy Schubert CommitDate: 2024-02-15 21:27:55 +0000 heimdal: Fix NULL deref A flawed logical condition allows a malicious actor to remotely trigger a NULL pointer dereference using a crafted negTokenInit token. Upstream notes: Reported to Heimdal by Michał Kępień . From the report: Acknowledgement --------------- This flaw was found while working on addressing ZDI-CAN-12302: ISC BIND TKEY Query Heap-based Buffer Overflow Remote Code Execution Vulnerability, which was reported to ISC by Trend Micro's Zero Day Security: CVE-2022-3116 Obtained from: upstream 7a19658c1 MFC after: 1 week --- crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c b/crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c index b60dc19ad8e3..48542f06fcbe 100644 --- a/crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c +++ b/crypto/heimdal/lib/gssapi/spnego/accept_sec_context.c @@ -605,7 +605,7 @@ acceptor_start * If opportunistic token failed, lets try the other mechs. */ - if (!first_ok && ni->mechToken != NULL) { + if (!first_ok) { size_t j; preferred_mech_type = GSS_C_NO_OID; From nobody Thu Feb 15 21:32: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 4TbSw65C7rz5BHqQ; Thu, 15 Feb 2024 21:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbSw64WRKz4VF8; Thu, 15 Feb 2024 21:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0u3CPzJiDgIHXUmQayNbwdTx0BEgrz4LzrXLtjbZMAY=; b=GtwZ8FyNaOzDLj62Z6wA/fxWQ/6gw0OqyeKTbSjQjHSW0y3CaGm0AY0xzOPYYX1Vk8AJ58 8mrquHbut5fA0NZECY+v8Kk5Wn6gAoJfmPUJMexQAOz1t27FiXwvRnR8g4h+NegzoWyyur vPzmvlx8lluJx0Li6WVcqX0W79IlfNTC9JcD7mIvYsmNae1fz8UZA5FtysnTHGVzpvRrzK CfD47OqM0h5eQoBCr5IVvKa+wIj/pew++mbcbSmHffByqVCLD0YPNGAVUZGUaC6PK7bfqj RiuN6U2MBy1URXRDveutOUAMMHziIPYXTiRehny3GV/f3rKlK1IIbCM+0foTbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708032774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0u3CPzJiDgIHXUmQayNbwdTx0BEgrz4LzrXLtjbZMAY=; b=YWO9dOfFeNEuUbzSz+1Abj+0d4xiN1pU7o0IHC0glEKLJdc4y1p9l+StTv/N0J0o1Gzsha OBDHnbX/4QA2wq9Yhm/2PdTHvZsasm+dBk1OOuery8K56gfVzC2mJ1fJjwQlklF89RjcaE II2tSpcb32TXHiaCcknKmfWj3ffLDIh+S+pkbNvD7PYFWveTMR9msoA+/h/BGuxjasxZ8k PJLF/MnGvwoMYWdVDEH+1R7nebHzC0QHt5x9rDrsYv0lC4BowSuZQO0gT988rCY9jrkA9S GpmN6r5cbBuYDUeYIIpicdRG2t3MMzWtr9qyHf/N1l/h/IkjS+brPwup7K5V8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708032774; a=rsa-sha256; cv=none; b=PCW15/fKE3czFvLkLHI9kSJ/7r0N66edj2cgJrjPpn12qDkP8FQaxnqKVoY36tCQJQ3G7P pjoqEjFNqEuFsEE/25mhuHUOwTddIAt+MMjcBwM91MHG36Et1Fdbqf2qIWiBr+rAHztsQx CBscrxbUHOP77NRhoHuWQyNvGRupDsu1E5wi+rdWa3XTO1cw835HAFsKsBNIzFkcflYeyg npCAjwhDQCX+Myg9UvbSX+AcCKzYLJkllD546bEyLWRSDc2jbZub4BvUoVi7rZaR6tV7sR W6phBhO1ueWcivtx8MLs45Ok8pfWglM7rETsUVm67Hc1iIjAVJfGVWiYIiqhNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbSw63ZqCzxyd; Thu, 15 Feb 2024 21:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41FLWsK5070758; Thu, 15 Feb 2024 21:32:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41FLWsjE070755; Thu, 15 Feb 2024 21:32:54 GMT (envelope-from git) Date: Thu, 15 Feb 2024 21:32:54 GMT Message-Id: <202402152132.41FLWsjE070755@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: e32de9626f1a - main - reboot: initialize howto 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e32de9626f1aaf6a564c93a139b43a1bad70fa2e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e32de9626f1aaf6a564c93a139b43a1bad70fa2e commit e32de9626f1aaf6a564c93a139b43a1bad70fa2e Author: Warner Losh AuthorDate: 2024-02-15 21:28:54 +0000 Commit: Warner Losh CommitDate: 2024-02-15 21:32:04 +0000 reboot: initialize howto Make static analyzers happy by initialzing howto to 0. Coverity is cranky that it could be used unused. But it's analysis is incomplete because the args to getopt when it wasn't initialized preclude it from being used. --- sbin/reboot/reboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index a31c31892745..e9d6487da6a5 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -175,7 +175,7 @@ main(int argc, char *argv[]) { struct utmpx utx; const struct passwd *pw; - int ch, howto, i, sverrno; + int ch, howto = 0, i, sverrno; bool Dflag, fflag, lflag, Nflag, nflag, qflag; uint64_t pageins; const char *user, *kernel = NULL, *getopts = GETOPT_REBOOT; @@ -188,6 +188,7 @@ main(int argc, char *argv[]) donextboot = true; getopts = GETOPT_NEXTBOOT; /* Note: reboot's extra opts return '?' */ } else { + /* reboot */ howto = 0; } Dflag = fflag = lflag = Nflag = nflag = qflag = false; From nobody Fri Feb 16 00:05: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 4TbXJ22MNqz513Dr; Fri, 16 Feb 2024 00:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbXJ21S1gz4pMP; Fri, 16 Feb 2024 00:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708041922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8iUH40Mkc5viit4oCsSJ2VPRBikhqS2Ji5sociC5QiE=; b=dE463NmmrE4ifiD8k384aqiQ7s63imwRVztB6I3U/UJOdWAJ7uq2JW2oDgbycrtWIRbP+Y NMVPjm5yUfw2yUqOT6Syd0j8TBqgViXuwasGlWiExJAbfZ09HQN3/p/USX2uB0cw1GpWYx lMIwgu9JiI0KLGvW4XjS1Ea59xy/nzkcYnwwr40Po5Vf5E0u+88C3SRcflkgmWVJAwbOmp JAzzS3LcCrE9TN8cEFM27WBqK7CKp5UC3/g2vy/GqY9Utf64V3n8V/ThFrx8GbpH34eBjY iBuU8JE8p2d48Y14b6LGPYJKv5vrCbAN79dD71iM3ejsJKxf9BaVdRpr4BVlUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708041922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8iUH40Mkc5viit4oCsSJ2VPRBikhqS2Ji5sociC5QiE=; b=UrhUmuBrwh0/wW2emQ66vbqJSyAR/cN6f1bKIIs3U6zjhp4CkRLsYmOlIYrBxmupfhidsH qvZd5U2Rm2ZWMST9NlwiMRI2c1yvkk/kWkUvPTFEgPav7mA8JZ/Q/mRG4WkmqEtzw17ctj 3OlV6nHemwoBubo7G78wAYOfAGsCGjXNOqmY6/iDSrAF4jbroM/1BVtxF2C9qdj8ud0cat juR3OIP5jZM/fLRJRA/7sdY5Jqzu5gPErhuwzLGoGda3huP4RKAHoWq8AudocaFDziu+64 b60MR990tUVjU+f7cPffDHWZqvQQ8mJ3tbcoHt4ysxkhVPddgC+pvu7lEWjCTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708041922; a=rsa-sha256; cv=none; b=yj07h6Fj7nr6gqeeSn4to7j4q7u2oNeZ+KZGwjowjl1CUpr0ipBjNbY4eJyNtLL1GMoloo EJoGa3saNFO9cCtL9vESFCVW/j9DhZCPyxoGq38B9VrOIaqdK2dvRs+eyB7Y50tZ3rheFN XDWoKt0/74knUsvwo/9sD8zkxbU4eOmYs/+79Czh0XaHdcVvbRQnEiCs6vqZRebK8KvQ1h qz0S4IHscrtRWF61pj1B3ck9IDoRUENCZUlpdtTLyVkQhOtVVKiUpYiOrhszab4jHUlUcw BQEGHyAlRF3TiN0+aau+cfMEItLe7GRgNEj7PVFy6MHJVRBekfdcBIqKJI5hpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbXJ20Pwpz12tj; Fri, 16 Feb 2024 00:05: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 41G05L12023000; Fri, 16 Feb 2024 00:05:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G05LHJ022997; Fri, 16 Feb 2024 00:05:21 GMT (envelope-from git) Date: Fri, 16 Feb 2024 00:05:21 GMT Message-Id: <202402160005.41G05LHJ022997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4505c8924202 - main - simplebus: Map SYS_RES_IOPORT to SYS_RES_MEMORY later in alloc_resource 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4505c89242025f840023cdf092fdab845586f42d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4505c89242025f840023cdf092fdab845586f42d commit 4505c89242025f840023cdf092fdab845586f42d Author: John Baldwin AuthorDate: 2024-02-16 00:04:50 +0000 Commit: John Baldwin CommitDate: 2024-02-16 00:04:50 +0000 simplebus: Map SYS_RES_IOPORT to SYS_RES_MEMORY later in alloc_resource Specifically, the set/get_resource methods do not currently remap resource types, so remap the type in alloc_resource only after looking for a matching resource list entry. Fixes: 3cf553288b96 simplebus: Consistently map SYS_RES_IOPORT to SYS_RES_MEMORY --- sys/dev/fdt/simplebus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c index bf6fceb48a9c..71ba8a0a1f7a 100644 --- a/sys/dev/fdt/simplebus.c +++ b/sys/dev/fdt/simplebus.c @@ -447,9 +447,6 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid, sc = device_get_softc(bus); - if (type == SYS_RES_IOPORT) - type = SYS_RES_MEMORY; - /* * Request for the default allocation with a given rid: use resource * list stored in the local device info. @@ -470,6 +467,9 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid, count = rle->count; } + if (type == SYS_RES_IOPORT) + type = SYS_RES_MEMORY; + if (type == SYS_RES_MEMORY) { /* Remap through ranges property */ for (j = 0; j < sc->nranges; j++) { From nobody Fri Feb 16 00:05: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 4TbXJ32tkGz5132X; Fri, 16 Feb 2024 00:05: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 4TbXJ3234Fz4pTv; Fri, 16 Feb 2024 00:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708041923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MfBRMizSxRWMcHeXzpn/3S9fvgIcwSaADSfaPiUyeA8=; b=n9BPmojCirGkqdouyl/D6cGDn4TFYXTHwfaDfLecMYpfXpD1eRRjmqHOPZ9wOWVL9bLIs8 O4WFWpcRgMIhfPbogoyPKPAyliuoIwzfNKhIwwu6w1l+e4a5stFJRoBzBfgaaVbLEveyOP 6YEpiA63eJnJOTHsF3i82jCauAAKqtbjsCaNMVfp275qdK/78pqZchsnG1UB8dcx1uWuUh hphsYoyvCTk24q3vxPy0oGlN9SYUZEROuLVBoqG5/718ARi+5cocaXkwi22m2pdTKFePxU WoryKdN5dJQU7z1tL/sXAAxunjuyfdswuQhJRlr9PkCDst7R/8Hxhjq9CNlIIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708041923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MfBRMizSxRWMcHeXzpn/3S9fvgIcwSaADSfaPiUyeA8=; b=bv51zzt6DTQ0O/BGyKnor6COdcFHNy5M/PSf27LrUxqoP0GYsSP8Jqkk7tFjyhLJUjU3DM 326GyyTpooOXwvgTb9a1kTTxR5QwqRmDSlut/C/Ipzm9TSiTQxxoU6WwoZDK13XvzohsET h/975nr6HchUsbfZM/Iw9rpILZpTYY2ncma+trw0iNh2RgQS7wGTHsKxEgTUKVoFNO+bSE HAMqvQY+Z2Zi41Y8aoaaXOx9iWtPiBjUyA7V/9PKovtyI+u8rpmyzneBJxJrE45nHg16Ne 9vWVCJyLHafTbwrb59UugWN0n7opYOXqLr0pX8jdZsUuhYLEQagKlIa2T+OffQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708041923; a=rsa-sha256; cv=none; b=utkUIGFRPKvwy8vUN+o74PalYrghT+CN8UV+y5dAh9H29TQiuk4DzkCgyzHMUpowBxHQhq kVHVvR+tS6CT9IUm7pj84P8ai3YLu+4jVZOjnfvYYAN1A2TrsOTfOlTpUgGfJxqKy9IofU et55vo6k9xe+fU6x/Qq/jhDMeJi34NcrnGbAAaRdwUU13uawJtxV4kwuBw0pXyko9kYJhh 5tDPgxA/IbA6vxxRZNtcR3dI6OJEK7ND6FJrxm3t2x0pDmCXob5LVjuYoUiWK0XoX7FIOO 93iENRJi3sxUMmUyCDKENkpoiuU6wm1dZDetZvA5QK6MdhwMCH+xai2U94ejMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbXJ3151fz12rb; Fri, 16 Feb 2024 00:05: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 41G05Nuh023036; Fri, 16 Feb 2024 00:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G05ND2023033; Fri, 16 Feb 2024 00:05:23 GMT (envelope-from git) Date: Fri, 16 Feb 2024 00:05:23 GMT Message-Id: <202402160005.41G05ND2023033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e89d0785ff13 - main - simplebus: Implement bus_delete_resource 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e89d0785ff1332d234ae4382a849f3c23e23573a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e89d0785ff1332d234ae4382a849f3c23e23573a commit e89d0785ff1332d234ae4382a849f3c23e23573a Author: John Baldwin AuthorDate: 2024-02-16 00:05:00 +0000 Commit: John Baldwin CommitDate: 2024-02-16 00:05:00 +0000 simplebus: Implement bus_delete_resource --- sys/dev/fdt/simplebus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c index 71ba8a0a1f7a..ceb5fdde4bb7 100644 --- a/sys/dev/fdt/simplebus.c +++ b/sys/dev/fdt/simplebus.c @@ -104,6 +104,7 @@ static device_method_t simplebus_methods[] = { DEVMETHOD(bus_unmap_resource, simplebus_unmap_resource), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), + DEVMETHOD(bus_delete_resource, bus_generic_rl_delete_resource), DEVMETHOD(bus_child_pnpinfo, ofw_bus_gen_child_pnpinfo), DEVMETHOD(bus_get_resource_list, simplebus_get_resource_list), DEVMETHOD(bus_get_property, simplebus_get_property), From nobody Fri Feb 16 00:05: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 4TbXJ44HRbz512sw; Fri, 16 Feb 2024 00:05: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 4TbXJ42zNqz4pXP; Fri, 16 Feb 2024 00:05:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708041924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiwuevaVEmM1/CCV4gOAW1uZwvfc+OKMK/XHdP7A0Aw=; b=Gg8EnH1BVBJKXBlZhyuRFULi1BzcRFd9t1y7lOzzZ4ZZVNZwIstwRNA3xOEC3QgpqK3nBy kcPA3EM1joT90KiuLznkhkwNxxOoE2LQGBcbbonsCW8v6EL0NDPBmvc/5mKlZsN+KpmHzv WWiFIYOJkNp4frXHLBaBfgjpwh78LIHpjvyRwTDbo9m+7oTT1wBa2SXy/STs7s5B1y+tH8 MB2RJFmIuRIAPUsz9z65izVePBP7fX8m7Ob2yNGSS1C2Mn9rjqw012VCKwbypbMhh9fCAD EdKr4FU9uxCs0G8T9IRkUfxZJlTr1NSZ4/HabM2FOR7Q43Bp5l1IcCWhF364WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708041924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiwuevaVEmM1/CCV4gOAW1uZwvfc+OKMK/XHdP7A0Aw=; b=TkNfctdp/M7Kh06IdwHJJnA6Q4HmkGAIeqlz1lhre5cgVUvTurGjcLGbYz70qky6TaiwAJ ZFSO5alahJixevty73zb9LEF3FmcC96EzcTlafplqUq5lpJEmh0NguETlCss+n6FpmrWNv TiUwZfZKuJRmEFoIMQQpWD8SK3iiwwOl49ny9qi1ZSoOsBWWhKYCv2uf0CYx2bjXwsXAFr JIktiohoosHsypUxHNKjy17xDWhq805OWSFYdyhrbBnMKlGO7eqqQDoQkrHMOWhBrH6LCw Npduie8MqV4PuPxkQpjju1jFm3zPcz6fWENcs724gtY/Om2BoXtH69b40vST1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708041924; a=rsa-sha256; cv=none; b=S2OJCNrBvPjz8P93UGFMC+RgH4cxvsD8zCpL39luGNs93xX47q8L+CpcozZpaS9MTjh+93 jzlY+b1u40D1HLUec9CCnb83RaSXBT8xOpsy34zyMNEnUReIy1+AzRItQ1GUAp9Sw/QA2w PrQwjKcdvyguGJvLtoQp7XGVv3i8poP+YStb37mKcW0kt9LHsDeJBtt5EjYV4W+m797rxa WtOQUJGRhemR7wXvaTKLTfxOISJVAIItzIsdlxXUPQduhAWEic5JYbsCA4wK1mW8wxE83c 8F59qAupUrdzEqMLtEu8QWrflpksJ8d2WibBeZRdrljfCPSgR18+yObYxiycrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbXJ424y2z12rc; Fri, 16 Feb 2024 00:05: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 41G05OKt023096; Fri, 16 Feb 2024 00:05:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G05Ou8023093; Fri, 16 Feb 2024 00:05:24 GMT (envelope-from git) Date: Fri, 16 Feb 2024 00:05:24 GMT Message-Id: <202402160005.41G05Ou8023093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 992f5b16afa7 - main - pci_host_generic: Set a valid error if allocating a range resource fails 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 992f5b16afa73d0ea63c8a886a78ad2eda928e37 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=992f5b16afa73d0ea63c8a886a78ad2eda928e37 commit 992f5b16afa73d0ea63c8a886a78ad2eda928e37 Author: John Baldwin AuthorDate: 2024-02-16 00:05:09 +0000 Commit: John Baldwin CommitDate: 2024-02-16 00:05:09 +0000 pci_host_generic: Set a valid error if allocating a range resource fails Previously pci_host_generic_attach was returning 0 (success) incorrectly if allocating a range failed. The error value was 0 from the previously successful call to bus_set_resource in this case. Fixes: d79b6b8ec267 pci_host_generic: Don't rewrite resource start address for translation --- sys/dev/pci/pci_host_generic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 45a478634d20..ca384d9a1483 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -216,6 +216,7 @@ pci_host_generic_core_attach(device_t dev) if (sc->ranges[tuple].res == NULL) { device_printf(dev, "failed to allocate resource for range %d\n", tuple); + error = ENXIO; goto err_rman_manage; } } From nobody Fri Feb 16 01:56: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 4TbZmN42mWz51pcY; Fri, 16 Feb 2024 01:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbZmN3YRgz41fh; Fri, 16 Feb 2024 01:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708048596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WrJe3BE2W4sKcPjGd37bGMQsocM58OCbFiuziaLH9FI=; b=Q60mlRoppix/PcqV4knvrbGlpLpGmhOaiRcJo9ovmAfhkJKcQmRzogOxSCDj5JdqXzf57S 3YNrMkN/plp4z9ReJJrA2YNg2rIH8yyFze8aItRmh8gGVpAwicqP6sjh4VPXjCT1GWfNJ/ fUzb5nX3AV2pXkFZjyosA5cP7ePsQC5CfAoHffpv457AWHqIJTQ1sU0q1rCov5GckxieTx MtMUb0ITJqkgV6udvQIPHFmHjNBAsLBVct9hr1yz2c/pnB/D0eB7Uk2vTEJDw0GMukfQ5U jBvSWBUjLGGA3YvAhDrd6OuA+wOv0WPLXbL3Ot+4+KB4eEjVFUPVtnDGeJalcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708048596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WrJe3BE2W4sKcPjGd37bGMQsocM58OCbFiuziaLH9FI=; b=RtEseRfLSobIMkskRSEOuz5fop7AO1uzJZFRNLrNf3v5ShSJTudFoyVvlanMCmkLCQ4kGS 7HpxKsRcBc1yIbTNVwGtb3KwGnBpR/5lqmljRZ2JG8pGiJ+ezLoQBm47sHlF7JWefxY7tl q54pprbyViEjThA/1T8Qw2IDR9mjxhFkXcB+ka92bHq3EfWdvVzVWifD0qR8+RUtcPcNnr 69stTA5n5NxeflqtLZD3Wk3zqvuoHnebcvrYFsiV1uDbJlpy4tBhFHmnlZbkLmvNF6OhMH 4r0IW87U688QTzxrfPVK0OBl1Q6R+jyR/rFA0YeuaY1l7i3RyyZx0s1PamUHjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708048596; a=rsa-sha256; cv=none; b=G5cRNYo1kRP76alZOH8kkutToC7dGx33i1uG0qIGRruAMz1eDWWtBX79jKlPsB5Soj7lOd s49PpEShY0H3cS6i57yuW/dU6kmOqNMcl/fh1PPRrI0Di8wwNcOxve8FGSBpZkEthpnTkj h0PMvNEQYpY8cjC9IdbaMCuukm2bqFMhTRphO8m09pUyFiyN46n60GmrZJzxIPmMmQoBXG SGGdwZtHlfQ/Iu7CRzFtYuwHr7J5GcF5vaTsO9reMu0ZXnDf3GAW0w4t3B3QSXebNkIYFL 2sqA2rwL9xxFUe9KT5aLAESNJm6DhgWLDvcDZh/NXT+fu6EXQa+ynBq2iuBprw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbZmN2dLZz15Zq; Fri, 16 Feb 2024 01:56: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 41G1uahF006455; Fri, 16 Feb 2024 01:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G1uanE006452; Fri, 16 Feb 2024 01:56:36 GMT (envelope-from git) Date: Fri, 16 Feb 2024 01:56:36 GMT Message-Id: <202402160156.41G1uanE006452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: feefc3c71e33 - main - pci_host_generic: Properly handle bus_release_resource of IRQ resources 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: feefc3c71e33d8f97879c4889d5cf1ec82e98cd9 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=feefc3c71e33d8f97879c4889d5cf1ec82e98cd9 commit feefc3c71e33d8f97879c4889d5cf1ec82e98cd9 Author: John Baldwin AuthorDate: 2024-02-16 01:56:01 +0000 Commit: John Baldwin CommitDate: 2024-02-16 01:56:01 +0000 pci_host_generic: Properly handle bus_release_resource of IRQ resources Unlike other bus methods updated to use bus_generic_rman_* in commit d79b6b8ec267, the bus_release_resource method was using bus_generic_rman_release_resource for all types other than PCI_RES_BUS. Instead, bus_generic_rman_* should only be used for memory and I/O port resources for this driver. Tested by: cperciva Reviewed by: cperciva Fixes: d79b6b8ec267 pci_host_generic: Don't rewrite resource start address for translation Differential Revision: https://reviews.freebsd.org/D43925 --- sys/dev/pci/pci_host_generic.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index ca384d9a1483..386b8411d29a 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -431,16 +431,24 @@ int pci_host_generic_core_release_resource(device_t dev, device_t child, int type, int rid, struct resource *res) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct generic_pcie_core_softc *sc; sc = device_get_softc(dev); - +#endif + switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) - if (type == PCI_RES_BUS) { + case PCI_RES_BUS: return (pci_domain_release_bus(sc->ecam, child, rid, res)); - } #endif - return (bus_generic_rman_release_resource(dev, child, type, rid, res)); + case SYS_RES_IOPORT: + case SYS_RES_MEMORY: + return (bus_generic_rman_release_resource(dev, child, type, rid, + res)); + default: + return (bus_generic_release_resource(dev, child, type, rid, + res)); + } } static struct pcie_range * From nobody Fri Feb 16 02:10: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 4Tbb4m0DjVz51s68; Fri, 16 Feb 2024 02:10: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 4Tbb4l6v4vz43T6; Fri, 16 Feb 2024 02:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708049448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+r6RCSIyzXFlNVAJHsCFxolXV1V11sPU0PGzbEdmcE=; b=ZNwfqSunz8Qr/SZa/cGHvtZPKw1t8+IqkBbCaUrmuab81fK3TOHsaasgO1C3Ku9Bfn5qse 2tgyNwB5BGLV5KAwamSmrXm9XXEAAy0IIpQ74K84tBBIY4+1IGVCoLsR/T4lIdhfV8ILjj mPJ9iKFn1rmm4LmvBTYeqRj4o4uV4smH8GKxwVtkuucyzSVUe/aFTDdiAFMqXwcri/59mK P5Wz4NTonZKAp0N6wnLPHEaCemnW9gw+oDi6zZR2RuMaWWEmNhFVkU5/4tL0oNwhinx9wS GwGyk7+NENYT8Qgsfn8k8F7ufjcEVlwErYsPOFeHMM3L6qbWAjNp957KE99xfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708049448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+r6RCSIyzXFlNVAJHsCFxolXV1V11sPU0PGzbEdmcE=; b=HB/FfioovvDR1rFn5Beb88hF+uW91fd/c3kOQPtOWtC1LIwG8Pv2IWzYgGB1WCLfz1a1ph 9p517kTwmVjDy/JU3SuT1SGvxfg5ENnMXoYiuT8LHdKKwpLARB5pgxQkAWTl0WUEtbOEt2 WvTS/kl+LjJ9n54mBRbei5WRpEFvOJ5ugtkgT5U/5oeexqKccmMBl+BejQuTgzlJhk1DMC TRBO0+jot/p8cSy0qxB27sMTPQLNLdPqMocAEhWDHyx+6N+pisOp7hrVaK6afSRe3ONKxO loyN+UWTgyedyLucW+XSFb3i+UdU9LM7KDsLWrwete+uNADQEoyPHtJ+XbX1zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708049448; a=rsa-sha256; cv=none; b=C9cFOZ4vt+xnVh5gj9w2AiSceFJYwIYUopOPLWKK91zXPSVMIbR1sRZEs/eCjr42JGN3Xi NSEEfm1FYfpxMsMoN33sp0VFfeo2N56Nzu64HWzFuD11T6ZN/rEsDGOSG9JZZEGRZEIWA/ Nv8VUWAhnnxhQviqgHbg2pnR2wGAAkHGNMSNr0xVFuCEHka72gRgWT9d7XNPX4bpxtKC/3 Amvr0KezqzTMVJysnCVRLJpBtsN+Nag8hCCQ2TOaYOiFzr54PYS6Rm07NZVeeiTBr4/y+r mYp3x2VPti/W/dFRTiQewXH8ksz3g74feBkdkXY+YCv1GIkvlMyUocZagWe2+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 4Tbb4l5y8Dz160F; Fri, 16 Feb 2024 02:10: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 41G2AlZA033076; Fri, 16 Feb 2024 02:10:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G2Alrp033073; Fri, 16 Feb 2024 02:10:47 GMT (envelope-from git) Date: Fri, 16 Feb 2024 02:10:47 GMT Message-Id: <202402160210.41G2Alrp033073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 62b1faa3b749 - main - ipfw: Skip to the start of the loop when following a keep-state rule 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62b1faa3b7495de22a3225e42dabe6ce8c371e86 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=62b1faa3b7495de22a3225e42dabe6ce8c371e86 commit 62b1faa3b7495de22a3225e42dabe6ce8c371e86 Author: Karim Fodil-Lemelin AuthorDate: 2024-02-16 01:57:51 +0000 Commit: John Baldwin CommitDate: 2024-02-16 01:57:51 +0000 ipfw: Skip to the start of the loop when following a keep-state rule When a packet matches an existing dynamic rule for a keep-state rule, the matching engine advances the "instruction pointer" to the action portion of the rule skipping over the match conditions. However, the code was merely breaking out of the switch statement rather than doing a continue, so the remainder of the loop body after the switch was still executed. If the first action opcode contains an F_NOT but not an F_OR (such as an "untag" action), then match is toggled to 0, and the code exits the inner loop via a break which aborts processing of the actions. To fix, just use a continue instead of a break. PR: 276732 Reviewed by: jhb, ae MFC after: 2 weeks --- sys/netpfil/ipfw/ip_fw2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index d2b01fde6944..e43d1a8fbbff 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -2886,8 +2886,7 @@ do { \ cmd = ACTION_PTR(f); l = f->cmd_len - f->act_ofs; cmdlen = 0; - match = 1; - break; + continue; } /* * Dynamic entry not found. If CHECK_STATE, From nobody Fri Feb 16 04:00: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 4TbdW81TTdz59Z36; Fri, 16 Feb 2024 04:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbdW80m6cz4GgF; Fri, 16 Feb 2024 04:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a4Q2HgQws7ZeneMdqgAGtc+wKYpIwE5HwTGGgr+ftL4=; b=qRi92jU3PF9IMx5nO//G0z8eYWkQhSbPXdNWZWizqBggOXJibVdw84hidyfjadx7aZ9MsV dbNeGpNf78BE503j1jYxQ+CtEMGayq4Je6P8CSOWI4VI6f2o6lvUzQNmsikFg/9nsZyZRe qW5BEHkTzyT9Cvtr5kfp63j3JsUF9kCJDVsRTFzxfz26khFqb4rUgvBKwVHpR+25At//mj sOArJtdwzvS/uqRHL+q0XXygt0ojHnayIz7TJMLsdMI+eCQKwvRiXpnBFOF2RHtkFThxOU av+MQHo6y4/K2KBCyFwcb6RNTgpxYNVAkrX7fAFCIOiJKV/H8mv/QIPfTT8qsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a4Q2HgQws7ZeneMdqgAGtc+wKYpIwE5HwTGGgr+ftL4=; b=WNgCD6gFgiUFtOjwMHpDPrIwr2Q2novoUU2RT8CKLDH63MnqAbuIIK53x4voMaRokWZfin woxB+Xs1zMBWMk0SuvKIMhFMoKuL/Rfzpt1JPQQ26VS4jqsUdm5OKMxexYMWdVmdGWwUUd 3egsoexE/UB+26RUh3+so/S4PxvquaeEvSp+I+HvPs5ABl8jQFQgzywvR/H/SJPVsw4Yzg ynZ/9Y1T8mcumTsAQeMPcFV3KUZfBoaaHPsk6nUKrZ5kePr4xTFk206+jqN4xdzK1JIzrE u73mtDGHRjEPsllsZMqgmV+M9GG/OnxH0Hwf5g0SrGh6VMAIoX4HkLkCJCX6pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056020; a=rsa-sha256; cv=none; b=bOD+z8hPGFk5G7TAKFe1RqbxKmJv1aQ5+GTaCpE1bHczGhCs75zFTPf74FAaTAtpMFfCEq 05fImrFrKSXu7Kgmw3QXtQBkKDmkM8/yIWjDB7claLtBa+3+jvrYJi6IeXuAnNoKL449rI gHgL35Uw00YQpbnyh1KHNDfXiCVTdEor7Aa2MyIsSvFRRQe+q7rjy01EDF7mjEY4XuFxQC 4H5wfpRitD7/UJphohlgcTW2ThMwxB6ToxK4qeUsAV3HEZtRKSsQxHujLHqL4uRyKmwFw+ 9thFy1D0hN7ZoDwTERf8q0oQJUkx1+GtXGrTTW8vxm5LOIKyaUl7xE62+KOjcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdW76wXTz18b2; Fri, 16 Feb 2024 04:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41G40JIb018720; Fri, 16 Feb 2024 04:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40Jgd018717; Fri, 16 Feb 2024 04:00:19 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:19 GMT Message-Id: <202402160400.41G40Jgd018717@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: 33a2406eed00 - main - reboot: Use posix_spawn instead of system 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33a2406eed009dbffd7dfa44285c23f0db5a3750 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=33a2406eed009dbffd7dfa44285c23f0db5a3750 commit 33a2406eed009dbffd7dfa44285c23f0db5a3750 Author: Warner Losh AuthorDate: 2024-02-16 03:52:31 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:22 +0000 reboot: Use posix_spawn instead of system Use posix_spawn to avoid having to allocate memory needed for the system command line. Sponsored by: Netflix Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D43860 --- sbin/reboot/reboot.c | 54 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index e9d6487da6a5..d3f1fc9bbb86 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -29,19 +29,21 @@ * SUCH DAMAGE. */ -#include #include #include #include #include #include #include +#include +#include #include #include #include #include #include +#include #include #include #include @@ -69,23 +71,43 @@ static bool donextboot; static void zfsbootcfg(const char *pool, bool force) { - char *k; - int rv; - - asprintf(&k, - "zfsbootcfg -z %s -n freebsd:nvstore -k nextboot_enable -v YES", - pool); - if (k == NULL) - E("No memory for zfsbootcfg"); - - rv = system(k); - if (rv == 0) - return; + const char * const av[] = { + "zfsbootcfg", + "-z", + pool, + "-n", + "freebsd:nvstore", + "-k", + "nextboot_enable" + "-v", + "YES", + NULL + }; + int rv, status; + pid_t p; + extern char **environ; + + rv = posix_spawnp(&p, av[0], NULL, NULL, __DECONST(char **, av), + environ); if (rv == -1) E("system zfsbootcfg"); - if (rv == 127) - E("zfsbootcfg not found in path"); - E("zfsbootcfg returned %d", rv); + if (waitpid(p, &status, WEXITED) < 0) { + if (errno == EINTR) + return; + E("waitpid zfsbootcfg"); + } + if (WIFEXITED(status)) { + int e = WEXITSTATUS(status); + + if (e == 0) + return; + if (e == 127) + E("zfsbootcfg not found in path"); + E("zfsbootcfg returned %d", e); + } + if (WIFSIGNALED(status)) + E("zfsbootcfg died with signal %d", WTERMSIG(status)); + E("zfsbootcfg unexpected status %d", status); } static void From nobody Fri Feb 16 04:00: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 4TbdW924cbz59Yxd; Fri, 16 Feb 2024 04:00: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 4TbdW91dTCz4H7c; Fri, 16 Feb 2024 04:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFtuAHsV90ZmUt+kqcQL4erNzAU/gPLxkXBRKOfjK4A=; b=vzpubdkwJB0i11pDUKneSCbNZkDJ4H5cgkBmbjNfYV+JtYsyTzW/E5iBOvsT+G549bAwxX c1oRRELrH/t9YLmaUfs0TFtHJXXW1A68l76i3lRvYVeyxEgJ4AeckKPU/jyTR9gOCLTYst q679Oz7+WVfcHO76RSYzjEnpRaIOo8KQaRclRYOJDCXSYV7gHYxQHveFWODqRwLcRaHnwT tmdzI28zJGNLrVNdZWQv+T2B1yWfJLWeqQYr3lKmf7bVzk6zZ/g6ZmZKi02F+z+PuNhb3/ SHs/UGVxT7un0L0CCrSGkvCh1k9+PhW/89nA/PQq14GxpL4f6QQu2MNNF5yS2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFtuAHsV90ZmUt+kqcQL4erNzAU/gPLxkXBRKOfjK4A=; b=kriQ2prYQAbb/7pCPyNKbuxl+Bs6QlsRobZssEu74zK9JW+a3ogSWYFnpbeHPvbwMTvnFY wvHH9eqYc1jj7alL52SJTBn6AYw0IzwNOH68t0X+12Po5omsVOd+c9yt+RHup/t0PwboT9 zXN6sEQlLals1jzKPDqZo0aFXKvWX33Qr2u9KvYmOB79IhBVncokH1f2yxVEyik2dckm0s w4Lhk6kifcUZ58XFTftO/g3RtTLy3BMIWu9R+1BTvTC3062RcTpvQs7r8gXHAQsybYVRP5 cjubOpW8+Imjqn/Ot7pm+HNlJ41NeftNLiECTElnsCgBfrPbGWejL6+CI3PlMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056021; a=rsa-sha256; cv=none; b=GV9USp+9xyBfoT7Lw6V5296vdsOszOoJZNO0JUdeWluvD5dAS6buIR2jDtKPxS6xXJ71lJ FzDucOrvGYbkXkOnp1vyariuV6Jo2avZ//IwWkw0MsPI/dO14dcVZ9ocn0jE2RdzYDyoBy zq28GbeNjQ83MF1EcrJ4xh8f12Vp2RnVAwb7LY/QUSOKMNXcE5wkedJbwsfXO744RhZne9 aGoWUDW9rgqj236vOc9Bj215DIaiR2Iur0t7euN1N8uuTDZd5bnX535UbNOYRvVCf2yDGx /G2ZUYikY+uqmTZHVYa2eTAa9E/pX/pMmJ6QDuSdpp0LFNp0sdNO8/VErQyQQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdW90lTGz18Jj; Fri, 16 Feb 2024 04:00: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 41G40LkI018765; Fri, 16 Feb 2024 04:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40LGi018762; Fri, 16 Feb 2024 04:00:21 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:21 GMT Message-Id: <202402160400.41G40LGi018762@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: 7fc95c31f007 - main - loader: Simplify the loader.has_command 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fc95c31f007ef01c53aa5f9d8802e9579f408ee Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7fc95c31f007ef01c53aa5f9d8802e9579f408ee commit 7fc95c31f007ef01c53aa5f9d8802e9579f408ee Author: Warner Losh AuthorDate: 2024-02-16 03:52:41 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:22 +0000 loader: Simplify the loader.has_command luaL_checkstring already checks for the right number of arguments. There's no need to do that by hand here. Now an exception will be thrown like any other function with the wrong args. Also, push a boolean instead of an int. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43820 --- stand/liblua/lutils.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c index 8066d3f685f7..182bd699dbc3 100644 --- a/stand/liblua/lutils.c +++ b/stand/liblua/lutils.c @@ -65,14 +65,15 @@ lua_has_command(lua_State *L) { const char *cmd; - if (lua_gettop(L) != 1) { - lua_pushnil(L); + cmd = luaL_checkstring(L, 1); + if (interp_has_builtin_cmd(cmd)) { + lua_pushboolean(L, 1); return 1; } - cmd = luaL_checkstring(L, 1); - lua_pushinteger(L, interp_has_builtin_cmd(cmd)); - return 1; + lua_pushnil(L); + lua_pushstring(L, "Builtin command not found"); + return 2; } static int From nobody Fri Feb 16 04:00: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 4TbdWB4phVz59ZBQ; Fri, 16 Feb 2024 04:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbdWB2gGPz4H65; Fri, 16 Feb 2024 04:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2GlpBGzlkvOqTyO9AOg1ihYEj1jOZ4x8uA2H2aiMj34=; b=qeT0vizrg9Oo38zvRtPVN8Wwe29v9omRNIJbrTtc0BpYO4LQgiukrreylAgMbWvb+xYpbd kbM/YA4mqLKkqhIJFXQUZyrfs7MxUaWuPolKd4Ds9i4R6PJGV0FKtsuFUkwGKI4ckritwH K2X446dmZC0Ar8MnKl5IDw4m5feba9fAhndP9S5p7FSwup3RE7nl2nHbu6A8xpKVpnx0bJ jz7xMgN5uDv6TxCMjHoq6BaRmaYqFdB5IiqCwNrol+Pk4L5z17r7HP/FIv/SC0K22h3lLa iBWTEoPzme9CpwLgGgLEMjKFvaYd8W7jsxRKl/Mv4H/aJDklNdkwMbu4xXCaBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2GlpBGzlkvOqTyO9AOg1ihYEj1jOZ4x8uA2H2aiMj34=; b=uqaLtLTjSnrotymexGvxU9NvDOuhzM1DBldSj3xkE9Yo12GnHo6wm70R5pmVzziJ03MClx VilgNVi73qFxJmF9K6l2yIRP7CTL8LvdIKmMLhhhqBJQKcJK5pS+YR1JUBzig3Sv7uJC3Y jk0Bk/Kq3mk4Vcp/gRfcWQ+QRi+1hRZKF1lRctx0WvQD0/ChFDzMOvSUQLImAR+xyY+BzE +nAqT0VRJ971CYCvdQbespMgcQzVFKaZbO0ekb2V33xGLDE4hXqHHJ27TgbeY0Sxw/4bdg ySRMQrR/OodC1KrtI3dnl4VGTVOdedXC6zHJn9jEhetwu/tBe6snsakUVkrhSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056022; a=rsa-sha256; cv=none; b=a26AcuTz/raW1z93r8KfV3CwCwAy05VDslzmHEFy/fO4oF4GNPwMk7z3d852zTf3cRBQVy 73aP9Uc3L5P8A/kTOJtuDMTbN+b9P743OwwM42hi0AsHR9lBtO/VknN41eht5RZeggnalq Hwdk5EolxYIab37JRfed63VvVZFvB1tvoUePGAcLxaxGRPsqUP3BKMjGxiOfQnsX94H2Fz 4PnwKpojYeRDM/sXXhQp1bT7kDwQY3tXq9y08we+Uz+F0M27kRfupNbXNpXQADeBhSf8IZ /wOd58ox58tD+/3IPOD3BACNaAijli9xFeDr+EegAih3D5juf7kgj3abBiaQLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWB1kYtz18Xc; Fri, 16 Feb 2024 04:00: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 41G40Mbq018816; Fri, 16 Feb 2024 04:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40MXc018813; Fri, 16 Feb 2024 04:00:22 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:22 GMT Message-Id: <202402160400.41G40MXc018813@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: 1dac5a34b64e - main - loader: Register the gfx stuff separately. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dac5a34b64e2573236f38b23f8b1f92bd6a1d7c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1dac5a34b64e2573236f38b23f8b1f92bd6a1d7c commit 1dac5a34b64e2573236f38b23f8b1f92bd6a1d7c Author: Warner Losh AuthorDate: 2024-02-16 03:52:48 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:22 +0000 loader: Register the gfx stuff separately. Move registration of the gfx stuff to separate function. However, no change in functionality is intended. Sponsored by: Netflix Reviewed by: kevans, jhb Differential Revision: https://reviews.freebsd.org/D43900 --- stand/liblua/lutils.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c index 182bd699dbc3..0dbd8a6f720b 100644 --- a/stand/liblua/lutils.c +++ b/stand/liblua/lutils.c @@ -578,6 +578,10 @@ static const struct luaL_Reg loaderlib[] = { REG_SIMPLE(setenv), REG_SIMPLE(time), REG_SIMPLE(unsetenv), + { NULL, NULL }, +}; + +static const struct luaL_Reg gfxlib[] = { REG_SIMPLE(fb_bezier), REG_SIMPLE(fb_drawrect), REG_SIMPLE(fb_line), @@ -627,10 +631,17 @@ lua_add_features(lua_State *L) lua_setfield(L, -2, "features"); } +static void +luaopen_gfx(lua_State *L) +{ + luaL_newlib(L, gfxlib); +} + int luaopen_loader(lua_State *L) { luaL_newlib(L, loaderlib); + luaopen_gfx(L); /* Add loader.machine and loader.machine_arch properties */ lua_pushstring(L, MACHINE); lua_setfield(L, -2, "machine"); From nobody Fri Feb 16 04:00: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 4TbdWC5PJYz59ZK0; Fri, 16 Feb 2024 04:00: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 4TbdWC3f54z4H1y; Fri, 16 Feb 2024 04:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VZwDpXDeKU+S1XVkeo3+wqvJDocRmmyhwVxGOrQSOa8=; b=IwxMBQiEa1zNe7qofSMtocx/zIiPm22hRnQPoIqlxhyGmfTpUTbKLR+OR1eBl4XwVl0Iac E9TjUzUiKyN4HdPEF863zCPyVGA6JIPFpqLtcd54jjkauuZLCw+FsaxD8nzUp0TbUASTVt aIYOwIWgaP6PiTJuWBntjTGxuglpQorIt6g2wTzkwEeet9Lz0NnQ4ZcZI2uwp0eGn2sQAT diZo0xc3imxy23kn313WTE+I4iB/wL03AczqdSUkotm4ksVL9y/Z9QLoRDe/XIXvBGCXso BjHJmDXVrXyAf+6FvP7QDqTCSHHB3Y5GZpC1H455sBeHqlXYMFvSsiLsVOwJUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VZwDpXDeKU+S1XVkeo3+wqvJDocRmmyhwVxGOrQSOa8=; b=cNlg6v3cq6XtK/b75jRcx/AlcjLC/4HptWDUb10jIzzDRJvYmG7Y/EjFzTdJNirfc0xIlx 6S6F8AJHW/JDFuiFj9dpO1Hm5Qli+49j3CsbqeV5o6gBco9f5Jah0g6P9Bh9eNiDsB3Igh w76g2wwyQYmVHvrgR2KkrX3XsGKUIR2+xSQN1YWLCDKlN3cCZwPT8LuWvaXTJ0yf8jCevn Gud0OowSiNHf7p33mxfFFtj0msJ6/TUKhU6ulyiKsMboRxJ7oa4ioQXlOb+pvZZncqE6Le qnXPUxDyJv8xs5wJoqUSJ+9E64J+lAugU87VjSZrEbqvv3Y42RlikiArekXFpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056023; a=rsa-sha256; cv=none; b=eKIJaWp+CudRwFbUB1WAdluaGfB/Fpxs9Ydr5fbF+p0PZH9GddkdblieL+cuEwhTOg9PDC cdOkB7dJbzKFeCP1njLRsTt/l4j70KkhwEmA3l7pfVOuyEL0700/U6+Jz02ONYsny/+g7U k6fq7QMwM93PT4AbJU7eFz3/VSybLayxdrMgeWv6UguoMkSLFKe4YjT0Tfjz2ZIhXBYtqc wQvnnQol6VVugugj2vQEOecVQfHOiKEgxlSzdPPkQ+h+f7u4LpOSslgyK4L1JeBmplRrAc /ap+J0ZZfXT9TGRigH6SyYRcFeCKvEfXLAp6IgmJez9P+cqzrG8mZZLxtY9s8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWC2lVpz18Jk; Fri, 16 Feb 2024 04:00: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 41G40NJs018864; Fri, 16 Feb 2024 04:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40NMe018861; Fri, 16 Feb 2024 04:00:23 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:23 GMT Message-Id: <202402160400.41G40NMe018861@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: 061b68a76030 - main - loader: Separate gfx to a new 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 061b68a76030f4147f5a30e60ab5f4296c1376b7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=061b68a76030f4147f5a30e60ab5f4296c1376b7 commit 061b68a76030f4147f5a30e60ab5f4296c1376b7 Author: Warner Losh AuthorDate: 2024-02-16 03:52:59 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:22 +0000 loader: Separate gfx to a new file. Move gfx lua hook registration to a new file. Sponsored by: Netflix Reviewed by: kevans, jhb Differential Revision: https://reviews.freebsd.org/D43901 --- stand/liblua/Makefile | 3 +- stand/liblua/gfx_utils.c | 242 +++++++++++++++++++++++++++++++++++++++++++++++ stand/liblua/lutils.c | 202 --------------------------------------- stand/liblua/lutils.h | 1 + 4 files changed, 245 insertions(+), 203 deletions(-) diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile index b2f17811ff84..bbfa21e07f53 100644 --- a/stand/liblua/Makefile +++ b/stand/liblua/Makefile @@ -23,6 +23,7 @@ SRCS+= lauxlib.c lbaselib.c lstrlib.c loadlib.c # Our utilities. SRCS+= lerrno.c lpager.c lstd.c lutils.c +SRCS+= gfx_utils.c .PATH: ${FLUASRC}/modules SRCS+= lfs.c @@ -34,7 +35,7 @@ CFLAGS+= -ffreestanding -nostdlib -DLUA_USE_POSIX CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC} -CFLAGS.lutils.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite +CFLAGS.gfx_utils.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0 CFLAGS+= -fPIC diff --git a/stand/liblua/gfx_utils.c b/stand/liblua/gfx_utils.c new file mode 100644 index 000000000000..fe208dc990d8 --- /dev/null +++ b/stand/liblua/gfx_utils.c @@ -0,0 +1,242 @@ +/*- + * Copyright (c) 2024 Netflix, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* Copied from a file that likely shoulve have had this at the top */ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2020 Toomas Soome + * Copyright 2020 RackTop Systems, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL 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 "lua.h" +#include "lauxlib.h" +#include "lutils.h" +#include +#include + +/* + * put image using terminal coordinates. + */ +static int +lua_term_putimage(lua_State *L) +{ + const char *name; + png_t png; + uint32_t x1, y1, x2, y2, f; + int nargs, ret = 0, error; + + nargs = lua_gettop(L); + if (nargs != 6) { + lua_pushboolean(L, 0); + return 1; + } + + name = luaL_checkstring(L, 1); + x1 = luaL_checknumber(L, 2); + y1 = luaL_checknumber(L, 3); + x2 = luaL_checknumber(L, 4); + y2 = luaL_checknumber(L, 5); + f = luaL_checknumber(L, 6); + + x1 = gfx_state.tg_origin.tp_col + x1 * gfx_state.tg_font.vf_width; + y1 = gfx_state.tg_origin.tp_row + y1 * gfx_state.tg_font.vf_height; + if (x2 != 0) { + x2 = gfx_state.tg_origin.tp_col + + x2 * gfx_state.tg_font.vf_width; + } + if (y2 != 0) { + y2 = gfx_state.tg_origin.tp_row + + y2 * gfx_state.tg_font.vf_height; + } + + if ((error = png_open(&png, name)) != PNG_NO_ERROR) { + if (f & FL_PUTIMAGE_DEBUG) + printf("%s\n", png_error_string(error)); + } else { + if (gfx_fb_putimage(&png, x1, y1, x2, y2, f) == 0) + ret = 1; + (void) png_close(&png); + } + lua_pushboolean(L, ret); + return 1; +} + +static int +lua_fb_putimage(lua_State *L) +{ + const char *name; + png_t png; + uint32_t x1, y1, x2, y2, f; + int nargs, ret = 0, error; + + nargs = lua_gettop(L); + if (nargs != 6) { + lua_pushboolean(L, 0); + return 1; + } + + name = luaL_checkstring(L, 1); + x1 = luaL_checknumber(L, 2); + y1 = luaL_checknumber(L, 3); + x2 = luaL_checknumber(L, 4); + y2 = luaL_checknumber(L, 5); + f = luaL_checknumber(L, 6); + + if ((error = png_open(&png, name)) != PNG_NO_ERROR) { + if (f & FL_PUTIMAGE_DEBUG) + printf("%s\n", png_error_string(error)); + } else { + if (gfx_fb_putimage(&png, x1, y1, x2, y2, f) == 0) + ret = 1; + (void) png_close(&png); + } + lua_pushboolean(L, ret); + return 1; +} + +static int +lua_fb_setpixel(lua_State *L) +{ + uint32_t x, y; + int nargs; + + nargs = lua_gettop(L); + if (nargs != 2) { + lua_pushnil(L); + return 1; + } + + x = luaL_checknumber(L, 1); + y = luaL_checknumber(L, 2); + gfx_fb_setpixel(x, y); + return 0; +} + +static int +lua_fb_line(lua_State *L) +{ + uint32_t x0, y0, x1, y1, wd; + int nargs; + + nargs = lua_gettop(L); + if (nargs != 5) { + lua_pushnil(L); + return 1; + } + + x0 = luaL_checknumber(L, 1); + y0 = luaL_checknumber(L, 2); + x1 = luaL_checknumber(L, 3); + y1 = luaL_checknumber(L, 4); + wd = luaL_checknumber(L, 5); + gfx_fb_line(x0, y0, x1, y1, wd); + return 0; +} + +static int +lua_fb_bezier(lua_State *L) +{ + uint32_t x0, y0, x1, y1, x2, y2, width; + int nargs; + + nargs = lua_gettop(L); + if (nargs != 7) { + lua_pushnil(L); + return 1; + } + + x0 = luaL_checknumber(L, 1); + y0 = luaL_checknumber(L, 2); + x1 = luaL_checknumber(L, 3); + y1 = luaL_checknumber(L, 4); + x2 = luaL_checknumber(L, 5); + y2 = luaL_checknumber(L, 6); + width = luaL_checknumber(L, 7); + gfx_fb_bezier(x0, y0, x1, y1, x2, y2, width); + return 0; +} + +static int +lua_fb_drawrect(lua_State *L) +{ + uint32_t x0, y0, x1, y1, fill; + int nargs; + + nargs = lua_gettop(L); + if (nargs != 5) { + lua_pushnil(L); + return 1; + } + + x0 = luaL_checknumber(L, 1); + y0 = luaL_checknumber(L, 2); + x1 = luaL_checknumber(L, 3); + y1 = luaL_checknumber(L, 4); + fill = luaL_checknumber(L, 5); + gfx_fb_drawrect(x0, y0, x1, y1, fill); + return 0; +} + +static int +lua_term_drawrect(lua_State *L) +{ + uint32_t x0, y0, x1, y1; + int nargs; + + nargs = lua_gettop(L); + if (nargs != 4) { + lua_pushnil(L); + return 1; + } + + x0 = luaL_checknumber(L, 1); + y0 = luaL_checknumber(L, 2); + x1 = luaL_checknumber(L, 3); + y1 = luaL_checknumber(L, 4); + gfx_term_drawrect(x0, y0, x1, y1); + return 0; +} + +#define REG_SIMPLE(n) { #n, lua_ ## n } +static const struct luaL_Reg gfxlib[] = { + REG_SIMPLE(fb_bezier), + REG_SIMPLE(fb_drawrect), + REG_SIMPLE(fb_line), + REG_SIMPLE(fb_putimage), + REG_SIMPLE(fb_setpixel), + REG_SIMPLE(term_drawrect), + REG_SIMPLE(term_putimage), + { NULL, NULL }, +}; + +int +luaopen_gfx(lua_State *L) +{ + luaL_newlib(L, gfxlib); + return 1; +} diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c index 0dbd8a6f720b..20876f965f0c 100644 --- a/stand/liblua/lutils.c +++ b/stand/liblua/lutils.c @@ -32,8 +32,6 @@ #include "lstd.h" #include "lutils.h" #include "bootstrap.h" -#include -#include /* * Like loader.perform, except args are passed already parsed @@ -380,189 +378,6 @@ lua_writefile(lua_State *L) return 1; } -/* - * put image using terminal coordinates. - */ -static int -lua_term_putimage(lua_State *L) -{ - const char *name; - png_t png; - uint32_t x1, y1, x2, y2, f; - int nargs, ret = 0, error; - - nargs = lua_gettop(L); - if (nargs != 6) { - lua_pushboolean(L, 0); - return 1; - } - - name = luaL_checkstring(L, 1); - x1 = luaL_checknumber(L, 2); - y1 = luaL_checknumber(L, 3); - x2 = luaL_checknumber(L, 4); - y2 = luaL_checknumber(L, 5); - f = luaL_checknumber(L, 6); - - x1 = gfx_state.tg_origin.tp_col + x1 * gfx_state.tg_font.vf_width; - y1 = gfx_state.tg_origin.tp_row + y1 * gfx_state.tg_font.vf_height; - if (x2 != 0) { - x2 = gfx_state.tg_origin.tp_col + - x2 * gfx_state.tg_font.vf_width; - } - if (y2 != 0) { - y2 = gfx_state.tg_origin.tp_row + - y2 * gfx_state.tg_font.vf_height; - } - - if ((error = png_open(&png, name)) != PNG_NO_ERROR) { - if (f & FL_PUTIMAGE_DEBUG) - printf("%s\n", png_error_string(error)); - } else { - if (gfx_fb_putimage(&png, x1, y1, x2, y2, f) == 0) - ret = 1; - (void) png_close(&png); - } - lua_pushboolean(L, ret); - return 1; -} - -static int -lua_fb_putimage(lua_State *L) -{ - const char *name; - png_t png; - uint32_t x1, y1, x2, y2, f; - int nargs, ret = 0, error; - - nargs = lua_gettop(L); - if (nargs != 6) { - lua_pushboolean(L, 0); - return 1; - } - - name = luaL_checkstring(L, 1); - x1 = luaL_checknumber(L, 2); - y1 = luaL_checknumber(L, 3); - x2 = luaL_checknumber(L, 4); - y2 = luaL_checknumber(L, 5); - f = luaL_checknumber(L, 6); - - if ((error = png_open(&png, name)) != PNG_NO_ERROR) { - if (f & FL_PUTIMAGE_DEBUG) - printf("%s\n", png_error_string(error)); - } else { - if (gfx_fb_putimage(&png, x1, y1, x2, y2, f) == 0) - ret = 1; - (void) png_close(&png); - } - lua_pushboolean(L, ret); - return 1; -} - -static int -lua_fb_setpixel(lua_State *L) -{ - uint32_t x, y; - int nargs; - - nargs = lua_gettop(L); - if (nargs != 2) { - lua_pushnil(L); - return 1; - } - - x = luaL_checknumber(L, 1); - y = luaL_checknumber(L, 2); - gfx_fb_setpixel(x, y); - return 0; -} - -static int -lua_fb_line(lua_State *L) -{ - uint32_t x0, y0, x1, y1, wd; - int nargs; - - nargs = lua_gettop(L); - if (nargs != 5) { - lua_pushnil(L); - return 1; - } - - x0 = luaL_checknumber(L, 1); - y0 = luaL_checknumber(L, 2); - x1 = luaL_checknumber(L, 3); - y1 = luaL_checknumber(L, 4); - wd = luaL_checknumber(L, 5); - gfx_fb_line(x0, y0, x1, y1, wd); - return 0; -} - -static int -lua_fb_bezier(lua_State *L) -{ - uint32_t x0, y0, x1, y1, x2, y2, width; - int nargs; - - nargs = lua_gettop(L); - if (nargs != 7) { - lua_pushnil(L); - return 1; - } - - x0 = luaL_checknumber(L, 1); - y0 = luaL_checknumber(L, 2); - x1 = luaL_checknumber(L, 3); - y1 = luaL_checknumber(L, 4); - x2 = luaL_checknumber(L, 5); - y2 = luaL_checknumber(L, 6); - width = luaL_checknumber(L, 7); - gfx_fb_bezier(x0, y0, x1, y1, x2, y2, width); - return 0; -} - -static int -lua_fb_drawrect(lua_State *L) -{ - uint32_t x0, y0, x1, y1, fill; - int nargs; - - nargs = lua_gettop(L); - if (nargs != 5) { - lua_pushnil(L); - return 1; - } - - x0 = luaL_checknumber(L, 1); - y0 = luaL_checknumber(L, 2); - x1 = luaL_checknumber(L, 3); - y1 = luaL_checknumber(L, 4); - fill = luaL_checknumber(L, 5); - gfx_fb_drawrect(x0, y0, x1, y1, fill); - return 0; -} - -static int -lua_term_drawrect(lua_State *L) -{ - uint32_t x0, y0, x1, y1; - int nargs; - - nargs = lua_gettop(L); - if (nargs != 4) { - lua_pushnil(L); - return 1; - } - - x0 = luaL_checknumber(L, 1); - y0 = luaL_checknumber(L, 2); - x1 = luaL_checknumber(L, 3); - y1 = luaL_checknumber(L, 4); - gfx_term_drawrect(x0, y0, x1, y1); - return 0; -} - #define REG_SIMPLE(n) { #n, lua_ ## n } static const struct luaL_Reg loaderlib[] = { REG_SIMPLE(delay), @@ -581,17 +396,6 @@ static const struct luaL_Reg loaderlib[] = { { NULL, NULL }, }; -static const struct luaL_Reg gfxlib[] = { - REG_SIMPLE(fb_bezier), - REG_SIMPLE(fb_drawrect), - REG_SIMPLE(fb_line), - REG_SIMPLE(fb_putimage), - REG_SIMPLE(fb_setpixel), - REG_SIMPLE(term_drawrect), - REG_SIMPLE(term_putimage), - { NULL, NULL }, -}; - static const struct luaL_Reg iolib[] = { { "close", lua_closefile }, REG_SIMPLE(getchar), @@ -631,12 +435,6 @@ lua_add_features(lua_State *L) lua_setfield(L, -2, "features"); } -static void -luaopen_gfx(lua_State *L) -{ - luaL_newlib(L, gfxlib); -} - int luaopen_loader(lua_State *L) { diff --git a/stand/liblua/lutils.h b/stand/liblua/lutils.h index 280fb77aa665..c1fd6af496e5 100644 --- a/stand/liblua/lutils.h +++ b/stand/liblua/lutils.h @@ -26,6 +26,7 @@ #include +int luaopen_gfx(lua_State *); int luaopen_loader(lua_State *); int luaopen_io(lua_State *); int luaopen_pager(lua_State *); From nobody Fri Feb 16 04:00: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 4TbdWD67Kvz59ZDR; Fri, 16 Feb 2024 04:00: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 4TbdWD48lxz4H6b; Fri, 16 Feb 2024 04:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TQ17omXinxVTKXbU9hVPgZxnG/4LAgiEaUt/mUWFqAU=; b=gVVY/tu6FfSCr9XBw4H/xiO+HP11XT/SmW+sx25Kldi2JEF+GEHtZQm/SMivgyLl+NxIi3 Fg312gyHj16oqFrGw+GjFMqiTPr1Wv8m2oqmkficllk5iW5mq30KmkIdWcBwhRYq65qfUF +VgS5A9fhfaREGuWqoLz56APm/9DEMXUwLyxuN7D7WdJjFDPr3GnP33nituO0jh/hPuxHz wE98cDzGH+fEWg9cGpfdK895g5SW6vEqoKj7TUzNEvOVi3WkGaTTTU7bmFQJH27b94L4OR URIY3nnQ1Q+QseVku2Gsp4GWMZexEbZ8I1AMJxRhYd3BF7P1FtfzHn9m8ZHTtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TQ17omXinxVTKXbU9hVPgZxnG/4LAgiEaUt/mUWFqAU=; b=jSmL/algHCoV9bviQzUhSdXYXnWDeemLbJuR01GGLzrIatXQyEqswOW9ldmzWYisMN9nfz 1ejjqPIunHuOpLH9OPS/fV8MLqE1xNOJcWV8XxQcUeiGhF585NEt7rvlqm7iq2a4ZAcuS8 D+3k0fhZ2ALC/i/SxlAd5mQUzlh2mAejSOueNHYi2pP48waZXAoH14KNXPsrBI42LyDVdt QXuF+KyBbBRoRV7jocCdlO57DeRhToZUw4zOwUPWQHMwgQ3j2Z08h/GwUJq9ao06VIj3H1 OrQCAddZ+5Gz4NIracFZsZxBtbK5cAMBNPycHAATKgPUIFDPU4chKcAFQi1YzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056024; a=rsa-sha256; cv=none; b=XhiKHnZ38QE3dSiu/QPFC/w5g4Wa5bfRaX/vfbzDNJK9yx49AEZg3yh9fe5M3Y8kG+J3TI /bdH0Yn52itfWF05bqj95cQlGEsreG6l+FRB3GbrOPf0z5j6QYd+3KlJ3kNdmW6jB9aW8t k6kQDC9lik/wv673Cuk/pomTXVJRdFRtUZqr3Nty8mUuk5X3Snlyetr8LD1KGFsAJ8Rfie /3PgBAp9Q2dBexbZTdLecHAES1o4wHT5oJF/9hFQDtjLKdYV8wjkCygMXF5CkBgCDdYUNl U+tJZCoWCpDuXhhlvAWAxdRz4MI5tMuFG0wDZHz4vCnLhY0o8aduKEuXqHkA5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWD3FLZz18Xd; Fri, 16 Feb 2024 04:00: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 41G40OhA018906; Fri, 16 Feb 2024 04:00:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40OI7018903; Fri, 16 Feb 2024 04:00:24 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:24 GMT Message-Id: <202402160400.41G40OI7018903@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: 9b16231032dd - main - loader: Create new gfx table 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b16231032ddb40be282d76ec0d82b3a0ec96d60 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b16231032ddb40be282d76ec0d82b3a0ec96d60 commit 9b16231032ddb40be282d76ec0d82b3a0ec96d60 Author: Warner Losh AuthorDate: 2024-02-16 03:53:07 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:22 +0000 loader: Create new gfx table Create a new gfx global table. Put into it all the graphics bindings that we have in loader today. For now, have compatability binding for loader. Remove them from loader. Sponsored by: Netflix Reviewed by: kevans, jhb Differential Revision: https://reviews.freebsd.org/D43902 --- stand/common/interp_lua.c | 27 +++++++++++++++++++++++++++ stand/liblua/lutils.c | 1 - 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/stand/common/interp_lua.c b/stand/common/interp_lua.c index 3f758baebc2d..a347526b67c9 100644 --- a/stand/common/interp_lua.c +++ b/stand/common/interp_lua.c @@ -97,6 +97,31 @@ static const luaL_Reg loadedlibs[] = { {NULL, NULL} }; +static void +interp_init_md(lua_State *L) +{ + luaL_requiref(L, "gfx", luaopen_gfx, 1); + lua_pop(L, 1); /* Remove lib */ + + /* + * Add in the comparability references in the loader table. Doing it with + * a pseudo-embedded script is easier than the raw calls. + */ + if (luaL_dostring(L, + "loader.fb_bezier = gfx.fb_bezier\n" + "loader.fb_drawrect = gfx.fb_drawrect\n" + "loader.fb_line = gfx.fb_line\n" + "loader.fb_putimage = gfx.fb_putimage\n" + "loader.fb_setpixel = gfx.fb_setpixel\n" + "loader.term_drawrect = gfx.term_drawrect\n" + "loader.term_putimage = gfx.term_putimage") != 0) { + lua_pop(L, 1); + const char *errstr = lua_tostring(L, -1); + errstr = errstr == NULL ? "unknown" : errstr; + printf("Error adding compat loader bindings: %s.\n", errstr); + } +} + void interp_init(void) { @@ -123,6 +148,8 @@ interp_init(void) lua_pop(luap, 1); /* remove lib */ } + interp_init_md(luap); + filename = getenv("loader_lua"); if (filename == NULL) filename = LOADER_LUA; diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c index 20876f965f0c..0be9f5f28ac3 100644 --- a/stand/liblua/lutils.c +++ b/stand/liblua/lutils.c @@ -439,7 +439,6 @@ int luaopen_loader(lua_State *L) { luaL_newlib(L, loaderlib); - luaopen_gfx(L); /* Add loader.machine and loader.machine_arch properties */ lua_pushstring(L, MACHINE); lua_setfield(L, -2, "machine"); From nobody Fri Feb 16 04:00:25 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 4TbdWG0nhvz59Z8b; Fri, 16 Feb 2024 04:00: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 4TbdWF5MlQz4H6w; Fri, 16 Feb 2024 04:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QM1RZPOIyR0PNR/CxiU+e6bYoC2gD9cW/a4M/tsPCEk=; b=wueijX65TlilVtlAMVgyNeaX0mcHkoG8QRbX0eAWXaksrbwTYFml/Bf5FyUMzsV0HvIUNk 8ZSm1EHQ4MuU5jVOlifHdfXJEyoUpzj7fxAgxbLU1QaAabU9il2Ec75whXSBfCegJcvjMg Gy5VGCTXfFqMg/82NKoNtVzz+EcMCi+8Y2RrpcrVsJNy2t3idr8+HklkP5bNbWBJ3ITjeU SuN46fg8DRDUzPJ8FPE5mT1twYxs1uRKji4QxGsxQRdit6SgNyxtQyaW21/3EOHA929leN ey81doVoN4JGq+X7hGeJa/wte6SRt7dZa693EfQwIkWCs0vK672KhfllaDWKUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QM1RZPOIyR0PNR/CxiU+e6bYoC2gD9cW/a4M/tsPCEk=; b=qOsgekxTUJ+jbc0pbrlr0DtFmpV7lnZuaQXZK8Hw8gCbJzWWGkqHdT5xJlhO76eFk3IHXp AsUlbmYC5EUs/tS/bbKYi4Xd0mfCPJjB0qEHRYdjQxGkqO3099/eRDek6eTjUcKCiaNa5q uBAKYDVxppivwmP7/1BK6cLZ6DQ8NuEDppDdKuNsXg0aVQ5Oa7HVQt8ty8KRuYGIHeAeqK HAB7vv+7rRLkKp8XTtlpCp/GAHkWsseRzCRCqkA4iqavYeUTVfZq/fjhz9o7YyM4afb95c CwSH2JU9tOViC3ImYxn78MHnaGjW7yWuV3VnduaIJw+QaeRxGcZ/DMrFXJFzSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056025; a=rsa-sha256; cv=none; b=KAIJLSulZyu6gW9Vv/QbH7gsjsLdCsY0WP7EeSnYDFIxAZt01q9YvPjuyfC1rj7wR3SSjg IDT8cSkW3FJJhOU/VeBgGRLlaS56gJBzxvjV78CPwkPY3fT2eIvZIgx6cMEk2vP9t8MqOr jPpC2FL9eoxdryEoiJG6pVklAcX4YKFSYti8AKMV0zbemYZUJZVWGMmZs37Alc2wPU9t/m O+K/zIGKTt/iTRfRw3VgiX0QwO9owCXbxn+dx2XLW6Ry2KbjZnn1XfIYRFBlYKMM/n6tNq 74mF/Yy2DSvBuyS42Rj5r5IZTmpx4psZZ+Cc4ocUAQ3e47v60nN1Hvrwd5E68w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWF4TxVz18Pl; Fri, 16 Feb 2024 04:00:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41G40PgT018948; Fri, 16 Feb 2024 04:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40PdK018945; Fri, 16 Feb 2024 04:00:25 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:25 GMT Message-Id: <202402160400.41G40PdK018945@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: 60e199d9fde1 - main - loader: Add prototype for gfx_interp_md 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60e199d9fde1c3c60a96b969bf6982278cbc1e88 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=60e199d9fde1c3c60a96b969bf6982278cbc1e88 commit 60e199d9fde1c3c60a96b969bf6982278cbc1e88 Author: Warner Losh AuthorDate: 2024-02-16 03:53:19 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:22 +0000 loader: Add prototype for gfx_interp_md This function will be used to draw in the graphics bindings when the loader is compiled with graphics (gfx) support. Provide definitions for lua and the simple interpreter. 4th support is forthcoming. Sponsored by: Netflix Reviewed by: kevans, jhb Differential Revision: https://reviews.freebsd.org/D43903 --- stand/common/gfx_fb.h | 2 ++ stand/common/interp_simple.c | 8 ++++++++ stand/liblua/gfx_utils.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/stand/common/gfx_fb.h b/stand/common/gfx_fb.h index adb60c673ea9..84062864c57f 100644 --- a/stand/common/gfx_fb.h +++ b/stand/common/gfx_fb.h @@ -281,6 +281,8 @@ void term_image_display(teken_gfx_t *, const teken_rect_t *); void reset_font_flags(void); +void gfx_interp_md(void); + #ifdef __cplusplus } #endif diff --git a/stand/common/interp_simple.c b/stand/common/interp_simple.c index fa021c796308..61ed724af9d0 100644 --- a/stand/common/interp_simple.c +++ b/stand/common/interp_simple.c @@ -198,3 +198,11 @@ interp_include(const char *filename) } return(res); } + +/* + * There's no graphics commands for the simple interpreter. + */ +void +gfx_interp_md(void) +{ +} diff --git a/stand/liblua/gfx_utils.c b/stand/liblua/gfx_utils.c index fe208dc990d8..d2d22738c929 100644 --- a/stand/liblua/gfx_utils.c +++ b/stand/liblua/gfx_utils.c @@ -240,3 +240,8 @@ luaopen_gfx(lua_State *L) luaL_newlib(L, gfxlib); return 1; } + +void +gfx_interp_md(void) +{ +} From nobody Fri Feb 16 04:00: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 4TbdWH1wf2z59ZK7; Fri, 16 Feb 2024 04:00: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 4TbdWG6Fjjz4HHh; Fri, 16 Feb 2024 04:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=09RywJpyORvv3yoH/3bQk4JGW7+OsOc8Y5zzACFcVVw=; b=p6MMsHIxaUir63DUDvvSNhqLMLTXQvZDAjACetCMrnpJl0yv2F9J4lLoW9ubJyRMhlwPiN mB/WKn3ob5lDNEku5MOUPQVZAas8HZMjBMqFl+Vyt44k0718FtZ254lv0UPvwFMxKR6QcD Cz00CX5knZEy6RM6m/pMdmEwv9ZWxg59ePDu8QWG22ZFfLBsQrjx0XRKzbetVVrSw1kQ5B m46Owpd63bixl0XFmxZqM7xXiMqE4naXCjYF3JOVE7JcHovMV4lcCBw0E5YhVlFyqmz7i9 KjWL0cBlbvUm1OLZSSiQ2KbniJS5uHxC9e5f/cW96jtrsphcwOUJshw7Tztlrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=09RywJpyORvv3yoH/3bQk4JGW7+OsOc8Y5zzACFcVVw=; b=JUJukx9hhcoz2rj7UK/Am5+AwyToucUc3KzMpVuay0JZ4/Q3ZrsRnmUvPtgMWLEoBLLBoK tx6UqTCtHlxYyxufNgzmZ4PWB59vYiEsmhp8mKVGH59/fqVCq0qMfIeX/37Nalc4BLCMVn AVysparFoJ5Yf5ysSohsSDD7Rgco2cc/VORgfKs3j7T2kWcM+aHPyZdo9DxtF8FxWnbTSN ih4OeCbUQwFpvi8PtS9bzIF8j6ZpQG0fuMH9AcCGcPfe+W6ZHPzqm68Lz6Car5RtgQfGQ3 +bmYC1qktnJyAHKiQlX/88xqVh3H3giiFj1kY1BQQb9UT6qnluYftZnsCOGhOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056026; a=rsa-sha256; cv=none; b=FZDkZdshNlhbTfovXPWb2Tu12BOrOLncrdsTkf1aoCOmi6QwfIo8o283ACFCMHVpKXWul4 utXwKN4OIIFog4Kg84zTRorcHU1HmT4dtx6ymbTkkdjBI9rWR8imtlr98FldRNfbuE7BUa on8Vked5+HlHA5Pxco0Yr4OBpG90bjyuNpJ1xO5Tlsy7DLJaC2wWPTMiVn/aklWMvPJmWj zdWTQcDQo1yl0qrXOj9TgmCjir2KUEDR4403yUGQfxMqiYbr4EuXZr4JZ+Hmz5R35RFXQ/ azaMjjpYAGt5sgM//7RuusOPcxxVg3C0ReyNyXfpdrxSiTK8GC95rSrBhkWhVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWG5GMXz18mY; Fri, 16 Feb 2024 04:00: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 41G40QNJ019005; Fri, 16 Feb 2024 04:00:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40QUI019002; Fri, 16 Feb 2024 04:00:26 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:26 GMT Message-Id: <202402160400.41G40QUI019002@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: 9c8bf69a53f6 - main - loader: Only create gfx 4th bindings when gfx is 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c8bf69a53f628b62fb196182ea55fb34c1c19e1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9c8bf69a53f628b62fb196182ea55fb34c1c19e1 commit 9c8bf69a53f628b62fb196182ea55fb34c1c19e1 Author: Warner Losh AuthorDate: 2024-02-16 03:53:28 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:22 +0000 loader: Only create gfx 4th bindings when gfx is available Only create the gfx bindings for 4th when it's compiled into the loader. We do this with a linker set that only gets brought in to those loaders that call gfx_framework_init. This calls gfx_interp_md() will will drag in gfx_loader.c which will add to the linker set that registers these bindings. Sponsored by: Netflix Reviewed by: kevans, jhb Differential Revision: https://reviews.freebsd.org/D43904 --- stand/common/gfx_fb.c | 1 + stand/ficl/Makefile | 5 +- stand/ficl/gfx_loader.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++++ stand/ficl/loader.c | 188 ----------------------------------- 4 files changed, 263 insertions(+), 190 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index b61591bf3d45..3a5b851915e0 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -181,6 +181,7 @@ gfx_framework_init(void) * Setup font list to have builtin font. */ (void) insert_font(NULL, FONT_BUILTIN); + gfx_interp_md(); /* Draw in the gfx interpreter for this thing */ } static uint8_t * diff --git a/stand/ficl/Makefile b/stand/ficl/Makefile index a9b384024667..fe4ee03974b1 100644 --- a/stand/ficl/Makefile +++ b/stand/ficl/Makefile @@ -11,8 +11,8 @@ BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES+= softcore.c testmain testmain.o -CFLAGS.loader.c += -I${SRCTOP}/sys/teken -CFLAGS.loader.c += -I${SRCTOP}/contrib/pnglite +CFLAGS.gfx_loader.c += -I${SRCTOP}/sys/teken +CFLAGS.gfx_loader.c += -I${SRCTOP}/contrib/pnglite .ifmake testmain CFLAGS= -DTESTMAIN -D_TESTMAIN CFLAGS+= -I${FICLSRC} -I${FICLSRC}/${FICL_CPUARCH} -I${LDRSRC} @@ -21,6 +21,7 @@ PROG= testmain .include .else LIB= ficl +BASE_SRCS+= gfx_loader.c # Not TESTMAINable .include .endif diff --git a/stand/ficl/gfx_loader.c b/stand/ficl/gfx_loader.c new file mode 100644 index 000000000000..a4501a7d3c39 --- /dev/null +++ b/stand/ficl/gfx_loader.c @@ -0,0 +1,259 @@ +/*- + * Copyright (c) 2024 Netflix, Inc + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* Copied from a file that likely shoulve have had this at the top */ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2020 Toomas Soome + * Copyright 2020 RackTop Systems, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL 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. + */ + +/******************************************************************* +** g f x _ l o a d e r . c +** Additional FICL words designed for FreeBSD's loader +** for graphics +*******************************************************************/ + +#include +#include "bootstrap.h" +#include +#include +#include "ficl.h" + +/* FreeBSD's loader interaction words and extras + * for graphics + * fb-bezier ( x0 y0 x1 y1 x2 y2 wd -- ) + * fb-drawrect ( x1 y1 x2 y2 fill -- ) + * fb-line ( x0 y0 x1 y1 wd -- ) + * fb-putimage ( flags x1 y1 x2 y2 -- flag ) + * fb-setpixel ( x y -- ) + * term-drawrect ( x1 y1 x2 y2 fill -- ) + * term-putimage ( flags x1 y1 x2 y2 -- flag ) + */ + +/* ( flags x1 y1 x2 y2 -- flag ) */ +void +ficl_term_putimage(FICL_VM *pVM) +{ + char *namep, *name; + int names; + unsigned long ret = FICL_FALSE; + uint32_t x1, y1, x2, y2, f; + png_t png; + int error; + +#if FICL_ROBUST > 1 + vmCheckStack(pVM, 7, 1); +#endif + names = stackPopINT(pVM->pStack); + namep = (char *) stackPopPtr(pVM->pStack); + y2 = stackPopINT(pVM->pStack); + x2 = stackPopINT(pVM->pStack); + y1 = stackPopINT(pVM->pStack); + x1 = stackPopINT(pVM->pStack); + f = stackPopINT(pVM->pStack); + + x1 = gfx_state.tg_origin.tp_col + x1 * gfx_state.tg_font.vf_width; + y1 = gfx_state.tg_origin.tp_row + y1 * gfx_state.tg_font.vf_height; + if (x2 != 0) { + x2 = gfx_state.tg_origin.tp_col + + x2 * gfx_state.tg_font.vf_width; + } + if (y2 != 0) { + y2 = gfx_state.tg_origin.tp_row + + y2 * gfx_state.tg_font.vf_height; + } + + name = ficlMalloc(names + 1); + if (!name) + vmThrowErr(pVM, "Error: out of memory"); + (void) strncpy(name, namep, names); + name[names] = '\0'; + + if ((error = png_open(&png, name)) != PNG_NO_ERROR) { + if (f & FL_PUTIMAGE_DEBUG) + printf("%s\n", png_error_string(error)); + } else { + if (gfx_fb_putimage(&png, x1, y1, x2, y2, f) == 0) + ret = FICL_TRUE; /* success */ + (void) png_close(&png); + } + ficlFree(name); + stackPushUNS(pVM->pStack, ret); +} + +/* ( flags x1 y1 x2 y2 -- flag ) */ +void +ficl_fb_putimage(FICL_VM *pVM) +{ + char *namep, *name; + int names; + unsigned long ret = FICL_FALSE; + uint32_t x1, y1, x2, y2, f; + png_t png; + int error; + +#if FICL_ROBUST > 1 + vmCheckStack(pVM, 7, 1); +#endif + names = stackPopINT(pVM->pStack); + namep = (char *) stackPopPtr(pVM->pStack); + y2 = stackPopINT(pVM->pStack); + x2 = stackPopINT(pVM->pStack); + y1 = stackPopINT(pVM->pStack); + x1 = stackPopINT(pVM->pStack); + f = stackPopINT(pVM->pStack); + + name = ficlMalloc(names + 1); + if (!name) + vmThrowErr(pVM, "Error: out of memory"); + (void) strncpy(name, namep, names); + name[names] = '\0'; + + if ((error = png_open(&png, name)) != PNG_NO_ERROR) { + if (f & FL_PUTIMAGE_DEBUG) + printf("%s\n", png_error_string(error)); + } else { + if (gfx_fb_putimage(&png, x1, y1, x2, y2, f) == 0) + ret = FICL_TRUE; /* success */ + (void) png_close(&png); + } + ficlFree(name); + stackPushUNS(pVM->pStack, ret); +} + +void +ficl_fb_setpixel(FICL_VM *pVM) +{ + FICL_UNS x, y; + +#if FICL_ROBUST > 1 + vmCheckStack(pVM, 2, 0); +#endif + + y = stackPopUNS(pVM->pStack); + x = stackPopUNS(pVM->pStack); + gfx_fb_setpixel(x, y); +} + +void +ficl_fb_line(FICL_VM *pVM) +{ + FICL_UNS x0, y0, x1, y1, wd; + +#if FICL_ROBUST > 1 + vmCheckStack(pVM, 5, 0); +#endif + + wd = stackPopUNS(pVM->pStack); + y1 = stackPopUNS(pVM->pStack); + x1 = stackPopUNS(pVM->pStack); + y0 = stackPopUNS(pVM->pStack); + x0 = stackPopUNS(pVM->pStack); + gfx_fb_line(x0, y0, x1, y1, wd); +} + +void +ficl_fb_bezier(FICL_VM *pVM) +{ + FICL_UNS x0, y0, x1, y1, x2, y2, width; + +#if FICL_ROBUST > 1 + vmCheckStack(pVM, 7, 0); +#endif + + width = stackPopUNS(pVM->pStack); + y2 = stackPopUNS(pVM->pStack); + x2 = stackPopUNS(pVM->pStack); + y1 = stackPopUNS(pVM->pStack); + x1 = stackPopUNS(pVM->pStack); + y0 = stackPopUNS(pVM->pStack); + x0 = stackPopUNS(pVM->pStack); + gfx_fb_bezier(x0, y0, x1, y1, x2, y2, width); +} + +void +ficl_fb_drawrect(FICL_VM *pVM) +{ + FICL_UNS x1, x2, y1, y2, fill; + +#if FICL_ROBUST > 1 + vmCheckStack(pVM, 5, 0); +#endif + + fill = stackPopUNS(pVM->pStack); + y2 = stackPopUNS(pVM->pStack); + x2 = stackPopUNS(pVM->pStack); + y1 = stackPopUNS(pVM->pStack); + x1 = stackPopUNS(pVM->pStack); + gfx_fb_drawrect(x1, y1, x2, y2, fill); +} + +void +ficl_term_drawrect(FICL_VM *pVM) +{ + FICL_UNS x1, x2, y1, y2; + +#if FICL_ROBUST > 1 + vmCheckStack(pVM, 4, 0); +#endif + + y2 = stackPopUNS(pVM->pStack); + x2 = stackPopUNS(pVM->pStack); + y1 = stackPopUNS(pVM->pStack); + x1 = stackPopUNS(pVM->pStack); + gfx_term_drawrect(x1, y1, x2, y2); +} + +/************************************************************************** + f i c l C o m p i l e G f x +** Build FreeBSD platform extensions into the system dictionary +** for gfx +**************************************************************************/ +static void ficlCompileGfx(FICL_SYSTEM *pSys) +{ + ficlCompileFcn **fnpp; + FICL_DICT *dp = pSys->dp; + assert (dp); + + dictAppendWord(dp, "fb-setpixel", ficl_fb_setpixel, FW_DEFAULT); + dictAppendWord(dp, "fb-line", ficl_fb_line, FW_DEFAULT); + dictAppendWord(dp, "fb-bezier", ficl_fb_bezier, FW_DEFAULT); + dictAppendWord(dp, "fb-drawrect", ficl_fb_drawrect, FW_DEFAULT); + dictAppendWord(dp, "fb-putimage", ficl_fb_putimage, FW_DEFAULT); + dictAppendWord(dp, "term-drawrect", ficl_term_drawrect, FW_DEFAULT); + dictAppendWord(dp, "term-putimage", ficl_term_putimage, FW_DEFAULT); + + return; +} +FICL_COMPILE_SET(ficlCompileGfx); + +void +gfx_interp_md(void) +{ +} diff --git a/stand/ficl/loader.c b/stand/ficl/loader.c index edde4f477d55..618d9483fbd9 100644 --- a/stand/ficl/loader.c +++ b/stand/ficl/loader.c @@ -44,8 +44,6 @@ #include "bootstrap.h" #include #include -#include -#include #include "ficl.h" /* FreeBSD's loader interaction words and extras @@ -65,182 +63,6 @@ * .# ( value -- ) */ -#ifndef TESTMAIN -/* ( flags x1 y1 x2 y2 -- flag ) */ -void -ficl_term_putimage(FICL_VM *pVM) -{ - char *namep, *name; - int names; - unsigned long ret = FICL_FALSE; - uint32_t x1, y1, x2, y2, f; - png_t png; - int error; - -#if FICL_ROBUST > 1 - vmCheckStack(pVM, 7, 1); -#endif - names = stackPopINT(pVM->pStack); - namep = (char *) stackPopPtr(pVM->pStack); - y2 = stackPopINT(pVM->pStack); - x2 = stackPopINT(pVM->pStack); - y1 = stackPopINT(pVM->pStack); - x1 = stackPopINT(pVM->pStack); - f = stackPopINT(pVM->pStack); - - x1 = gfx_state.tg_origin.tp_col + x1 * gfx_state.tg_font.vf_width; - y1 = gfx_state.tg_origin.tp_row + y1 * gfx_state.tg_font.vf_height; - if (x2 != 0) { - x2 = gfx_state.tg_origin.tp_col + - x2 * gfx_state.tg_font.vf_width; - } - if (y2 != 0) { - y2 = gfx_state.tg_origin.tp_row + - y2 * gfx_state.tg_font.vf_height; - } - - name = ficlMalloc(names + 1); - if (!name) - vmThrowErr(pVM, "Error: out of memory"); - (void) strncpy(name, namep, names); - name[names] = '\0'; - - if ((error = png_open(&png, name)) != PNG_NO_ERROR) { - if (f & FL_PUTIMAGE_DEBUG) - printf("%s\n", png_error_string(error)); - } else { - if (gfx_fb_putimage(&png, x1, y1, x2, y2, f) == 0) - ret = FICL_TRUE; /* success */ - (void) png_close(&png); - } - ficlFree(name); - stackPushUNS(pVM->pStack, ret); -} - -/* ( flags x1 y1 x2 y2 -- flag ) */ -void -ficl_fb_putimage(FICL_VM *pVM) -{ - char *namep, *name; - int names; - unsigned long ret = FICL_FALSE; - uint32_t x1, y1, x2, y2, f; - png_t png; - int error; - -#if FICL_ROBUST > 1 - vmCheckStack(pVM, 7, 1); -#endif - names = stackPopINT(pVM->pStack); - namep = (char *) stackPopPtr(pVM->pStack); - y2 = stackPopINT(pVM->pStack); - x2 = stackPopINT(pVM->pStack); - y1 = stackPopINT(pVM->pStack); - x1 = stackPopINT(pVM->pStack); - f = stackPopINT(pVM->pStack); - - name = ficlMalloc(names + 1); - if (!name) - vmThrowErr(pVM, "Error: out of memory"); - (void) strncpy(name, namep, names); - name[names] = '\0'; - - if ((error = png_open(&png, name)) != PNG_NO_ERROR) { - if (f & FL_PUTIMAGE_DEBUG) - printf("%s\n", png_error_string(error)); - } else { - if (gfx_fb_putimage(&png, x1, y1, x2, y2, f) == 0) - ret = FICL_TRUE; /* success */ - (void) png_close(&png); - } - ficlFree(name); - stackPushUNS(pVM->pStack, ret); -} - -void -ficl_fb_setpixel(FICL_VM *pVM) -{ - FICL_UNS x, y; - -#if FICL_ROBUST > 1 - vmCheckStack(pVM, 2, 0); -#endif - - y = stackPopUNS(pVM->pStack); - x = stackPopUNS(pVM->pStack); - gfx_fb_setpixel(x, y); -} - -void -ficl_fb_line(FICL_VM *pVM) -{ - FICL_UNS x0, y0, x1, y1, wd; - -#if FICL_ROBUST > 1 - vmCheckStack(pVM, 5, 0); -#endif - - wd = stackPopUNS(pVM->pStack); - y1 = stackPopUNS(pVM->pStack); - x1 = stackPopUNS(pVM->pStack); - y0 = stackPopUNS(pVM->pStack); - x0 = stackPopUNS(pVM->pStack); - gfx_fb_line(x0, y0, x1, y1, wd); -} - -void -ficl_fb_bezier(FICL_VM *pVM) -{ - FICL_UNS x0, y0, x1, y1, x2, y2, width; - -#if FICL_ROBUST > 1 - vmCheckStack(pVM, 7, 0); -#endif - - width = stackPopUNS(pVM->pStack); - y2 = stackPopUNS(pVM->pStack); - x2 = stackPopUNS(pVM->pStack); - y1 = stackPopUNS(pVM->pStack); - x1 = stackPopUNS(pVM->pStack); - y0 = stackPopUNS(pVM->pStack); - x0 = stackPopUNS(pVM->pStack); - gfx_fb_bezier(x0, y0, x1, y1, x2, y2, width); -} - -void -ficl_fb_drawrect(FICL_VM *pVM) -{ - FICL_UNS x1, x2, y1, y2, fill; - -#if FICL_ROBUST > 1 - vmCheckStack(pVM, 5, 0); -#endif - - fill = stackPopUNS(pVM->pStack); - y2 = stackPopUNS(pVM->pStack); - x2 = stackPopUNS(pVM->pStack); - y1 = stackPopUNS(pVM->pStack); - x1 = stackPopUNS(pVM->pStack); - gfx_fb_drawrect(x1, y1, x2, y2, fill); -} - -void -ficl_term_drawrect(FICL_VM *pVM) -{ - FICL_UNS x1, x2, y1, y2; - -#if FICL_ROBUST > 1 - vmCheckStack(pVM, 4, 0); -#endif - - y2 = stackPopUNS(pVM->pStack); - x2 = stackPopUNS(pVM->pStack); - y1 = stackPopUNS(pVM->pStack); - x1 = stackPopUNS(pVM->pStack); - gfx_term_drawrect(x1, y1, x2, y2); -} -#endif /* TESTMAIN */ - void ficlSetenv(FICL_VM *pVM) { @@ -1042,16 +864,6 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys) dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT); dictAppendWord(dp, "uuid-from-string", ficlUuidFromString, FW_DEFAULT); dictAppendWord(dp, "uuid-to-string", ficlUuidToString, FW_DEFAULT); -#ifndef TESTMAIN - dictAppendWord(dp, "fb-setpixel", ficl_fb_setpixel, FW_DEFAULT); - dictAppendWord(dp, "fb-line", ficl_fb_line, FW_DEFAULT); - dictAppendWord(dp, "fb-bezier", ficl_fb_bezier, FW_DEFAULT); - dictAppendWord(dp, "fb-drawrect", ficl_fb_drawrect, FW_DEFAULT); - dictAppendWord(dp, "fb-putimage", ficl_fb_putimage, FW_DEFAULT); - dictAppendWord(dp, "term-drawrect", ficl_term_drawrect, FW_DEFAULT); - dictAppendWord(dp, "term-putimage", ficl_term_putimage, FW_DEFAULT); - dictAppendWord(dp, "isvirtualized?",ficlIsvirtualizedQ, FW_DEFAULT); -#endif SET_FOREACH(fnpp, Xficl_compile_set) (*fnpp)(pSys); From nobody Fri Feb 16 04:00: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 4TbdWJ2Cqxz59ZGk; Fri, 16 Feb 2024 04:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbdWJ0BgYz4HNW; Fri, 16 Feb 2024 04:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=puoDqWPSMZ9KdgUk03lczYLaPDXictUrUlnXIH7sx+E=; b=m/U0l9uysUfCTH9pgtpObT1hDVOCuokphYqfFnIFWes4CnmzAsbow9qMZd2CH6SfPXSZVY VEjdsxq2hYdnXrwa/Cr+LOqxtCVhsRGAuLavSGd4/wABokAcDhk7xpaQ93mBG8MhNulPvJ YEo8KGIPhS3m7y+L6ST7eicDO4U3xjlJQ/8sznkhCQ5skmUKSLiijhTO7rdztEc3QlxUlr Wr67ngpn9LtkpYRElqLo56ZaTAbbMUDcbObxin77PPzJiFiYcBNlun16F4Xa5KP4UMEPWQ Aow1IwHb1BHastFwndwc9pfNqoQIUnloTULnKyeVuWXrOBxLJHnAkQKwxBxJgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=puoDqWPSMZ9KdgUk03lczYLaPDXictUrUlnXIH7sx+E=; b=cjUImclHv3m8IhMQMTOYidoyz5NgbHV7xZHqJREo4D+Kwbl2YzPIXgT5KFBJauqN71CFjq ykytw7It3gptmuwoCmbJE93HN8wHH56alO7Nol7Pt/1y8tNZnpwB1roaq/3EMwMsSBA9Yn l5o0UaEvt+fNasxwKtTypcH1qxP3aZVxOEM9zijgtjH+vQL/7WNR3oYSZfLG822ibM2VGm BNR3m008X0y5aItF9IKaSeZV5Xfp6eSRYhiwc1QEALmheqdY93jxB3/tCxWxVhu2C9ALLY +CkMJO8oSU0jLWyaFfhmoaw3E3DHhOH1TIsUvAAweZbKVu+/4VJH7j6axDfg5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056028; a=rsa-sha256; cv=none; b=CtPE0FD8XEnPfFny8IxH6+trX3Vc9LhvYzzxKZy7/gQ/2kDSJPuJqJcuVlDkGVwjiUsD4P uq328xw3bWlRzUuWdzjWEXF3vZK18K5IAYGJXT1d09brYZ+oaYoW1Ub5de1FGYaGXsY5u0 Vc90Ls5AK54sTl7Y8Bzbd3UvcFg8wj0XSQ5hqGrng0SgmhXd+O1ocWO/P9cxAqNNV83i1/ zKkkF96io21osYXmyfKmcS8043/Xw6VFOYpY2E+HboLAbmpfDUhH79JBoeI7vyYvwOz7VM CgmPoVGIk4k6aaXcpvFYayYcpaNBYiCxKUv3QSxFjfDFmYFgZmKscqxl9u2GSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWH6HTzz18Pm; Fri, 16 Feb 2024 04:00: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 41G40RZg019053; Fri, 16 Feb 2024 04:00:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40RiK019050; Fri, 16 Feb 2024 04:00:27 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:27 GMT Message-Id: <202402160400.41G40RiK019050@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: 23d9b5c9febf - main - loader: Remove gfx_fb_stub.c, it's no longer needed 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23d9b5c9febf4b02957d01bc46ee75530b0dcb4a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=23d9b5c9febf4b02957d01bc46ee75530b0dcb4a commit 23d9b5c9febf4b02957d01bc46ee75530b0dcb4a Author: Warner Losh AuthorDate: 2024-02-16 03:53:39 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:23 +0000 loader: Remove gfx_fb_stub.c, it's no longer needed Now that we draw in the gfx bindings for all our interpreters only when graphics support is compiled in, we can eliminate this from all the loaders that don't have graphics support. Sponsored by: Netflix Reviewed by: kevans, jhb Differential Revision: https://reviews.freebsd.org/D43905 --- stand/common/gfx_fb_stub.c | 76 ---------------------------------------- stand/kboot/kboot/Makefile | 2 -- stand/powerpc/ofw/Makefile | 4 +-- stand/uboot/Makefile | 3 +- stand/userboot/userboot/Makefile | 2 -- 5 files changed, 2 insertions(+), 85 deletions(-) diff --git a/stand/common/gfx_fb_stub.c b/stand/common/gfx_fb_stub.c deleted file mode 100644 index a4ebdeb8c388..000000000000 --- a/stand/common/gfx_fb_stub.c +++ /dev/null @@ -1,76 +0,0 @@ -/*- - * Copyright 2021 Toomas Soome - * 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 -/* - * Generic gfx stubs. - */ - -#include -#include -#include "bootstrap.h" -#include "gfx_fb.h" - -font_list_t fonts = STAILQ_HEAD_INITIALIZER(fonts); -teken_gfx_t gfx_state = { 0 }; - -void -gfx_fb_setpixel(uint32_t x __unused, uint32_t y __unused) -{ -} - -void -gfx_fb_drawrect(uint32_t x1 __unused, uint32_t y1 __unused, - uint32_t x2 __unused, uint32_t y2 __unused, uint32_t fill __unused) -{ -} - -void -gfx_term_drawrect(uint32_t x1 __unused, uint32_t y1 __unused, - uint32_t x2 __unused, uint32_t y2 __unused) -{ -} - -void -gfx_fb_line(uint32_t x0 __unused, uint32_t y0 __unused, - uint32_t x1 __unused, uint32_t y1 __unused, uint32_t w __unused) -{ -} - -void -gfx_fb_bezier(uint32_t x0 __unused, uint32_t y0 __unused, - uint32_t x1 __unused, uint32_t y1 __unused, uint32_t x2 __unused, - uint32_t y2 __unused, uint32_t w __unused) -{ -} - -int -gfx_fb_putimage(png_t *png __unused, uint32_t ux1 __unused, - uint32_t uy1 __unused, uint32_t ux2 __unused, uint32_t uy2 __unused, - uint32_t flags __unused) -{ - return (1); -} diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index 055027b85eb2..2e68a9ba9214 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -21,7 +21,6 @@ INSTALLFLAGS= -b SRCS= \ bootinfo.c \ conf.c \ - gfx_fb_stub.c \ hostcons.c \ hostdisk.c \ hostfs.c \ @@ -32,7 +31,6 @@ SRCS= \ util.c \ vers.c -CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken .if ${MK_LOADER_ZFS} != "no" CFLAGS+= -I${ZFSSRC} CFLAGS+= -I${SYSDIR}/contrib/openzfs/include diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile index 3e4c92220fac..b7cbbd9fca00 100644 --- a/stand/powerpc/ofw/Makefile +++ b/stand/powerpc/ofw/Makefile @@ -17,9 +17,7 @@ INSTALLFLAGS= -b # Architecture-specific loader code SRCS= conf.c vers.c main.c elf_freebsd.c ppc64_elf_freebsd.c start.c -SRCS+= ucmpdi2.c gfx_fb_stub.c - -CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken +SRCS+= ucmpdi2.c .include "${BOOTSRC}/fdt.mk" .if ${MK_FDT} == "yes" diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index 83ac5949cbb3..4405f09408bf 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -46,10 +46,9 @@ LDFLAGS+= -Wl,-znotext SRCS+= main.c vers.c SRCS+= copy.c devicename.c elf_freebsd.c glue.c -SRCS+= net.c reboot.c time.c gfx_fb_stub.c +SRCS+= net.c reboot.c time.c SRCS+= uboot_console.c uboot_disk.c uboot_fdt.c uboot_module.c -CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken CFLAGS.glue.c+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib CFLAGS+= -I${BOOTSRC}/common diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index d652f2b53968..15ac8701e4d4 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -31,7 +31,6 @@ SRCS+= main.c SRCS+= userboot_cons.c SRCS+= userboot_disk.c SRCS+= vers.c -SRCS+= gfx_fb_stub.c CFLAGS+= -Wall CFLAGS+= -I${BOOTSRC}/userboot @@ -43,7 +42,6 @@ CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs .endif CWARNFLAGS.main.c += -Wno-implicit-function-declaration -CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken NEWVERSWHAT= "User boot ${LOADER_INTERP}" ${MACHINE_CPUARCH} VERSION_FILE= ${.CURDIR}/../userboot/version From nobody Fri Feb 16 04:00: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 4TbdWK3rJKz59ZGq; Fri, 16 Feb 2024 04:00: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 4TbdWK1SYfz4HNd; Fri, 16 Feb 2024 04:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4z/ddsiMDmZ87DQplUCTHjptwiY31LyQBhkJANy3TI=; b=abTGCOsw1okEKkj+8YK/6AqgrgkX/G7OLbLhbRKvigYL283/67QrEb+o3IFk0T6j0nNcZi s23rGTFWS22UUBq9L2nY7QUI/0uAdRTxpLM2YjVAmzN0dR2VMJYQBHDs3opUboiBoat5tB +6le1akefH3rUNzy3prmXPj8OippuD7blJdrYRFOFGUv6SOiRKH6wvLsGPw+gnZXDEDVJK DJ9zwKOWJ/FVKHJ6f0Mv2FNfM0PsM4pV5YXGlvbRpGKm7+s6jC0nf6i0abIJa7eH4TmVN5 rmXm2aCcpKJsOTcxsM/WE5Vn/V8i2U4qSQwP+mS2orZ2twlhZ3/KVX7DJbGpsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4z/ddsiMDmZ87DQplUCTHjptwiY31LyQBhkJANy3TI=; b=qNRAlmfR2Pwu+4OAarccf93HbR6GzfAhEzgL6w3jSxf8NwSVx4w9vNLB3X9A4pwNs/nYBn SlH1LhClwPaTjrzS3ogKT08AePrKaPhE+kV4nsb2X3YKsQi5XjBVhq6NPC3EcbYT+B/NVv A5Jf3zFV3vYxg8wTbHmr8rp7F3wND87V7Fqc28WY35W8FPAF9dAA9xvdkoJfXpS+VzfNzJ I1qDqcPEpvI94XF+PmBjofBKJdsdpaovpq2Gacn8Lk2yg1scU4tyY3oyRb6ePDASXtkWYE 4Qqp9/9w+pEXX9A0qf5PrKwSbPUlGG9I0w34DZ/Kai1Hw1S7Hw/MzumxR6ko6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056029; a=rsa-sha256; cv=none; b=kYCOqNHQmrZH6zKXQ4Bspl99/XizzSfrfLDGIUF1uW31ZCzHH0HjyFqwkVevWVdfig1tdv gFuDtANpKGhpLK7kYQfGkKpVLVNpbOIL3fMmLlTm/ZGY8ZPj9qglgzj1Xz6m31PXBMWYjd 1dsEV5rMYpJVwPNvXD0M1doeyVbBktfePX1zYQrG/sfRxSA2tYOosGWf/3LZiJhxFpKbf5 Bo99jplaKc8EZF/XQxJ85ofUKayRy5HX4sgrTQNU2aOcb9edH+glga/cspzuvZWBsThk6p A9zRmX7NzTIm5Oh8jiw7Mem4gzsCoxhcTd35OH4iVdZPPHzP17fbtMcYM8pLDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWK02FNz18mZ; Fri, 16 Feb 2024 04:00: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 41G40SeN019113; Fri, 16 Feb 2024 04:00:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40S0w019110; Fri, 16 Feb 2024 04:00:28 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:28 GMT Message-Id: <202402160400.41G40S0w019110@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: 0921a771da8a - main - loader: Move to using linker sets to bring in optional bits 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0921a771da8a9117edf26352a8a047bacbfcee45 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0921a771da8a9117edf26352a8a047bacbfcee45 commit 0921a771da8a9117edf26352a8a047bacbfcee45 Author: Warner Losh AuthorDate: 2024-02-16 03:53:47 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:23 +0000 loader: Move to using linker sets to bring in optional bits The graphics stuff is optional. When it is pulled into the system, we use a linker set to initialize the lua bindings for it now. Sponsored by: Netflix Reviewed by: kevans, jhb Differential Revision: https://reviews.freebsd.org/D43906 --- stand/common/interp_lua.c | 29 +++-------------------------- stand/liblua/gfx_utils.c | 27 +++++++++++++++++++++++++++ stand/liblua/lutils.h | 9 +++++++++ 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/stand/common/interp_lua.c b/stand/common/interp_lua.c index a347526b67c9..11595b78a7bd 100644 --- a/stand/common/interp_lua.c +++ b/stand/common/interp_lua.c @@ -97,31 +97,6 @@ static const luaL_Reg loadedlibs[] = { {NULL, NULL} }; -static void -interp_init_md(lua_State *L) -{ - luaL_requiref(L, "gfx", luaopen_gfx, 1); - lua_pop(L, 1); /* Remove lib */ - - /* - * Add in the comparability references in the loader table. Doing it with - * a pseudo-embedded script is easier than the raw calls. - */ - if (luaL_dostring(L, - "loader.fb_bezier = gfx.fb_bezier\n" - "loader.fb_drawrect = gfx.fb_drawrect\n" - "loader.fb_line = gfx.fb_line\n" - "loader.fb_putimage = gfx.fb_putimage\n" - "loader.fb_setpixel = gfx.fb_setpixel\n" - "loader.term_drawrect = gfx.term_drawrect\n" - "loader.term_putimage = gfx.term_putimage") != 0) { - lua_pop(L, 1); - const char *errstr = lua_tostring(L, -1); - errstr = errstr == NULL ? "unknown" : errstr; - printf("Error adding compat loader bindings: %s.\n", errstr); - } -} - void interp_init(void) { @@ -129,6 +104,7 @@ interp_init(void) struct interp_lua_softc *softc = &lua_softc; const char *filename; const luaL_Reg *lib; + lua_init_md_t **fnpp; TSENTER(); @@ -148,7 +124,8 @@ interp_init(void) lua_pop(luap, 1); /* remove lib */ } - interp_init_md(luap); + LUA_FOREACH_SET(fnpp) + (*fnpp)(luap); filename = getenv("loader_lua"); if (filename == NULL) diff --git a/stand/liblua/gfx_utils.c b/stand/liblua/gfx_utils.c index d2d22738c929..8d2aaacbd688 100644 --- a/stand/liblua/gfx_utils.c +++ b/stand/liblua/gfx_utils.c @@ -245,3 +245,30 @@ void gfx_interp_md(void) { } + +static void +gfx_init_md(lua_State *L) +{ + luaL_requiref(L, "gfx", luaopen_gfx, 1); + lua_pop(L, 1); /* Remove lib */ + + /* + * Add in the compatibility references in the loader table. Doing it with + * a pseudo-embedded script is easier than the raw calls. + */ + if (luaL_dostring(L, + "loader.fb_bezier = gfx.fb_bezier\n" + "loader.fb_drawrect = gfx.fb_drawrect\n" + "loader.fb_line = gfx.fb_line\n" + "loader.fb_putimage = gfx.fb_putimage\n" + "loader.fb_setpixel = gfx.fb_setpixel\n" + "loader.term_drawrect = gfx.term_drawrect\n" + "loader.term_putimage = gfx.term_putimage") != 0) { + lua_pop(L, 1); + const char *errstr = lua_tostring(L, -1); + errstr = errstr == NULL ? "unknown" : errstr; + printf("Error adding compat loader bindings: %s.\n", errstr); + } +} + +LUA_COMPILE_SET(gfx_init_md); diff --git a/stand/liblua/lutils.h b/stand/liblua/lutils.h index c1fd6af496e5..522abfd3d0d4 100644 --- a/stand/liblua/lutils.h +++ b/stand/liblua/lutils.h @@ -30,3 +30,12 @@ int luaopen_gfx(lua_State *); int luaopen_loader(lua_State *); int luaopen_io(lua_State *); int luaopen_pager(lua_State *); + +#include + +typedef void lua_init_md_t(lua_State *); +#define LUA_COMPILE_SET(func) \ + DATA_SET(Xficl_compile_set, func) /* XXX linker set know by ldscrips */ +#define LUA_FOREACH_SET(s) \ + SET_FOREACH((s), Xficl_compile_set) +SET_DECLARE(Xficl_compile_set, lua_init_md_t); From nobody Fri Feb 16 04:00: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 4TbdWL2KPxz59Z8n; Fri, 16 Feb 2024 04:00: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 4TbdWL1K2Dz4HD5; Fri, 16 Feb 2024 04:00:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQY2rei76Fo25IZUe5OjPmmxjlJ0bw+I6UDUXiFs4W8=; b=GAnmRCD9skJxR9Jfqjaw/C/qweUgKYfNbu6p/gUT4w/L9ebeNOfHDghoUDsxpQK3fsP4nw RVdWyhYyIekYTRUoNsUr3c0ylAzj5756zQFRVSWxzz6WlwoOA/dGTtdM1fWBKO+K0cze8l 0sk1fkogv1O1t9r0d5GA4adoZh7AIaNUAnEURWSgB5NlDD/0xMetSxooumcDmgc+KGFNdw DNlJpp1qV4zfzDVOV+y576dUVpruK7JCJTNeLxhdJ7s7LNat6kitLLZfP0BZt1jxxtEfyI eqfKEtlvEMHWikXEBOZEu/q8YqfvhAvNPJSkT5WzeOHxRi1znz0mB5l7K/CxUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JQY2rei76Fo25IZUe5OjPmmxjlJ0bw+I6UDUXiFs4W8=; b=dhBEAEp76QV4EN+QsYBZFSRYySoekV8UbYfN8neHM7N3vaEUEnnfpW1EGFgdB/FbB5R4xR ByGj1C0hX1AKVbvyLus6RxzBsiyehv+K/VwNFMbjW7EbVemg/whAU473361SQ6mZuhPh1u tpHaRIOfqozPeDcqI6OhsmGzF/mbP0T3Wez+le+R5R0rc2oAcLY6KESD+mO3Be6FluQF6a XtBynygVsiPMdGPbSOOoamdIyuhZpiTdp4ZhA2/fjFeHgnfWxSf8091GFAHRH3BYc5qxW+ oT3RVOlYQGLI1xGXofTHSpTgVxQ/mJ94qJYRnUx1cvC0TueLPriq+6s32ys0WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056030; a=rsa-sha256; cv=none; b=JbQh+Fu4++EdkJ86e+tG28XLZ/X8vsW9C9X5lP8kfiHWYXoXCLrB22ogha/TXstTANI/ld IRdTbqD/ybmeyB3bRhY1skuRAGMIgtBNvknfyGlDHM6EgmZN+4B46bO13kHJoHElaE9J9R Nf71f6CO+8ITJ8uF5yN2+XyqYecEc16Yockb+mmTjFFR4eDjGuvsGh5MSoG5CGbwtbNZ4K BYFb+0/eyM9+nBYG3fVzV5IVhREao2oBM0OCzcdsnndDV5pGEXdmzwQlIMs6M+yLo3MmSl IjXqAoujoH0WDEK6w7sexmWAnXe+6LHV7mLt9P34HmIm95WlvfWk838MVqclKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWL0PwCz18Xf; Fri, 16 Feb 2024 04:00: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 41G40TWf019158; Fri, 16 Feb 2024 04:00:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40T2a019155; Fri, 16 Feb 2024 04:00:29 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:29 GMT Message-Id: <202402160400.41G40T2a019155@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: a8f8c53761c4 - main - loader: Move gfx functions to gfx.lua.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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8f8c53761c4b0436c9d546ebe046003f1b3d88f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8f8c53761c4b0436c9d546ebe046003f1b3d88f commit a8f8c53761c4b0436c9d546ebe046003f1b3d88f Author: Warner Losh AuthorDate: 2024-02-16 03:53:55 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:23 +0000 loader: Move gfx functions to gfx.lua.8 Now that the fb_* and term_* functions are available in the gfx table, move the documentation to gfx.lua.8. Add information about backwards compatibility. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D43907 --- stand/lua/Makefile | 1 + stand/lua/gfx.lua.8 | 106 +++++++++++++++++++++++++++++++++++++++++++++++++ stand/lua/loader.lua.8 | 89 ++++++++--------------------------------- 3 files changed, 124 insertions(+), 72 deletions(-) diff --git a/stand/lua/Makefile b/stand/lua/Makefile index e8fa16e6b589..4462a803beef 100644 --- a/stand/lua/Makefile +++ b/stand/lua/Makefile @@ -7,6 +7,7 @@ MAN= loader.conf.lua.5 \ config.lua.8 \ core.lua.8 \ drawer.lua.8 \ + gfx.lua.8 \ hook.lua.8 \ loader.lua.8 \ menu.lua.8 \ diff --git a/stand/lua/gfx.lua.8 b/stand/lua/gfx.lua.8 new file mode 100644 index 000000000000..82d3f90f4af7 --- /dev/null +++ b/stand/lua/gfx.lua.8 @@ -0,0 +1,106 @@ +.\" +.\" Copyright (c) 2024 Netflix, Inc. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd February 6, 2024 +.Dt GFX.LUA 8 +.Os +.Sh NAME +.Nm gfx.lua +.Nd Fx Lua gfx module +.Sh DESCRIPTION +The built-in graphics related Lua bindings for the +.Fx +boot loaders using the Lua interpreter are available via the +.Ic gfx +table. +.Ss Exported Functions +The following functions are exported in the +.Nm loader +table. +.Bl -tag -width term_putimage +.It Fn fb_bezier x0 y0 x1 y1 x2 y2 width +Draw a bezier curve through the points +.Pq Va x0 , Va y0 , +.Pq Va x1 , Va y1 , +and +.Pq Va x2 , Va y2 +of width +.Va width . +The units are in pixels and have an origin of +.Pq 0 , 0 . +.It Fn fb_drawrect x0 y0 x1 y1 fill +Fill in a rectangle with the pixel +.Va fill +with the corners +.Pq Va x0 , Va y0 +and +.Pq Va x1 , Va y1 . +The units are in pixels and have an origin of +.Pq 0 , 0 . +.It Fn fb_line x0 y0 x1 y1 width +Draw a line from +.Pq Va x0 , Va y0 +to +.Pq Va x1 , Va y1 +with a width of +.Va width . +The units are in pixels and have an origin of +.Pq 0 , 0 . +.It Fn fb_putimage name x0 y0 x1 y1 f +Load the PNG file +.Va name +and place it in the rectangle +with the corners +.Pq Va x0 , Va y0 +and +.Pq Va x1 , Va y1 +and fill with pixel +.Va f . +The units are in pixels and have an origin of +.Pq 0 , 0 . +.It Fn fb_set_pixel x y +Sets the pixel at +.Pq Va x , Va y . +The units are in pixels and have an origin of +.Pq 0 , 0 . +.It Fn term_drawrect x0 y0 x1 y1 +Draw the outline of a rectangle with the text coordinate corners of +.Pq Va x0 , Va y0 +and +.Pq Va x1 , Va y1 . +The units are in character cells and have an origin of +.Pq 1 , 1 . +.It Fn term_putimage name x0 y0 x1 y1 f +Load the PNG file +.Va name +and place it in the rectangle +with the text coordinate corners +.Pq Va x0 , Va y0 +and +.Pq Va x1 , Va y1 +and fill with pixel +.Va f . +The units are in character cells and have an origin of +.Pq 1 , 1 . +.El +.Pp +This table is optional and should only be used if it is non-nil and if +.Fn core.isFramebufferConsole +is true. +.Ss Compatibility +All the interfaces described above are also available via the +.Ic loader +table through at last FreeBSD 15.0. +.Sh SEE ALSO +.Xr loader.conf 5 , +.Xr core.lua 8 , +.Xr loader 8 , +.Xr loader.lua 8 +.Sh AUTHORS +The +.Nm +man page was written by +.An Warner Losh Aq Mt imp@FreeBSD.org . + diff --git a/stand/lua/loader.lua.8 b/stand/lua/loader.lua.8 index cd436255d4a5..ff3b91ddfb09 100644 --- a/stand/lua/loader.lua.8 +++ b/stand/lua/loader.lua.8 @@ -147,80 +147,24 @@ environments. Removes the environment variable .Va name from the loader's environment list. -.It Fn fb_bezier x0 y0 x1 y1 x2 y2 width -Draw a bezier curve through the points -.Pq Va x0 , Va y0 , -.Pq Va x1 , Va y1 , -and -.Pq Va x2 , Va y2 -of width -.Va width . -The units are in pixels and have an origin of -.Pq 0 , 0 . -.It Fn fb_drawrect x0 y0 x1 y1 fill -Fill in a rectangle with the pixel -.Va fill -with the corners -.Pq Va x0 , Va y0 -and -.Pq Va x1 , Va y1 . -The units are in pixels and have an origin of -.Pq 0 , 0 . -.It Fn fb_line x0 y0 x1 y1 width -Draw a line from -.Pq Va x0 , Va y0 -to -.Pq Va x1 , Va y1 -with a width of -.Va width . -The units are in pixels and have an origin of -.Pq 0 , 0 . -.It Fn fb_putimage name x0 y0 x1 y1 f -Load the PNG file -.Va name -and place it in the rectangle -with the corners -.Pq Va x0 , Va y0 -and -.Pq Va x1 , Va y1 -and fill with pixel -.Va f . -The units are in pixels and have an origin of -.Pq 0 , 0 . -.It Fn fb_set_pixel x y -Sets the pixel at -.Pq Va x , Va y . -The units are in pixels and have an origin of -.Pq 0 , 0 . -.It Fn term_drawrect x0 y0 x1 y1 -Draw the outline of a rectangle with the text coordinate corners of -.Pq Va x0 , Va y0 -and -.Pq Va x1 , Va y1 . -The units are in character cells and have an origin of -.Pq 1 , 1 . -.It Fn term_putimage name x0 y0 x1 y1 f -Load the PNG file -.Va name -and place it in the rectangle -with the text coordinate corners -.Pq Va x0 , Va y0 -and -.Pq Va x1 , Va y1 -and fill with pixel -.Va f . -The units are in character cells and have an origin of -.Pq 1 , 1 . .El -.Pp -The functions starting with -.Fn fb_ +.Ss Compatibility +The functions +.Fn fb_bezier , +.Fn fb_drawrect , +.Fn fb_line , +.Fn fb_putimage , +.Fn fb_set_pixel , +.Fn term_drawrect , and -.Fn term_ -are optional. -They should only be used if they are non-nil and if -.Fn core.isFramebufferConsole -is true. +.Fn term_putimage +have moved to the +.Ic gfx +table. +They remain in the +.Ic loader +table for a transition period and are documented in +.Xr gfx.lua 8 . .Ss Default File In addition, the Lua interpreters start with the file .Pa /boot/lua/loader.lua @@ -231,6 +175,7 @@ If autoboot is enabled, the loaded files will boot. .Sh SEE ALSO .Xr loader.conf 5 , .Xr core.lua 8 , +.Xr gfx.lua 8 , .Xr loader 8 , .Xr sysctl 8 .Sh AUTHORS From nobody Fri Feb 16 04:00: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 4TbdWN5sdKz59ZBh; Fri, 16 Feb 2024 04:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbdWN3PS9z4H9T; Fri, 16 Feb 2024 04:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iKAA73VbNlvqAMRKJM4G9LpqJAbowROdjnP5qglgWWg=; b=Zuv2JNvd6WXRbjUOuKWJXUpko+1XZoZKWgZ5dFuFqd0IPXlnVqfKGn6PE2RDxXvjc931ji zr5OKFO2qyTUyxce9FsR2cSDTSmVim8VUYd40gvAFIsDIcvuoTxfhoxW6SyHDS8U/WHvXi eBO+b+FX74pdC1nlQldhoLdqoSbLPwdheWgWbkhNOLbR0iZZ1ti4YmbnQlADn2FnyOu7+c /f7awUitXxoAPwky+SwWYgbmxffxdt2FL5EZvvK9tUUSnbTmPXYvn9KrYgynhFRMDMEe2p 58MnUNhQeYgBLK4nNQD8a7hQZCJRWJDkTTm2/MRzh7jmG0Pg96qmVCCfPPCLXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iKAA73VbNlvqAMRKJM4G9LpqJAbowROdjnP5qglgWWg=; b=vQVQ7kVwyFMe1U9M5bcNPin0bLBQbe4XWojTPi6CCZBFZeojwX/a8H7PPHcRJrj/yiyw9J dC7g0IG4C+UsgkDx76qU0gO9BHwKWA3fqE+cpAWhTWvFpweugoDMjJusyCF117sUqMisds +7g0xylv+iTmXyXf1/6hYrQrtpmSsYln0z2jFCmsNMAwqrzQXGpbarIC55KL1cvbG8Fms9 oHO0prB3PS5QWBAWbQqo2W5MAyyMa+IsTUYkP+XuoswSMtIHowdDYDxeKXuvCYQIfAnRyD u7Yh2pgb4yJspKsRW5gMIZYLxe79CrSH9cVl2+LhVlwK06ehq4qqaBu8GDw/qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056032; a=rsa-sha256; cv=none; b=xjmYxGxvKcGFM2azvDzmP+t0aSeTZTryC1mMNekvZaGcuN8p2Kg6X8hq6VA8RcWZCQmwXw 0mqO+QB9Etx15ra3G3qGw9gFSuLatGTnuNQBhB53FA6Fr2EzZO2LvS72bakmbglWTQWifp 6757XRNx/Zgv66BtnLGHoiNpqeHjbk6d2pAMJNxGrIJ5Jq8GidVbTLW/GIosa6wR4O6JyR Rfya6DC7cifijTLgvtvTlNqWN9h8upEgOCDwIIvs+RzXy3CvWF6zRLqhSTDjfrA5yGq0Gy dwqjY72YmKX2UYy1bwrxd3BwUWwpI1VUl/1RNxyP0vLhoFG2rvwhug4p6SovyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWN2WM4z18b4; Fri, 16 Feb 2024 04:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41G40WxJ019245; Fri, 16 Feb 2024 04:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40WVx019242; Fri, 16 Feb 2024 04:00:32 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:32 GMT Message-Id: <202402160400.41G40WVx019242@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: f7781d030ccd - main - flua: Add hash module 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7781d030ccd18b1d4c864ecfade122ea19dafb1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f7781d030ccd18b1d4c864ecfade122ea19dafb1 commit f7781d030ccd18b1d4c864ecfade122ea19dafb1 Author: Warner Losh AuthorDate: 2024-02-16 03:54:36 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:23 +0000 flua: Add hash module Add lua bindings to hashing functions. sha256 is available. sha256.new craetes a new object. sha256.update updates the digest. sha256.digest returns the digest as a binary string and resets the context. sha256.hexdigest returns the digest as a string of hex digits and then resets the cotnext. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43872 --- lib/flua/Makefile | 4 +- lib/flua/libhash/Makefile | 14 ++++ lib/flua/libhash/hash.3lua | 54 ++++++++++++++ lib/flua/libhash/lhash.c | 177 +++++++++++++++++++++++++++++++++++++++++++++ lib/flua/libhash/lhash.h | 11 +++ 5 files changed, 258 insertions(+), 2 deletions(-) diff --git a/lib/flua/Makefile b/lib/flua/Makefile index eb148c2125fd..769736039f7e 100644 --- a/lib/flua/Makefile +++ b/lib/flua/Makefile @@ -1,4 +1,4 @@ - -SUBDIR= libjail +SUBDIR+= libhash +SUBDIR+= libjail .include diff --git a/lib/flua/libhash/Makefile b/lib/flua/libhash/Makefile new file mode 100644 index 000000000000..f166ff90a392 --- /dev/null +++ b/lib/flua/libhash/Makefile @@ -0,0 +1,14 @@ +SHLIB_NAME= hash.so +SHLIBDIR= ${LIBDIR}/flua + +SRCS+= lhash.c + +CFLAGS+= \ + -I${SRCTOP}/contrib/lua/src \ + -I${SRCTOP}/lib/liblua \ + +LIBADD+= md + +MAN= hash.3lua + +.include diff --git a/lib/flua/libhash/hash.3lua b/lib/flua/libhash/hash.3lua new file mode 100644 index 000000000000..1662e87f7c68 --- /dev/null +++ b/lib/flua/libhash/hash.3lua @@ -0,0 +1,54 @@ +.\" +.\" Copyright (c) 2024 Netflix, Inc. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd February 6, 2024 +.Dt HASH 3lua +.Os +.Sh NAME +.Nm new , +.Nm update , +.Nm digest , +.Nm hexdigest +.Nd Lua Cryptographic hash module. +.Sh DESCRIPTION +The built-in cryptographic hashing Lua bindings for the are available via the +.Ic hash +table. +.Ss Supported Hashing Schemes +The following hashing schemes are supported by the hash module. +.Bl -bullet -compact +.It +sha256 +.El +.Ss APIs Supported +.Bl -tag -width asdf -compact +.It Fn new data +Compute a digest based on the +.Va data . +.It Fn update Va data +Using the current digest, process +.Va data +to compute a new digest as if all prior data had been concatenated together. +.It Fn digest +Return the hashed digest as a binary array. +This resets the context. +.It Fn hexdigest +Take +.Fn digest +and convert it to an upper case hex string. +This resets the context. +.It Va digest_size +Return the size of the digest, in bytes. +.It Va block_size +Return the block size used in bytes. +.El +.Sh EXAMPLES +.Sh SEE ALSO +.Xr sha256 3 +.Sh AUTHORS +The +.Nm +man page was written by +.An Warner Losh Aq Mt imp@FreeBSD.org . diff --git a/lib/flua/libhash/lhash.c b/lib/flua/libhash/lhash.c new file mode 100644 index 000000000000..4587961fe8a0 --- /dev/null +++ b/lib/flua/libhash/lhash.c @@ -0,0 +1,177 @@ +/*- + * Copyright (c) 2024 Netflix, Inc + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include "lauxlib.h" +#include "lhash.h" + +#include +#include + +#define SHA256_META "SHA256 meta table" +#define SHA256_DIGEST_LEN 32 + +/* + * Note C++ comments indicate the before -- after state of the stack, in with a + * similar convention to forth's ( ) comments. Lua indexes are from 1 and can be + * read left to right (leftmost is 1). Negative are relative to the end (-1 is + * rightmost). A '.' indicates a return value left on the stack (all values to + * its right). Trivial functions don't do this. + */ + +/* + * Updates the digest with the new data passed in. Takes 1 argument, which + * is converted to a string. + */ +static int +lua_sha256_update(lua_State *L) +{ + size_t len; + const unsigned char *data; + SHA256_CTX *ctx; + + ctx = luaL_checkudata(L, 1, SHA256_META); + data = luaL_checklstring(L, 2, &len); + SHA256_Update(ctx, data, len); + + lua_settop(L, 1); + + return (1); +} + +/* + * Finalizes the digest value and returns it as a 32-byte binary string. The ctx + * is zeroed. + */ +static int +lua_sha256_digest(lua_State *L) +{ + SHA256_CTX *ctx; + unsigned char digest[SHA256_DIGEST_LEN]; + + ctx = luaL_checkudata(L, 1, SHA256_META); + SHA256_Final(digest, ctx); + lua_pushlstring(L, digest, sizeof(digest)); + + return (1); +} + +/* + * Finalizes the digest value and returns it as a 64-byte ascii string of hex + * numbers. The ctx is zeroed. + */ +static int +lua_sha256_hexdigest(lua_State *L) +{ + SHA256_CTX *ctx; + char buf[SHA256_DIGEST_LEN * 2 + 1]; + unsigned char digest[SHA256_DIGEST_LEN]; + static const char hex[]="0123456789abcdef"; + int i; + + ctx = luaL_checkudata(L, 1, SHA256_META); + SHA256_Final(digest, ctx); + for (i = 0; i < SHA256_DIGEST_LEN; i++) { + buf[i+i] = hex[digest[i] >> 4]; + buf[i+i+1] = hex[digest[i] & 0x0f]; + } + buf[i+i] = '\0'; + + lua_pushstring(L, buf); + + return (1); +} + +/* + * Zeros out the ctx before garbage collection. Normally this is done in + * obj:digest or obj:hexdigest, but if not, it will be wiped here. Lua + * manages freeing the ctx memory. + */ +static int +lua_sha256_done(lua_State *L) +{ + SHA256_CTX *ctx; + + ctx = luaL_checkudata(L, 1, SHA256_META); + memset(ctx, 0, sizeof(*ctx)); + + return (0); +} + +/* + * Create object obj which accumulates the state of the sha256 digest + * for its contents and any subsequent obj:update call. It takes zero + * or 1 arguments. + */ +static int +lua_sha256(lua_State *L) +{ + SHA256_CTX *ctx; + int top; + + /* We take 0 or 1 args */ + top = lua_gettop(L); // data -- data + if (top > 1) { + lua_pushnil(L); + return (1); + } + + ctx = lua_newuserdata(L, sizeof(*ctx)); // data -- data ctx + SHA256_Init(ctx); + if (top == 1) { + size_t len; + const unsigned char *data; + + data = luaL_checklstring(L, 1, &len); + SHA256_Update(ctx, data, len); + } + luaL_setmetatable(L, SHA256_META); // data ctx -- data ctx + + return (1); // data . ctx +} + +/* + * Setup the metatable to manage our userdata that we create in lua_sha256. We + * request a finalization call with __gc so we can zero out the ctx buffer so + * that we don't leak secrets if obj:digest or obj:hexdigest aren't called. + */ +static void +register_metatable_sha256(lua_State *L) +{ + luaL_newmetatable(L, SHA256_META); // -- meta + + lua_newtable(L); // meta -- meta tbl + lua_pushcfunction(L, lua_sha256_update); // meta tbl -- meta tbl fn + lua_setfield(L, -2, "update"); // meta tbl fn -- meta tbl + lua_pushcfunction(L, lua_sha256_digest); // meta tbl -- meta tbl fn + lua_setfield(L, -2, "digest"); // meta tbl fn -- meta tbl + lua_pushcfunction(L, lua_sha256_hexdigest); // meta tbl -- meta tbl fn + lua_setfield(L, -2, "hexdigest"); // meta tbl fn -- meta tbl + + /* Associate tbl with metatable */ + lua_setfield(L, -2, "__index"); // meta tbl -- meta + lua_pushcfunction(L, lua_sha256_done); // meta -- meta fn + lua_setfield(L, -2, "__gc"); // meta fn -- meta + + lua_pop(L, 1); // meta -- +} + +#define REG_SIMPLE(n) { #n, lua_ ## n } +static const struct luaL_Reg hashlib[] = { + REG_SIMPLE(sha256), + { NULL, NULL }, +}; +#undef REG_SIMPLE + +int +luaopen_hash(lua_State *L) +{ + register_metatable_sha256(L); + + luaL_newlib(L, hashlib); + + return 1; +} diff --git a/lib/flua/libhash/lhash.h b/lib/flua/libhash/lhash.h new file mode 100644 index 000000000000..c1e9788a55a3 --- /dev/null +++ b/lib/flua/libhash/lhash.h @@ -0,0 +1,11 @@ +/*- + * Copyright (c) 2024 Netflix, Inc + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +int luaopen_hash(lua_State *L); From nobody Fri Feb 16 04:00: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 4TbdWM6jQVz59ZKH; Fri, 16 Feb 2024 04:00: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 4TbdWM2tGZz4HTT; Fri, 16 Feb 2024 04:00:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i6SxmD3taaDQ89aw9rkbd3gdBiYzZjb2upMl0HUnEGE=; b=UpaltDj5D9ddPpSZHtCPAI+DcunC/65VK3Ptv0RUE8eEwI9ayS2k6Nxa7Etvx6JZTesXIe PMTzU+4fcqNmZ4iQl6iueHnTERiEuLuKvkkJvvvAQjxMZS4QjmPX4qsG29Rl5OnmbkS4iV 0SRLZFoEM8eIY1zOLPDCgiEa1J8maNZuGDaWeXRif5gm+4yz+G/KwV4Fy/fXJWxVEStPEk /t+t3qLn5jAJnsGFtUjbToLtSJRNqefM4u1d1Cr/a6Wiv9DJLljaCFjeNWfuUrgWk4AKGv hX7EePFwM+p2lssD2B8JP0fzKJ6PB4DBnZBQkx8kZa+or7iE1v5ZMpFMagL76Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i6SxmD3taaDQ89aw9rkbd3gdBiYzZjb2upMl0HUnEGE=; b=tH/BX7aqNYCVaAMkD0PE/SEO19kITodvUVKHpBFmvbbGqZ3WL8nGz+vC8G5XVLq2CI0xNc 480tZPX7iPgcucSqGeyW/l4s6tlewxrAeueriHWPobj6XMca8WdA8JlDn2TNtJu88tw61J w3OK8phB8BLxPhAwJSTx1n6WAYSdhZNWtmpZZn72mWHiDRcCZKBILaNAGjSrAyZDUz4jdB jQAh57FPhVuCwFB/aoTGskfwWpS1q/Sl0qpejjMootHLSbUGvMvM656ZusA3qCoeO45G3m tR8Q7RC5/pzPz0luyCUrRjCrroGC4bKoYPTkH74b+k1oT5wvqaQt0arNdO83Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056031; a=rsa-sha256; cv=none; b=fTb+kKI9ff7y08tPIre5mTsJx79rz+zRYdWr9vEKJ3GHbf72wVahqaqvMzAd55nOsy6ad7 aLrV2Kxo52tbhx+iwMH1KsrzoIaOpx4/NTwKfimj8wwj85mspLzZ3NcvIPumopi5i0uJEh YwXJJ+/7mRZeo0+3NV/2e4F8AI3fIkvwZ2gVwCYdVx54aPHbKWdgHyYG+M2a+0m89XV4sF yrlUfBIAHwx0BIwHirRrhjU7rZ576gJW2CfrwJu7iWDVIa7lnVt5hjvN/FKFlquOU95R9/ 8Vphjz8BT/J9e3C8TZ8V8SJj7TIMnKi1XWi7V8SLV1CMB2iokMDSd/vcemRXHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWM1hpyz18b3; Fri, 16 Feb 2024 04:00: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 41G40Vkd019206; Fri, 16 Feb 2024 04:00:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40VHa019203; Fri, 16 Feb 2024 04:00:31 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:31 GMT Message-Id: <202402160400.41G40VHa019203@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: 0fd98b8a7691 - main - loader: Move drawer.lua over to gfx table. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fd98b8a7691b4f11e1bfbcb53a3a7c68d7c1fb7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0fd98b8a7691b4f11e1bfbcb53a3a7c68d7c1fb7 commit 0fd98b8a7691b4f11e1bfbcb53a3a7c68d7c1fb7 Author: Warner Losh AuthorDate: 2024-02-16 03:54:04 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:23 +0000 loader: Move drawer.lua over to gfx table. Drawer.lua is the only bit of lua code in the base that uses any of the functons moved from the loader table to the gfx table. Move the main code to using the gfx dispatch. Add compat code for running on old loaders that creates the newer-style gfx table with the term_* functions we call in it populated. This will even work on the super old versions of the loader that don't have them (we'll still skip using them). Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D43908 --- stand/lua/drawer.lua | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 2dcf7d5de0f8..a009b78164df 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -47,6 +47,19 @@ local frame_size local default_shift local shift +-- Make this code compatible with older loader binaries. We moved the term_* +-- functions from loader to the gfx. if we're running on an older loader that +-- has these functions, create aliases for them in gfx. The loader binary might +-- be so old as to not have them, but in that case, we want to copy the nil +-- values. The new loader will provide loader.* versions of all the gfx.* +-- functions for backwards compatibility, so we only define the functions we use +-- here. +if gfx == nil then + gfx = {} + gfx.term_drawrect = loader.term_drawrect + gfx.term_putimage = loader.term_putimage +end + local function menuEntryName(drawing_menu, entry) local name_handler = menu_name_handlers[entry.entry_type] @@ -225,8 +238,8 @@ local function drawframe() x = x + shift.x y = y + shift.y - if core.isFramebufferConsole() and loader.term_drawrect ~= nil then - loader.term_drawrect(x, y, x + w, y + h) + if core.isFramebufferConsole() and gfx.term_drawrect ~= nil then + gfx.term_drawrect(x, y, x + w, y + h) return true end @@ -312,9 +325,9 @@ local function drawbrand() end if core.isFramebufferConsole() and - loader.term_putimage ~= nil and + gfx.term_putimage ~= nil and branddef.image ~= nil then - if loader.term_putimage(branddef.image, 1, 1, 0, 7, 0) + if gfx.term_putimage(branddef.image, 1, 1, 0, 7, 0) then return true end @@ -363,14 +376,14 @@ local function drawlogo() end if core.isFramebufferConsole() and - loader.term_putimage ~= nil and + gfx.term_putimage ~= nil and logodef.image ~= nil then local y1 = 15 if logodef.image_rl ~= nil then y1 = logodef.image_rl end - if loader.term_putimage(logodef.image, x, y, 0, y + y1, 0) + if gfx.term_putimage(logodef.image, x, y, 0, y + y1, 0) then return true end From nobody Fri Feb 16 04:00: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 4TbdWP6BMLz59ZKP; Fri, 16 Feb 2024 04:00: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 4TbdWP4M91z4HLx; Fri, 16 Feb 2024 04:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WRXo4zfsB6pW0goeaYQ45WTckws3tiwxjhReYHU/yBk=; b=T86jh3nDd5D2EftB1ZC3SEoaPUwJ/079MzzNJxBSygQdF5VXiccTqssuSRrzXV8nkL9DYl 4WM9lnglB5ngbCi+p5TaRcuys0OfGZJ9dBDrfuTZbxvhg8dd5m+xVHf6l75CAdbpGJXwmm VOWf+XRpVtBqmbajmOF3CG4QGjxRVHq4Vq8p572v1KKa6+YIQKa/OOXq3CMLJ5/Ue1sQNY +h4SGt0yILr8HBlOQCWDhTjm7yPNFVL39Z2VWHu7z/pFek9DZ9vSbgXI5f6CxYsii7gm+Y kO6mFqFyHJKIfB60JiXbn3M4Ev3R9/kyX0q7NSIY0SHtHRBTQ3jipu7yFNFBfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WRXo4zfsB6pW0goeaYQ45WTckws3tiwxjhReYHU/yBk=; b=SCaV+nLqbHsTu0YwcybSbyXajK0ULxw3AGI9t4382luQNswb/GKUidkUuvxsdTpJz+nxW6 CEk84ZlTO3Y4yZEuG+wA5xt7ozpwAAQ8WTQn5hb7fW5EwquGW9FlUIMVDapH7m1NWS6g0b EvJC11NnljSCrpxVt+Z7KbdELk7/cGMC3jVxLcBk8rGe6hjCXkcJ2QwdTiHZF7MMSAu2zL gQ72LCQQlOjmzUgQxScZt13aKxujbCfT+CxVaaKrtuSCJJQh9bso68nIPkhmjSef0L1b6Y Yx500JMp/yzxZccp790/0It5QBvcoaTn0XEAvYtL6/zQswvFNbT0AR75AG4hMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056033; a=rsa-sha256; cv=none; b=bwUwYOy95OY99SXSfyCjAmNaXhdDGbgNP7ZspBFj0VRMSy/hInbEgWMIBrt4lwqXUpOLaf TsZLfeHDEZBqnj9tSqx+c3xxCtD4/CYljc0WGRehFZaSKoMalULvr4JdgQVMKrQ01q3Pbi qJPX0Y8oaiulvE5E8X729MA2mSRsCyHLpNw/ammEIuXoF8TtE9tNlyxMDLfugkafLC+o+F grP07l/+b1Xw1yUzy0HR466fyf2xB4vzuIrfQZqfNJz8YfWH6u/ruqzivln7ZuEIwBZUL/ Vm7eY4zH//FfAZbYibICpkuHeyJ+f0eIcW5ZMmukuIx1JhffCCz33+VewRj8LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWP3RLLz18b6; Fri, 16 Feb 2024 04:00: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 41G40X6U019296; Fri, 16 Feb 2024 04:00:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40XDY019293; Fri, 16 Feb 2024 04:00:33 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:33 GMT Message-Id: <202402160400.41G40XDY019293@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: e34fd722cafe - main - kboot: Add our own lua bindings 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e34fd722cafe8639214c72997f08b5f5faa9c21f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e34fd722cafe8639214c72997f08b5f5faa9c21f commit e34fd722cafe8639214c72997f08b5f5faa9c21f Author: Warner Losh AuthorDate: 2024-02-16 03:54:55 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:23 +0000 kboot: Add our own lua bindings Create a small wrapper around the new flua hash module so we can use it here too. There's no 4th bindings, nor will they be created. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43874 --- stand/defs.mk | 1 + stand/i386/loader/Makefile | 2 +- stand/kboot/kboot/Makefile | 7 +++++++ stand/kboot/kboot/lua_bindings.c | 19 +++++++++++++++++++ stand/liblua/Makefile | 3 +++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/stand/defs.mk b/stand/defs.mk index e8480a8c2b1e..3624b9311161 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -62,6 +62,7 @@ BINDIR?= /boot # LUAPATH is where we search for and install lua scripts. LUAPATH?= /boot/lua FLUASRC?= ${SRCTOP}/libexec/flua +FLUALIB?= ${SRCTOP}/lib/flua LIBSA= ${BOOTOBJ}/libsa/libsa.a .if ${MACHINE} == "i386" diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index de96e1329b2f..57191b3c8f78 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -33,7 +33,7 @@ VERSION_FILE= ${.CURDIR}/../loader/version # # will tell you how many kiB of lomem are available. # -LOADERSIZE?= 550000 # Largest known safe size for loader.bin +LOADERSIZE?= 570000 # Largest known safe size for loader.bin .PATH: ${BOOTSRC}/i386/loader diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index 2e68a9ba9214..b571c3acada1 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -60,4 +60,11 @@ CFLAGS+= -Wall DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT} LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT} +# Add our own lua bindings until they are universal +.if ${LOADER_INTERP} == "lua" +SRCS+= \ + lua_bindings.c +CFLAGS.lua_bindings.c+= -I${FLUALIB}/libhash +.endif + .include diff --git a/stand/kboot/kboot/lua_bindings.c b/stand/kboot/kboot/lua_bindings.c new file mode 100644 index 000000000000..ca5d0253c21f --- /dev/null +++ b/stand/kboot/kboot/lua_bindings.c @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2024 Netflix, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include "lua.h" +#include "lauxlib.h" +#include "lutils.h" +#include "lhash.h" + +static void +lua_hash_bindings(lua_State *L) +{ + luaL_requiref(L, "hash", luaopen_hash, 1); + lua_pop(L, 1); /* Remove lib */ +} + +LUA_COMPILE_SET(lua_hash_bindings); diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile index bbfa21e07f53..b0d89bec4f02 100644 --- a/stand/liblua/Makefile +++ b/stand/liblua/Makefile @@ -27,6 +27,8 @@ SRCS+= gfx_utils.c .PATH: ${FLUASRC}/modules SRCS+= lfs.c +.PATH: ${FLUALIB}/libhash +SRCS+= lhash.c WARNS?= 3 @@ -36,6 +38,7 @@ CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC} CFLAGS.gfx_utils.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite +CFLAGS.lhash.c+= -I${FLUALIB}/libhash -I${SRCTOP}/sys/crypto/sha2 .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0 CFLAGS+= -fPIC From nobody Fri Feb 16 04:00: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 4TbdWQ6hT6z59ZGx; Fri, 16 Feb 2024 04:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbdWQ5V91z4HWt; Fri, 16 Feb 2024 04:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lIVLsZRnKwxuO7oWVADVEDxPiQysvgyxiD6Q/Hrts4A=; b=L6ejnZxB6Llc1Z2L46uzTaBAhMni/L3FUL0u07+oyXOxiPlwffO9c8o0oW2n8no/nMsbtL nmu7WPdGs1Yb07HGzRkq4a8tNixz6jDo88dOwqMyA3vIJUMyvp2RaoGadbK3aIU3ObW0yd 12CfuP9g2rqLnY8KgrLSvx3wgLTud/bwq0LhDHA4e+qKJ/eM1T4Ebtr6eKBDAR42wrDYr1 1LuiQYvM/HjwD1vLESPHwg4qaabTS93M3nl4UU4hYnoCJBqKW+wwL99FHzUDJ5yjOuStsA cY9GdO4AcheGV4mUDb+PA9ObESNvDqHCqmhZFeSRh6tt6m7WtNDC2FRimjynhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lIVLsZRnKwxuO7oWVADVEDxPiQysvgyxiD6Q/Hrts4A=; b=ywRoZRejbSEc0gHAriOQ5lfOLF2IDb4m8izA0X5Gt7zIoswOjANHdZ0poxAglWAOkAfU44 Juk0ttCkMXhqJQkBM41jNDP29Iw+KLvhsVWjChnQ6uhAiz0rXRZvpOUTj2OzEnRGWHYAo/ 0RQmv8Irs2RWvybeha6A2NeoRAziyYtFP3v4XU1BHaODC7ZikKz9YsgxBW1ocjKAg+WkU/ 8tS/FstwRZ3h90E+rNmye5d5FkqERaT9LwbmswH8GF/9rFlMTx05TqBegF/1NTaSEWQtXu PRhoaQ2wQLiTU4q7g1uUNYzh2pT2dW17qjJOotgpARzUMDoYv7+bq0uhpmK99A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056034; a=rsa-sha256; cv=none; b=wBlZ20oM6sshqrMHjtg7Iwq6/RPctsp6Byxncf9pFilGAyzNVNmjUgPWQ1bVnY6tqc2/8c SDKySY8gURJ8Xcx0riA6IgyE7rvBJ3mwQPW3P6mLUh6LZ2/k4tnBdKd4HjKj1yiZzmL+3r a5mZD+IljCaNHTZH+iV3xwHFt0jccsj1YEeewuwAmIEs1H2tDjUnWdxVUGEgo8vc2x8owE AVzKGV+hT4JYeDWIvbQIgdKA5e4eOpPICr54/kRNDBPbdXpGpAh+dazkYT/9fGR7R/A8J9 vPnEdydrBOn8aajKT648KBisv2ASLpK3fA+s9enuKrPFUPYHZnrBm6+QdpDCow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdWQ4bDPz18mb; Fri, 16 Feb 2024 04:00: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 41G40Yon019338; Fri, 16 Feb 2024 04:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G40Yqx019335; Fri, 16 Feb 2024 04:00:34 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:00:34 GMT Message-Id: <202402160400.41G40Yqx019335@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: 588ff0748f4a - main - loader: Simplify build a little 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 588ff0748f4acf8e00395f86e4956f184c7d3795 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=588ff0748f4acf8e00395f86e4956f184c7d3795 commit 588ff0748f4acf8e00395f86e4956f184c7d3795 Author: Warner Losh AuthorDate: 2024-02-16 03:55:05 +0000 Commit: Warner Losh CommitDate: 2024-02-16 03:59:23 +0000 loader: Simplify build a little Confine -DDISK_DEBUG to biosdisc.c, the only file it affects. Use modern variable arrays instead of alloca and add a sanity size minimum for biospnp nodes. These nodes are tiny enough that we needn't do a malloc/free pair: the stack is fine. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D43914 --- stand/i386/libi386/Makefile | 8 ++------ stand/i386/libi386/biospnp.c | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile index 0bc0efd35f22..fcba20fa26c4 100644 --- a/stand/i386/libi386/Makefile +++ b/stand/i386/libi386/Makefile @@ -23,7 +23,7 @@ CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} .ifdef(BOOT_BIOSDISK_DEBUG) # Make the disk code more talkative -CFLAGS+= -DDISK_DEBUG +CFLAGS.biosdisk.c+= -DDISK_DEBUG .endif # terminal emulation @@ -35,11 +35,7 @@ CFLAGS.teken.c+= -I${SRCTOP}/sys/teken CFLAGS.bootinfo.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite CFLAGS.vbe.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite -# XXX: make alloca() useable -CFLAGS+= -Dalloca=__builtin_alloca - -CFLAGS+= -I${BOOTSRC}/ficl -I${BOOTSRC}/ficl/i386 \ - -I${LDRSRC} -I${BOOTSRC}/i386/common \ +CFLAGS+= -I${LDRSRC} -I${BOOTSRC}/i386/common \ -I${SYSDIR}/contrib/dev/acpica/include # Handle FreeBSD specific %b and %D printf format specifiers diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c index 7e3bc97a35ee..a26c0d4d52d8 100644 --- a/stand/i386/libi386/biospnp.c +++ b/stand/i386/libi386/biospnp.c @@ -155,6 +155,7 @@ biospnp_enumerate(void) { uint8_t Node; struct pnp_devNode *devNodeBuffer; + uint8_t buffer[max(pnp_NodeSize, sizeof(*devNodeBuffer))]; int result; struct pnpinfo *pi; int count; @@ -163,7 +164,7 @@ biospnp_enumerate(void) if (biospnp_init()) return; - devNodeBuffer = (struct pnp_devNode *)alloca(pnp_NodeSize); + devNodeBuffer = (struct pnp_devNode *)buffer; Node = 0; count = 1000; while((Node != 0xff) && (count-- > 0)) { From nobody Fri Feb 16 04:03: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 4TbdZQ46Lwz59ZJG; Fri, 16 Feb 2024 04:03: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 4TbdZQ3MpLz4MgS; Fri, 16 Feb 2024 04:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6vK9TpWLiSr8hG0BuxF2Za4fhbIktxGGPlS8DcKNvqs=; b=hVh08rREKmryd3Cp1r75iDVkZFGjClBda0npe6RbOcWV7Q6vxV6EsMmN8FeWjll3slmJ3t wa1A4S73xDeGes3ms3X8urPSdg3ZA/uLWkI9Vy/tJ6KczaUY8LqhbIloaGSQqRJCUsD1av Rx2MEafJ3tX6uO8TkTRXMy/q/YxuTsBjaeYaIJR02Gai29mMBwGjzatWjdoxk/ss4bwSpJ rfUySZ9WHQEqv4YJ7GC3o9Bey9y/sCJMjb7UmKapdDU7Hgt9/N/HwOhxqsVxOv/qzLqWjX 2XwWvRGTvE/CmZb3aaMmas8m6hgR926e2Egzx3V7AVQ5eZ9WveNdNbfvRHxAZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708056190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6vK9TpWLiSr8hG0BuxF2Za4fhbIktxGGPlS8DcKNvqs=; b=lgjFehRNuIexgPfLb1L/NEURtPqZc2pkRSYFcz8ztAetSMAcXG+cqLU/PoQ2Rjpq7DbHoN hVn3lcbuJ0NTWC8bLWLbXXg2IxAjpHMXD+WRnwfYTdTcUVboKVJ9e9iWnv+euW0fE2Kq1J P6Rk0IxeXX4AkB7PcmfFl0B7+Q0aSQ5v4qGcr9dyLneZ5tgKMpca5GF2WmLslzFsFGFa7h w1EEDRYEX9rkPGvIMvu6Wv6wS6NdKivycLzx7S3ViVqW2et/q3VR0xxX4DtCq388uaxweM sQZ5lgKDdaMM+Q9GrX25Sl3tPZGm6MfhVku3UnA6NdQP7XTvfj5pizi/crR9gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708056190; a=rsa-sha256; cv=none; b=u/twQgp6/B1qXZBNcgQBrlYEX9hVWiCgF0A2qICddhATSSWzgdKQjwPDnDLjPcJ9XlxvPx oljK2lD6RU9uNtmjXz5kwEt3B5UlklaCIKtk9eSe3uJ2OaNOeHDR5cmbs5HL6Xxundvn2C LwQ2nocITiMyM4E8n5dN9LPrigTr9Qkyxom/0xU54KqF+HCaQDmxMTfxLNL7wEbOciz6GP c6xBINt2E+GOjlWCF5t0DgxRdttINJpWgXSxWpFimqFLM35+ax8dAaZU6IhYhgohlzKEHH itkbAMKmJaD99LUQ6tC5ecdn0691cIZynE0aV3U5ry7QOePxPkBWEI3JcNQMpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdZQ2QNvz18Z1; Fri, 16 Feb 2024 04:03: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 41G43Anj026965; Fri, 16 Feb 2024 04:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G43AiN026962; Fri, 16 Feb 2024 04:03:10 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:03:10 GMT Message-Id: <202402160403.41G43AiN026962@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: 26c8dedef118 - main - loader: line line per src file in libi386 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26c8dedef118cebdda4a0e22949ae35bc60c45c9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=26c8dedef118cebdda4a0e22949ae35bc60c45c9 commit 26c8dedef118cebdda4a0e22949ae35bc60c45c9 Author: Warner Losh AuthorDate: 2024-02-16 04:02:37 +0000 Commit: Warner Losh CommitDate: 2024-02-16 04:02:37 +0000 loader: line line per src file in libi386 Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43913 --- stand/i386/libi386/Makefile | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile index fcba20fa26c4..ac12d67e3475 100644 --- a/stand/i386/libi386/Makefile +++ b/stand/i386/libi386/Makefile @@ -1,14 +1,35 @@ .include -LIB= i386 - -SRCS= bio.c biosacpi.c biosdisk.c biosmem.c biospnp.c \ - biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ - comconsole.c devicename.c elf32_freebsd.c \ - elf64_freebsd.c multiboot.c multiboot_tramp.S relocater_tramp.S \ - i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.S \ - time.c vidconsole.c vbe.c amd64_tramp.S spinconsole.c +LIB= i386 + +SRCS+= amd64_tramp.S +SRCS+= bio.c +SRCS+= biosacpi.c +SRCS+= biosdisk.c +SRCS+= biosmem.c +SRCS+= biospci.c +SRCS+= biospnp.c +SRCS+= biossmap.c +SRCS+= bootinfo.c +SRCS+= bootinfo32.c +SRCS+= bootinfo64.c +SRCS+= comconsole.c +SRCS+= devicename.c +SRCS+= elf32_freebsd.c +SRCS+= elf64_freebsd.c +SRCS+= i386_copy.c +SRCS+= i386_module.c +SRCS+= multiboot.c +SRCS+= multiboot_tramp.S +SRCS+= nullconsole.c +SRCS+= pxe.c +SRCS+= pxetramp.S +SRCS+= relocater_tramp.S +SRCS+= spinconsole.c +SRCS+= time.c +SRCS+= vbe.c +SRCS+= vidconsole.c .PATH: ${SYSDIR}/teken SRCS+= teken.c From nobody Fri Feb 16 04:16: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 4TbdtD4clgz59cLS; Fri, 16 Feb 2024 04:16: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 4TbdtD44gjz4Psq; Fri, 16 Feb 2024 04:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708057012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LcNGzilS90pHp3O1kn6xa8a8wGG4PqixDwgBVuHO0tg=; b=E3hzWLhnEdszkj0ATVB0y0s20ctQzQdgqRX3t7aRcXPkz5E1/Kmi6Y/7h/+wnusgkWnOY6 Og8TlfLUG9w7emoZOGjxxOg8lS9ZtaE7sH1YWAzVpAgNKs5orNppFEYXYtszv7FY7pJPic 16C5Z/wfSnzj3ElFG/hD+suA8W9eEMCmNepIASxLiB8p9fHhCM6wuXWM+qjDno6+GAGlOo NduVEhlJU57U623Ec58fgJB2NdGNlg7uQ1/3u4d8Nm9zJ0ONfYtpKjQS8WCWtnxnEUtHe5 qK/3Eo1KRIQL6vb6NjJYCwXpaRtLzFO6+TnLdw3feNo/j8ve+kNp7ywxQXQwmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708057012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LcNGzilS90pHp3O1kn6xa8a8wGG4PqixDwgBVuHO0tg=; b=t73QUsBxl2Vd70AwAdF1d5T80u0wp6+rdMd1ggM5Ha4yMDTqdKwzVHC+nTvLzDbfK7vVOC lJ+RsMo6mPEM4zcwWYLveqhKoEuBz934BfAlc40cMjiGgr1ontdWhKdL6aK6LAyPQv+fOB lIYSIFkqoPgP5x7uyjog50iLEDGV++nmGl7SIRBbAa8kvRGx3fwzil40GiCwkRFF4Yfbrh 93btAd1Xt6nKYqktAK2nUgBmnJr2rW5Mwvks2cquLSMkeRCXDrzoo198S7wX5h1s1g1oJE BD9g8TQo9mPoQHYCxMl0nsp1YED4aworEvagv8OntvUq1fO3VUOB1mcAixvLQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708057012; a=rsa-sha256; cv=none; b=JZT4+bYOLQSxD/mo+EO8D72HWRhJD3gOLUpmgUwxmP2f53Dy23BSzAf3B2X8o2oM3Twc4E geCk6iWvHrZ/H9bwj+QKhgrQBUV7mh3iWjTwiJI7Plhi6BKNmHOsrFDDFM3CbnsVX2SPVq tHTK22V2frHvnPpP33GCIBr5B+I9h0NuB0vfClMo1iGAn1a8DYvV/Iw0NTspnM5L0kbGql EaH2Fo8sl4Nwd4QTZN10NUKVAjJLNA2brF1TMNfcrD8lxWNMHc3/U8LtouXNeubBh3iRnm z6Oi8NPDi7clK73FGZLAOaUX+w1R6rtTGmmd8ZV/vsqKbVoRYgMGAyKUtsVQmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbdtD37jbz190Y; Fri, 16 Feb 2024 04:16: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 41G4GqW6044289; Fri, 16 Feb 2024 04:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41G4GqoK044286; Fri, 16 Feb 2024 04:16:52 GMT (envelope-from git) Date: Fri, 16 Feb 2024 04:16:52 GMT Message-Id: <202402160416.41G4GqoK044286@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: e5d1a21e5001 - main - loader: Bump the limit to 560,000 bytes for BIOS loader 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5d1a21e500142c02fd44ce2f7822f2815a74fcc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e5d1a21e500142c02fd44ce2f7822f2815a74fcc commit e5d1a21e500142c02fd44ce2f7822f2815a74fcc Author: Warner Losh AuthorDate: 2024-02-16 04:12:52 +0000 Commit: Warner Losh CommitDate: 2024-02-16 04:16:36 +0000 loader: Bump the limit to 560,000 bytes for BIOS loader Further experience suggests we do not need as much margin. This was mistakenly bumped to 570,000 in a prior commit, so this undoes that. Sponsored by: Netflix --- stand/i386/loader/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index 57191b3c8f78..525561b7c4d1 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -1,4 +1,3 @@ - HAVE_ZFS= ${MK_LOADER_ZFS} LOADER_NET_SUPPORT?= yes @@ -23,7 +22,7 @@ VERSION_FILE= ${.CURDIR}/../loader/version # non-random survey suggests that 20k-25k is a good value for 'most' machines. # We also need to subtract maximum stack usage (20-25k). # -# So 640k - 40k - 25k - 25k = 550k = 563,200 bytes, but use 550,000 below for +# So 640k - 40k - 25k - 25k = 550k = 563,200 bytes, but use 560,000 below for # some extra buffer for more complex setups and/or wider BIOS lomem variation. # # Some systems use more stack or have BIOS reserve more RAM (or both), and will @@ -33,7 +32,7 @@ VERSION_FILE= ${.CURDIR}/../loader/version # # will tell you how many kiB of lomem are available. # -LOADERSIZE?= 570000 # Largest known safe size for loader.bin +LOADERSIZE?= 560000 # Largest known safe size for loader.bin .PATH: ${BOOTSRC}/i386/loader From nobody Fri Feb 16 11:25: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 4TbqNj2J2Sz5BcxQ; Fri, 16 Feb 2024 11:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TbqNj0n1tz4KZN; Fri, 16 Feb 2024 11:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708082725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0nRf2D7RaSQoVRpUvxbMgs09q8I44e77/GnSICun5c=; b=oBN/OdoXR+iIxmPur+Rl7H3jOH76ialLDYxu2RsEkqcUxpip2XsrlYeNaZt5LhUOAOtJPn T6ZM9jcDksxxNzZqLFuTqLDQXkM9dlJtwyW99Oz8jmKxSte1+y6VYngDfL2LPrFKhNJ3Uc rMiNZaZ1YhssUScqGXNYg+3AlLZ35QSRcJKpIApVYgdPZqRlkyGdkh+QlP+3DfhBeOtNuP WEf+tek553pPsmPjw1QvIMMGvtlhNgmmHUt6uaXozhWGVMYPrWz14zvG8QylLdlWpXVb6y NZH5vE5HpjvO9jSuJhUQsGM76QWzOuIh/KP/q49qSqJcc9d1tNuLGEfKVrL+cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708082725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0nRf2D7RaSQoVRpUvxbMgs09q8I44e77/GnSICun5c=; b=BH4Cj56UYeVIz/ggMll2dUVLptGjl+BRE3ztXdoLersRo3JU0u30PHVDPLaDKZDS0frkPw Ay+Zu2ie31eewv2d18x65m2rqAv0u82WXWdJm6FcUuEppzDRJOnPdGjx11Ow55MYyUhAnW Q7xCZWs617TD3hk4Rhyy+oUfbseHMohnhac7qazTOdM7GFCaiBL5YkdLWdxSgXYUsYJM8f jIdRMo8j5Dl2+02Tl49uiHv5dbYutnOnTWBnhDQOIiiDk91k0F5Kswpgfe7DdlQrmof3RA dxOzSfVG0P+LKuJV7I6+T/Z0HArlULSPiTh24+px35dsMbv3cJA3CwuHCGyDuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708082725; a=rsa-sha256; cv=none; b=F2ZuLYvRCPpCO4PI71u0mAEJdbsXQpE6WgnhHEBT/2/agWWhQzyawcPySpCTLkeKDtdqWu Oi4O7HGlt8ipP9+BGXL6jmkS+Fg/1aLKdMGEuQ7bSDs5Sa+X3cX8dNdZQh9GhWkPVqAKR2 ru95CZzx6cebDT4VuUExq/02DU50ps0WMqSzEJsvSaTl6LXJLPXFjKgrAKzdY0GyY4rmIz KZcUfp3A+kKGwOf5eEU0SGYPAgB5PIA8atNQwOnxGkY2/a4pmEfhPQjNBBZHV55FkAjF3K PDgOw6V739Sucu863junyILTdBu2FUJABsI//GR6Tw6vTqI4e+sbiR48qCmBgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbqNh6z2TzMXw; Fri, 16 Feb 2024 11:25: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 41GBPOTV067157; Fri, 16 Feb 2024 11:25:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GBPOxV067154; Fri, 16 Feb 2024 11:25:24 GMT (envelope-from git) Date: Fri, 16 Feb 2024 11:25:24 GMT Message-Id: <202402161125.41GBPOxV067154@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: 2f4e46dfdd71 - main - RACK, BBR: handle EACCES like EPERM for IP output handling 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: Sender: owner-dev-commits-src-main@freebsd.org 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f4e46dfdd710c6679f233480c9de430e6c4ef9b Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2f4e46dfdd710c6679f233480c9de430e6c4ef9b commit 2f4e46dfdd710c6679f233480c9de430e6c4ef9b Author: Michael Tuexen AuthorDate: 2024-02-16 11:19:24 +0000 Commit: Michael Tuexen CommitDate: 2024-02-16 11:19:24 +0000 RACK, BBR: handle EACCES like EPERM for IP output handling The FreeBSD TCP base stack handles them also the same way. In case of packet filters dropping packets in the output path, this avoids retranmitting the dropped packet every 10ms or so. Reviewed by: rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43773 --- sys/netinet/tcp_stacks/bbr.c | 1 + sys/netinet/tcp_stacks/rack.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index c643f0321099..931beba7a262 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -13809,6 +13809,7 @@ nomore: return (error); } case EPERM: + case EACCES: tp->t_softerror = error; /* FALLTHROUGH */ case EHOSTDOWN: diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 0ec50bb5e5c5..49d946dbb63b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -22376,6 +22376,7 @@ nomore: sendalot = 0; switch (error) { case EPERM: + case EACCES: tp->t_softerror = error; #ifdef TCP_ACCOUNTING crtsc = get_cyclecount(); From nobody Fri Feb 16 11:33:25 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 4TbqYy0zn6z5BdvB; Fri, 16 Feb 2024 11:33: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 4TbqYy0Hjcz4LXw; Fri, 16 Feb 2024 11:33:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708083206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szjzUM3+MOwlgcLBI86881uQ4fdKqCo0AYejO3+AxBU=; b=ChyUND8egUQl/nSGTgkrR0Pj/nQgBJxl2xvDMmKIlmuXIOnO48PF7MIqkLmNJd5dppy/Nw TYLIJGVTspoIzc3ivuUd2aaG5ZSnYf9GYPpSscYJ47vdhsqcdVly59AIHPZQzdr2h1o0YF yyEcUBCKq8mRtHIIhMDnG0/NLPsTOGci436kWi8kJTcgxKDdF3Tkz7WjSCkHtzQPGAW4HD sva9ntrLKp8z58xoKK7OajdSmAHSW96wTm4H9csNJ6kZgarTCWx4Z6d63VRcRpq8hKIWs0 KwpnFEYUyts+/iYz8hoF3zcp8O6PEAOInjusYFKBGQ8ZLqeTLu/4wWnd3DL34Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708083206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szjzUM3+MOwlgcLBI86881uQ4fdKqCo0AYejO3+AxBU=; b=XYJab9TSjHzi9OVKZIBtBvcv4x37H5sy9ohRhFa2o8dsPyRE/PpTX9lByrtlIvuSJdk7ny z/wDv9JujKHna90r7n4RHd2LW+MFKELQwOtEfVMKZR3dz9TT3Fuq/6aRQ8AOGp1OGRJTtK Dg2uz4bFo8iXaP1EPfu4A/lgH+NywEz1xLYKuDFjb5Add00dlJLbrcQfQRCzgPh6QuO0gb eVmXJ1mz1YfocbQ9aGAt/8NnwTmiDrb0/MRgekUioDoMeiuBtD0JXdSa/MhBhCV5s6W3xw IWvRnm8nk7XcNClOyRj+hVic4EBjtDChpdYkMKqgcb3lXRg0D7ubQh8eqfSBKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708083206; a=rsa-sha256; cv=none; b=C03CoHAMQL64uknFw1AtuHVb/drvP7TEySFbt8kgd/21GRK0VPLODutQzEDVOPEinONXBf E0zjet/3NZf5uzSz2MOPCznRSoYOqvyWqNSVj5bJnNiUFki+Kn6AphJ4EuOtYiyPhJEud1 WaQ9JGgb2T6qmF0ks162iil9EYpwSBQxidm6AjI1yJaLaZCIn31op8v9OiyhDg6K91be9b 5Ctd1WzZJixZgjGHfmgY/O7x+0EVAwJKJuyd30v9liTkLSs23Mz9mXxZYLNJ8T/D6gAwjr rAHDVjWZbolFtE/fuhWLzbnb37KD/HfHgjIr9HhOcaY+R5F+nZO+BvgeVUJ0oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbqYx6SYCzNfd; Fri, 16 Feb 2024 11:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41GBXPdd083514; Fri, 16 Feb 2024 11:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GBXP78083511; Fri, 16 Feb 2024 11:33:25 GMT (envelope-from git) Date: Fri, 16 Feb 2024 11:33:25 GMT Message-Id: <202402161133.41GBXP78083511@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: e00fd2426294 - main - dtrace: allow NULL interface pointer for ifinfo_t translator 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: Sender: owner-dev-commits-src-main@freebsd.org 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e00fd24262945fdc7f16198c8abd977f743e66e4 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e00fd24262945fdc7f16198c8abd977f743e66e4 commit e00fd24262945fdc7f16198c8abd977f743e66e4 Author: Michael Tuexen AuthorDate: 2024-02-16 11:28:48 +0000 Commit: Michael Tuexen CommitDate: 2024-02-16 11:28:48 +0000 dtrace: allow NULL interface pointer for ifinfo_t translator This is similar to other translators and will be used in static probes where the interface is not known. Reviewed by: markj MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43728 --- cddl/lib/libdtrace/ip.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/lib/libdtrace/ip.d b/cddl/lib/libdtrace/ip.d index 172d7d54bc36..2fe98858efc2 100644 --- a/cddl/lib/libdtrace/ip.d +++ b/cddl/lib/libdtrace/ip.d @@ -262,8 +262,8 @@ inline int IFF_LOOPBACK = 0x8; #pragma D binding "1.5" translator translator ifinfo_t < struct ifnet *p > { - if_name = p->if_xname; - if_local = (p->if_flags & IFF_LOOPBACK) == 0 ? 0 : 1; + if_name = p == NULL ? "" : p->if_xname; + if_local = p == NULL ? 0 : (p->if_flags & IFF_LOOPBACK) == 0 ? 0 : 1; if_addr = (uintptr_t)p; }; From nobody Fri Feb 16 12:50: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 4TbsHH4hWLz5BpKl; Fri, 16 Feb 2024 12:50: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 4TbsHH27mlz4V9t; Fri, 16 Feb 2024 12:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708087851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RPLHWoW1NI0z+VWnLNK7DhJpXrSh4IGpZMEwN21gDJE=; b=v0VNtv9tgRoWiJmf23cPys91oe1cXZf6qQhEwW3+/p6HFsOwXGAQwWb4RvFZFqVFSwZLRb kWGrzl80Lc0KbpbqZnOAAVu4LyToNA4LdNpmd31RuOGemLV1QlwXkFCzwfZjeLFw575fqm 11HlRErlFkP2Wk3SJyGarOsR9JUhxE+dJ8aMQeBvrObfU0XfKs88iaqKUtxyidiPiiOf9R rySs3w129gZTDbGUqcU1UIuoCEU0s/atl21qv4vs1XusLU1c6DrRlPFi+bdkQGh1BuLsCU RW+DyTRla5hdCRsFVoXLr+/ktb4ALZVoABChCLN6X9F563bX63rlDms6bjwFvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708087851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RPLHWoW1NI0z+VWnLNK7DhJpXrSh4IGpZMEwN21gDJE=; b=uWF+4Qrsihomv6GLncOeDGNa3frgVqd+Eu3THERKWoVxYKL4/JXbXDuQ63le8FTkmWE0EV +76oqsmfcrDDaGea2YBzACMDMf3iEax5vbekItR2oZu4+SiCtnyeYuzauWhNJPAoV+WHTr qZBukiU2KRsZHcmCWpY4itCECFdxbYrlb7Wttp/VYxTgOmv4GcNgFypnGM4qQgq8HNbFZX eSL7ksBgPKSt+59MH5Stz7MNjxAF7yJZqe3rHV6CFwQRSUe9qiThYn1LuKXj5RV/j3XsVM TJgsRWD3Cl097shJIMQNSMI/kVlfAcM4AxJdbvT76TN86Ak9rg1gh+vq4v55Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708087851; a=rsa-sha256; cv=none; b=WAKv4jO1A4RQqfouN0cl2rk6dgdNZDu+kbxpyt5SKwRvCHvr/QLpGjYxOAuniMA22aLA/6 esvebkMkVD0FQcm4Uu7hYLgpxJkSC23JLSS77q6IQcTXu6yo8fhxDJ02yt7n8HcmbPSmhm Tw/n7U5XvAj5lNL+sqFeFJ6pJjYhWp+4k+uJzpvPG8eiH//eb2WbNY9qJMajr7dZxO1q5e BUVjZWKBx3SduGSZAZVmigoAPe9NpsDhEsNrqcQd6hiBHj5ifNfcw1S3ddeqm7X0ADEGdk wJw6h7eAjcvxp3uwOMiWtPZ7VslEGmxLEFcPn+gF4HiV6L9XZmnLC9O3n/9pOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbsHH1Cp1zPy1; Fri, 16 Feb 2024 12:50: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 41GCoplZ013772; Fri, 16 Feb 2024 12:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GCop6T013769; Fri, 16 Feb 2024 12:50:51 GMT (envelope-from git) Date: Fri, 16 Feb 2024 12:50:51 GMT Message-Id: <202402161250.41GCop6T013769@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: 72ee91fed4cf - main - md5: Accept "-" as alias for stdin. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ee91fed4cfdcfbfb767cc166370b40e50d446a Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=72ee91fed4cfdcfbfb767cc166370b40e50d446a commit 72ee91fed4cfdcfbfb767cc166370b40e50d446a Author: Dag-Erling Smørgrav AuthorDate: 2024-02-16 12:36:58 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-16 12:37:29 +0000 md5: Accept "-" as alias for stdin. (based on a patch by jhb) MFC after: 1 week PR: 276915 Reported by: Hannes Hauswedell Reviewed by: allanjude, markj, jhb, emaste Differential Revision: https://reviews.freebsd.org/D43870 --- sbin/md5/md5.1 | 7 ++++++- sbin/md5/md5.c | 12 +++++++++--- sbin/md5/tests/md5_test.sh | 10 ++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1 index 0cdfff928211..a17ef5ae30b7 100644 --- a/sbin/md5/md5.1 +++ b/sbin/md5/md5.1 @@ -1,4 +1,4 @@ -.Dd May 10, 2023 +.Dd February 13, 2024 .Dt MD5 1 .Os .Sh NAME @@ -79,6 +79,11 @@ utility does the same, but with command-line options and an output format that match those of the similarly named utility that ships with Perl. .Pp +In all cases, each file listed on the command line is processed separately. +If no files are listed on the command line, or a file name is given as +.Pa - , +input is taken from stdin instead. +.Pp It is conjectured that it is computationally infeasible to produce two messages having the same message digest, or to produce any message having a given prespecified target message digest. diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index c8292fe2f692..29f212148ce3 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -611,11 +611,16 @@ main(int argc, char *argv[]) const char *filename = *argv; const char *filemode = "rb"; + if (strcmp(filename, "-") == 0) { + f = stdin; + } else { #ifdef HAVE_CAPSICUM - if ((f = fileargs_fopen(fa, filename, filemode)) == NULL) { + f = fileargs_fopen(fa, filename, filemode); #else - if ((f = fopen(filename, filemode)) == NULL) { + f = fopen(filename, filemode); #endif + } + if (f == NULL) { if (errno != ENOENT || !(cflag && ignoreMissing)) { warn("%s", filename); failed = true; @@ -633,7 +638,8 @@ main(int argc, char *argv[]) rec = rec->next; } p = MDInput(&Algorithm[digest], f, buf, false); - (void)fclose(f); + if (f != stdin) + (void)fclose(f); MDOutput(&Algorithm[digest], p, filename); } while (*++argv); } else if (!cflag && string == NULL && !skip) { diff --git a/sbin/md5/tests/md5_test.sh b/sbin/md5/tests/md5_test.sh index c6bc1dfd7be0..6b00a6b102c4 100644 --- a/sbin/md5/tests/md5_test.sh +++ b/sbin/md5/tests/md5_test.sh @@ -197,7 +197,9 @@ bsd_${alg}_vec${i}_body() { printf '%s' \"\$inp_${i}\" >in atf_check -o inline:\"\$out_${i}_${alg}\n\" ${alg} 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: 5b44edb40583 - main - md5: Ignore files in string and passthrough mode. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b44edb4058365ba8e4ccfdb5176c1cddd4394fe Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5b44edb4058365ba8e4ccfdb5176c1cddd4394fe commit 5b44edb4058365ba8e4ccfdb5176c1cddd4394fe Author: Dag-Erling Smørgrav AuthorDate: 2024-02-16 12:37:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-16 12:37:36 +0000 md5: Ignore files in string and passthrough mode. MFC after: 1 week Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D43871 --- sbin/md5/md5.1 | 2 ++ sbin/md5/md5.c | 2 +- sbin/md5/tests/md5_test.sh | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1 index a17ef5ae30b7..0a8dc46f3b1f 100644 --- a/sbin/md5/md5.1 +++ b/sbin/md5/md5.1 @@ -129,6 +129,7 @@ option, the calculated digest is printed in addition to the exit status being se .Pq Note that this option is not yet useful if multiple files are specified. .It Fl p , -passthrough Echo stdin to stdout and append the checksum to stdout. +In this mode, any files specified on the command line are silently ignored. .It Fl q , -quiet Quiet mode \(em only the checksum is printed out. Overrides the @@ -146,6 +147,7 @@ options. .It Fl s Ar string , Fl -string= Ns Ar string Print a checksum of the given .Ar string . +In this mode, any files specified on the command line are silently ignored. .It Fl t , Fl -time-trial Run a built-in time trial. For the diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 29f212148ce3..2045b623ff57 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -606,7 +606,7 @@ main(int argc, char *argv[]) err(1, "Unable to enter capability mode"); #endif - if (*argv) { + if (*argv && !pflag && string == NULL) { do { const char *filename = *argv; const char *filemode = "rb"; diff --git a/sbin/md5/tests/md5_test.sh b/sbin/md5/tests/md5_test.sh index 6b00a6b102c4..5b018b18c220 100644 --- a/sbin/md5/tests/md5_test.sh +++ b/sbin/md5/tests/md5_test.sh @@ -204,6 +204,8 @@ bsd_${alg}_vec${i}_body() { for opt in -q -qr -rq ; do atf_check -o inline:\"\$out_${i}_${alg}\n\" ${alg} \${opt} in done + atf_check -o inline:\"\$inp_${i}\$out_${i}_${alg}\n\" ${alg} -p 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: 17d5b027c192 - main - md5: Clean up input stream rights. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17d5b027c1921d0c6ba2de7993dd808dbf4df078 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=17d5b027c1921d0c6ba2de7993dd808dbf4df078 commit 17d5b027c1921d0c6ba2de7993dd808dbf4df078 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-16 12:37:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-16 12:37:41 +0000 md5: Clean up input stream rights. Keep it simple, caph_limit_stdio() and fileargs_fopen() already take care of everything for us. MFC after: 1 week Reviewed by: markj, jhb, emaste Differential Revision: https://reviews.freebsd.org/D43897 --- sbin/md5/md5.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 2045b623ff57..b6405635a5a1 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -574,7 +574,7 @@ main(int argc, char *argv[]) argv += optind; #ifdef HAVE_CAPSICUM - if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0) + if (caph_limit_stdio() < 0) err(1, "unable to limit rights for stdio"); #endif @@ -629,10 +629,6 @@ main(int argc, char *argv[]) rec = rec->next; continue; } -#ifdef HAVE_CAPSICUM - if (caph_rights_limit(fileno(f), &rights) < 0) - err(1, "capsicum"); -#endif if (cflag && mode != mode_bsd) { checkAgainst = rec->chksum; rec = rec->next; @@ -643,10 +639,6 @@ main(int argc, char *argv[]) MDOutput(&Algorithm[digest], p, filename); } while (*++argv); } else if (!cflag && string == NULL && !skip) { -#ifdef HAVE_CAPSICUM - if (caph_limit_stdin() < 0) - err(1, "capsicum"); -#endif if (mode == mode_bsd) output_mode = output_bare; p = MDInput(&Algorithm[digest], stdin, buf, pflag); From nobody Fri Feb 16 13:17: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 4Tbssc2R9Qz5Bs3p; Fri, 16 Feb 2024 13:17: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 4Tbssc1jn7z4YZw; Fri, 16 Feb 2024 13:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708089428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=64va3I4ZmRjSy2WpAhooJs+muIcPaOh0FARL4daaAmM=; b=QaGDvYgC8ifxNunLmlFbyfol/SYrfVczszag7YmhvyBdm8TNjEqR6tQB49PdJ0Jz9w33N6 2oJCKu27WlJRzUBzkP5TigoaPMme1XkKnSdMIBabFJniQbIVvcEaSFp3Puwan6O2i8LL0k g8z6rUdbcxQ59jPefdIXzq5S6Fsihk05lToiv75lrJ6mGGEplOtrzZIPDAypfqLFrXBDSR aQmfDOuDb3jldjepD1LfXC9ZhvfEmjYGsTaN3DoQnsmBvDUY6Iunp6icb3dUTsYtkoOugB 62ZmF9PUPmeugUh5Ghf7EFm9ep8pZhRA8GMYrrx0zirVHZhAQ+TLuM57sNtX3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708089428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=64va3I4ZmRjSy2WpAhooJs+muIcPaOh0FARL4daaAmM=; b=HLuev/ccSi8NLERGzZLUoXi6kJdE0Bcoh7xuzxnEJupnUTUYGzn6dx0DsGROAOOSzfAnVv gjsS+euV01WaTpRIBqb8WeAFbu1ujICrHy0AX3my0ntJuoKTI5+CJ+wPI1X93XVdUx0tp6 KQe1EBzJeZjPVhaCMGZKAMuuhr6whoILwH99R8cvvwG+Dw6Z6Qc5wjsZQpMpITpKsSsVIe biwdUZD3u6k+Bim0q3+lHX0IeUNGGFIPNgjeS3MRjjzKslnz+wfqeH6SWvBlrDSaMXfMHp qz2FJ94YY4NL3P1XPOKdlciACxWyWJ/FnxB3GU2xBi3dCPSkFxSeW2mXijHf1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708089428; a=rsa-sha256; cv=none; b=yQHDSt943ToAA+lxRvbpOIpSpLiHSmRxVDnoz+nZ3CKtLZyOEMbWJ1VPjyb4dKTWJRerEv arlMd3AhgUwpLh3HuHLUmJ+UrMCjrRZeiMlImB8SvMBYnb9f8hlcWdKpJy7VsftUh6WOw1 gFifrw/ts9lGB1caFdrQz86aepkjv2VYXoZW7K4fPHPktwdwGiArQMz13hu3bWieJOMsxX P6CQqnUI1RWWC+/xj4Odkku4kgnC+90cUGIU9/nzknnscZDQYQ8YMvhdPBmHQljxbd5PRz PVP8yxDCClE4DemvCX6WLB01JCiK6UkHoeCC6/v7C9pfhWKIy731ggKTcvMbug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tbssc0nyBzPwL; Fri, 16 Feb 2024 13:17: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 41GDH8Lo053088; Fri, 16 Feb 2024 13:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GDH86q053085; Fri, 16 Feb 2024 13:17:08 GMT (envelope-from git) Date: Fri, 16 Feb 2024 13:17:08 GMT Message-Id: <202402161317.41GDH86q053085@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: e7e2431586a4 - main - x86/xen: fix migration when ACPI suspend is not 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: Sender: owner-dev-commits-src-main@freebsd.org 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7e2431586a4f1d81fc37410f1ca1a9ae794857b Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=e7e2431586a4f1d81fc37410f1ca1a9ae794857b commit e7e2431586a4f1d81fc37410f1ca1a9ae794857b Author: Roger Pau Monné AuthorDate: 2024-02-06 08:16:44 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-16 13:16:18 +0000 x86/xen: fix migration when ACPI suspend is not available Xen PVH guests expose a very minimal set of ACPI tables, and due to the lack of SCI interrupt FreeBSD doesn't allocate the suspend stacks for saving CPU and FPU contexts. Lack of allocated stacks would lead to a page-fault in cpususpend_handler() when CPUs attempted to use the save context area as a result of a Xen suspend request. However there's no need to save the CPU or the FPU registers in the Xen case, as that's all handled by the hypervisor. Hence avoid saving all this state if the suspend stacks are not allocated. Note that this will currently only apply to PVH guests, HVM ones will still get the stack allocated and the context saved even when not strictly required. I find it easier rather that having to provide cpususpend_handler() with extra information whether the context needs to be saved or not. Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43765 --- sys/x86/x86/mp_x86.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index 11b11471d736..1027c2c8972b 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -1594,6 +1594,24 @@ cpususpend_handler(void) mtx_assert(&smp_ipi_mtx, MA_NOTOWNED); cpu = PCPU_GET(cpuid); + +#ifdef XENHVM + /* + * Some Xen guest types (PVH) expose a very minimal set of ACPI tables, + * and for example have no support for SCI. That leads to the suspend + * stacks not being allocated, and hence when attempting to perform a + * Xen triggered suspension FreeBSD will hit a #PF. Avoid saving the + * CPU and FPU contexts if the stacks are not allocated, as the + * hypervisor will already take care of this. Note that we could even + * do this for Xen triggered suspensions on guests that have full ACPI + * support, but doing so would introduce extra complexity. + */ + if (susppcbs == NULL) { + KASSERT(vm_guest == VM_GUEST_XEN, ("Missing suspend stack")); + CPU_SET_ATOMIC(cpu, &suspended_cpus); + CPU_SET_ATOMIC(cpu, &resuming_cpus); + } else +#endif if (savectx(&susppcbs[cpu]->sp_pcb)) { #ifdef __amd64__ fpususpend(susppcbs[cpu]->sp_fpususpend); From nobody Fri Feb 16 13:33: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 4TbtFt14D5z5BvgN; Fri, 16 Feb 2024 13:34:42 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [176.36.249.139]) (using TLSv1.3 with cipher TLS_AES_256_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 4TbtFs59nVz4bLs; Fri, 16 Feb 2024 13:34:41 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 41GDXAmM056350; Fri, 16 Feb 2024 15:33:13 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 41GDXAmM056350 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 41GDXA89056349; Fri, 16 Feb 2024 15:33:10 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 16 Feb 2024 15:33:10 +0200 From: Konstantin Belousov To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 33a2406eed00 - main - reboot: Use posix_spawn instead of system Message-ID: References: <202402160400.41G40Jgd018717@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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202402160400.41G40Jgd018717@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TbtFs59nVz4bLs 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:39608, ipnet:176.36.0.0/16, country:UA] On Fri, Feb 16, 2024 at 04:00:19AM +0000, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=33a2406eed009dbffd7dfa44285c23f0db5a3750 > > commit 33a2406eed009dbffd7dfa44285c23f0db5a3750 > Author: Warner Losh > AuthorDate: 2024-02-16 03:52:31 +0000 > Commit: Warner Losh > CommitDate: 2024-02-16 03:59:22 +0000 > > reboot: Use posix_spawn instead of system > > Use posix_spawn to avoid having to allocate memory needed for the system > command line. > > Sponsored by: Netflix > Reviewed by: jrtc27 > Differential Revision: https://reviews.freebsd.org/D43860 > --- > sbin/reboot/reboot.c | 54 ++++++++++++++++++++++++++++++++++++---------------- > 1 file changed, 38 insertions(+), 16 deletions(-) > > diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c > index e9d6487da6a5..d3f1fc9bbb86 100644 > --- a/sbin/reboot/reboot.c > +++ b/sbin/reboot/reboot.c > @@ -29,19 +29,21 @@ > * SUCH DAMAGE. > */ > > -#include > #include > #include > #include > #include > #include > #include > +#include > +#include sys/types.h should go first, the previous location was right > > #include > #include > #include > #include > #include > +#include > #include > #include > #include > @@ -69,23 +71,43 @@ static bool donextboot; > static void > zfsbootcfg(const char *pool, bool force) > { > - char *k; > - int rv; > - > - asprintf(&k, > - "zfsbootcfg -z %s -n freebsd:nvstore -k nextboot_enable -v YES", > - pool); > - if (k == NULL) > - E("No memory for zfsbootcfg"); > - > - rv = system(k); > - if (rv == 0) > - return; > + const char * const av[] = { Why not 'static'? > + "zfsbootcfg", > + "-z", > + pool, > + "-n", > + "freebsd:nvstore", > + "-k", > + "nextboot_enable" > + "-v", > + "YES", > + NULL > + }; > + int rv, status; > + pid_t p; > + extern char **environ; > + > + rv = posix_spawnp(&p, av[0], NULL, NULL, __DECONST(char **, av), > + environ); > if (rv == -1) > E("system zfsbootcfg"); > - if (rv == 127) > - E("zfsbootcfg not found in path"); > - E("zfsbootcfg returned %d", rv); > + if (waitpid(p, &status, WEXITED) < 0) { > + if (errno == EINTR) > + return; > + E("waitpid zfsbootcfg"); > + } > + if (WIFEXITED(status)) { > + int e = WEXITSTATUS(status); > + > + if (e == 0) > + return; > + if (e == 127) > + E("zfsbootcfg not found in path"); > + E("zfsbootcfg returned %d", e); > + } > + if (WIFSIGNALED(status)) > + E("zfsbootcfg died with signal %d", WTERMSIG(status)); > + E("zfsbootcfg unexpected status %d", status); > } > > static void From nobody Fri Feb 16 14:51: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 4TbvyS5hSbz51hs7; Fri, 16 Feb 2024 14:51: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 4TbvyS5Dt5z4mK1; Fri, 16 Feb 2024 14:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708095088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NgyBjgMe7AO0iyIUhznVjgIgPdxqNalo/9Di6SHoJnU=; b=Dd/ydv0Rr7ONP2XGepNDxd2JnJnuWLySeOTM2ts6UU1V+apeF8qaK/5alDxzKn80cTpexr u9Lqt3QMjJ9DtQ+wklite9LP8wL6w+tsymUa0zcjViZCUMlhgIJWuW6vMgSvvgMaKpwjZG 5b1mVyjMncZIM4Z6hS4CSa86tqfbQ9bmv5HBTVC90daQTDtd7qBIpymd+/fMobGr2396qg Ab23sgBNjMK6KQH6lVQ2KhFWp8wCPx/zLDXbYH1g/FvrN6ue010+E+ey0C6wWmMKF8XCtz Hkcf/HuAfYHWYYtSQ6RVMwUzZtg2LdkqE2Ht+FDn1j25e5omBUcR5nzleBpGxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708095088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NgyBjgMe7AO0iyIUhznVjgIgPdxqNalo/9Di6SHoJnU=; b=kzOfdCjbQ6ygMevDvw2GXkDSunftJhfwjeoZYjgFPyOkJqesvYuTSuGf3jllIRyHdEqYPV xQdn3gLNrh/oBITDGhWXwMuERKxdAazm7pHgfkOLXRPxmwxrwkb/4lMxgLGWPe2RBZbE0/ 79CeJmCjJQgi7ydretFKtVArjJ4wpwJoyNqhNtW8kuDQClJHYYvVBUF0YAYQ4UI/WptF9V 84FmEWQmUy1j+vVaHbQPCybkw5T0XO3T90Ix3TYh+4gY4zHjzcK8c513qw/pMFtFGpkeJN TIu4f8YK5UPV+llNvRDkB2T59/Iwgljcywj9TJzlsG+nS7NIGaZyncc4ywI9Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708095088; a=rsa-sha256; cv=none; b=NVCfJSphvui99//5PUgDJA/XDciWLSrSbiPI1kjWfqPqiTQ72rKR2wbanLnwqscGu1Rg4v 58BF5ObG2cTrQEXG9THHf7LyRhZYFTqYUgcEnjbZoOgcgzc/l9mSg2HP11flE+NGx45lLf 8nn11GCX3GpUnDcnPJJ/PXyBwAf4i+BKZkq995enRaxxmS8ynX83Su2zxjW4t7pyAhOKf1 ZhWNQPApeAVldWoh5RTlt4xXbM7qiRwSXjl/vDepO/06z4OcNRPJufI8jCQFnjOA71yrZy 1FcJYzZgNOIWSiF8PEjyFsv0fB2bgPw8bXMmIMJeDodr3Bl80/9Uh0jOSq7ZCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbvyS4KXTzT8V; Fri, 16 Feb 2024 14:51: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 41GEpSni016171; Fri, 16 Feb 2024 14:51:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GEpSwE016168; Fri, 16 Feb 2024 14:51:28 GMT (envelope-from git) Date: Fri, 16 Feb 2024 14:51:28 GMT Message-Id: <202402161451.41GEpSwE016168@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: 23d4d0fcc1be - main - pmc: Fix some problems with the makefile 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: Sender: owner-dev-commits-src-main@freebsd.org 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23d4d0fcc1be3d2f44054dd12725098ac7ee34a9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=23d4d0fcc1be3d2f44054dd12725098ac7ee34a9 commit 23d4d0fcc1be3d2f44054dd12725098ac7ee34a9 Author: Mark Johnston AuthorDate: 2024-02-15 18:17:37 +0000 Commit: Mark Johnston CommitDate: 2024-02-16 14:50:43 +0000 pmc: Fix some problems with the makefile - For some reason we don't build it as a PIE, but I don't have any problems doing so with either clang or gcc. - There is no apparent need to override WARNS, so don't. - Some building with -O0, presumably that's left over from debugging. MFC after: 1 week Reviewed by: imp, brooks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D43923 --- usr.sbin/pmc/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/usr.sbin/pmc/Makefile b/usr.sbin/pmc/Makefile index dda72c85a106..3f73dd398958 100644 --- a/usr.sbin/pmc/Makefile +++ b/usr.sbin/pmc/Makefile @@ -1,18 +1,11 @@ -# -# - .include + PROG_CXX= pmc MAN= -WARNS?= 3 -CXXFLAGS+= -O0 CXXSTD= c++14 CWARNFLAGS.gcc+= -Wno-redundant-decls CFLAGS+= -I${SRCTOP}/lib/libpmcstat -# Does not link when built position-independent. -MK_PIE=no - LIBADD= pmc m pmcstat elf SRCS= pmc.c pmc_util.c cmd_pmc_stat.c \ From nobody Fri Feb 16 15:50: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 4TbxH50hK2z51rfd; Fri, 16 Feb 2024 15:50: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 4TbxH50FRtz4sbV; Fri, 16 Feb 2024 15:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708098657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IBAhm0x9q8yjNTHplHA/NogyRWxeYvZ30/sCtuqMoDY=; b=qSn2dmLZM4pbEpjaa8cc/Jh9/wRbtulDLZopgRNrxvaAc7xHu7elivVeiYHKn7tmNHblVE ehVPKPEqw+9opLBn0orxgFx0wu+lGK+510zIzTkuSIKsH8bcy17OsG6sEWlEU1je2M3MWw VV9otT6uteWJ4GOf2qU9ESPhC1HWYZplE0+g5oPI7Qfc/YNCzF8EQFi3SNxdSd5XkpkxSl mKjft2p98umFuQVOXBZintuOIKOsI+GCWRkod5CPGSXzsckPDpA8LuYUhvfazyfQgBp+pm 4c27OomEGgo4Nhb/T0hDO2YKNm0R4irWFESSAj26ZjzXWCUlFty7ebHukTm2Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708098657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IBAhm0x9q8yjNTHplHA/NogyRWxeYvZ30/sCtuqMoDY=; b=tdiH3/3cM+guGxu3GVgN2URX8Oa+6PaHLGzMSYE1NtvpGWEFYmyNNvw2ch7Q9Rx1nEpAXu cyxV/+QMLxEap0HD4Xf8fr2ivslkTwkaRqg8P3S1MnzzrL0NubnZIcmMkJIosi03zwS8LA bN3dqcQnAg6mE3EyeppI0d2JShpNpZeiSYyAMG0YLB1/2Aa/wzqTx3saJVE7hxp2A/O35M of153FXwqew1cC4nyPzf6N1ddmWk+sJLTyuRyqsve9Hm7srN0ClozzWmZsXG50hKoBFniI z29enEMSSQo/4rBRz9fXtwriZ9reO9SNM4fNXGfUJ1I89CqEGwci5inMgJG98A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708098657; a=rsa-sha256; cv=none; b=JYzgmlvYsQmkTdYsx4QY3tqteSpC/w/LFSr1ZPlwBzcPnEYii9VVpJd0Ic59EzomBjsCCK 2jgHOE/xTlYqjEEm5PkYDqdiRfPrwn7e0R66mTmBLBFTPU/HGAWw+Ad7WS3ad7Liak4ZIj EtwWyOnp8PBC6tjbCo1gLmTS8dGUZlYKgyvnfjNSXsPkBSbWw2UOZYnbJlfaeWjUeYExVQ PfCDAiP8cICanjeG7PGiPmSw0wK8KeLZsfr9y/aAh5oozFBgGeTz4Kk741CphxacRFwW/j 5QXdFC9m7YNg+W4Q20yZmAXXJLSXIQ2K120WB5J1DSAqmZM9TGncxZ0BSH/OxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbxH46Q7tzWv9; Fri, 16 Feb 2024 15:50: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 41GFouCp018322; Fri, 16 Feb 2024 15:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GFouxo018319; Fri, 16 Feb 2024 15:50:56 GMT (envelope-from git) Date: Fri, 16 Feb 2024 15:50:56 GMT Message-Id: <202402161550.41GFouxo018319@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: fa4e42579436 - main - LinuxKPI: 802.11: lsta txq locking cleanup 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa4e4257943650c0b5f58c01bb0bdfadea61dfb2 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fa4e4257943650c0b5f58c01bb0bdfadea61dfb2 commit fa4e4257943650c0b5f58c01bb0bdfadea61dfb2 Author: Bjoern A. Zeeb AuthorDate: 2024-02-14 21:56:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-16 15:50:11 +0000 LinuxKPI: 802.11: lsta txq locking cleanup Rename the LSTA lock to LSTA_TXQ lock as that is really what it is and put down the full set of macros. Replace the init and destroy with the macro invocation rather than direct code. Put locking around the txq_ready unset and check. Move the taskq_enqueue call under lock to be sure we do not call it anymore after txq_ready got unset. Leave a comment related to the node reference which is passed into the TX path on the recvif mbuf pointer. Fixes: 0936c648ad0ee PR: 274382 (possibly) MFC after: 1 day Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43909 --- sys/compat/linuxkpi/common/src/linux_80211.c | 31 ++++++++++++++++++---------- sys/compat/linuxkpi/common/src/linux_80211.h | 14 +++++++++++-- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 99984569f35e..6ed5722ab998 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -366,7 +366,7 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], } /* Deferred TX path. */ - mtx_init(&lsta->txq_mtx, "lsta_txq", NULL, MTX_DEF); + LKPI_80211_LSTA_TXQ_LOCK_INIT(lsta); TASK_INIT(&lsta->txq_task, 0, lkpi_80211_txq_task, lsta); mbufq_init(&lsta->txq, IFQ_MAXLEN); lsta->txq_ready = true; @@ -398,8 +398,11 @@ lkpi_lsta_free(struct lkpi_sta *lsta, struct ieee80211_node *ni) /* XXX-BZ free resources, ... */ IMPROVE(); - /* XXX locking */ + /* Drain sta->txq[] */ + + LKPI_80211_LSTA_TXQ_LOCK(lsta); lsta->txq_ready = false; + LKPI_80211_LSTA_TXQ_UNLOCK(lsta); /* Drain taskq, won't be restarted until added_to_drv is set again. */ while (taskqueue_cancel(taskqueue_thread, &lsta->txq_task, NULL) != 0) @@ -418,9 +421,7 @@ lkpi_lsta_free(struct lkpi_sta *lsta, struct ieee80211_node *ni) } KASSERT(mbufq_empty(&lsta->txq), ("%s: lsta %p has txq len %d != 0\n", __func__, lsta, mbufq_len(&lsta->txq))); - - /* Drain sta->txq[] */ - mtx_destroy(&lsta->txq_mtx); + LKPI_80211_LSTA_TXQ_LOCK_DESTROY(lsta); /* Remove lsta from vif; that is done by the state machine. Should assert it? */ @@ -3536,16 +3537,21 @@ lkpi_ic_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, struct lkpi_sta *lsta; lsta = ni->ni_drv_data; - /* XXX locking */ + LKPI_80211_LSTA_TXQ_LOCK(lsta); if (!lsta->txq_ready) { + LKPI_80211_LSTA_TXQ_UNLOCK(lsta); + /* + * Free the mbuf (do NOT release ni ref for the m_pkthdr.rcvif! + * ieee80211_raw_output() does that in case of error). + */ m_free(m); return (ENETDOWN); } /* Queue the packet and enqueue the task to handle it. */ - LKPI_80211_LSTA_LOCK(lsta); mbufq_enqueue(&lsta->txq, m); - LKPI_80211_LSTA_UNLOCK(lsta); + taskqueue_enqueue(taskqueue_thread, &lsta->txq_task); + LKPI_80211_LSTA_TXQ_UNLOCK(lsta); #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_TX) @@ -3554,7 +3560,6 @@ lkpi_ic_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, mbufq_len(&lsta->txq)); #endif - taskqueue_enqueue(taskqueue_thread, &lsta->txq_task); return (0); } @@ -3769,9 +3774,13 @@ lkpi_80211_txq_task(void *ctx, int pending) mbufq_init(&mq, IFQ_MAXLEN); - LKPI_80211_LSTA_LOCK(lsta); + LKPI_80211_LSTA_TXQ_LOCK(lsta); + /* + * Do not re-check lsta->txq_ready here; we may have a pending + * disassoc frame still. + */ mbufq_concat(&mq, &lsta->txq); - LKPI_80211_LSTA_UNLOCK(lsta); + LKPI_80211_LSTA_TXQ_UNLOCK(lsta); m = mbufq_dequeue(&mq); while (m != NULL) { diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index b36b27168566..d25614de56dc 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -310,8 +310,18 @@ struct lkpi_wiphy { #define LKPI_80211_LVIF_LOCK(_lvif) mtx_lock(&(_lvif)->mtx) #define LKPI_80211_LVIF_UNLOCK(_lvif) mtx_unlock(&(_lvif)->mtx) -#define LKPI_80211_LSTA_LOCK(_lsta) mtx_lock(&(_lsta)->txq_mtx) -#define LKPI_80211_LSTA_UNLOCK(_lsta) mtx_unlock(&(_lsta)->txq_mtx) +#define LKPI_80211_LSTA_TXQ_LOCK_INIT(_lsta) \ + mtx_init(&(_lsta)->txq_mtx, "lsta-txq", NULL, MTX_DEF); +#define LKPI_80211_LSTA_TXQ_LOCK_DESTROY(_lsta) \ + mtx_destroy(&(_lsta)->txq_mtx); +#define LKPI_80211_LSTA_TXQ_LOCK(_lsta) \ + mtx_lock(&(_lsta)->txq_mtx) +#define LKPI_80211_LSTA_TXQ_UNLOCK(_lsta) \ + mtx_unlock(&(_lsta)->txq_mtx) +#define LKPI_80211_LSTA_TXQ_LOCK_ASSERT(_lsta) \ + mtx_assert(&(_lsta)->txq_mtx, MA_OWNED) +#define LKPI_80211_LSTA_TXQ_UNLOCK_ASSERT(_lsta) \ + mtx_assert(&(_lsta)->txq_mtx, MA_NOTOWNED) #define LKPI_80211_LTXQ_LOCK_INIT(_ltxq) \ mtx_init(&(_ltxq)->ltxq_mtx, "ltxq", NULL, MTX_DEF); From nobody Fri Feb 16 17: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 4TbzZ65y7Zz53sQd; Fri, 16 Feb 2024 17: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 4TbzZ635rYz56C5; Fri, 16 Feb 2024 17: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=1708104846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GI18JAzZ1rNvzX3Mbwvc9nKd1hCF0Z5GxhkO1O6nSsM=; b=mL5NW/SjLZnjcIMSj3GKm0bi3PGKkX0YurnPhJUp3gERuIB7VsuMNX2hGZm9lWGX5h6rZF aNv26jyQsLf6rULpHUUfe4rNOSuNQnLsvkdL57TmXMHxEgptlSX8AgTKK3zeFptOj2TK0u xIZXIO2W6yc7iCBvzOAAQAJHfmXnVDY0l1M/4aae17zR0hGGXByYI5l34F8LfP/jLMnQSf EAS9fEYQS17anLuuSfBleq6M0GtxClB+tywSSyjvfG+SQsBYNbcdFUGMPU2X72kfgf3VNI LiTgD86yObzUtAbk9DplJEpNKaf4Fx5SJuYe57oRsuS/zRdIfsTda1TPiLIKZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708104846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GI18JAzZ1rNvzX3Mbwvc9nKd1hCF0Z5GxhkO1O6nSsM=; b=eAf4Mq5PzcjLyExrDij5EMmCMUC1pU+pDJ1Ky5+Bk8G8SEWn0j7fztsEk4W82BqVkcNVx0 Gtir6izivzc/d4SsrSeBluimZZK/135C90NTzQ7o2Ifrste0IwTJgIHW+/6BmUi7Em0/6U RKdFQ1dyCxDNFH+hf2NmyTuBxwBi2RDyy1ru2PAxM0tTVWYY6oBQruaN0zdgG55RbQ+fCP 6iaCun004hh80/i+/OZxod26QfvqQ04sU4qHkAvdxMFSoFww5Ouq6CKIx1mISWFLRHISFy gBG+tWjIFMxrA52od+23FlIN8Fi+gxa4V7gEPmNZLi03p8keBKCn3Pu2Vt+OmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708104846; a=rsa-sha256; cv=none; b=N3FcLE22FQrq4Gg1kioMxKog3iOi7cvQTiKGoA/evQVckcSCEDJ+0lbbwgExRgd5cADW4R yehsxAaqcShIos16+h6I+y3fvDYRu4Zf02Md7D9ftasyztq6/1TyTTYvcBJrqxqocjq6Nr RE7ICYaNCFZ7XfmZFnc+gW6V6klVrzG+D+eqeEQpcpGhh5iiGVBmpbpF4g8cY2ugwJy7Tt wz8tAQQKSDuXtL+mQreFW1GMfaF+JmPUiThA+4gm40+0+aG1vxwX7iiZR7q/EXMfD4rMiY GvfRzyq9lJkMm0xS8Szkh27rIZQHnw6MIhgeE+gfhFgUneMenChsid80NCYjfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbzZ62B05zZhK; Fri, 16 Feb 2024 17: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 41GHY6Y9089563; Fri, 16 Feb 2024 17: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 41GHY6al089560; Fri, 16 Feb 2024 17:34:06 GMT (envelope-from git) Date: Fri, 16 Feb 2024 17:34:06 GMT Message-Id: <202402161734.41GHY6al089560@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: 5130b35ef561 - main - Revert "heimdal: CVE-2022-41916: Check for overflow in _gsskrb5_get_mech()" 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: Sender: owner-dev-commits-src-main@freebsd.org 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5130b35ef561edf87be53721ed68de7927843fd4 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=5130b35ef561edf87be53721ed68de7927843fd4 commit 5130b35ef561edf87be53721ed68de7927843fd4 Author: Cy Schubert AuthorDate: 2024-02-16 17:31:13 +0000 Commit: Cy Schubert CommitDate: 2024-02-16 17:31:13 +0000 Revert "heimdal: CVE-2022-41916: Check for overflow in _gsskrb5_get_mech()" This was already applied by ed549cb0c53f. Repored by: Gunther Nikl This reverts commit 9286d46a794f25482880d29864a8901ef6666fae. --- crypto/heimdal/lib/gssapi/krb5/decapsulate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c b/crypto/heimdal/lib/gssapi/krb5/decapsulate.c index 7a18708a633a..343a3d7acb97 100644 --- a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c +++ b/crypto/heimdal/lib/gssapi/krb5/decapsulate.c @@ -56,8 +56,6 @@ _gsskrb5_get_mech (const u_char *ptr, return -1; if (total_len < 1 + len_len + 1) return -1; - if (total_len < 1 + len_len + 1) - return -1; p += len_len; if (*p++ != 0x06) return -1; From nobody Fri Feb 16 17:43: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 4TbznG0pLcz53tL2; Fri, 16 Feb 2024 17:43: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 4TbznF6rr3z57sL; Fri, 16 Feb 2024 17:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708105426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWixekZFVsO4wPqCri4cy6mp2V5fvfEG1Mj1Z7T8nSc=; b=kc+Gnb3t3Mk8yWI9k6IOXL4idjTTixeeklbVOuIKbJG2v2z78pqLU2XREIs2gbDw6+mN6Z P/JGWL7ppN37TdbUOpfh3+cKG5jT8CHMfy03cf+E7hUhYgVfezsK+9FrnNaF7FAAwWfzTZ OgaMieyBEywvHjpewaujWQR9L1erzk317Lyk8txpvcq4WvAplVmMx05fmqGfH547JWq/mA 2S91p+Oby5Ctw15RsiSG2XifuSXgimzy6Pa8rQ0+fRwscB4OrIQonA06g0OjP4DN7CtfBx 54AeXG/FpT9pE/Hx7Kip77Nnm8Jjnyzy02mi+I90tkKVhww9GnbXKa0QLHWxJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708105426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWixekZFVsO4wPqCri4cy6mp2V5fvfEG1Mj1Z7T8nSc=; b=oOwtkiznx444ujzVIipSTel+AaVrIou0cZ3vXR7WnEG9hgcvyBg21PYM1BB5bPb41rwcdd 15X6ZtM8auf3GIAXY/EK5ufxgJnpEx+xvv9UUQARz1FciRKzGI7q8eE5uvlunoH5QjFUkP OCL/lJ1csJ2VF2d+Ld2kCm7i9eb7ouNZH9vSCuJIntm4i9aVAQCE/eIAaf+vw+oEfDo1jd XEhgNNqvXF97gp2yeL+Q0SXy2j3HW88F5spoq8F2kz31ZfGStmUAw9rint5VcmfLmC79JS l7GOj+vcmhNUtB00NZmH36IHq9UloQon6Yj4QJW/L57IZzFvriMRFkq1tlUelg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708105426; a=rsa-sha256; cv=none; b=dNnqnuwXABimgp2Vb6C3Lvuqq9xJePWz6afm3xrpjmc5eZ1MHGTQiqmD6XKOXL6IUSJOpv FRzYHbfBg2oJZIFc7c1ExoT2jm5w8SHJW3cLGUIdJU5Kxz7a1tcAYAjmPlJ7mecaWTty6Q FCNdgps+KE6PzkLfasQsCmrY0aknaXLpsSiGyHZ/8okYnW53K/Tqwprf6var6Zi4oTavA0 kRkZi2la6UQuOLE0cNGCux/EjsFx5a5LMncgUQVFf3vQlV9HAXyr53wfLcWtEfWmMejqmU YMUkpaZ5H2vJ7TSF5BZUkWPNYY0xapxRifCSwYMu1nrbpd69fzU1toyoPBSOrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbznF5vbrzZTK; Fri, 16 Feb 2024 17:43: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 41GHhj1V006087; Fri, 16 Feb 2024 17:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GHhjOs006084; Fri, 16 Feb 2024 17:43:45 GMT (envelope-from git) Date: Fri, 16 Feb 2024 17:43:45 GMT Message-Id: <202402161743.41GHhjOs006084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 68a3ff041129 - main - powerpc mpc85xx: Fix infinite recursion in bus_adjust_resource method 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68a3ff041129208ea98a3bd5142061176ab4165e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=68a3ff041129208ea98a3bd5142061176ab4165e commit 68a3ff041129208ea98a3bd5142061176ab4165e Author: John Baldwin AuthorDate: 2024-02-16 17:40:34 +0000 Commit: John Baldwin CommitDate: 2024-02-16 17:40:34 +0000 powerpc mpc85xx: Fix infinite recursion in bus_adjust_resource method The default case needs to call bus_generic_adjust_resource to pass the request up the tree, not bus_adjust_resource which will just call this method again. Fixes: 5a7e717fb790 powerpc mpc85xx: Use bus_generic_rman_* --- sys/powerpc/mpc85xx/lbc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c index 7db2d49955a3..151d77739c4a 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -773,7 +773,8 @@ lbc_adjust_resource(device_t dev, device_t child, int type, struct resource *r, return (bus_generic_rman_adjust_resource(dev, child, type, r, start, end)); case SYS_RES_IRQ: - return (bus_adjust_resource(dev, type, r, start, end)); + return (bus_generic_adjust_resource(dev, child, type, r, start, + end)); default: return (EINVAL); } From nobody Fri Feb 16 17:43: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 4TbznH1ksBz53tL3; Fri, 16 Feb 2024 17:43: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 4TbznH0LjHz58BN; Fri, 16 Feb 2024 17:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708105427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J9OR27v5VKhvI2p1BgEpRnLLvzopexkmrqPdc4HGhhE=; b=OXGB+cvvb0uAFVXGaKtTWypSywC05mC/ALylcUHicx9qyHFEeF7sTX2BfuEx6u2HL9ySNE f2DFVceIItVqxNJJ+XK0ISn0ueWZkYkgJOotnn0o+ZWDbDJWaxo2Osjz99JGXXLwDbsHLI 9SQBJyxd8liu/sB/OSYoosczsET5BukGAcacsbvv4/Gser+tW4rgG8EaxJR7s2wQZkQ7Ne oFRFej3Ak8v533ouXhXuR4pjNIwUu/g7rBkm/5gPrbmKxbtw+nJ5pxsEgpiFB9y0OQy1EM efecm34jyob5C+8eZc7RkPcS5OOIAw8v1wcT67Nvk41MxpR0g3ABGd/qO5wR2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708105427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J9OR27v5VKhvI2p1BgEpRnLLvzopexkmrqPdc4HGhhE=; b=yIDKNYxC3ekkUVlOBO9ccotm64c4mWz736IYpi3zF4Ee+L+xvuJKJ/WpXzllTfIpB1ZGUE wpl1ceYmO6hpy2UMDReURiLyTVYizgnPobQTFaR2/3LWEfjsayULU6CSS3qPszBU1k1Bfs Jw2Q5kqJuebSMftK7gT0SMuUu/vGzQSQWtTA04CSXPGkUC1FPcB/KzUVuZ7WAxI1GBo0dq Nfk1jwMoBy8igvrElZIN5ZbD/7VQ8T6ixubRHeBwvgjuApqPlOrdbFHSjN17OAPFcY+Pn9 DY6P76e6ZVQ5Yu8DBwFbF6rNaHzCXxwuLdeqKPP6H4t9s/g0WyFk14lmRQZ0/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708105427; a=rsa-sha256; cv=none; b=MK9M5aiwMkHHgnwRDGqjXuQvuhHyhD+EaMHss4YEnF+bCxoaO+/k9APCux35Hhh5p7wIUK BAT6/CfS7zuSbNZP6ngKeNGnORZMmb5IFmaWxWIvSd0IHhVtuuZ4ipAHBonsItN54ChCQU Lm9KSmtCa10GzDsRwQ93Pl/5hLARehgfig+I7XaSe7rs3WvfUeJKJPbBXsIXUEVGKwHubV Baipqkg8UiQj/ph7cNGnF4GfOaKwmhTFNmyAq3PnGCdyESikjKDzgLVnLCteNVP7kM3cWS AE9fHQdMJaWZnoZEWlQM/OzOo28LcAfqmhY/gZFzF5coWbmPF1KViQEobQkaoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TbznG6XCVzZR8; Fri, 16 Feb 2024 17:43: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 41GHhkS3006139; Fri, 16 Feb 2024 17:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GHhkRZ006136; Fri, 16 Feb 2024 17:43:46 GMT (envelope-from git) Date: Fri, 16 Feb 2024 17:43:46 GMT Message-Id: <202402161743.41GHhkRZ006136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ccb1b43e20f5 - main - powerpc psim: Fix infinite recursion in bus_adjust_resource method 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccb1b43e20f5a1a0795b14f3ef39d5c2e15b424d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ccb1b43e20f5a1a0795b14f3ef39d5c2e15b424d commit ccb1b43e20f5a1a0795b14f3ef39d5c2e15b424d Author: John Baldwin AuthorDate: 2024-02-16 17:42:30 +0000 Commit: John Baldwin CommitDate: 2024-02-16 17:42:30 +0000 powerpc psim: Fix infinite recursion in bus_adjust_resource method The default case needs to call bus_generic_adjust_resource to pass the request up the tree, not bus_adjust_resource which will just call this method again. Fixes: d7c16b333455 powerpc psim: Use bus_generic_rman_* --- sys/powerpc/psim/iobus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index 497ef42d82e6..c572a1fdc12b 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -352,7 +352,8 @@ iobus_adjust_resource(device_t bus, device_t child, int type, return (bus_generic_rman_adjust_resource(bus, child, type, r, start, end)); case SYS_RES_IRQ: - return (bus_adjust_resource(bus, type, r, start, end)); + return (bus_generic_adjust_resource(bus, child, type, r, start, + end)); default: return (EINVAL); } From nobody Fri Feb 16 18: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 4Tc11h3xs2z542ly; Fri, 16 Feb 2024 18: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 4Tc11h3Mv4z44p3; Fri, 16 Feb 2024 18: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=1708108776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdsQn4jfD2aJsMDLJ/9gzg3RyHPuQLvtME+ou9xbzw4=; b=uyl1jKEXn3t+UdkxSx/bTn0UVVLvHX0v6UCczC2hcqVaEUm5Qpbku0XUPsz6EZc3xsz6Ao JKumCeM1mpwIw8XA6ImYCN9pIQGmzoNBmOtElmOnuTio5Sm4K8omPCbTfyoF5C3+sXUs8j xTQBVkoDyPFRU9sGv65wI2bqyeGv3ifPOgP1wGftL6B4i/Zp6luchEAxHBdWROeHxb7+Pu 6CjEAoxvhX9KgC4uC68yuWyKCXOOOGFvtANZro28Dt/kiow8LV0cTq04LZF4qLQVSHn0XT R9uSufnoi4vj/rHJ7N7/vhrVQocZHQpyRN1mAv9J0VKA317T+FfhCLdggI3feg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708108776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdsQn4jfD2aJsMDLJ/9gzg3RyHPuQLvtME+ou9xbzw4=; b=ZcIjD4xyYUyKJ8F4+dtkRXqUtrz3/sBSrzxQD+HrYCwwPRoIWS9brdC32dAHSeduu0jOHp e+WRh3shk4PvwBt2foQH+FUAc2huh8OTMILlJR3pIGCbzFgXZkhRwOTMrTBPfjQBViOMXD upP4t4g9tv/bJkvsRlCizOh6fWt1L2Lcbi6L8tlfSKOCWTRVH3gfefG+qYBLZF4jeBTeUb SqyBgFiEzP7iLgPeNUf8Dk/huGMfbvNNEDrLGB0SgiW1fhNRg/FbIECkqUZQs5dGMNuvnw kbr4qHocARnSSIu7o9wAIktGdYcxtezXkLXwiVfQ3BWfN23QEaxgFL0jeRUD/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708108776; a=rsa-sha256; cv=none; b=Z9M9rPPiYgUEYBolLBYe4GT4BfTehnyhcdNKElH76clIe3QbtldMAw5IBfTLgk2I5SApkc DI98qdP6jJEwfccl10FILhsElaVdq6Xv7ITKbXGeAvW2hrODCD5KGz1S0oP24z2+Y5y1CO jO5ImRGKshFudIa7bruLBLF7FgbDrWMPrdHqe4J6RrkegJFmlCU4Klw20sV0qxsk9zlJWU MQvHXQPtOV89S1LTBkbqxXZNdRbYYeB7IkZ0xjc0u/Gjv/SE4rU0lQSr7rvZjQGB9misBV P8bU8sfiGcGmDarcwGPhJV1rtuozvYeqaz8xVNjevNK/BMt1DtEcgTV+/wEgtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tc11h2Kpjzbvc; Fri, 16 Feb 2024 18: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 41GIdaef093039; Fri, 16 Feb 2024 18: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 41GIdaGo093036; Fri, 16 Feb 2024 18:39:36 GMT (envelope-from git) Date: Fri, 16 Feb 2024 18:39:36 GMT Message-Id: <202402161839.41GIdaGo093036@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: b134c10d658c - main - busdma: fix page miscount for small segment sizes 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: Sender: owner-dev-commits-src-main@freebsd.org 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b134c10d658c3b350e04aa8dbd2628e955ddcce0 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b134c10d658c3b350e04aa8dbd2628e955ddcce0 commit b134c10d658c3b350e04aa8dbd2628e955ddcce0 Author: Mitchell Horne AuthorDate: 2021-05-25 21:04:56 +0000 Commit: Mitchell Horne CommitDate: 2024-02-16 18:38:48 +0000 busdma: fix page miscount for small segment sizes For small segments (< PAGE_SIZE) there is a mismatch between how required bounce pages are counted in _bus_dmamap_count_pages() and bounce_bus_dmamap_load_buffer(). This problem has been observed on the RISC-V VisionFive v2 SoC (and earlier revisions of the hardware) which has memory physically addressed above 4GB. This requires some bouncing for the dwmmc driver, which has has a maximum segment size of 2048 bytes. When attempting to load a page-aligned 4-page buffer that requires bouncing, we can end up counting 4 bounce pages for an 8-segment transfer. These pages will be incorrectly configured to cover only the first half of the transfer (4 x 2048 bytes). Fix the immediate issue by adding the maxsegsz check to _bus_dmamap_count_pages(); this is what _bus_dmamap_count_phys() does already. The result is that we will inefficiently allocate a separate bounce page for each segment (8 pages for the example above), but the transfer will proceed in its entirety. The more complete fix is to address the shortcomings in how small segments are assigned to bounce pages, so that we opportunistically batch multiple segments to a page whenever they fit (e.g. two 2048 bytes segments per 4096 page). This will be addressed more holistically in the future. For now this change will prevent the (silent) incomplete transfers that have been observed. PR: 273694 Reported by: Jari Sihvola Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34118 --- sys/arm/arm/busdma_machdep.c | 11 ++++++----- sys/arm64/arm64/busdma_bounce.c | 1 + sys/powerpc/powerpc/busdma_machdep.c | 1 + sys/riscv/riscv/busdma_bounce.c | 1 + sys/x86/x86/busdma_bounce.c | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c index 9f4c6e561bbc..9ae74892ebd4 100644 --- a/sys/arm/arm/busdma_machdep.c +++ b/sys/arm/arm/busdma_machdep.c @@ -812,6 +812,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, pmap_t pmap, bus_dmamap_t map, vm_offset_t vaddr; vm_offset_t vendaddr; bus_addr_t paddr; + bus_size_t sg_len; if (map->pagesneeded == 0) { CTR5(KTR_BUSDMA, "lowaddr= %d, boundary= %d, alignment= %d" @@ -826,16 +827,16 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, pmap_t pmap, bus_dmamap_t map, vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { + sg_len = MIN(vendaddr - vaddr, + (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK))); + sg_len = MIN(sg_len, dmat->maxsegsz); if (__predict_true(pmap == kernel_pmap)) paddr = pmap_kextract(vaddr); else paddr = pmap_extract(pmap, vaddr); - if (must_bounce(dmat, map, paddr, - min(vendaddr - vaddr, (PAGE_SIZE - ((vm_offset_t)vaddr & - PAGE_MASK)))) != 0) { + if (must_bounce(dmat, map, paddr, sg_len) != 0) map->pagesneeded++; - } - vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); + vaddr += sg_len; } CTR1(KTR_BUSDMA, "pagesneeded= %d", map->pagesneeded); } diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index 57551a2edb47..ec2dfe76894c 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -693,6 +693,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, while (vaddr < vendaddr) { sg_len = PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK); + sg_len = MIN(sg_len, dmat->common.maxsegsz); if (pmap == kernel_pmap) paddr = pmap_kextract(vaddr); else diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index aa1a29e1f1ce..bc28619372f0 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -520,6 +520,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, bus_size_t sg_len; sg_len = PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK); + sg_len = MIN(sg_len, dmat->maxsegsz); if (pmap == kernel_pmap) paddr = pmap_kextract(vaddr); else diff --git a/sys/riscv/riscv/busdma_bounce.c b/sys/riscv/riscv/busdma_bounce.c index c9fdb0e38e40..e504b122ebd1 100644 --- a/sys/riscv/riscv/busdma_bounce.c +++ b/sys/riscv/riscv/busdma_bounce.c @@ -531,6 +531,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, while (vaddr < vendaddr) { sg_len = PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK); + sg_len = MIN(sg_len, dmat->common.maxsegsz); if (pmap == kernel_pmap) paddr = pmap_kextract(vaddr); else diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c index f56ecd9e7e1e..ef96f5ba7bdc 100644 --- a/sys/x86/x86/busdma_bounce.c +++ b/sys/x86/x86/busdma_bounce.c @@ -560,6 +560,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap, while (vaddr < vendaddr) { sg_len = PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK); + sg_len = MIN(sg_len, dmat->common.maxsegsz); if (pmap == kernel_pmap) paddr = pmap_kextract(vaddr); else From nobody Fri Feb 16 18:51: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 4Tc1Hj1pGkz544Z5; Fri, 16 Feb 2024 18:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tc1Hj1L5yz46tL; Fri, 16 Feb 2024 18:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708109505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vMMcECqXAx/E8/yY8+agSoG1FV16GcfCuBqbhT6E7LE=; b=FlL3xIs1IozZhoO66PUcFtAqC3GbTbtSY+Sivbnr8ZoXwrV7J1lVKk5Vm7/A9l2+qZq8v4 GarQYnNFN8P0bWEYHq9JvM9B0cjYVbMEEG1dCrxoms/veS76uYK2fYeU6cMTJgb2kfHJPJ Y7eAdEQwVF5qqknRMDK5y6tsuDk9EU6na3YFxHLPiFwblyHNJKzJ0O74Dq2D+igb4SH+gm NkLAooSj+M7FdYYnhFA0pQlTpZSkr3QDMs4u+MUkb7C/rVmn/S4EjeRaRrtjD2Av0vI6n7 FgoR9LEK6bZxytHp9Yg4gu6whfS8Vkb8McwLt89Axy5iDxxu6wwa9bBmnQyO+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708109505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vMMcECqXAx/E8/yY8+agSoG1FV16GcfCuBqbhT6E7LE=; b=cM0D/QmG9t9axKmu4Qc8ds9X8P5818eEi3PU99UTR7YxJw9m8nmL26Kg67qT/Al1sP6CN/ 9ou9yWU8llvmxzQhsYJAssuED+hh/hvRtYH9U9Q7eGP35o3HzidBEFT0YkzIVkQoUWZOYw 8cVt23BseKzLzFGED+JqjV1VhCjaaANziBMy+NIjruAWk6tjfLAm5ICSEk3dp73h6o2p8v UvuOXoM5nmSewkmoycIo7WaQPExxsHTJ5EmrynmALxh9+xRV/ned1sHT4Z0fjIv3a+LTxc 4K4j1XICI3sIM/RNBQIQry1F1ALN2Q6QzTaV9HSJmD44ZcuIfuVMR4CyWK3Bpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708109505; a=rsa-sha256; cv=none; b=Rbs8j4KoUBnpc49nVKlbQJse4XQiC5XyJoqBKWTH0Sn38M6Rte2WH+NjILxhgNlVQzO+4T n7RNLTm52AWkL+0d8jRQ8YaIQaza2QVAdCufTpEjSTxgWVP9nRQYuyyNehn237YxyNU9Hx 5VFKCjOjlbEcusHTE1nGiQdMiWPNJi9PtUxxqZycbRWpgmAqCoDRvOrL0x0SFUqweLe3b1 1W4oVALO8euadFtvWf3rOvh81/eEm0q1rnZ2taKDj7S4SVhc1Kx2Bg0QbMfx0K18DjotsD Cuzlj+k7BdffGZlqnMuX+gdp0D0ZykXa23U97Zqzewl/qZUzVdUQf44Dj7OwbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tc1Hj0NFnzbjn; Fri, 16 Feb 2024 18:51: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 41GIpiDx025089; Fri, 16 Feb 2024 18:51:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GIpiLO025085; Fri, 16 Feb 2024 18:51:44 GMT (envelope-from git) Date: Fri, 16 Feb 2024 18:51:44 GMT Message-Id: <202402161851.41GIpiLO025085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 1250c9647959 - main - fclose.3: remove a confusing 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: Sender: owner-dev-commits-src-main@freebsd.org 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: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1250c9647959fab955fb8d9046cb41bc749e6855 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=1250c9647959fab955fb8d9046cb41bc749e6855 commit 1250c9647959fab955fb8d9046cb41bc749e6855 Author: Maxim Konovalov AuthorDate: 2024-02-16 18:50:12 +0000 Commit: Maxim Konovalov CommitDate: 2024-02-16 18:50:12 +0000 fclose.3: remove a confusing sentence PR: 277037 Reviewed by: oshogbo --- lib/libc/stdio/fclose.3 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libc/stdio/fclose.3 b/lib/libc/stdio/fclose.3 index 188c35b1f0c7..524ff9754bb4 100644 --- a/lib/libc/stdio/fclose.3 +++ b/lib/libc/stdio/fclose.3 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 4, 2015 +.Dd February 13, 2024 .Dt FCLOSE 3 .Os .Sh NAME @@ -69,9 +69,6 @@ If is not .Dv NULL , the file descriptor will be written to it. -If the -.Fa fdp -argument will be different then NULL the file descriptor will be returned in it, If the stream does not have an associated file descriptor, .Fa fdp will be set to -1. From nobody Fri Feb 16 19:45: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 4Tc2Tg6Lywz56Rtx for ; Fri, 16 Feb 2024 19:45:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tc2Tg0NdXz4H6L for ; Fri, 16 Feb 2024 19:45:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5640fef9fa6so621568a12.0 for ; Fri, 16 Feb 2024 11:45:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1708112724; x=1708717524; 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=rh2WqiG0+XRxdOIKmO/bJyrwo0vBbVBU0iAspO7PaSg=; b=fv637LYFc5NL8pT8OuOwmnl2sSVyrHMZW7f0fWF0xXgBdCLSwcBKPcVFCXg2t8N0e5 PuCWcCbwKDb5EJXM3cRy7aSm3hVlM8r8Yvnag6vwP+V/jo4ejpnpsnUn5zf2JFSVBvOG KB/RNwojhM8NIYvxnbzSXxI4quP9M5El9DrnyCzo5KhH/GBUg5+Pgc1ZYltZwgXsuur8 oDIDJkeHZcX7XTSoEyYxPlDYtegMnAuKX2f9xwiyXzyygIVuiXSp0KWeh0pQSBLBlgwJ Y8T/WU/QLsn2/Ch3JEps3+Er1M7TC5mPVdRxHe7CMk1l0S3A/HFUZJIL2z0r/6ntmOOB S2HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708112724; x=1708717524; 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=rh2WqiG0+XRxdOIKmO/bJyrwo0vBbVBU0iAspO7PaSg=; b=cN34dmUQinZmGIcPX7u030GNkZdX256LSCVFlnIVkP37XJGsSWmxZv8SroTwfXGOsX FT4EZBoNQ1YxSvDzhT0IeLBnHGx/uR4ZEk0bmgMRyuBQxld0EmBRGxUiyHo7jCL9Hzjx oCRAxEqOSHYtrm117H389JPshJUZi7u9QDqgEDklDza5sV6zA8OGcEmWfuQq4RJW49GY +stxVHmQJr2YfLnfn4qCCIoAPbImH5+JuwEV1EEiGLoZtigqcaqSmW+lk7Q5Ej15P7tm CjSDISPAo3u0vViHX3G7IQeegfUZuPPd5Om5gsU6vkcCCp1Nb0xD0Lw4ZljJGKdkTvZ7 JzeQ== X-Forwarded-Encrypted: i=1; AJvYcCV1oNjAUC5kuGF14SYBoXnFMJ2jFhnYpFbEvqZVqbEVGyW2uibVLaBfK5mD/sb6EkqClSElK4gBovSvKADXKJTWpZJEU+Dkt7wsvmxIb7ieNA== X-Gm-Message-State: AOJu0YwaY5JmDjd4f9KkhoMY6kPfnU1gsvRFESH/jMwZgub/AX1RDxPb OsQefV6doYV6DetkJ8qD3CQf+f0/h02vnGRY1aQWi3Wa7Zo3IZ/SfVrzUs9OdKC64u41KBrxTXH qq/z2olnccSCI69tPL6p1EymHfS48zQDhqcFCXw== X-Google-Smtp-Source: AGHT+IHpns15Q8AmvB2pKhQ3Xd0QYB2TRSfJp7g9j8EptzNWd5CaSgpoUQsnHAY8GI6afHHi0oqrMIuTpez3UoQaDgc= X-Received: by 2002:a05:6402:ca3:b0:563:d32f:544a with SMTP id cn3-20020a0564020ca300b00563d32f544amr3040674edb.1.1708112724271; Fri, 16 Feb 2024 11:45:24 -0800 (PST) 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402160400.41G40Jgd018717@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Fri, 16 Feb 2024 12:45:14 -0700 Message-ID: Subject: Re: git: 33a2406eed00 - main - reboot: Use posix_spawn instead of system To: Konstantin Belousov Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002ab542061184fcaa" X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Tc2Tg0NdXz4H6L 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] --0000000000002ab542061184fcaa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Feb 16, 2024 at 6:34=E2=80=AFAM Konstantin Belousov wrote: > On Fri, Feb 16, 2024 at 04:00:19AM +0000, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D33a2406eed009dbffd7dfa44285c23f= 0db5a3750 > > > > commit 33a2406eed009dbffd7dfa44285c23f0db5a3750 > > Author: Warner Losh > > AuthorDate: 2024-02-16 03:52:31 +0000 > > Commit: Warner Losh > > CommitDate: 2024-02-16 03:59:22 +0000 > > > > reboot: Use posix_spawn instead of system > > > > Use posix_spawn to avoid having to allocate memory needed for the > system > > command line. > > > > Sponsored by: Netflix > > Reviewed by: jrtc27 > > Differential Revision: https://reviews.freebsd.org/D43860 > > --- > > sbin/reboot/reboot.c | 54 > ++++++++++++++++++++++++++++++++++++---------------- > > 1 file changed, 38 insertions(+), 16 deletions(-) > > > > diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c > > index e9d6487da6a5..d3f1fc9bbb86 100644 > > --- a/sbin/reboot/reboot.c > > +++ b/sbin/reboot/reboot.c > > @@ -29,19 +29,21 @@ > > * SUCH DAMAGE. > > */ > > > > -#include > > #include > > #include > > #include > > #include > > #include > > #include > > +#include > > +#include > sys/types.h should go first, the previous location was right > Yea, it's not needed at all, so I'm removing it. > > > > #include > > #include > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -69,23 +71,43 @@ static bool donextboot; > > static void > > zfsbootcfg(const char *pool, bool force) > > { > > - char *k; > > - int rv; > > - > > - asprintf(&k, > > - "zfsbootcfg -z %s -n freebsd:nvstore -k nextboot_enable -v > YES", > > - pool); > > - if (k =3D=3D NULL) > > - E("No memory for zfsbootcfg"); > > - > > - rv =3D system(k); > > - if (rv =3D=3D 0) > > - return; > > + const char * const av[] =3D { > Why not 'static'? > > > + "zfsbootcfg", > > + "-z", > > + pool, > > + "-n", > > + "freebsd:nvstore", > > + "-k", > > + "nextboot_enable" > > + "-v", > > + "YES", > > + NULL > > + }; > Because 'pool' is not a compile time constant? Warner > > + int rv, status; > > + pid_t p; > > + extern char **environ; > > + > > + rv =3D posix_spawnp(&p, av[0], NULL, NULL, __DECONST(char **, av)= , > > + environ); > > if (rv =3D=3D -1) > > E("system zfsbootcfg"); > > - if (rv =3D=3D 127) > > - E("zfsbootcfg not found in path"); > > - E("zfsbootcfg returned %d", rv); > > + if (waitpid(p, &status, WEXITED) < 0) { > > + if (errno =3D=3D EINTR) > > + return; > > + E("waitpid zfsbootcfg"); > > + } > > + if (WIFEXITED(status)) { > > + int e =3D WEXITSTATUS(status); > > + > > + if (e =3D=3D 0) > > + return; > > + if (e =3D=3D 127) > > + E("zfsbootcfg not found in path"); > > + E("zfsbootcfg returned %d", e); > > + } > > + if (WIFSIGNALED(status)) > > + E("zfsbootcfg died with signal %d", WTERMSIG(status)); > > + E("zfsbootcfg unexpected status %d", status); > > } > > > > static void > --0000000000002ab542061184fcaa Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, Feb 16, 2024 at 6:34=E2=80=AF= AM Konstantin Belousov <kostikbel= @gmail.com> wrote:
On Fri, Feb 16, 2024 at 04:00:19AM +0000, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D33a2406eed009dbffd7dfa44285c23f0db5a3750<= /a>
>
> commit 33a2406eed009dbffd7dfa44285c23f0db5a3750
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2024-02-16 03:52:31 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-02-16 03:59:22 +0000
>
>=C2=A0 =C2=A0 =C2=A0reboot: Use posix_spawn instead of system
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Use posix_spawn to avoid having to allocate memory = needed for the system
>=C2=A0 =C2=A0 =C2=A0command line.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0Netflix
>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 jrtc27
>=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://revie= ws.freebsd.org/D43860
> ---
>=C2=A0 sbin/reboot/reboot.c | 54 ++++++++++++++++++++++++++++++++++++--= --------------
>=C2=A0 1 file changed, 38 insertions(+), 16 deletions(-)
>
> diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
> index e9d6487da6a5..d3f1fc9bbb86 100644
> --- a/sbin/reboot/reboot.c
> +++ b/sbin/reboot/reboot.c
> @@ -29,19 +29,21 @@
>=C2=A0 =C2=A0* SUCH DAMAGE.
>=C2=A0 =C2=A0*/
>=C2=A0
> -#include <sys/types.h>
>=C2=A0 #include <sys/boottrace.h>
>=C2=A0 #include <sys/mount.h>
>=C2=A0 #include <sys/reboot.h>
>=C2=A0 #include <sys/stat.h>
>=C2=A0 #include <sys/sysctl.h>
>=C2=A0 #include <sys/time.h>
> +#include <sys/types.h>
> +#include <sys/wait.h>
sys/types.h should go first, the previous location was right

Yea, it's not needed at all, so I'm removing = it.
=C2=A0
>=C2=A0
>=C2=A0 #include <err.h>
>=C2=A0 #include <errno.h>
>=C2=A0 #include <fcntl.h>
>=C2=A0 #include <pwd.h>
>=C2=A0 #include <signal.h>
> +#include <spawn.h>
>=C2=A0 #include <stdbool.h>
>=C2=A0 #include <stdio.h>
>=C2=A0 #include <stdlib.h>
> @@ -69,23 +71,43 @@ static bool donextboot;
>=C2=A0 static void
>=C2=A0 zfsbootcfg(const char *pool, bool force)
>=C2=A0 {
> -=C2=A0 =C2=A0 =C2=A0char *k;
> -=C2=A0 =C2=A0 =C2=A0int rv;
> -
> -=C2=A0 =C2=A0 =C2=A0asprintf(&k,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"zfsbootcfg -z %s -n freebsd:n= vstore -k nextboot_enable -v YES",
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pool);
> -=C2=A0 =C2=A0 =C2=A0if (k =3D=3D NULL)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0E("No memory for= zfsbootcfg");
> -
> -=C2=A0 =C2=A0 =C2=A0rv =3D system(k);
> -=C2=A0 =C2=A0 =C2=A0if (rv =3D=3D 0)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
> +=C2=A0 =C2=A0 =C2=A0const char * const av[] =3D {
Why not 'static'?

> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"zfsbootcfg"= ;,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"-z",
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pool,
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"-n",
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"freebsd:nvstore= ",
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"-k",
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"nextboot_enable= "
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"-v",
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"YES",
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL
> +=C2=A0 =C2=A0 =C2=A0};

Because &#= 39;pool' is not a compile time constant?

Warne= r
=C2=A0
> +=C2=A0 =C2=A0 =C2=A0int rv, status;
> +=C2=A0 =C2=A0 =C2=A0pid_t p;
> +=C2=A0 =C2=A0 =C2=A0extern char **environ;
> +
> +=C2=A0 =C2=A0 =C2=A0rv =3D posix_spawnp(&p, av[0], NULL, NULL, __= DECONST(char **, av),
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0environ);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0if (rv =3D=3D -1)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0E("system z= fsbootcfg");
> -=C2=A0 =C2=A0 =C2=A0if (rv =3D=3D 127)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0E("zfsbootcfg no= t found in path");
> -=C2=A0 =C2=A0 =C2=A0E("zfsbootcfg returned %d", rv);
> +=C2=A0 =C2=A0 =C2=A0if (waitpid(p, &status, WEXITED) < 0) { > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (errno =3D=3D EINT= R)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0return;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0E("waitpid zfsbo= otcfg");
> +=C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0if (WIFEXITED(status)) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int e =3D WEXITSTATUS= (status);
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (e =3D=3D 0)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0return;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (e =3D=3D 127)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0E("zfsbootcfg not found in path");
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0E("zfsbootcfg re= turned %d", e);
> +=C2=A0 =C2=A0 =C2=A0}
> +=C2=A0 =C2=A0 =C2=A0if (WIFSIGNALED(status))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0E("zfsbootcfg di= ed with signal %d", WTERMSIG(status));
> +=C2=A0 =C2=A0 =C2=A0E("zfsbootcfg unexpected status %d", st= atus);
>=C2=A0 }
>=C2=A0
>=C2=A0 static void
--0000000000002ab542061184fcaa-- From nobody Fri Feb 16 20:10: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 4Tc32L09CVz56WD4; Fri, 16 Feb 2024 20:10: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 4Tc32K6N9Jz4K0G; Fri, 16 Feb 2024 20:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708114217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNOAzD9IFpw6NU05nLlQLOE388BBNjOcyCsZNS+YB84=; b=hoEL1mgUJmwus38omkqxhSkvo1ky3Bv6lTmzjLtQxSd4zsSYiu7hpbOkJC902litHtC29M fD0mPR7SxAdmorr+L0U06Fpkz7o06skgXkA+sONizQJiGRcRZos9K+AGUtpGDAleYr5B37 SWGcmUUnF7lTDCve8P+LkOWCkCZ422oakr2EX6U0265Z/4M6iHJGsKsxc0aQg3h4t3HpF2 GbE5/zC0p5t0hebaijMn323psH4oFfvL39ISMc8cl3n0V/vcs/q0+ClQqdLIi9ipTG2lUm PL/OOMfLNVAVMry9isU7DSG0H8oYBNFM3aKaIfqSnn5yPRb9FQjeFpjEcqoCkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708114217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNOAzD9IFpw6NU05nLlQLOE388BBNjOcyCsZNS+YB84=; b=PNlcTyBvQmLrEMi/o3Ftw5yzNRHHSngOoEFspWLk9KA59PWJRarhsX6YMUJQst/WyNLDAw Vjf6+LjwWHY8j392f6x68OPeNP0ooIa1MXsnmYhpIIZIWckoKwBtyOdzoSXc58CRbE2fiO L5aWccXt63ZPOScdVsXhMLy5DgpkTahF+g/siRyfvrCGxwW3DpW7//sFRru6S4id7DYgPH B88z2yaLOTzWg7KBLdNdnh9K5VfxZMdR9bKejDRgfIhHJDW10pMIsmx+BwMHVzgUnHxw9B Q1fsybZqh4/jDh9itjQhMx0ratGUxO93qMEOlTilQeJNMbD4eSlON5MzJxL8Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708114217; a=rsa-sha256; cv=none; b=Bo+jzHayxg/L3BVeLtLx2YApQ+oR0DwDeI6SjOTLrmx9ByigLqdWDzO6MZIk9N8aSfhqlO tbjm3CEJdgU42Z6dQoALhPolw8TPms9lezzsRxyBspZPKNSKlZ/igkev67OcGpcAzF+YGf 9cUQ7FlrUbWQxC/sESgWi1seQsSm0Q+crPp3K5NvLTEvznWGWQBij0v9pQK1jSa/Q/9Hid ghgMWjz4HwrwamLIXySTDPdKPKTjtLvR4UG0anMXrGRLZW9jEGlBsXa72z+Zi6IDAEcX/l UzCx3Kmc7b8aE/MzNKC2iqhyOyrUg2BkYYuNPTFUYftTNVjax2fATw77DHCSUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tc32K5R3Mzf29; Fri, 16 Feb 2024 20:10: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 41GKAH5C054868; Fri, 16 Feb 2024 20:10:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GKAHMd054864; Fri, 16 Feb 2024 20:10:17 GMT (envelope-from git) Date: Fri, 16 Feb 2024 20:10:17 GMT Message-Id: <202402162010.41GKAHMd054864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 66d37dbedfbf - main - pci_host_generic: Fix build without PCI_RES_BUS 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66d37dbedfbf2dc94ccf49e6983c3652d5909b91 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=66d37dbedfbf2dc94ccf49e6983c3652d5909b91 commit 66d37dbedfbf2dc94ccf49e6983c3652d5909b91 Author: John Baldwin AuthorDate: 2024-02-16 20:09:46 +0000 Commit: John Baldwin CommitDate: 2024-02-16 20:09:46 +0000 pci_host_generic: Fix build without PCI_RES_BUS Fixes: d79b6b8ec267 pci_host_generic: Don't rewrite resource start address for translation --- sys/dev/pci/pci_host_generic.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 386b8411d29a..520462972a66 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -537,10 +537,14 @@ struct resource * pci_host_generic_core_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct generic_pcie_core_softc *sc; +#endif struct resource *res; +#if defined(NEW_PCIB) && defined(PCI_RES_BUS) sc = device_get_softc(dev); +#endif switch (type) { #if defined(NEW_PCIB) && defined(PCI_RES_BUS) From nobody Fri Feb 16 22:03: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 4Tc5Xh0w4xz59mZJ; Fri, 16 Feb 2024 22:03: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 4Tc5Xh0TD2z4Zh7; Fri, 16 Feb 2024 22:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708120996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+VJDjz7JFWM/ivAnHP9+McKc0e2E8xOlu7+Ub/BJ0CI=; b=wxg6ibE+/mIcVwUWK1TUzffGEmGFOffOu8MU/imIB7Pmw+cichbW+2rcvnZbGR2eDsM2uq bbC/Y9igTAc8uX85lz8CMXUVYEhzgGCiPvcvcBOSYK34TzQVe23WWOkqqoNY4kNoRA3gST +YkfxNnniIBcX+uok8gnyEKPgFFLi2DAEanGs4KRu9tm9VwOutJ3vMOZlxoZ520iJyFiTq rlBYfefWefJ66FoerwDJEB3lf6E2bE7iiY8Iv4mdSEgrFdqBuIAzixKupynkb+NcRceHjD sLqP1BarcDceGb7M+wvokVil3OxcL71XnzKljA1cV10m0qpKA3Bwy+dbOogCbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708120996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+VJDjz7JFWM/ivAnHP9+McKc0e2E8xOlu7+Ub/BJ0CI=; b=K9ktBlde0UvnIQEw5G/uiz6C6y9a+WQ8fHg79d32+uoZeAjtV1r9DBKMB51/NZThq/cVVc lzDPDDYlsTDHklhK277MmqDCTaD/pktIpO+FS6WYu1ra/WzsZQJjKOFhCuFy8A1fn/JpXv OFWy5F/ekqaJEm4s7rKr3c1mMd77xG0d8FpJGe8ybVsoJg6oL2anNFM7KizPLPdrDEYEqx IrYkjrWygIrjpGFHBr5t2C+SB4dowsXRTRGywdkdTfFaNj/J4lFnWfN48ZuFyD62CQ/xnU hBUXAVvw/AC/iB7N9xZYySR881gijn+czfpg8TOlAUc4ZAdF58Z1NbJNX36BIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708120996; a=rsa-sha256; cv=none; b=Dr3urOyIsZK0fRFH/VeSrpNtymTO9LaZqSQ5kM4B+Zzg+yGRF8hTO9R5SU52rI/Jr6Z01W y5ynXDp0Fqgnr8CYSV+ccd6K2gk/jPXhWKUT1oBrAJUrHWrpIaQoWEFIVn7WEWVyJCmX30 IZd1Cv0RbvpWYgdNEckqD52J7e4Fpd9wi08L50uEpD4t2EHIJFKfkrbdZYxSa8JHPPc42B 2pUnOlhQu7//UlK0qBeeygPi87K8LQ5bZ2qUA/6Xgft5OMaf/aS/8Ub1NL+6g3JuSLkRbD QfEKpi1HCp0ILoivImH1uyRXPR3l9IvhBu1S66mAMd0iBXcFr+S+MtauAiTvPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tc5Xg6g5DzjRd; Fri, 16 Feb 2024 22:03: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 41GM3Fie048033; Fri, 16 Feb 2024 22:03:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GM3FVE048030; Fri, 16 Feb 2024 22:03:15 GMT (envelope-from git) Date: Fri, 16 Feb 2024 22:03:15 GMT Message-Id: <202402162203.41GM3FVE048030@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: 5b5f7d0e77a9 - main - irdma(4): Upgrade to 1.2.36-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: Sender: owner-dev-commits-src-main@freebsd.org 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b5f7d0e77a9eee73eb5d596f43aef4e1a3674d8 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=5b5f7d0e77a9eee73eb5d596f43aef4e1a3674d8 commit 5b5f7d0e77a9eee73eb5d596f43aef4e1a3674d8 Author: Bartosz Sobczak AuthorDate: 2024-02-16 21:55:08 +0000 Commit: Eric Joyner CommitDate: 2024-02-16 22:01:34 +0000 irdma(4): Upgrade to 1.2.36-k Update Intel irdma driver to version 1.2.36-k. Notable changes: - Start using ib_sge directly instead of irdma_sge - Turn off flush completion generator for libirdma - Minor formatting changes Signed-off-by: Bartosz Sobczak Signed-off-by: Eric Joyner Reviewed by: erj@ MFC after: 3 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D43567 --- contrib/ofed/libirdma/abi.h | 9 +- contrib/ofed/libirdma/i40e_devids.h | 1 - contrib/ofed/libirdma/i40iw_hw.h | 3 +- contrib/ofed/libirdma/ice_devids.h | 1 - contrib/ofed/libirdma/irdma-abi.h | 12 +- contrib/ofed/libirdma/irdma.h | 2 - contrib/ofed/libirdma/irdma_defs.h | 14 - contrib/ofed/libirdma/irdma_uk.c | 108 +++--- contrib/ofed/libirdma/irdma_umain.c | 5 +- contrib/ofed/libirdma/irdma_umain.h | 3 - contrib/ofed/libirdma/irdma_uquery.h | 1 - contrib/ofed/libirdma/irdma_user.h | 197 +--------- contrib/ofed/libirdma/irdma_uverbs.c | 90 ++--- contrib/ofed/libirdma/osdep.h | 5 - sys/dev/irdma/fbsd_kcompat.c | 3 +- sys/dev/irdma/fbsd_kcompat.h | 76 +--- sys/dev/irdma/icrdma.c | 4 +- sys/dev/irdma/icrdma_hw.c | 9 +- sys/dev/irdma/icrdma_hw.h | 3 +- sys/dev/irdma/irdma-abi.h | 11 + sys/dev/irdma/irdma.h | 4 +- sys/dev/irdma/irdma_cm.c | 49 ++- sys/dev/irdma/irdma_ctrl.c | 104 +++--- sys/dev/irdma/irdma_defs.h | 3 - sys/dev/irdma/irdma_hw.c | 46 ++- sys/dev/irdma/irdma_kcompat.c | 688 ++--------------------------------- sys/dev/irdma/irdma_main.h | 15 +- sys/dev/irdma/irdma_puda.c | 9 +- sys/dev/irdma/irdma_puda.h | 2 +- sys/dev/irdma/irdma_type.h | 29 +- sys/dev/irdma/irdma_uda.h | 1 + sys/dev/irdma/irdma_uk.c | 80 ++-- sys/dev/irdma/irdma_user.h | 33 +- sys/dev/irdma/irdma_utils.c | 52 +-- sys/dev/irdma/irdma_verbs.c | 389 +++----------------- sys/dev/irdma/irdma_verbs.h | 26 +- sys/dev/irdma/irdma_ws.c | 4 +- sys/dev/irdma/irdma_ws.h | 2 +- sys/dev/irdma/osdep.h | 8 +- 39 files changed, 428 insertions(+), 1673 deletions(-) diff --git a/contrib/ofed/libirdma/abi.h b/contrib/ofed/libirdma/abi.h index 6553ebcbcaca..a3e159828bec 100644 --- a/contrib/ofed/libirdma/abi.h +++ b/contrib/ofed/libirdma/abi.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (C) 2019 - 2022 Intel Corporation + * Copyright (C) 2019 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef PROVIDER_IRDMA_ABI_H #define PROVIDER_IRDMA_ABI_H @@ -86,6 +85,7 @@ struct irdma_ucreate_qp { struct ibv_create_qp ibv_cmd; __aligned_u64 user_wqe_bufs; __aligned_u64 user_compl_ctx; + __aligned_u64 comp_mask; }; struct irdma_ucreate_qp_resp { @@ -98,6 +98,9 @@ struct irdma_ucreate_qp_resp { __u8 lsmm; __u8 rsvd; __u32 qp_caps; + __aligned_u64 comp_mask; + __u8 start_wqe_idx; + __u8 rsvd2[7]; }; struct irdma_umodify_qp_resp { @@ -138,6 +141,8 @@ struct irdma_get_context_resp { __u8 hw_rev; __u8 rsvd2; __aligned_u64 comp_mask; + __u16 min_hw_wq_size; + __u8 rsvd3[6]; }; struct irdma_ureg_mr { diff --git a/contrib/ofed/libirdma/i40e_devids.h b/contrib/ofed/libirdma/i40e_devids.h index 1b0eaae95b82..e775a75bade5 100644 --- a/contrib/ofed/libirdma/i40e_devids.h +++ b/contrib/ofed/libirdma/i40e_devids.h @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef I40E_DEVIDS_H #define I40E_DEVIDS_H diff --git a/contrib/ofed/libirdma/i40iw_hw.h b/contrib/ofed/libirdma/i40iw_hw.h index d04c37d689cb..fcbfea8dfe09 100644 --- a/contrib/ofed/libirdma/i40iw_hw.h +++ b/contrib/ofed/libirdma/i40iw_hw.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2015 - 2022 Intel Corporation + * Copyright (c) 2015 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef I40IW_HW_H #define I40IW_HW_H diff --git a/contrib/ofed/libirdma/ice_devids.h b/contrib/ofed/libirdma/ice_devids.h index 57f26bc33260..57a7f2f7c2af 100644 --- a/contrib/ofed/libirdma/ice_devids.h +++ b/contrib/ofed/libirdma/ice_devids.h @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef ICE_DEVIDS_H #define ICE_DEVIDS_H diff --git a/contrib/ofed/libirdma/irdma-abi.h b/contrib/ofed/libirdma/irdma-abi.h index b7d4b61c162d..ae805919ea55 100644 --- a/contrib/ofed/libirdma/irdma-abi.h +++ b/contrib/ofed/libirdma/irdma-abi.h @@ -35,7 +35,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef IRDMA_ABI_H #define IRDMA_ABI_H @@ -55,6 +54,11 @@ enum irdma_memreg_type { enum { IRDMA_ALLOC_UCTX_USE_RAW_ATTR = 1 << 0, + IRDMA_ALLOC_UCTX_MIN_HW_WQ_SIZE = 1 << 1, +}; + +enum { + IRDMA_CREATE_QP_USE_START_WQE_IDX = 1 << 0, }; struct irdma_alloc_ucontext_req { @@ -83,6 +87,8 @@ struct irdma_alloc_ucontext_resp { __u8 hw_rev; __u8 rsvd2; __aligned_u64 comp_mask; + __u16 min_hw_wq_size; + __u8 rsvd3[6]; }; struct irdma_alloc_pd_resp { @@ -102,6 +108,7 @@ struct irdma_create_cq_req { struct irdma_create_qp_req { __aligned_u64 user_wqe_bufs; __aligned_u64 user_compl_ctx; + __aligned_u64 comp_mask; }; struct irdma_mem_reg_req { @@ -131,6 +138,9 @@ struct irdma_create_qp_resp { __u8 lsmm; __u8 rsvd; __u32 qp_caps; + __aligned_u64 comp_mask; + __u8 start_wqe_idx; + __u8 rsvd2[7]; }; struct irdma_modify_qp_resp { diff --git a/contrib/ofed/libirdma/irdma.h b/contrib/ofed/libirdma/irdma.h index 1dd09c36c7ea..f4a5a4796f82 100644 --- a/contrib/ofed/libirdma/irdma.h +++ b/contrib/ofed/libirdma/irdma.h @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef IRDMA_H #define IRDMA_H @@ -47,7 +46,6 @@ enum irdma_vers { IRDMA_GEN_RSVD = 0, IRDMA_GEN_1 = 1, IRDMA_GEN_2 = 2, - IRDMA_GEN_MAX = 2, }; struct irdma_uk_attrs { diff --git a/contrib/ofed/libirdma/irdma_defs.h b/contrib/ofed/libirdma/irdma_defs.h index 9276490793a0..39d4e7772c31 100644 --- a/contrib/ofed/libirdma/irdma_defs.h +++ b/contrib/ofed/libirdma/irdma_defs.h @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef IRDMA_DEFS_H #define IRDMA_DEFS_H @@ -457,19 +456,6 @@ enum irdma_qp_wqe_size { IRDMA_WQE_SIZE_256 = 256, }; -enum irdma_ws_op_type { - IRDMA_WS_OP_TYPE_NODE = 0, - IRDMA_WS_OP_TYPE_LEAF_NODE_GROUP, -}; - -enum irdma_ws_rate_limit_flags { - IRDMA_WS_RATE_LIMIT_FLAGS_VALID = 0x1, - IRDMA_WS_NO_RDMA_RATE_LIMIT = 0x2, - IRDMA_WS_LEAF_NODE_IS_PART_GROUP = 0x4, - IRDMA_WS_TREE_RATE_LIMITING = 0x8, - IRDMA_WS_PACING_CONTROL = 0x10, -}; - /** * set_64bit_val - set 64 bit value to hw wqe * @wqe_words: wqe addr to write diff --git a/contrib/ofed/libirdma/irdma_uk.c b/contrib/ofed/libirdma/irdma_uk.c index a1b796b318f4..115c5f0a27f0 100644 --- a/contrib/ofed/libirdma/irdma_uk.c +++ b/contrib/ofed/libirdma/irdma_uk.c @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #include "osdep.h" #include "irdma_defs.h" @@ -46,16 +45,16 @@ * @valid: The wqe valid */ static void -irdma_set_fragment(__le64 * wqe, u32 offset, struct irdma_sge *sge, +irdma_set_fragment(__le64 * wqe, u32 offset, struct ibv_sge *sge, u8 valid) { if (sge) { set_64bit_val(wqe, offset, - FIELD_PREP(IRDMAQPSQ_FRAG_TO, sge->tag_off)); + FIELD_PREP(IRDMAQPSQ_FRAG_TO, sge->addr)); set_64bit_val(wqe, offset + IRDMA_BYTE_8, FIELD_PREP(IRDMAQPSQ_VALID, valid) | - FIELD_PREP(IRDMAQPSQ_FRAG_LEN, sge->len) | - FIELD_PREP(IRDMAQPSQ_FRAG_STAG, sge->stag)); + FIELD_PREP(IRDMAQPSQ_FRAG_LEN, sge->length) | + FIELD_PREP(IRDMAQPSQ_FRAG_STAG, sge->lkey)); } else { set_64bit_val(wqe, offset, 0); set_64bit_val(wqe, offset + IRDMA_BYTE_8, @@ -72,14 +71,14 @@ irdma_set_fragment(__le64 * wqe, u32 offset, struct irdma_sge *sge, */ static void irdma_set_fragment_gen_1(__le64 * wqe, u32 offset, - struct irdma_sge *sge, u8 valid) + struct ibv_sge *sge, u8 valid) { if (sge) { set_64bit_val(wqe, offset, - FIELD_PREP(IRDMAQPSQ_FRAG_TO, sge->tag_off)); + FIELD_PREP(IRDMAQPSQ_FRAG_TO, sge->addr)); set_64bit_val(wqe, offset + IRDMA_BYTE_8, - FIELD_PREP(IRDMAQPSQ_GEN1_FRAG_LEN, sge->len) | - FIELD_PREP(IRDMAQPSQ_GEN1_FRAG_STAG, sge->stag)); + FIELD_PREP(IRDMAQPSQ_GEN1_FRAG_LEN, sge->length) | + FIELD_PREP(IRDMAQPSQ_GEN1_FRAG_STAG, sge->lkey)); } else { set_64bit_val(wqe, offset, 0); set_64bit_val(wqe, offset + IRDMA_BYTE_8, 0); @@ -210,8 +209,7 @@ irdma_qp_push_wqe(struct irdma_qp_uk *qp, __le64 * wqe, u16 quanta, if (IRDMA_RING_CURRENT_HEAD(qp->initial_ring) != IRDMA_RING_CURRENT_TAIL(qp->sq_ring) && !qp->push_mode) { - if (post_sq) - irdma_uk_qp_post_wr(qp); + irdma_uk_qp_post_wr(qp); } else { push = (__le64 *) ((uintptr_t)qp->push_wqe + (wqe_idx & 0x7) * 0x20); @@ -339,7 +337,7 @@ irdma_uk_rdma_write(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, return EINVAL; for (i = 0; i < op_info->num_lo_sges; i++) - total_size += op_info->lo_sg_list[i].len; + total_size += op_info->lo_sg_list[i].length; read_fence |= info->read_fence; @@ -358,7 +356,7 @@ irdma_uk_rdma_write(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, qp->sq_wrtrk_array[wqe_idx].signaled = info->signaled; set_64bit_val(wqe, IRDMA_BYTE_16, - FIELD_PREP(IRDMAQPSQ_FRAG_TO, op_info->rem_addr.tag_off)); + FIELD_PREP(IRDMAQPSQ_FRAG_TO, op_info->rem_addr.addr)); if (info->imm_data_valid) { set_64bit_val(wqe, IRDMA_BYTE_0, @@ -387,7 +385,7 @@ irdma_uk_rdma_write(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, ++addl_frag_cnt; } - hdr = FIELD_PREP(IRDMAQPSQ_REMSTAG, op_info->rem_addr.stag) | + hdr = FIELD_PREP(IRDMAQPSQ_REMSTAG, op_info->rem_addr.lkey) | FIELD_PREP(IRDMAQPSQ_OPCODE, info->op_type) | FIELD_PREP(IRDMAQPSQ_IMMDATAFLAG, info->imm_data_valid) | FIELD_PREP(IRDMAQPSQ_REPORTRTT, info->report_rtt) | @@ -438,7 +436,7 @@ irdma_uk_rdma_read(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, return EINVAL; for (i = 0; i < op_info->num_lo_sges; i++) - total_size += op_info->lo_sg_list[i].len; + total_size += op_info->lo_sg_list[i].length; ret_code = irdma_fragcnt_to_quanta_sq(op_info->num_lo_sges, &quanta); if (ret_code) @@ -476,8 +474,8 @@ irdma_uk_rdma_read(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, ++addl_frag_cnt; } set_64bit_val(wqe, IRDMA_BYTE_16, - FIELD_PREP(IRDMAQPSQ_FRAG_TO, op_info->rem_addr.tag_off)); - hdr = FIELD_PREP(IRDMAQPSQ_REMSTAG, op_info->rem_addr.stag) | + FIELD_PREP(IRDMAQPSQ_FRAG_TO, op_info->rem_addr.addr)); + hdr = FIELD_PREP(IRDMAQPSQ_REMSTAG, op_info->rem_addr.lkey) | FIELD_PREP(IRDMAQPSQ_REPORTRTT, (info->report_rtt ? 1 : 0)) | FIELD_PREP(IRDMAQPSQ_ADDFRAGCNT, addl_frag_cnt) | FIELD_PREP(IRDMAQPSQ_OPCODE, @@ -526,7 +524,7 @@ irdma_uk_send(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, return EINVAL; for (i = 0; i < op_info->num_sges; i++) - total_size += op_info->sg_list[i].len; + total_size += op_info->sg_list[i].length; if (info->imm_data_valid) frag_cnt = op_info->num_sges + 1; @@ -621,15 +619,15 @@ irdma_set_mw_bind_wqe_gen_1(__le64 * wqe, * @polarity: compatibility parameter */ static void -irdma_copy_inline_data_gen_1(u8 *wqe, struct irdma_sge *sge_list, +irdma_copy_inline_data_gen_1(u8 *wqe, struct ibv_sge *sge_list, u32 num_sges, u8 polarity) { u32 quanta_bytes_remaining = 16; u32 i; for (i = 0; i < num_sges; i++) { - u8 *cur_sge = (u8 *)(uintptr_t)sge_list[i].tag_off; - u32 sge_len = sge_list[i].len; + u8 *cur_sge = (u8 *)(uintptr_t)sge_list[i].addr; + u32 sge_len = sge_list[i].length; while (sge_len) { u32 bytes_copied; @@ -684,7 +682,7 @@ irdma_set_mw_bind_wqe(__le64 * wqe, * @polarity: polarity of wqe valid bit */ static void -irdma_copy_inline_data(u8 *wqe, struct irdma_sge *sge_list, +irdma_copy_inline_data(u8 *wqe, struct ibv_sge *sge_list, u32 num_sges, u8 polarity) { u8 inline_valid = polarity << IRDMA_INLINE_VALID_S; @@ -695,8 +693,8 @@ irdma_copy_inline_data(u8 *wqe, struct irdma_sge *sge_list, wqe += 8; for (i = 0; i < num_sges; i++) { - u8 *cur_sge = (u8 *)(uintptr_t)sge_list[i].tag_off; - u32 sge_len = sge_list[i].len; + u8 *cur_sge = (u8 *)(uintptr_t)sge_list[i].addr; + u32 sge_len = sge_list[i].length; while (sge_len) { u32 bytes_copied; @@ -776,7 +774,7 @@ irdma_uk_inline_rdma_write(struct irdma_qp_uk *qp, return EINVAL; for (i = 0; i < op_info->num_lo_sges; i++) - total_size += op_info->lo_sg_list[i].len; + total_size += op_info->lo_sg_list[i].length; if (unlikely(total_size > qp->max_inline_data)) return EINVAL; @@ -789,9 +787,9 @@ irdma_uk_inline_rdma_write(struct irdma_qp_uk *qp, qp->sq_wrtrk_array[wqe_idx].signaled = info->signaled; read_fence |= info->read_fence; set_64bit_val(wqe, IRDMA_BYTE_16, - FIELD_PREP(IRDMAQPSQ_FRAG_TO, op_info->rem_addr.tag_off)); + FIELD_PREP(IRDMAQPSQ_FRAG_TO, op_info->rem_addr.addr)); - hdr = FIELD_PREP(IRDMAQPSQ_REMSTAG, op_info->rem_addr.stag) | + hdr = FIELD_PREP(IRDMAQPSQ_REMSTAG, op_info->rem_addr.lkey) | FIELD_PREP(IRDMAQPSQ_OPCODE, info->op_type) | FIELD_PREP(IRDMAQPSQ_INLINEDATALEN, total_size) | FIELD_PREP(IRDMAQPSQ_REPORTRTT, info->report_rtt ? 1 : 0) | @@ -847,7 +845,7 @@ irdma_uk_inline_send(struct irdma_qp_uk *qp, return EINVAL; for (i = 0; i < op_info->num_sges; i++) - total_size += op_info->sg_list[i].len; + total_size += op_info->sg_list[i].length; if (unlikely(total_size > qp->max_inline_data)) return EINVAL; @@ -912,7 +910,7 @@ irdma_uk_stag_local_invalidate(struct irdma_qp_uk *qp, u64 hdr; u32 wqe_idx; bool local_fence = false; - struct irdma_sge sge = {0}; + struct ibv_sge sge = {0}; u16 quanta = IRDMA_QP_WQE_MIN_QUANTA; info->push_wqe = qp->push_db ? true : false; @@ -923,7 +921,7 @@ irdma_uk_stag_local_invalidate(struct irdma_qp_uk *qp, if (!wqe) return ENOSPC; - sge.stag = op_info->target_stag; + sge.lkey = op_info->target_stag; qp->wqe_ops.iw_set_fragment(wqe, IRDMA_BYTE_0, &sge, 0); set_64bit_val(wqe, IRDMA_BYTE_16, 0); @@ -1437,8 +1435,7 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, IRDMA_RING_MOVE_TAIL(cq->cq_ring); set_64bit_val(cq->shadow_area, IRDMA_BYTE_0, IRDMA_RING_CURRENT_HEAD(cq->cq_ring)); - memset(info, 0, - sizeof(struct irdma_cq_poll_info)); + memset(info, 0, sizeof(*info)); return irdma_uk_cq_poll_cmpl(cq, info); } } @@ -1511,7 +1508,6 @@ exit: if (pring && IRDMA_RING_MORE_WORK(*pring)) move_cq_head = false; } - if (move_cq_head) { IRDMA_RING_MOVE_HEAD_NOCHECK(cq->cq_ring); if (!IRDMA_RING_CURRENT_HEAD(cq->cq_ring)) @@ -1592,10 +1588,12 @@ irdma_get_wqe_shift(struct irdma_uk_attrs *uk_attrs, u32 sge, int irdma_get_sqdepth(struct irdma_uk_attrs *uk_attrs, u32 sq_size, u8 shift, u32 *sqdepth) { + u32 min_size = (u32)uk_attrs->min_hw_wq_size << shift; + *sqdepth = irdma_round_up_wq((sq_size << shift) + IRDMA_SQ_RSVD); - if (*sqdepth < ((u32)uk_attrs->min_hw_wq_size << shift)) - *sqdepth = uk_attrs->min_hw_wq_size << shift; + if (*sqdepth < min_size) + *sqdepth = min_size; else if (*sqdepth > uk_attrs->max_hw_wq_quanta) return EINVAL; @@ -1609,10 +1607,12 @@ irdma_get_sqdepth(struct irdma_uk_attrs *uk_attrs, u32 sq_size, u8 shift, u32 *s int irdma_get_rqdepth(struct irdma_uk_attrs *uk_attrs, u32 rq_size, u8 shift, u32 *rqdepth) { + u32 min_size = (u32)uk_attrs->min_hw_wq_size << shift; + *rqdepth = irdma_round_up_wq((rq_size << shift) + IRDMA_RQ_RSVD); - if (*rqdepth < ((u32)uk_attrs->min_hw_wq_size << shift)) - *rqdepth = uk_attrs->min_hw_wq_size << shift; + if (*rqdepth < min_size) + *rqdepth = min_size; else if (*rqdepth > uk_attrs->max_hw_rq_quanta) return EINVAL; @@ -1645,41 +1645,16 @@ irdma_setup_connection_wqes(struct irdma_qp_uk *qp, { u16 move_cnt = 1; - if (qp->uk_attrs->feature_flags & IRDMA_FEATURE_RTS_AE) + if (info->start_wqe_idx) + move_cnt = info->start_wqe_idx; + else if (qp->uk_attrs->feature_flags & IRDMA_FEATURE_RTS_AE) move_cnt = 3; - qp->conn_wqes = move_cnt; IRDMA_RING_MOVE_HEAD_BY_COUNT_NOCHECK(qp->sq_ring, move_cnt); IRDMA_RING_MOVE_TAIL_BY_COUNT(qp->sq_ring, move_cnt); IRDMA_RING_MOVE_HEAD_BY_COUNT_NOCHECK(qp->initial_ring, move_cnt); } -/** - * irdma_uk_calc_shift_wq - calculate WQE shift for both SQ and RQ - * @ukinfo: qp initialization info - * @sq_shift: Returns shift of SQ - * @rq_shift: Returns shift of RQ - */ -void -irdma_uk_calc_shift_wq(struct irdma_qp_uk_init_info *ukinfo, u8 *sq_shift, - u8 *rq_shift) -{ - bool imm_support = ukinfo->uk_attrs->hw_rev >= IRDMA_GEN_2 ? true : false; - - irdma_get_wqe_shift(ukinfo->uk_attrs, - imm_support ? ukinfo->max_sq_frag_cnt + 1 : - ukinfo->max_sq_frag_cnt, - ukinfo->max_inline_data, sq_shift); - - irdma_get_wqe_shift(ukinfo->uk_attrs, ukinfo->max_rq_frag_cnt, 0, - rq_shift); - - if (ukinfo->uk_attrs->hw_rev == IRDMA_GEN_1) { - if (ukinfo->abi_ver > 4) - *rq_shift = IRDMA_MAX_RQ_WQE_SHIFT_GEN1; - } -} - /** * irdma_uk_calc_depth_shift_sq - calculate depth and shift for SQ size. * @ukinfo: qp initialization info @@ -1692,6 +1667,7 @@ irdma_uk_calc_depth_shift_sq(struct irdma_qp_uk_init_info *ukinfo, { bool imm_support = ukinfo->uk_attrs->hw_rev >= IRDMA_GEN_2 ? true : false; int status; + irdma_get_wqe_shift(ukinfo->uk_attrs, imm_support ? ukinfo->max_sq_frag_cnt + 1 : ukinfo->max_sq_frag_cnt, @@ -1786,6 +1762,8 @@ irdma_uk_qp_init(struct irdma_qp_uk *qp, struct irdma_qp_uk_init_info *info) qp->wqe_ops = iw_wqe_uk_ops_gen_1; else qp->wqe_ops = iw_wqe_uk_ops; + qp->start_wqe_idx = info->start_wqe_idx; + return ret_code; } diff --git a/contrib/ofed/libirdma/irdma_umain.c b/contrib/ofed/libirdma/irdma_umain.c index 9e223cae429f..e8d27c31a0dc 100644 --- a/contrib/ofed/libirdma/irdma_umain.c +++ b/contrib/ofed/libirdma/irdma_umain.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2021 - 2023 Intel Corporation + * Copyright (c) 2021 - 2022 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #include @@ -49,7 +48,7 @@ /** * Driver version */ -char libirdma_version[] = "1.2.17-k"; +char libirdma_version[] = "1.2.36-k"; unsigned int irdma_dbg; diff --git a/contrib/ofed/libirdma/irdma_umain.h b/contrib/ofed/libirdma/irdma_umain.h index 7ff850c46b72..269609f8c77f 100644 --- a/contrib/ofed/libirdma/irdma_umain.h +++ b/contrib/ofed/libirdma/irdma_umain.h @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef IRDMA_UMAIN_H #define IRDMA_UMAIN_H @@ -97,7 +96,6 @@ struct irdma_cq_buf { LIST_ENTRY(irdma_cq_buf) list; struct irdma_cq_uk cq; struct verbs_mr vmr; - size_t buf_size; }; extern pthread_mutex_t sigusr1_wait_mutex; @@ -143,7 +141,6 @@ struct irdma_uqp { struct ibv_recv_wr *pend_rx_wr; struct irdma_qp_uk qp; enum ibv_qp_type qp_type; - struct irdma_sge *recv_sges; }; /* irdma_uverbs.c */ diff --git a/contrib/ofed/libirdma/irdma_uquery.h b/contrib/ofed/libirdma/irdma_uquery.h index cf56818e4d51..4660c05f0a91 100644 --- a/contrib/ofed/libirdma/irdma_uquery.h +++ b/contrib/ofed/libirdma/irdma_uquery.h @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef IRDMA_UQUERY_H diff --git a/contrib/ofed/libirdma/irdma_user.h b/contrib/ofed/libirdma/irdma_user.h index 8d71a37d7bf4..aeb6aa9feebd 100644 --- a/contrib/ofed/libirdma/irdma_user.h +++ b/contrib/ofed/libirdma/irdma_user.h @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #ifndef IRDMA_USER_H #define IRDMA_USER_H @@ -51,7 +50,7 @@ #define irdma_access_privileges u32 #define irdma_physical_fragment u64 #define irdma_address_list u64 * -#define irdma_sgl struct irdma_sge * +#define irdma_sgl struct ibv_sge * #define IRDMA_MAX_MR_SIZE 0x200000000000ULL @@ -81,96 +80,6 @@ #define IRDMA_OP_TYPE_REC_IMM 0x3f #define IRDMA_FLUSH_MAJOR_ERR 1 -#define IRDMA_SRQFLUSH_RSVD_MAJOR_ERR 0xfffe - -/* Async Events codes */ -#define IRDMA_AE_AMP_UNALLOCATED_STAG 0x0102 -#define IRDMA_AE_AMP_INVALID_STAG 0x0103 -#define IRDMA_AE_AMP_BAD_QP 0x0104 -#define IRDMA_AE_AMP_BAD_PD 0x0105 -#define IRDMA_AE_AMP_BAD_STAG_KEY 0x0106 -#define IRDMA_AE_AMP_BAD_STAG_INDEX 0x0107 -#define IRDMA_AE_AMP_BOUNDS_VIOLATION 0x0108 -#define IRDMA_AE_AMP_RIGHTS_VIOLATION 0x0109 -#define IRDMA_AE_AMP_TO_WRAP 0x010a -#define IRDMA_AE_AMP_FASTREG_VALID_STAG 0x010c -#define IRDMA_AE_AMP_FASTREG_MW_STAG 0x010d -#define IRDMA_AE_AMP_FASTREG_INVALID_RIGHTS 0x010e -#define IRDMA_AE_AMP_FASTREG_INVALID_LENGTH 0x0110 -#define IRDMA_AE_AMP_INVALIDATE_SHARED 0x0111 -#define IRDMA_AE_AMP_INVALIDATE_NO_REMOTE_ACCESS_RIGHTS 0x0112 -#define IRDMA_AE_AMP_INVALIDATE_MR_WITH_BOUND_WINDOWS 0x0113 -#define IRDMA_AE_AMP_MWBIND_VALID_STAG 0x0114 -#define IRDMA_AE_AMP_MWBIND_OF_MR_STAG 0x0115 -#define IRDMA_AE_AMP_MWBIND_TO_ZERO_BASED_STAG 0x0116 -#define IRDMA_AE_AMP_MWBIND_TO_MW_STAG 0x0117 -#define IRDMA_AE_AMP_MWBIND_INVALID_RIGHTS 0x0118 -#define IRDMA_AE_AMP_MWBIND_INVALID_BOUNDS 0x0119 -#define IRDMA_AE_AMP_MWBIND_TO_INVALID_PARENT 0x011a -#define IRDMA_AE_AMP_MWBIND_BIND_DISABLED 0x011b -#define IRDMA_AE_PRIV_OPERATION_DENIED 0x011c -#define IRDMA_AE_AMP_INVALIDATE_TYPE1_MW 0x011d -#define IRDMA_AE_AMP_MWBIND_ZERO_BASED_TYPE1_MW 0x011e -#define IRDMA_AE_AMP_FASTREG_INVALID_PBL_HPS_CFG 0x011f -#define IRDMA_AE_AMP_MWBIND_WRONG_TYPE 0x0120 -#define IRDMA_AE_AMP_FASTREG_PBLE_MISMATCH 0x0121 -#define IRDMA_AE_UDA_XMIT_DGRAM_TOO_LONG 0x0132 -#define IRDMA_AE_UDA_XMIT_BAD_PD 0x0133 -#define IRDMA_AE_UDA_XMIT_DGRAM_TOO_SHORT 0x0134 -#define IRDMA_AE_UDA_L4LEN_INVALID 0x0135 -#define IRDMA_AE_BAD_CLOSE 0x0201 -#define IRDMA_AE_RDMAP_ROE_BAD_LLP_CLOSE 0x0202 -#define IRDMA_AE_CQ_OPERATION_ERROR 0x0203 -#define IRDMA_AE_RDMA_READ_WHILE_ORD_ZERO 0x0205 -#define IRDMA_AE_STAG_ZERO_INVALID 0x0206 -#define IRDMA_AE_IB_RREQ_AND_Q1_FULL 0x0207 -#define IRDMA_AE_IB_INVALID_REQUEST 0x0208 -#define IRDMA_AE_WQE_UNEXPECTED_OPCODE 0x020a -#define IRDMA_AE_WQE_INVALID_PARAMETER 0x020b -#define IRDMA_AE_WQE_INVALID_FRAG_DATA 0x020c -#define IRDMA_AE_IB_REMOTE_ACCESS_ERROR 0x020d -#define IRDMA_AE_IB_REMOTE_OP_ERROR 0x020e -#define IRDMA_AE_WQE_LSMM_TOO_LONG 0x0220 -#define IRDMA_AE_DDP_INVALID_MSN_GAP_IN_MSN 0x0301 -#define IRDMA_AE_DDP_UBE_DDP_MESSAGE_TOO_LONG_FOR_AVAILABLE_BUFFER 0x0303 -#define IRDMA_AE_DDP_UBE_INVALID_DDP_VERSION 0x0304 -#define IRDMA_AE_DDP_UBE_INVALID_MO 0x0305 -#define IRDMA_AE_DDP_UBE_INVALID_MSN_NO_BUFFER_AVAILABLE 0x0306 -#define IRDMA_AE_DDP_UBE_INVALID_QN 0x0307 -#define IRDMA_AE_DDP_NO_L_BIT 0x0308 -#define IRDMA_AE_RDMAP_ROE_INVALID_RDMAP_VERSION 0x0311 -#define IRDMA_AE_RDMAP_ROE_UNEXPECTED_OPCODE 0x0312 -#define IRDMA_AE_ROE_INVALID_RDMA_READ_REQUEST 0x0313 -#define IRDMA_AE_ROE_INVALID_RDMA_WRITE_OR_READ_RESP 0x0314 -#define IRDMA_AE_ROCE_RSP_LENGTH_ERROR 0x0316 -#define IRDMA_AE_ROCE_EMPTY_MCG 0x0380 -#define IRDMA_AE_ROCE_BAD_MC_IP_ADDR 0x0381 -#define IRDMA_AE_ROCE_BAD_MC_QPID 0x0382 -#define IRDMA_AE_MCG_QP_PROTOCOL_MISMATCH 0x0383 -#define IRDMA_AE_INVALID_ARP_ENTRY 0x0401 -#define IRDMA_AE_INVALID_TCP_OPTION_RCVD 0x0402 -#define IRDMA_AE_STALE_ARP_ENTRY 0x0403 -#define IRDMA_AE_INVALID_AH_ENTRY 0x0406 -#define IRDMA_AE_LLP_CLOSE_COMPLETE 0x0501 -#define IRDMA_AE_LLP_CONNECTION_RESET 0x0502 -#define IRDMA_AE_LLP_FIN_RECEIVED 0x0503 -#define IRDMA_AE_LLP_RECEIVED_MARKER_AND_LENGTH_FIELDS_DONT_MATCH 0x0504 -#define IRDMA_AE_LLP_RECEIVED_MPA_CRC_ERROR 0x0505 -#define IRDMA_AE_LLP_SEGMENT_TOO_SMALL 0x0507 -#define IRDMA_AE_LLP_SYN_RECEIVED 0x0508 -#define IRDMA_AE_LLP_TERMINATE_RECEIVED 0x0509 -#define IRDMA_AE_LLP_TOO_MANY_RETRIES 0x050a -#define IRDMA_AE_LLP_TOO_MANY_KEEPALIVE_RETRIES 0x050b -#define IRDMA_AE_LLP_DOUBT_REACHABILITY 0x050c -#define IRDMA_AE_LLP_CONNECTION_ESTABLISHED 0x050e -#define IRDMA_AE_RESOURCE_EXHAUSTION 0x0520 -#define IRDMA_AE_RESET_SENT 0x0601 -#define IRDMA_AE_TERMINATE_SENT 0x0602 -#define IRDMA_AE_RESET_NOT_SENT 0x0603 -#define IRDMA_AE_LCE_QP_CATASTROPHIC 0x0700 -#define IRDMA_AE_LCE_FUNCTION_CATASTROPHIC 0x0701 -#define IRDMA_AE_LCE_CQ_CATASTROPHIC 0x0702 -#define IRDMA_AE_QP_SUSPEND_COMPLETE 0x0900 enum irdma_device_caps_const { IRDMA_WQE_SIZE = 4, @@ -202,8 +111,7 @@ enum irdma_device_caps_const { IRDMA_MAX_OUTBOUND_MSG_SIZE = 65537, /* 64K +1 */ IRDMA_MAX_INBOUND_MSG_SIZE = 65537, - IRDMA_MAX_PUSH_PAGE_COUNT = 1024, - IRDMA_MAX_PE_ENA_VF_COUNT = 32, + IRDMA_MAX_PE_ENA_VF_COUNT = 32, IRDMA_MAX_VF_FPM_ID = 47, IRDMA_MAX_SQ_PAYLOAD_SIZE = 2145386496, IRDMA_MAX_INLINE_DATA_SIZE = 101, @@ -230,12 +138,7 @@ enum irdma_flush_opcode { FLUSH_RETRY_EXC_ERR, FLUSH_MW_BIND_ERR, FLUSH_REM_INV_REQ_ERR, -}; - -enum irdma_qp_event_type { - IRDMA_QP_EVENT_CATASTROPHIC, - IRDMA_QP_EVENT_ACCESS_ERR, - IRDMA_QP_EVENT_REQ_ERR, + FLUSH_RNR_RETRY_EXC_ERR, }; enum irdma_cmpl_status { @@ -283,12 +186,6 @@ struct irdma_cq_uk; struct irdma_qp_uk_init_info; struct irdma_cq_uk_init_info; -struct irdma_sge { - irdma_tagged_offset tag_off; - u32 len; - irdma_stag stag; -}; - struct irdma_ring { volatile u32 head; volatile u32 tail; /* effective tail */ @@ -320,13 +217,13 @@ struct irdma_post_rq_info { struct irdma_rdma_write { irdma_sgl lo_sg_list; u32 num_lo_sges; - struct irdma_sge rem_addr; + struct ibv_sge rem_addr; }; struct irdma_rdma_read { irdma_sgl lo_sg_list; u32 num_lo_sges; - struct irdma_sge rem_addr; + struct ibv_sge rem_addr; }; struct irdma_bind_window { @@ -400,11 +297,6 @@ struct irdma_cq_poll_info { } stat; }; -struct qp_err_code { - enum irdma_flush_opcode flush_code; - enum irdma_qp_event_type event_type; -}; - int irdma_uk_inline_rdma_write(struct irdma_qp_uk *qp, struct irdma_post_sq_info *info, bool post_sq); int irdma_uk_inline_send(struct irdma_qp_uk *qp, @@ -427,9 +319,9 @@ int irdma_uk_stag_local_invalidate(struct irdma_qp_uk *qp, bool post_sq); struct irdma_wqe_uk_ops { - void (*iw_copy_inline_data)(u8 *dest, struct irdma_sge *sge_list, u32 num_sges, u8 polarity); + void (*iw_copy_inline_data)(u8 *dest, struct ibv_sge *sge_list, u32 num_sges, u8 polarity); u16 (*iw_inline_data_size_to_quanta)(u32 data_size); - void (*iw_set_fragment)(__le64 *wqe, u32 offset, struct irdma_sge *sge, + void (*iw_set_fragment)(__le64 *wqe, u32 offset, struct ibv_sge *sge, u8 valid); void (*iw_set_mw_bind_wqe)(__le64 *wqe, struct irdma_bind_window *op_info); @@ -445,8 +337,6 @@ int irdma_uk_cq_init(struct irdma_cq_uk *cq, struct irdma_cq_uk_init_info *info); int irdma_uk_qp_init(struct irdma_qp_uk *qp, struct irdma_qp_uk_init_info *info); -void irdma_uk_calc_shift_wq(struct irdma_qp_uk_init_info *ukinfo, u8 *sq_shift, - u8 *rq_shift); int irdma_uk_calc_depth_shift_sq(struct irdma_qp_uk_init_info *ukinfo, u32 *sq_depth, u8 *sq_shift); int irdma_uk_calc_depth_shift_rq(struct irdma_qp_uk_init_info *ukinfo, @@ -495,6 +385,7 @@ struct irdma_qp_uk { u8 rwqe_polarity; u8 rq_wqe_size; u8 rq_wqe_size_multiplier; + u8 start_wqe_idx; bool deferred_flag:1; bool push_mode:1; /* whether the last post wqe was pushed */ bool push_dropped:1; @@ -542,6 +433,7 @@ struct irdma_qp_uk_init_info { u32 sq_depth; u32 rq_depth; u8 first_sq_wq; + u8 start_wqe_idx; u8 type; u8 sq_shift; u8 rq_shift; @@ -575,75 +467,4 @@ int irdma_get_rqdepth(struct irdma_uk_attrs *uk_attrs, u32 rq_size, u8 shift, u3 void irdma_qp_push_wqe(struct irdma_qp_uk *qp, __le64 *wqe, u16 quanta, u32 wqe_idx, bool post_sq); void irdma_clr_wqes(struct irdma_qp_uk *qp, u32 qp_wqe_idx); - -static inline struct qp_err_code irdma_ae_to_qp_err_code(u16 ae_id) -{ - struct qp_err_code qp_err = { 0 }; - - switch (ae_id) { - case IRDMA_AE_AMP_BOUNDS_VIOLATION: - case IRDMA_AE_AMP_INVALID_STAG: - case IRDMA_AE_AMP_RIGHTS_VIOLATION: - case IRDMA_AE_AMP_UNALLOCATED_STAG: - case IRDMA_AE_AMP_BAD_PD: - case IRDMA_AE_AMP_BAD_QP: - case IRDMA_AE_AMP_BAD_STAG_KEY: - case IRDMA_AE_AMP_BAD_STAG_INDEX: - case IRDMA_AE_AMP_TO_WRAP: - case IRDMA_AE_PRIV_OPERATION_DENIED: - qp_err.flush_code = FLUSH_PROT_ERR; - qp_err.event_type = IRDMA_QP_EVENT_ACCESS_ERR; - break; - case IRDMA_AE_UDA_XMIT_BAD_PD: - case IRDMA_AE_WQE_UNEXPECTED_OPCODE: - qp_err.flush_code = FLUSH_LOC_QP_OP_ERR; - qp_err.event_type = IRDMA_QP_EVENT_CATASTROPHIC; - break; - case IRDMA_AE_UDA_XMIT_DGRAM_TOO_SHORT: - case IRDMA_AE_UDA_XMIT_DGRAM_TOO_LONG: - case IRDMA_AE_UDA_L4LEN_INVALID: - case IRDMA_AE_DDP_UBE_INVALID_MO: - case IRDMA_AE_DDP_UBE_DDP_MESSAGE_TOO_LONG_FOR_AVAILABLE_BUFFER: - qp_err.flush_code = FLUSH_LOC_LEN_ERR; - qp_err.event_type = IRDMA_QP_EVENT_CATASTROPHIC; - break; - case IRDMA_AE_AMP_INVALIDATE_NO_REMOTE_ACCESS_RIGHTS: - case IRDMA_AE_IB_REMOTE_ACCESS_ERROR: - qp_err.flush_code = FLUSH_REM_ACCESS_ERR; - qp_err.event_type = IRDMA_QP_EVENT_ACCESS_ERR; - break; - case IRDMA_AE_AMP_MWBIND_INVALID_RIGHTS: - case IRDMA_AE_AMP_MWBIND_BIND_DISABLED: - case IRDMA_AE_AMP_MWBIND_INVALID_BOUNDS: - case IRDMA_AE_AMP_MWBIND_VALID_STAG: - qp_err.flush_code = FLUSH_MW_BIND_ERR; - qp_err.event_type = IRDMA_QP_EVENT_ACCESS_ERR; - break; - case IRDMA_AE_LLP_TOO_MANY_RETRIES: - qp_err.flush_code = FLUSH_RETRY_EXC_ERR; - qp_err.event_type = IRDMA_QP_EVENT_CATASTROPHIC; - break; - case IRDMA_AE_IB_INVALID_REQUEST: - qp_err.flush_code = FLUSH_REM_INV_REQ_ERR; - qp_err.event_type = IRDMA_QP_EVENT_REQ_ERR; - break; - case IRDMA_AE_LLP_SEGMENT_TOO_SMALL: - case IRDMA_AE_LLP_RECEIVED_MPA_CRC_ERROR: - case IRDMA_AE_ROCE_RSP_LENGTH_ERROR: - case IRDMA_AE_IB_REMOTE_OP_ERROR: - qp_err.flush_code = FLUSH_REM_OP_ERR; - qp_err.event_type = IRDMA_QP_EVENT_CATASTROPHIC; - break; - case IRDMA_AE_LCE_QP_CATASTROPHIC: - qp_err.flush_code = FLUSH_FATAL_ERR; - qp_err.event_type = IRDMA_QP_EVENT_CATASTROPHIC; - break; - default: - qp_err.flush_code = FLUSH_GENERAL_ERR; - qp_err.event_type = IRDMA_QP_EVENT_CATASTROPHIC; - break; - } - - return qp_err; -} #endif /* IRDMA_USER_H */ diff --git a/contrib/ofed/libirdma/irdma_uverbs.c b/contrib/ofed/libirdma/irdma_uverbs.c index bc6bec34e6cd..e52ce1cfa229 100644 --- a/contrib/ofed/libirdma/irdma_uverbs.c +++ b/contrib/ofed/libirdma/irdma_uverbs.c @@ -31,7 +31,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/*$FreeBSD$*/ #include #include @@ -153,6 +152,7 @@ irdma_ualloc_pd(struct ibv_context *context) err_free: free(iwupd); + errno = err; return NULL; } @@ -164,7 +164,6 @@ err_free: int irdma_ufree_pd(struct ibv_pd *pd) { - struct irdma_uvcontext *iwvctx = container_of(pd->context, struct irdma_uvcontext, ibv_ctx); struct irdma_upd *iwupd; int ret; @@ -375,12 +374,12 @@ irdma_free_hw_buf(void *buf, size_t size) * @cqe_64byte_ena: enable 64byte cqe */ static inline int -get_cq_size(int ncqe, u8 hw_rev, bool cqe_64byte_ena) +get_cq_size(int ncqe, u8 hw_rev) { ncqe++; /* Completions with immediate require 1 extra entry */ - if (!cqe_64byte_ena && hw_rev > IRDMA_GEN_1) + if (hw_rev > IRDMA_GEN_1) ncqe *= 2; *** 4007 LINES SKIPPED *** From nobody Fri Feb 16 23:20: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 4Tc7Fq1VR9z59yJm; Fri, 16 Feb 2024 23:20: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 4Tc7Fq0tqgz4hXw; Fri, 16 Feb 2024 23:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708125631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qeyzyD5kI9h8u7tHoJAMac8GF2F3jqG+FRHrfEQulYE=; b=DgBuVHwnbXP1yqfP1sDA8v7Ta3NRmHxdJXL1XfbdXbU+MOjezXc8LhaDIyPr/xge9EqMJN OxGmHWhZ/SA/19AiNI+y5om76GQFOuFrHm6vRBtXa2O2fkw6VwPAtwo93XVJQ/B6UwGFlq CRmrAMxwTg1d8oLHYm1EU9heP8ieHxn7QF3nzrRLO1ff6RkQAKyw3z/iWRQ2rGf/95QI1z RemCpTj0nZbjDIOGb3MPoxFJk51iyZ+0P8j/JFFa8o6J70luuLLQnXV27v8qRJxUkGzeQL VoW+ywzAVXNsIccuCaHw6eoKt+/tUtS9lLKd1cbBjkWaJNf+aFKE1WSrAAOv3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708125631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qeyzyD5kI9h8u7tHoJAMac8GF2F3jqG+FRHrfEQulYE=; b=Ju1/BnONEKh1zD50ePmxb77sloGn+ATvw1vGulLytjYsph4YueLZch8kbmfQS7VW8mc8us YqfLLZyqvd2MrAgas77ojQr+bOvrBngFG44UDISP/LaQvwPPQJkzpkr9OUvUtGvAEy7mUY Ndl3/uOsEFdaQsMMKOtH65hj5vkix1imMQJ3RdMZwIQ4CA9VZObz5y+tidVX5O3+qvt2zc eZVqUemilhD0bXyz4LVQwbdZn894NSEmzxGmEoqMWGtGWV4LwRj4gFeiuE5nEDP46nKIwB O2EyBlyhKVRHuBxw9bkN329gWrHaiYOpIzIkaQK/f6BvB+S0ZpPnPvnPaVU29g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708125631; a=rsa-sha256; cv=none; b=rIj7bhfgZAODY+6KhM9bTpaGELzFpdwY16WN4uAfJb+I4sm4qiBMBimsRkusrXZG7gNZya 9U/T+C+JOdkWUmaSG8Bpu0jUshQrrvC8CVvg0GFuGi752IE5ov6/hF7tE+yQuBlgNPWZfk kricHmkc4IahKvDKdTvp4vIdUovyYnQm1bP4mNhsZTV4l+yEzUNtQDc6/fpCzYxj8SjwT1 jVWFu41XqF8lMJNPBJ7+Ht+1gh3iJJP6S/Ke+Bju77cxFaw2JynqaYjqj1PGcL05VTRL57 W4+w8G9CTgAwSz4cCcH3OYgpQZlJppDDzyQ+mYgI5F4n66CTqz+iRuNgzsvFHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tc7Fp5nRbzl27; Fri, 16 Feb 2024 23:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41GNKUgF075493; Fri, 16 Feb 2024 23:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GNKUm3075490; Fri, 16 Feb 2024 23:20:30 GMT (envelope-from git) Date: Fri, 16 Feb 2024 23:20:30 GMT Message-Id: <202402162320.41GNKUm3075490@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: 73ff7384e025 - main - Optionally create full debuginfo for llvm-related executables 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: Sender: owner-dev-commits-src-main@freebsd.org 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73ff7384e025033abc98fd5437a48beb8077a90b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=73ff7384e025033abc98fd5437a48beb8077a90b commit 73ff7384e025033abc98fd5437a48beb8077a90b Author: Dimitry Andric AuthorDate: 2024-02-11 19:02:51 +0000 Commit: Dimitry Andric CommitDate: 2024-02-16 23:15:32 +0000 Optionally create full debuginfo for llvm-related executables Commit de6feefdb7cfd limited the amount of debuginfo generated for clang and other llvm-related executables. This was done to save disk space and memory during building, but it makes debugging any of these executables much harder. Add a new src.conf(5) setting, WITH_LLVM_FULL_DEBUGINFO, to generate full debuginfo instead. This is off by default, but could for example be enabled for release builds or snapshots, so llvm executables are easier to debug. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43839 --- lib/clang/Makefile.inc | 4 +++- lib/clang/headers/Makefile | 1 + lib/clang/libclang/Makefile | 2 +- lib/clang/libclangminimal/Makefile | 1 + lib/clang/liblldb/Makefile | 1 + lib/clang/libllvm/Makefile | 2 +- lib/clang/libllvmminimal/Makefile | 1 + share/man/man5/src.conf.5 | 5 ++++- share/mk/src.opts.mk | 1 + tools/build/options/WITH_LLVM_FULL_DEBUGINFO | 2 ++ usr.bin/clang/Makefile.inc | 8 +++++--- 11 files changed, 21 insertions(+), 7 deletions(-) diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc index 2dfc966726b0..37da7ac759b1 100644 --- a/lib/clang/Makefile.inc +++ b/lib/clang/Makefile.inc @@ -1,13 +1,15 @@ -.include +.include PACKAGE= clang MK_PIE:= no # Explicit libXXX.a references +.if ${MK_LLVM_FULL_DEBUGINFO} == "no" .if ${COMPILER_TYPE} == "clang" DEBUG_FILES_CFLAGS= -gline-tables-only .else DEBUG_FILES_CFLAGS= -g1 .endif +.endif WARNS?= 0 diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 49f78b0a4d97..f72567514f20 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -1,4 +1,5 @@ +.include .include "../clang.pre.mk" .PATH: ${CLANG_SRCS}/lib/Headers diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 51c209d879f1..8d911905808d 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1,5 +1,5 @@ -.include +.include .include "../clang.pre.mk" LIB= clang diff --git a/lib/clang/libclangminimal/Makefile b/lib/clang/libclangminimal/Makefile index 744e1a835f90..22faa7b98aeb 100644 --- a/lib/clang/libclangminimal/Makefile +++ b/lib/clang/libclangminimal/Makefile @@ -1,4 +1,5 @@ +.include .include "../clang.pre.mk" LIB= clangminimal diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index c32e4a387b2e..e6e1e638abce 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -1,4 +1,5 @@ +.include .include "../lldb.pre.mk" LIB= lldb diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index df39f2eb212e..b59d881ad99a 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1,5 +1,5 @@ -.include +.include .include "../llvm.pre.mk" LIB= llvm diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile index 83c7101b04f5..ce5535a59072 100644 --- a/lib/clang/libllvmminimal/Makefile +++ b/lib/clang/libllvmminimal/Makefile @@ -1,4 +1,5 @@ +.include .include "../llvm.pre.mk" LIB= llvmminimal diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index e6affc81ab9c..a32b267afeb4 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd November 13, 2023 +.Dd February 16, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -929,6 +929,9 @@ Do not build the tool. .It Va WITHOUT_LLVM_CXXFILT Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt. +.It Va WITH_LLVM_FULL_DEBUGINFO +Generate full debug information for LLVM libraries and tools, which uses +more disk space and build resources, but allows for easier debugging. .It Va WITHOUT_LLVM_TARGET_AARCH64 Do not build LLVM target support for AArch64. The diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index cf7f3f7dffa7..20c98cf45567 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -205,6 +205,7 @@ __DEFAULT_NO_OPTIONS = \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ LLVM_BINUTILS \ + LLVM_FULL_DEBUGINFO \ MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ diff --git a/tools/build/options/WITH_LLVM_FULL_DEBUGINFO b/tools/build/options/WITH_LLVM_FULL_DEBUGINFO new file mode 100644 index 000000000000..4362de9eb762 --- /dev/null +++ b/tools/build/options/WITH_LLVM_FULL_DEBUGINFO @@ -0,0 +1,2 @@ +Generate full debug information for LLVM libraries and tools, which uses +more disk space and build resources, but allows for easier debugging. diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 831cd56a8c25..99e993b57cb2 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,14 +1,16 @@ -WARNS?= 0 - -.include +.include MK_PIE:= no # Explicit libXXX.a references +.if ${MK_LLVM_FULL_DEBUGINFO} == "no" .if ${COMPILER_TYPE} == "clang" DEBUG_FILES_CFLAGS= -gline-tables-only .else DEBUG_FILES_CFLAGS= -g1 .endif +.endif + +WARNS?= 0 .include "../Makefile.inc" From nobody Sat Feb 17 07:19: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 4TcKtc57f6z541gD; Sat, 17 Feb 2024 07:19: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 4TcKtc4Hdzz4b8Z; Sat, 17 Feb 2024 07:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708154376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jb/QLm+NQ7MsLo4F0/nnWbm8TYLbUTiBL35mYP/bhjg=; b=nQWWOQcFe2l+84xWsBsc03TqhAjjT6Yj7uQy0D027rQqGhpG8CSks6RoKfRlUCHBUL8a6G wmwXitWP1E0/tF+1KQDQTBnE1gom1zSk/13eQroYqNQAoChUIYMEgAHQnVI1kpjq0CMga3 eKrqgAHkz5tULmC6e6teF3WrXPoc0IRqjfZpLRknqWNfC2RApEwJ9U4bIXNCz0zri3/47n 1SuFdd4wQcAZ7mdrEID15xfiJuIXNn05aObqKlCrOkr8vif7MvwbfzQNtuCfwVKs6lPd4q mxbQugGAMTfTewmpwGa2LdUX0WQXLpGnYbf+xb+RFzkXvASYM56LqP9HUyr6Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708154376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jb/QLm+NQ7MsLo4F0/nnWbm8TYLbUTiBL35mYP/bhjg=; b=cXyuQpz8khB4tTGH+NrumPQWBP5O8vKqnze4tCs9L9/1tll+g29oBOgzzrGXnsmMqrfPK0 RXBt1QDzfRGndS5HHVQ6Ipg23KS/a3NwmvB0scfYREQspKPwWuaktZBfRSQWmqU4vpX4Ce toUawBjLphmMAxRtkpLMw69d5s0oCAQQe8qF4LmC+4jUcwVLb/BZIE9dhASiRjhkLdAjj5 YfOV82FD/3Embq2PfgayR6lZ5VRzLmUza1G8bACiQSa6AkeyAvZCUK8Q/RVMNEHWgXpihA 0167a0XU8Hq1OWSgmYAlxbeXqoyg+YG8ld0op1LTwPCxHRcfLjeiQXfwcQhfpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708154376; a=rsa-sha256; cv=none; b=w7M4xpW0eLw2Qc6lDMOKwchhcJUgnPrp50SPPiIZ+X5frSd114ma6Z/hvj1Da3YObOYIXJ BQ6frqM5kqd9xl67wA0qih6WZz53jQ1hAFk9TnRZInLg02Jq6EZdOHeR/vpP+DGa6Xhb34 EkF0q5idB4n2HthG5nyRHk8Lpf/8fVMB4f7CjENMKOXFyOPLMpb1Hy7iaoyNaqG9xytRPC BIRR4BjuQBxS/deBupboRvvDetKq1TqCBdZ+QykZ7tiaepeUkfnndVil/CaDFLekUOwhS/ 4weGghcj1iuEHBatHWzM5GSSQZp8QAHdX60SLh5KHPvLQn+dcDZplK2ftC8/dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcKtc3KT9z100P; Sat, 17 Feb 2024 07:19: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 41H7Ja4h072390; Sat, 17 Feb 2024 07:19:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41H7Jacc072387; Sat, 17 Feb 2024 07:19:36 GMT (envelope-from git) Date: Sat, 17 Feb 2024 07:19:36 GMT Message-Id: <202402170719.41H7Jacc072387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: cd9d26ed91c0 - main - powerpc mpc85xx: Fix infinite recursion in multiple bus methods 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd9d26ed91c049dd60919c71badced89e18a882a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cd9d26ed91c049dd60919c71badced89e18a882a commit cd9d26ed91c049dd60919c71badced89e18a882a Author: John Baldwin AuthorDate: 2024-02-17 07:15:52 +0000 Commit: John Baldwin CommitDate: 2024-02-17 07:19:06 +0000 powerpc mpc85xx: Fix infinite recursion in multiple bus methods Similar to 68a3ff041129208ea98a3bd5142061176ab4165e, the default case needs to call bus_generic_* to pass the request up the tree, not bus_* which will just call this method again. Fixes: 5a7e717fb790 powerpc mpc85xx: Use bus_generic_rman_* --- sys/powerpc/mpc85xx/lbc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c index 151d77739c4a..f6f38f22beb6 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -792,7 +792,7 @@ lbc_release_resource(device_t dev, device_t child, int type, int rid, return (bus_generic_rman_release_resource(dev, child, type, rid, res)); case SYS_RES_IRQ: - return (bus_release_resource(dev, type, rid, res)); + return (bus_generic_release_resource(dev, child, type, rid, res)); default: return (EINVAL); } @@ -810,7 +810,7 @@ lbc_activate_resource(device_t bus, device_t child, int type, int rid, return (bus_generic_rman_activate_resource(bus, child, type, rid, r)); case SYS_RES_IRQ: - return (bus_activate_resource(bus, type, rid, r)); + return (bus_generic_activate_resource(bus, child, type, rid, r)); default: return (EINVAL); } @@ -828,7 +828,7 @@ lbc_deactivate_resource(device_t bus, device_t child, int type, int rid, return (bus_generic_rman_deactivate_resource(bus, child, type, rid, r)); case SYS_RES_IRQ: - return (bus_deactivate_resource(bus, type, rid, r)); + return (bus_generic_deactivate_resource(bus, child, type, rid, r)); default: return (EINVAL); } From nobody Sat Feb 17 07:19: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 4TcKtd687rz541Y0; Sat, 17 Feb 2024 07:19: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 4TcKtd5GxSz4bLN; Sat, 17 Feb 2024 07:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708154377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2EMiande2YYTyVc0bI4UfWOCt9YSP8Fwonrj3CMuT2k=; b=FM93o3mNI8TDq/upUHqN6tPzMUVy09CVQAbncsBERKzB4oHYwakJU9LLurBxl8bTKOD+6s oL6ztNecdK13EXGoPE/d7/DGV85AUenaG69p9RCnr0edcNK5a0UGwIoBQJZlVAms5A8DM/ lrISdB5Du5zDtHjhh853ShCPXkmNEhx211AD4cQXggJuR3kRj5FQEHv5Vk8zJaKX56yg4H 5iRkjb/pjCjio+jPz0Ao3H0y0zX7Ofw+nMftSbvLwC8aR6WQesO27X7ccaOHUP/7/42g/G +1dSd1zG5PBg1ewHHYCc6fTVTYwfzOpOgmlQNuFq4yD3QaJgUUX+1t2oy+6XWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708154377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2EMiande2YYTyVc0bI4UfWOCt9YSP8Fwonrj3CMuT2k=; b=suSDS5yBHvSXeQKG4oMXOmNPL9q5ftn7XtHfQid4kpLIyI3TsFNNcp1/2YL7H34hjsUpNG ayH/myLngBs8C6oNOIO3gaGbmIQbX5VS08uZ23vQbm6ufYR2j13T94GmSbiBF7f8vJAHwA sbNvJ0BNOCwjRNyDDRtn8uALrUx3r9szLjXb93st2MVae88/qxggytVIakkymIfLJRrvYE wBXODti2QHHnZNHqKuTGgSH6fH/x5izBIUNgGalFB6gIviDZo8eyP5C7Vj70LmrDBl7ab6 4/7eFJlci39Qp+bkfvR5CP8pzRYyRZUj4bQ6GKcMSpHLycuETzOXOxQrMqDneA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708154377; a=rsa-sha256; cv=none; b=ffaBRagvVd9fZlsaVPvk0qf4IpMy/rY/SZsMiw3/KGkQZ7mT+aOHQqA+LH/QiukR9UhWoL khdxt36cVNypow7BvIdhuhYeDfSk3ahRvLcVzMxA3LQDs/e+dfmyqJMxIn6qhylN/Lg7zO Y0jjfD1PzNiamvRMv90hwoZiMjxlddpaYmkRU/9BWu97pTodTsIByvATq9MD9YFCsav/KO r/H0OXTlOzDmxwyYlpTHSMv9ZJE0WyqPKLYJojKH7xRv2KJepj1aBY6hN+BAsPBeVF03wS 6W98QBLhfnJa191yV0CymWd433XlgJVEMe18Dzi8EiZuE6JGrR3QkOilIzkggg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcKtd4LdxzyfY; Sat, 17 Feb 2024 07:19: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 41H7JbLU072444; Sat, 17 Feb 2024 07:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41H7Jb92072441; Sat, 17 Feb 2024 07:19:37 GMT (envelope-from git) Date: Sat, 17 Feb 2024 07:19:37 GMT Message-Id: <202402170719.41H7Jb92072441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 61d9bd21e9d6 - main - powerpc psim: Fix infinite recursion in multiple bus methods 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61d9bd21e9d6c3f876c4c8549fafaaaa4de75983 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=61d9bd21e9d6c3f876c4c8549fafaaaa4de75983 commit 61d9bd21e9d6c3f876c4c8549fafaaaa4de75983 Author: John Baldwin AuthorDate: 2024-02-17 07:17:42 +0000 Commit: John Baldwin CommitDate: 2024-02-17 07:19:06 +0000 powerpc psim: Fix infinite recursion in multiple bus methods Similar to 68a3ff041129208ea98a3bd5142061176ab4165e, the default case needs to call bus_generic_* to pass the request up the tree, not bus_* which will just call this method again. Fixes: d7c16b333455 powerpc psim: Use bus_generic_rman_* --- sys/powerpc/psim/iobus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index c572a1fdc12b..eea0255aa21c 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -370,7 +370,7 @@ iobus_release_resource(device_t bus, device_t child, int type, int rid, return (bus_generic_rman_release_resource(bus, child, type, rid, res)); case SYS_RES_IRQ: - return (bus_release_resource(bus, type, rid, res)); + return (bus_generic_release_resource(bus, child, type, rid, res)); default: return (EINVAL); } @@ -383,7 +383,7 @@ iobus_activate_resource(device_t bus, device_t child, int type, int rid, switch (type) { case SYS_RES_IRQ: - return (bus_activate_resource(bus, type, rid, res)); + return (bus_generic_activate_resource(bus, child, type, rid, res)); case SYS_RES_IOPORT: case SYS_RES_MEMORY: return (bus_generic_rman_activate_resource(bus, child, type, @@ -400,7 +400,7 @@ iobus_deactivate_resource(device_t bus, device_t child, int type, int rid, switch (type) { case SYS_RES_IRQ: - return (bus_deactivate_resource(bus, type, rid, res)); + return (bus_generic_deactivate_resource(bus, child, type, rid, res)); case SYS_RES_IOPORT: case SYS_RES_MEMORY: return (bus_generic_rman_deactivate_resource(bus, child, type, From nobody Sat Feb 17 11: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 4TcRSs2qjRz5B8dy; Sat, 17 Feb 2024 11:31: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 4TcRSs1dYsz47j2; Sat, 17 Feb 2024 11:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708169469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fdy1oNi2AHDI6mffZ49R3iM3wMG9I1na8T9fwbv3JWg=; b=JsMr46rSoc1YKCEBTeqycq6I9rrecJFeKYHLz8HHhz+h3kWpd84ejaAnXqX7B57AHjCTla Rh5L6taD/Idt5F/1nKtWZsmnIJlzDoXLbSqF+7IZlYDsj2x02277nibXsj+DK1ASK/HNUf eRQbnphRaRJO2l2fnpSUDXMacu2wn2OpbNc/yuHI14LpNWX50PhUzgkteiSeymcZJDQJxB ytws8yb+ysmZDP3bO4ZD0TdYKyqZnw8HBocmMFZ2wtd6DL11F3y80RUMqeMAnFdjfRvNOj X7tknaffwHaAknA/HLNlP6WBR7QP+NX5PePZh1kYFDqfpTfpFyeAdUv1RwIeOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708169469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fdy1oNi2AHDI6mffZ49R3iM3wMG9I1na8T9fwbv3JWg=; b=AWaC9JcxaFBNATCZUJ0YV+EeNEJu0FyMpz7sDS51bKmTrZZwWcXmnYuxKEAjT9hyCA3jSa Ju/jfD/14ueDXTZQPpU+eywdJSgBt/8n+WFnLlxlzePBuhQHHNN6Z74PZn9nIN+pGDGI+F 5CyCx+yD9tUCijXmk1bUD1BbwCLY+EeYpQPLpEVB+kD5nhfUYinmE0VAMcdayHMWNe8hi7 bCKtIPH92QWBxvYTopLS2yMOr+ZSM0pFYd+jZMWU3mdpqjqoK2cgdl0qb+56K15LeRGby2 s11gT89vyRa0PvF81PGzT6NbGoYywmS6fzNeCW+VIMU2sLllYp3v8VADpTPo4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708169469; a=rsa-sha256; cv=none; b=Ex73UZc8TgklsK62o+XdTEnZWHLUTmStItBJkic1GSFX3siBBewVOjZN6cAxCFnmx4NCiy juHBx5+FYMCKQ3q4nocWAn+Chp4flUkSP6iqB4dM+KBYq0y32vPfxvUXuNN8rKv/C8Q7Nf 5na3CK7Ze9iwlUanuSwkxcY0V+mVme7A6WTKEI+h+IyHp3nt700tw10Kaf5Xdqf3VdM3KK rBh9KvjL2420W1/KZoJisDbX4ogRU6158mIakB0MfUvkUcCV612MM3M+SoLK8EsIIrL5ZY pjsPv4xMRbuu8TCbX/mId+FVeIi1+VYFDGjeU5XHbilRtXIXa3kf9J+5w9BGUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcRSs0hw3z15pH; Sat, 17 Feb 2024 11:31: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 41HBV9gh005575; Sat, 17 Feb 2024 11:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HBV9wg005572; Sat, 17 Feb 2024 11:31:09 GMT (envelope-from git) Date: Sat, 17 Feb 2024 11:31:09 GMT Message-Id: <202402171131.41HBV9wg005572@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: e368e9b75677 - main - Proactively remove /usr/lib/kgdb file that became a 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: Sender: owner-dev-commits-src-main@freebsd.org 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e368e9b756772264acdbc11f3cc1d223bcd48dee Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e368e9b756772264acdbc11f3cc1d223bcd48dee commit e368e9b756772264acdbc11f3cc1d223bcd48dee Author: Dimitry Andric AuthorDate: 2024-02-17 11:27:33 +0000 Commit: Dimitry Andric CommitDate: 2024-02-17 11:27:33 +0000 Proactively remove /usr/lib/kgdb file that became a directory This was already handled in ObsoleteFiles.inc (see the 20201215 entry), but some people never run "make delete-old", or want to upgrade directly from a revision that still had the file to the most recent revision. They would then encounter a failure during installworld, similar to: install: /usr/libexec/kgdb exists but is not a directory Therefore, clean it up in the distrib-cleanup phase, similar to the earlier instances of libc++ header files that became a directory. MFC after: 3 days --- etc/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/Makefile b/etc/Makefile index 745ca91c60bf..229d9380901d 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -126,6 +126,7 @@ MTREES+= ../${mtree} / # scenario. DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__string DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__tuple +DISTRIB_CLEANUP_FILES+= ${LIBEXECDIR}/kgdb distrib-cleanup: .PHONY for file in ${DISTRIB_CLEANUP_FILES}; do \ if [ -f ${DESTDIR}/$${file} ]; then \ From nobody Sat Feb 17 21:11: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 4TchL75xWCz59h33; Sat, 17 Feb 2024 21:11: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 4TchL74f84z4ZSK; Sat, 17 Feb 2024 21:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708204271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=89hBo54n5ppD7yWUCjpNeuB9llDg4YAhm6y2KxP//kI=; b=jMEz/A+3r34tTF9kOtrk79lK6tuzWeRepd1LsDjQ1fdWAy8Wc6ougsa+oVGEXg8SgnoK1e POKDGKhEWWssBuuojIlC2dvr3Cn5ImLM4mR8j1UF9NpKfdoBIDWWvM+ZRwEteOzngOVhfz jSO2HBZgQF88PvVXiQIFqNTu58BCTXlP9sjVGGSFLrYn2HAUJ2Xy7eavsqik2lP+AtFqab hTcT6agwWvi9R6I0fH1Phdj4b3VfelbVUfgpqzdYK9KRjJLwtWzJZlbdvpEz81AWCjlawx zTVHDVLnovN9bdjZGTC2UWyi33NOqj3KZrADm253KvnF3Kh/yaz8MdGwoMYftg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708204271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=89hBo54n5ppD7yWUCjpNeuB9llDg4YAhm6y2KxP//kI=; b=f4zlMa/qVq5gRQJOpN5Rf9mxM1Qw7wqSXcqc47xObMbh+sU3VCBlwpjPLd9nxhxO/qfXyc /eD6EMo/VKMyNABRTLl6lZyKkCWBHHPJKZDoZVoNqImxq7kxU9NS2T0BIDsOwqneW+PShS LO3a3WB5wqHnWLMqFs7vO2rqIfIwpnWWuPEb/ftcmQwL4HSg37CyVDTwQm5yTEo1hxLLC+ XzoES5hNKwc8adNdK2LHHMem4FqGgTt2oCQ7LGT1RsWzXS/K/Vm9SnZ6yAJLmoq8/+/c80 uHgcoQJb22NOpznjbXd3jTK3DS9OGeyfeopsquk1u+EK3GiGbsNuCF+Lrac5hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708204271; a=rsa-sha256; cv=none; b=fjxSAfuK+7aaF9e4LX77w0ZD+6pOUCLgDyk85GmHl+sRAQAsAseJyQB+MIPFNrwirN6rbH GHk6zhBY7mOIHRvjbrxBAust8Tiol2G5muu2fy70b9yNkpFyhnhHXovhFbrQMLO7u9C4I4 nlLfWRPPUKK4eKJCaLYrpxQEC/kh3YEJFSdlEgdW/aDWmNEjlOZh1iLfVn/GTp9FvJEj1q 4AZre7oPL81XQyew63cBJgjX8vtRZ+yszUpyAKxb0stR/EgNMWYdIGoFqPNaFjhONIbwuy 8aNrQhOU3VianMZHOk3V1IxaBuTolN+EzSPAAIQkDx+Tk0Q2V0l6LOPr7kJxsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TchL73SH9zNfy; Sat, 17 Feb 2024 21:11: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 41HLBB3x080100; Sat, 17 Feb 2024 21:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HLBBiV080097; Sat, 17 Feb 2024 21:11:11 GMT (envelope-from git) Date: Sat, 17 Feb 2024 21:11:11 GMT Message-Id: <202402172111.41HLBBiV080097@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: 8b67c670a49b - main - msdosfs: fix directory corruption after rename operation 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: Sender: owner-dev-commits-src-main@freebsd.org 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: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b67c670a49b4efe7e1557121b5bbae682ea3bc7 Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=8b67c670a49b4efe7e1557121b5bbae682ea3bc7 commit 8b67c670a49b4efe7e1557121b5bbae682ea3bc7 Author: Stefan Eßer AuthorDate: 2024-02-17 21:04:49 +0000 Commit: Stefan Eßer CommitDate: 2024-02-17 21:04:49 +0000 msdosfs: fix directory corruption after rename operation The is a bug in MSDOSFS that can be triggered when the target of a rename operation exists. It is caused by the lack of inodes in the FAT file system, which are substituted by the location of the DOS 8.3 directory entry in the file system. This causes the "inode" of a file to change when its directory entry is moved to a different location. The rename operation wants to re-use the existing directory entry position of an existing target file name (POS1). But the code does instead locate the first position in the directory that provides sufficient free directory slots (POS2) to hold the target file name and fills it with the directory data. The rename operation continues and at the end writes directory data to the initially retrieved location (POS1) of the old target directory. This leads to 2 directory entries for the target file, but with inconsistent data in the directory and in the cached file system state. The location that should have been re-used (POS1) is marked as deleted in the directory, and new directory data has been written to a different location (POS2). But the VFS cache has the newly written data stored under the inode number that corresponds to the initially planned position (POS1). If then a new file is written, it can allocate the deleted directory entries (POS1) and when it queries the cache, it retrieves data that is valid for the target of the prior rename operation, leading to a corrupt directory entry (at POS1) being written (DOS file name of the earlier rename target combined with the Windows long file name of the newly written file). PR: 268005 Reported by: wbe@psr.com Approved by: kib, mckusick Fixes: 2c9cbc2d45b94 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43951 --- sys/fs/msdosfs/msdosfs_vnops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 31d9b003a6fa..078ea5e52312 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1180,8 +1180,10 @@ relock: memcpy(oldname, fip->de_Name, 11); memcpy(fip->de_Name, toname, 11); /* update denode */ error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); - if (error == EJUSTRETURN) + if (error == EJUSTRETURN) { + tdip->de_fndoffset = to_diroffset; error = createde(fip, tdip, NULL, tcnp); + } if (error != 0) { memcpy(fip->de_Name, oldname, 11); goto unlock; From nobody Sun Feb 18 03:10: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 4TcrJw3FQXz5B98S; Sun, 18 Feb 2024 03:10: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 4TcrJv6B0Cz4Lqh; Sun, 18 Feb 2024 03:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708225839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGJZOMeqp3mBntuRbHxjG3H6Smree2Hu1bs48qsviT0=; b=ZuUkbCtS3BYD54N87KTrV/2Old3++zXw4PKO1NlIh8IwbMugURJjydRyYGW1oQbYaEX/x6 yLWEfazxpzfqrNQddMKJu/fdtXaKQYFtO4yNg1GzaqocTKrxzWlDBfEOFqbaMFwoSsWIsy GhdWzlXiczV7+/q2dhui4aj9yThGo7Mecqy31wu/v11ULP1sTAwdubH5IwGJZI5H6sd7xq mJs1xamcgD2Gm+8KYRdGVnO53yJatc2llI/NqCygMWqYctkdajhYJods9KyDXirdD/Mw1t o2M5jO0OtZzZ+QAl0hcPqTqeAhLwN4ZAopc3plMQgCN6Vv6/7msq2zN0BzBO0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708225839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGJZOMeqp3mBntuRbHxjG3H6Smree2Hu1bs48qsviT0=; b=IrU/ahQlhnx5lYcdRZNfO0IxLBYk/zWwHTPKPEX7mDGfTYV9OO/1WCyixfD68BVamz+NqS lG3SEFPODsJMhAEtKz/fkVuRsKAU7a+g1RU9W0sF+GTEEFTvrAgkbXkO8p7clsyo1/J/1j +6IrY6DWMZDC0MX/qGW07BzgqclMMqFvK4pbdtd4q9p0nQu6f07zFguvbkEKFZ6tYBZhdx biX10K4Lv+ED2Uj0ALRkWL4gpkTpMDZaZNUetFGqUaS+3tyeZ3SL1Y4H9Ul4q0wp9f7SMd eX+G3f0RjRawFlCSFml2c8JbFupRFJ3FDXM+SQqEXrHu7qAaDcEdhbbgOKAdxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708225839; a=rsa-sha256; cv=none; b=GySbkIPV3B7xDJYx7mJ/QHk3dz7UD1MuKQ20pNvPunMGUkOjFD90lSNy66snK62OrbUq8X OHYpQhhsgN88jtssxeKVtJ6kARdFAA183aGWnIAgMzBeNRO2DoOpXcHzfYj5zLc2crFeSX 94jjW1ZEFpXTsfwCUXrnRp5QALJg9NBEPBc+fUkHb4Y5pW/zM+pWuMErdsrWVM2mxsIFbY TyzbHRZzkWmyxvfVO9SufE0biXV2/Zj7BbWdQoRKWt1m+a9dZkzg03b8xrTYHd98FvPv+F cvR4Zoy3suHhFRAXm3QVnsS1qBbGu0x05iUr9qNU6gftnsGnx93NffveDuQhTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcrJv5F2lzZYT; Sun, 18 Feb 2024 03:10: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 41I3AdqG087096; Sun, 18 Feb 2024 03:10:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I3Aduf087093; Sun, 18 Feb 2024 03:10:39 GMT (envelope-from git) Date: Sun, 18 Feb 2024 03:10:39 GMT Message-Id: <202402180310.41I3Aduf087093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 4543ef516683 - main - MFV: expat 2.6.0. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4543ef516683042d46f3bd3bb8a4f3f746e00499 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=4543ef516683042d46f3bd3bb8a4f3f746e00499 commit 4543ef516683042d46f3bd3bb8a4f3f746e00499 Merge: 8b67c670a49b 345cf360f8b8 Author: Xin LI AuthorDate: 2024-02-17 21:56:56 +0000 Commit: Xin LI CommitDate: 2024-02-17 22:04:14 +0000 MFV: expat 2.6.0. MFC after: 3 days contrib/expat/Changes | 118 +- contrib/expat/Makefile.am | 10 +- contrib/expat/Makefile.in | 22 +- contrib/expat/README.md | 7 +- contrib/expat/configure.ac | 43 +- contrib/expat/doc/Makefile.in | 10 +- contrib/expat/doc/ok.min.css | 4 +- contrib/expat/doc/reference.html | 222 +- contrib/expat/doc/xmlwf.1 | 24 +- contrib/expat/doc/xmlwf.xml | 50 +- contrib/expat/examples/Makefile.am | 9 +- contrib/expat/examples/Makefile.in | 48 +- contrib/expat/examples/element_declarations.c | 234 + contrib/expat/expat_config.h.in | 8 +- contrib/expat/fuzz/xml_parse_fuzzer.c | 53 +- contrib/expat/fuzz/xml_parsebuffer_fuzzer.c | 68 +- contrib/expat/lib/Makefile.in | 10 +- contrib/expat/lib/expat.h | 28 +- contrib/expat/lib/internal.h | 8 +- contrib/expat/lib/siphash.h | 10 +- contrib/expat/lib/xmlparse.c | 558 +- contrib/expat/lib/xmlrole.c | 6 +- contrib/expat/lib/xmlrole.h | 6 +- contrib/expat/lib/xmltok.c | 29 +- contrib/expat/lib/xmltok.h | 8 +- contrib/expat/lib/xmltok_impl.c | 2 +- contrib/expat/tests/Makefile.am | 61 +- contrib/expat/tests/Makefile.in | 261 +- contrib/expat/tests/acc_tests.c | 396 + contrib/expat/tests/acc_tests.h | 56 + contrib/expat/tests/acc_tests_cxx.cpp | 32 + contrib/expat/tests/alloc_tests.c | 2127 ++++ contrib/expat/tests/alloc_tests.h | 56 + contrib/expat/tests/alloc_tests_cxx.cpp | 32 + contrib/expat/tests/basic_tests.c | 6076 +++++++++ contrib/expat/tests/basic_tests.h | 56 + contrib/expat/tests/basic_tests_cxx.cpp | 32 + contrib/expat/tests/benchmark/Makefile.in | 10 +- contrib/expat/tests/benchmark/benchmark.c | 14 +- contrib/expat/tests/chardata.c | 16 +- contrib/expat/tests/chardata_cxx.cpp | 32 + contrib/expat/tests/common.c | 325 + contrib/expat/tests/common.h | 162 + contrib/expat/tests/common_cxx.cpp | 32 + contrib/expat/tests/dummy.c | 261 + contrib/expat/tests/dummy.h | 150 + contrib/expat/tests/dummy_cxx.cpp | 32 + contrib/expat/tests/handlers.c | 1932 +++ contrib/expat/tests/handlers.h | 595 + contrib/expat/tests/handlers_cxx.cpp | 32 + contrib/expat/tests/memcheck.c | 21 +- contrib/expat/tests/memcheck_cxx.cpp | 32 + contrib/expat/tests/minicheck.c | 58 +- contrib/expat/tests/minicheck.h | 79 +- contrib/expat/tests/minicheck_cxx.cpp | 32 + contrib/expat/tests/misc_tests.c | 523 + contrib/expat/tests/misc_tests.h | 56 + contrib/expat/tests/misc_tests_cxx.cpp | 32 + contrib/expat/tests/ns_tests.c | 754 ++ contrib/expat/tests/ns_tests.h | 56 + contrib/expat/tests/ns_tests_cxx.cpp | 32 + contrib/expat/tests/nsalloc_tests.c | 1537 +++ contrib/expat/tests/nsalloc_tests.h | 56 + contrib/expat/tests/nsalloc_tests_cxx.cpp | 32 + contrib/expat/tests/runtests.c | 12479 +------------------ .../tests/{runtestspp.cpp => runtests_cxx.cpp} | 4 +- contrib/expat/tests/structdata.c | 37 +- contrib/expat/tests/structdata_cxx.cpp | 32 + contrib/expat/xmlwf/Makefile.in | 10 +- contrib/expat/xmlwf/readfilemap.c | 21 +- contrib/expat/xmlwf/xmlfile.c | 16 +- contrib/expat/xmlwf/xmlfile.h | 4 +- contrib/expat/xmlwf/xmlwf.c | 156 +- contrib/expat/xmlwf/xmlwf_helpgen.py | 31 +- lib/libexpat/expat_config.h | 16 +- lib/libexpat/libbsdxml.3 | 4 +- 76 files changed, 17368 insertions(+), 13115 deletions(-) diff --cc contrib/expat/README.md index e5e237fc9496,000000000000..43c4f4f3dbb3 mode 100644,000000..100644 --- a/contrib/expat/README.md +++ b/contrib/expat/README.md @@@ -1,269 -1,0 +1,270 @@@ - [![Run Linux Travis CI tasks](https://github.com/libexpat/libexpat/actions/workflows/linux.yml/badge.svg)](https://github.com/libexpat/libexpat/actions/workflows/linux.yml) ++[![Run Linux CI tasks](https://github.com/libexpat/libexpat/actions/workflows/linux.yml/badge.svg)](https://github.com/libexpat/libexpat/actions/workflows/linux.yml) +[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/libexpat/libexpat?svg=true)](https://ci.appveyor.com/project/libexpat/libexpat) +[![Packaging status](https://repology.org/badge/tiny-repos/expat.svg)](https://repology.org/metapackage/expat/versions) +[![Downloads SourceForge](https://img.shields.io/sourceforge/dt/expat?label=Downloads%20SourceForge)](https://sourceforge.net/projects/expat/files/) +[![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases) + + - # Expat, Release 2.5.0 ++# Expat, Release 2.6.0 + - This is Expat, a C library for parsing XML, started by ++This is Expat, a C99 library for parsing ++[XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by +[James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997. +Expat is a stream-oriented XML parser. This means that you register +handlers with the parser before starting the parse. These handlers +are called when the parser discovers the associated structures in the +document being parsed. A start tag is an example of the kind of +structures for which you may register handlers. + +Expat supports the following compilers: + +- GNU GCC >=4.5 +- LLVM Clang >=3.5 +- Microsoft Visual Studio >=15.0/2017 (rolling `${today} minus 5 years`) + +Windows users can use the +[`expat-win32bin-*.*.*.{exe,zip}` download](https://github.com/libexpat/libexpat/releases), +which includes both pre-compiled libraries and executables, and source code for +developers. + +Expat is [free software](https://www.gnu.org/philosophy/free-sw.en.html). +You may copy, distribute, and modify it under the terms of the License +contained in the file +[`COPYING`](https://github.com/libexpat/libexpat/blob/master/expat/COPYING) +distributed with this package. +This license is the same as the MIT/X Consortium license. + + +## Using libexpat in your CMake-Based Project + +There are two ways of using libexpat with CMake: + +### a) Module Mode + +This approach leverages CMake's own [module `FindEXPAT`](https://cmake.org/cmake/help/latest/module/FindEXPAT.html). + +Notice the *uppercase* `EXPAT` in the following example: + +```cmake +cmake_minimum_required(VERSION 3.0) # or 3.10, see below + +project(hello VERSION 1.0.0) + +find_package(EXPAT 2.2.8 MODULE REQUIRED) + +add_executable(hello + hello.c +) + +# a) for CMake >=3.10 (see CMake's FindEXPAT docs) +target_link_libraries(hello PUBLIC EXPAT::EXPAT) + +# b) for CMake >=3.0 +target_include_directories(hello PRIVATE ${EXPAT_INCLUDE_DIRS}) +target_link_libraries(hello PUBLIC ${EXPAT_LIBRARIES}) +``` + +### b) Config Mode + +This approach requires files from… + +- libexpat >=2.2.8 where packaging uses the CMake build system +or +- libexpat >=2.3.0 where packaging uses the GNU Autotools build system + on Linux +or +- libexpat >=2.4.0 where packaging uses the GNU Autotools build system + on macOS or MinGW. + +Notice the *lowercase* `expat` in the following example: + +```cmake +cmake_minimum_required(VERSION 3.0) + +project(hello VERSION 1.0.0) + +find_package(expat 2.2.8 CONFIG REQUIRED char dtd ns) + +add_executable(hello + hello.c +) + +target_link_libraries(hello PUBLIC expat::expat) +``` + + +## Building from a Git Clone + +If you are building Expat from a check-out from the +[Git repository](https://github.com/libexpat/libexpat/), +you need to run a script that generates the configure script using the +GNU autoconf and libtool tools. To do this, you need to have +autoconf 2.58 or newer. Run the script like this: + +```console +./buildconf.sh +``` + +Once this has been done, follow the same instructions as for building +from a source distribution. + + +## Building from a Source Distribution + +### a) Building with the configure script (i.e. GNU Autotools) + +To build Expat from a source distribution, you first run the +configuration shell script in the top level distribution directory: + +```console +./configure +``` + +There are many options which you may provide to configure (which you +can discover by running configure with the `--help` option). But the +one of most interest is the one that sets the installation directory. +By default, the configure script will set things up to install +libexpat into `/usr/local/lib`, `expat.h` into `/usr/local/include`, and +`xmlwf` into `/usr/local/bin`. If, for example, you'd prefer to install +into `/home/me/mystuff/lib`, `/home/me/mystuff/include`, and +`/home/me/mystuff/bin`, you can tell `configure` about that with: + +```console +./configure --prefix=/home/me/mystuff +``` + +Another interesting option is to enable 64-bit integer support for +line and column numbers and the over-all byte index: + +```console +./configure CPPFLAGS=-DXML_LARGE_SIZE +``` + +However, such a modification would be a breaking change to the ABI +and is therefore not recommended for general use — e.g. as part of +a Linux distribution — but rather for builds with special requirements. + +After running the configure script, the `make` command will build +things and `make install` will install things into their proper +location. Have a look at the `Makefile` to learn about additional +`make` options. Note that you need to have write permission into +the directories into which things will be installed. + +If you are interested in building Expat to provide document +information in UTF-16 encoding rather than the default UTF-8, follow +these instructions (after having run `make distclean`). +Please note that we configure with `--without-xmlwf` as xmlwf does not +support this mode of compilation (yet): + +1. Mass-patch `Makefile.am` files to use `libexpatw.la` for a library name: +
+ `find -name Makefile.am -exec sed + -e 's,libexpat\.la,libexpatw.la,' + -e 's,libexpat_la,libexpatw_la,' + -i {} +` + +1. Run `automake` to re-write `Makefile.in` files:
+ `automake` + +1. For UTF-16 output as unsigned short (and version/error strings as char), + run:
+ `./configure CPPFLAGS=-DXML_UNICODE --without-xmlwf`
+ For UTF-16 output as `wchar_t` (incl. version/error strings), run:
+ `./configure CFLAGS="-g -O2 -fshort-wchar" CPPFLAGS=-DXML_UNICODE_WCHAR_T + --without-xmlwf` +
Note: The latter requires libc compiled with `-fshort-wchar`, as well. + +1. Run `make` (which excludes xmlwf). + +1. Run `make install` (again, excludes xmlwf). + +Using `DESTDIR` is supported. It works as follows: + +```console +make install DESTDIR=/path/to/image +``` + +overrides the in-makefile set `DESTDIR`, because variable-setting priority is + +1. commandline +1. in-makefile +1. environment + +Note: This only applies to the Expat library itself, building UTF-16 versions +of xmlwf and the tests is currently not supported. + +When using Expat with a project using autoconf for configuration, you +can use the probing macro in `conftools/expat.m4` to determine how to +include Expat. See the comments at the top of that file for more +information. + +A reference manual is available in the file `doc/reference.html` in this +distribution. + + +### b) Building with CMake + +The CMake build system is still *experimental* and may replace the primary +build system based on GNU Autotools at some point when it is ready. + + +#### Available Options + +For an idea of the available (non-advanced) options for building with CMake: + +```console +# rm -f CMakeCache.txt ; cmake -D_EXPAT_HELP=ON -LH . | grep -B1 ':.*=' | sed 's,^--$,,' +// Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel ... +CMAKE_BUILD_TYPE:STRING= + +// Install path prefix, prepended onto install directories. +CMAKE_INSTALL_PREFIX:PATH=/usr/local + +// Path to a program. +DOCBOOK_TO_MAN:FILEPATH=/usr/bin/docbook2x-man + +// Build man page for xmlwf +EXPAT_BUILD_DOCS:BOOL=ON + +// Build the examples for expat library +EXPAT_BUILD_EXAMPLES:BOOL=ON + +// Build fuzzers for the expat library +EXPAT_BUILD_FUZZERS:BOOL=OFF + +// Build pkg-config file +EXPAT_BUILD_PKGCONFIG:BOOL=ON + +// Build the tests for expat library +EXPAT_BUILD_TESTS:BOOL=ON + +// Build the xmlwf tool for expat library +EXPAT_BUILD_TOOLS:BOOL=ON + +// Character type to use (char|ushort|wchar_t) [default=char] +EXPAT_CHAR_TYPE:STRING=char + +// Install expat files in cmake install target +EXPAT_ENABLE_INSTALL:BOOL=ON + +// Use /MT flag (static CRT) when compiling in MSVC +EXPAT_MSVC_STATIC_CRT:BOOL=OFF + +// Build fuzzers via ossfuzz for the expat library +EXPAT_OSSFUZZ_BUILD:BOOL=OFF + +// Build a shared expat library +EXPAT_SHARED_LIBS:BOOL=ON + +// Treat all compiler warnings as errors +EXPAT_WARNINGS_AS_ERRORS:BOOL=OFF + +// Make use of getrandom function (ON|OFF|AUTO) [default=AUTO] +EXPAT_WITH_GETRANDOM:STRING=AUTO + +// Utilize libbsd (for arc4random_buf) +EXPAT_WITH_LIBBSD:BOOL=OFF + +// Make use of syscall SYS_getrandom (ON|OFF|AUTO) [default=AUTO] +EXPAT_WITH_SYS_GETRANDOM:STRING=AUTO +``` diff --cc contrib/expat/examples/element_declarations.c index 000000000000,7ce8544f6f04..7ce8544f6f04 mode 000000,100644..100644 --- a/contrib/expat/examples/element_declarations.c +++ b/contrib/expat/examples/element_declarations.c diff --cc contrib/expat/tests/acc_tests.c index 000000000000,e1c4b7f7eb51..e1c4b7f7eb51 mode 000000,100644..100644 --- a/contrib/expat/tests/acc_tests.c +++ b/contrib/expat/tests/acc_tests.c diff --cc contrib/expat/tests/acc_tests.h index 000000000000,bbb93f37ed20..bbb93f37ed20 mode 000000,100644..100644 --- a/contrib/expat/tests/acc_tests.h +++ b/contrib/expat/tests/acc_tests.h diff --cc contrib/expat/tests/acc_tests_cxx.cpp index 000000000000,01644991ae51..01644991ae51 mode 000000,100644..100644 --- a/contrib/expat/tests/acc_tests_cxx.cpp +++ b/contrib/expat/tests/acc_tests_cxx.cpp diff --cc contrib/expat/tests/alloc_tests.c index 000000000000,e5d46ebea821..e5d46ebea821 mode 000000,100644..100644 --- a/contrib/expat/tests/alloc_tests.c +++ b/contrib/expat/tests/alloc_tests.c diff --cc contrib/expat/tests/alloc_tests.h index 000000000000,1eae130be78f..1eae130be78f mode 000000,100644..100644 --- a/contrib/expat/tests/alloc_tests.h +++ b/contrib/expat/tests/alloc_tests.h diff --cc contrib/expat/tests/alloc_tests_cxx.cpp index 000000000000,3270b1a6c984..3270b1a6c984 mode 000000,100644..100644 --- a/contrib/expat/tests/alloc_tests_cxx.cpp +++ b/contrib/expat/tests/alloc_tests_cxx.cpp diff --cc contrib/expat/tests/basic_tests.c index 000000000000,7112a4401879..7112a4401879 mode 000000,100644..100644 --- a/contrib/expat/tests/basic_tests.c +++ b/contrib/expat/tests/basic_tests.c diff --cc contrib/expat/tests/basic_tests.h index 000000000000,4c16562ca0fd..4c16562ca0fd mode 000000,100644..100644 --- a/contrib/expat/tests/basic_tests.h +++ b/contrib/expat/tests/basic_tests.h diff --cc contrib/expat/tests/basic_tests_cxx.cpp index 000000000000,d7e75a9061cf..d7e75a9061cf mode 000000,100644..100644 --- a/contrib/expat/tests/basic_tests_cxx.cpp +++ b/contrib/expat/tests/basic_tests_cxx.cpp diff --cc contrib/expat/tests/chardata_cxx.cpp index 000000000000,81820c72dca1..81820c72dca1 mode 000000,100644..100644 --- a/contrib/expat/tests/chardata_cxx.cpp +++ b/contrib/expat/tests/chardata_cxx.cpp diff --cc contrib/expat/tests/common.c index 000000000000,26d0c5473a63..26d0c5473a63 mode 000000,100644..100644 --- a/contrib/expat/tests/common.c +++ b/contrib/expat/tests/common.c diff --cc contrib/expat/tests/common.h index 000000000000,52f00cc0eeb0..52f00cc0eeb0 mode 000000,100644..100644 --- a/contrib/expat/tests/common.h +++ b/contrib/expat/tests/common.h diff --cc contrib/expat/tests/common_cxx.cpp index 000000000000,698a0ccfa9d5..698a0ccfa9d5 mode 000000,100644..100644 --- a/contrib/expat/tests/common_cxx.cpp +++ b/contrib/expat/tests/common_cxx.cpp diff --cc contrib/expat/tests/dummy.c index 000000000000,4ab57edd2cf2..4ab57edd2cf2 mode 000000,100644..100644 --- a/contrib/expat/tests/dummy.c +++ b/contrib/expat/tests/dummy.c diff --cc contrib/expat/tests/dummy.h index 000000000000,3d7ec63ed336..3d7ec63ed336 mode 000000,100644..100644 --- a/contrib/expat/tests/dummy.h +++ b/contrib/expat/tests/dummy.h diff --cc contrib/expat/tests/dummy_cxx.cpp index 000000000000,27c9f431ecd8..27c9f431ecd8 mode 000000,100644..100644 --- a/contrib/expat/tests/dummy_cxx.cpp +++ b/contrib/expat/tests/dummy_cxx.cpp diff --cc contrib/expat/tests/handlers.c index 000000000000,449ada70f9a2..449ada70f9a2 mode 000000,100644..100644 --- a/contrib/expat/tests/handlers.c +++ b/contrib/expat/tests/handlers.c diff --cc contrib/expat/tests/handlers.h index 000000000000,e1f0995f79e6..e1f0995f79e6 mode 000000,100644..100644 --- a/contrib/expat/tests/handlers.h +++ b/contrib/expat/tests/handlers.h diff --cc contrib/expat/tests/handlers_cxx.cpp index 000000000000,86c62b159cc7..86c62b159cc7 mode 000000,100644..100644 --- a/contrib/expat/tests/handlers_cxx.cpp +++ b/contrib/expat/tests/handlers_cxx.cpp diff --cc contrib/expat/tests/memcheck_cxx.cpp index 000000000000,e62ac98999c8..e62ac98999c8 mode 000000,100644..100644 --- a/contrib/expat/tests/memcheck_cxx.cpp +++ b/contrib/expat/tests/memcheck_cxx.cpp diff --cc contrib/expat/tests/minicheck_cxx.cpp index 000000000000,58881c60ba07..58881c60ba07 mode 000000,100644..100644 --- a/contrib/expat/tests/minicheck_cxx.cpp +++ b/contrib/expat/tests/minicheck_cxx.cpp diff --cc contrib/expat/tests/misc_tests.c index 000000000000,b5212f58a5bb..b5212f58a5bb mode 000000,100644..100644 --- a/contrib/expat/tests/misc_tests.c +++ b/contrib/expat/tests/misc_tests.c diff --cc contrib/expat/tests/misc_tests.h index 000000000000,3d9c4b8a4065..3d9c4b8a4065 mode 000000,100644..100644 --- a/contrib/expat/tests/misc_tests.h +++ b/contrib/expat/tests/misc_tests.h diff --cc contrib/expat/tests/misc_tests_cxx.cpp index 000000000000,0b84c1b1f4d6..0b84c1b1f4d6 mode 000000,100644..100644 --- a/contrib/expat/tests/misc_tests_cxx.cpp +++ b/contrib/expat/tests/misc_tests_cxx.cpp diff --cc contrib/expat/tests/ns_tests.c index 000000000000,411e1d3c974a..411e1d3c974a mode 000000,100644..100644 --- a/contrib/expat/tests/ns_tests.c +++ b/contrib/expat/tests/ns_tests.c diff --cc contrib/expat/tests/ns_tests.h index 000000000000,acb0db786a40..acb0db786a40 mode 000000,100644..100644 --- a/contrib/expat/tests/ns_tests.h +++ b/contrib/expat/tests/ns_tests.h diff --cc contrib/expat/tests/ns_tests_cxx.cpp index 000000000000,b2fe187bb8b4..b2fe187bb8b4 mode 000000,100644..100644 --- a/contrib/expat/tests/ns_tests_cxx.cpp +++ b/contrib/expat/tests/ns_tests_cxx.cpp diff --cc contrib/expat/tests/nsalloc_tests.c index 000000000000,ec88586af1d4..ec88586af1d4 mode 000000,100644..100644 --- a/contrib/expat/tests/nsalloc_tests.c +++ b/contrib/expat/tests/nsalloc_tests.c diff --cc contrib/expat/tests/nsalloc_tests.h index 000000000000,026a2a21a950..026a2a21a950 mode 000000,100644..100644 --- a/contrib/expat/tests/nsalloc_tests.h +++ b/contrib/expat/tests/nsalloc_tests.h diff --cc contrib/expat/tests/nsalloc_tests_cxx.cpp index 000000000000,9ba75d1c5368..9ba75d1c5368 mode 000000,100644..100644 --- a/contrib/expat/tests/nsalloc_tests_cxx.cpp +++ b/contrib/expat/tests/nsalloc_tests_cxx.cpp diff --cc contrib/expat/tests/structdata_cxx.cpp index 000000000000,43448f634057..43448f634057 mode 000000,100644..100644 --- a/contrib/expat/tests/structdata_cxx.cpp +++ b/contrib/expat/tests/structdata_cxx.cpp diff --cc lib/libexpat/expat_config.h index 369cebcbe451,000000000000..0d581a431a53 mode 100644,000000..100644 --- a/lib/libexpat/expat_config.h +++ b/lib/libexpat/expat_config.h @@@ -1,146 -1,0 +1,152 @@@ +/* expat_config.h. Generated from expat_config.h.in by configure. */ +/* expat_config.h.in. Generated from configure.ac by autoheader. */ + +#ifndef EXPAT_CONFIG_H +#define EXPAT_CONFIG_H 1 + +#include + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* 1234 = LILENDIAN, 4321 = BIGENDIAN */ +#if BYTE_ORDER == LITTLE_ENDIAN +#define BYTEORDER 1234 +#else +#define BYTEORDER 4321 +#endif + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + ++/* define if the compiler supports basic C++11 syntax */ ++#define HAVE_CXX11 1 ++ +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrandom' function. */ +#define HAVE_GETRANDOM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `bsd' library (-lbsd). */ +/* #undef HAVE_LIBBSD */ + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have `syscall' and `SYS_getrandom'. */ +#define HAVE_SYSCALL_GETRANDOM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "expat" + +/* Define to the address where bug reports for this package should be sent. */ - #define PACKAGE_BUGREPORT "expat-bugs@libexpat.org" ++#define PACKAGE_BUGREPORT "https://github.com/libexpat/libexpat/issues" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "expat" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "expat 2.5.0" ++#define PACKAGE_STRING "expat 2.6.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "expat" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "2.5.0" ++#define PACKAGE_VERSION "2.6.0" + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Version number of package */ - #define VERSION "2.5.0" ++#define VERSION "2.6.0" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define to allow retrieving the byte offsets for attribute names and values. + */ +/* #undef XML_ATTR_INFO */ + +/* Define to specify how much context to retain around the current parse - point. */ ++ point, 0 to disable. */ +#define XML_CONTEXT_BYTES 1024 + +/* Define to include code reading entropy from `/dev/urandom'. */ +#define XML_DEV_URANDOM 1 + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD 1 + ++/* Define as 1/0 to enable/disable support for general entities. */ ++#define XML_GE 1 ++ +/* Define to make XML Namespaces functionality available. */ +#define XML_NS 1 + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +#endif // ndef EXPAT_CONFIG_H diff --cc lib/libexpat/libbsdxml.3 index e4e55a64dd47,000000000000..c6c2518ea41a mode 100644,000000..100644 --- a/lib/libexpat/libbsdxml.3 +++ b/lib/libexpat/libbsdxml.3 @@@ -1,67 -1,0 +1,67 @@@ +.\"- +.\" Copyright (c) 2002 Poul-Henning Kamp +.\" 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. +.\"/ - .Dd November 18, 2022 ++.Dd February 17, 2024 +.Dt LIBBSDXML 3 +.Os +.Sh NAME +.Nm libbsdxml +.Nd eXpat XML parser library +.Sh SYNOPSIS +.In bsdxml.h +.Sh DESCRIPTION +The +.Nm - library is a verbatim copy of the eXpat XML library version 2.5.0. ++library is a verbatim copy of the eXpat XML library version 2.6.0. +.Pp +The +.Nm +library is intended to be used within the +.Fx +base system only. +Use of the +.Nm +library for other purposes is not supported and discouraged. +.Pp +To avoid version and autoconfiguration issues, the library has been +renamed to +.Nm +rather than retain the original eXpat library and include file names +to prevent confusion and autoconfiguration issues for 3rd party +software. +.Sh SEE ALSO +For full documentation, please see the eXpat webpage at +.Pa http://www.libexpat.org/ . +.Sh AUTHORS +.An -nosplit +The original eXpat was written by +.An James Clark Aq Mt jjc@jclark.com . +.Pp +Subsequently eXpat maintenance and development been taken up by a group +of people under the leadership of +.An Fred Drake Aq Mt fdrake@acm.com , +.An Paul Prescod , +and +.An Clark Cooper . From nobody Sun Feb 18 04:40: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 4TctJg0JP6z5BPx3; Sun, 18 Feb 2024 04:40: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 4TctJf539dz4TqL; Sun, 18 Feb 2024 04:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708231234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9HqXsg3iuw7C0cEmg7OZ2MdtvCQwNeiOP/vvc64Y9g=; b=DuKyF5qarvAu2bGLgercKI6E9IjF4HbTvx0PVc7/ln1GN+74BjbCDRTMjMdwD6XVvMunv7 ctRSOF3EMXQHrCVQr/ZdC1fc3lUyzua5hAkTww4hZTjInd5hSX/0lEKcc8Ee6SWZqIpAyN 3OECdcSd3rLlYz1RRM8LgUd4wbB64Opscd0Gkd7uK5Fpunqz4iVylSI/DgU5m6sfxbz8MM +Ks7D7RFMOnaK7LCr2pmv9/93i160dLLJrdTHy5mKMpS5SYSFSaIVNIbBoJC5tGt6gS4g+ TAXBTocR95CmusmQlnZbM9ewdD4oFAmZLxgZExsl6rBOSIq+ppi1qbssmvkBlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708231234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9HqXsg3iuw7C0cEmg7OZ2MdtvCQwNeiOP/vvc64Y9g=; b=GdSY1bteSzJiexg2dj7LSkwGRZlMEKpflTBA9kkUQMv+7tSCg3K79ipzXSiH8KOM5j1bZJ XCX8hGzHWPYcFuByemSzH2l6DOEHMoE2hEKR1BqX2wNJQIl8OKudZ4eu7AHnPQDzOaX05I 4bdY9Baa1AiXlG6SF+8JMVk47l6Di30GmMCvfJyl8pbzxKlEfrBFZnSdFSUx9qMcqj/UsX rAx5pEEEEz1W2x5KNhV+uNL6RHdRT4Yet7iy3w/X7t7lqSLoNC2AsIYpdUoT7gsPg1fRZj NQJQBly6nOLMfVtFHQX0h9qUxxoIIUUsyHzzGKv9eYkftki5PjRMTlXodvPe7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708231234; a=rsa-sha256; cv=none; b=ntJPTWCq2YYGzpimzqxixlTYGYPU2DTbmbt1C5uDPBH+FLBqh1a+mFtf5ubDDRGorhuV/X M5RGXeJD3bD1umPrCChVVVv14aEyu0J0c7X+N0xgwLffTrRr8mQ9qs/pnlXXKx/xk+Ngfs 7J8q0yekc873LKsFQkJAAPe7zt1bm+4q2EBEB7sWkStiymFzk3YD0pIjjagatF8W3OTFIO P7HMAtwdcMpopGh+W7J+0re700OAy67PEF2mefDlcNRQDEPa1U+aptmrNQKeyjnzq8jJFL 01v4Tpm/dW5pQWf/KvvmFqjgWK+85CCHsTsSAbILkgtPUT5wjTvebtv4EE9t/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 4TctJf47cSzcxj; Sun, 18 Feb 2024 04:40: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 41I4eYLe038661; Sun, 18 Feb 2024 04:40:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I4eYv3038658; Sun, 18 Feb 2024 04:40:34 GMT (envelope-from git) Date: Sun, 18 Feb 2024 04:40:34 GMT Message-Id: <202402180440.41I4eYv3038658@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: 2546c543fd79 - main - reboot: Move extern for environ 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2546c543fd7955276388aae6f0869d2c9285ba59 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2546c543fd7955276388aae6f0869d2c9285ba59 commit 2546c543fd7955276388aae6f0869d2c9285ba59 Author: Warner Losh AuthorDate: 2024-02-18 04:30:48 +0000 Commit: Warner Losh CommitDate: 2024-02-18 04:39:42 +0000 reboot: Move extern for environ envorin isn't defined in any header, and gcc is cranky with this inside a function, so move it to global scope. Both clang and gcc are now happy with this. Sponsored by: Netflix --- sbin/reboot/reboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 550530ad079e..d215255487a7 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -51,6 +51,8 @@ #include #include +extern char **environ; + #define PATH_NEXTBOOT "/boot/nextboot.conf" static void usage(void) __dead2; @@ -84,7 +86,6 @@ zfsbootcfg(const char *pool, bool force) }; int rv, status; pid_t p; - extern char **environ; rv = posix_spawnp(&p, av[0], NULL, NULL, __DECONST(char **, av), environ); From nobody Sun Feb 18 06:13: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 4TcwMc4nN6z5BdWX; Sun, 18 Feb 2024 06:13: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 4TcwMc4YNNz4hTm; Sun, 18 Feb 2024 06:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708236796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jLVIJ3vHLS2QrF82QSHNvikn6R/RfKuwQzgvPnrOwyc=; b=A4zZNeLVgOfvm+XUt32JrUTgCsM7GJnLdUYKr4NJKuc+C6M3WBstW3xqZNj2NHWl/ajwLA oCaVNybLhEObknk/GSAofxzcR9LgfojBjhtqUu4jz4mzWCJ45FiZTE+QnveqNNN4RoDbYS nEDimBi/ooAwFpjeWmGfY93t8yWm3LPUfMBUVA/zPz0B+IX+P/4cXy404BFyghuQB+WDdv S6O2LyW23NahnR08WFEkN76CkH1L6JJhr0RlOGfGduXYdqLjBd9HQhP/rhdTjuGExuye29 AB+XjWupN6cRlZIHfBu8/FX3hC59IeLUVRDrni0El/dSPxmfjX2gZgkyP2JtUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708236796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jLVIJ3vHLS2QrF82QSHNvikn6R/RfKuwQzgvPnrOwyc=; b=MkJ8Gu5o54PRj1mrJKWCKxP+OEe2gz7V4rb2P3vh6iPkww3hYqQpGQ0K+hOFl+12z+gFIh qodnLsxy8rOn8nxFkoXr8cgDHzIrWWcZwll9RzLnja5B8j/oUpvVVe+B7jOEsJcNVkMdTs VeV9c7pIdLej2xLV/Ff7AmimhIpwGn69pJjztrUpMuO7jSeU7iccUtdaCFpG4ku3wTudh1 HB3sIzDHLKVY+McYzPlDT0xlS18jQK0IbYaka1azfO+slyjYtF+eMZkZK6i0Qhw+YJ4oC2 LH/n1kUqG6Z9ggUn41/9L9ruDd4WPSnO6NJYAwLR7nqvX94V0TxgPFT/1E3hLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708236796; a=rsa-sha256; cv=none; b=VsdcEYPUOt7DzzRjOq0qRDjVpLXrspnydgnK5M3d59kWyuH1n/GhO9GYWVuEfKAh1wWeQT Svw3kQO4LfOXBc4sOPfd5gLL1HaFXoD4b+/pysJgH513gIZDIc78NU9x/dYxI3yo41YptO oPqMNRqmO/nr3UkSRio0bdvKO2RHkAYvaWcTGQkc0zwxZ/nJpTWyuV4AbuOguDrlB4beuG zdgqnpj6mKwMHOjpZitl2uf3DM7jnta6/dsPuKmjQ0CQqU0EA1/XT2jacfFCLm4pCPQf21 JfvDJ5zPIGjTC46xrckNqfXOEuvwJkiGscNVLCou53YOTniv7q/+uO+65o5Viw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcwMc3H0vzgBN; Sun, 18 Feb 2024 06:13: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 41I6DGjf097410; Sun, 18 Feb 2024 06:13:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I6DGKL097407; Sun, 18 Feb 2024 06:13:16 GMT (envelope-from git) Date: Sun, 18 Feb 2024 06:13:16 GMT Message-Id: <202402180613.41I6DGKL097407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 6255c67c3d1a - main - MFV: zlib 1.3.1. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6255c67c3d1a268535c50de74d3300fd86d8f15d Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=6255c67c3d1a268535c50de74d3300fd86d8f15d commit 6255c67c3d1a268535c50de74d3300fd86d8f15d Merge: 2546c543fd79 f4695a30267c Author: Xin LI AuthorDate: 2024-02-18 06:12:51 +0000 Commit: Xin LI CommitDate: 2024-02-18 06:12:51 +0000 MFV: zlib 1.3.1. MFC after: 1 week sys/contrib/zlib/ChangeLog | 10 ++++++++ sys/contrib/zlib/FAQ | 3 +-- sys/contrib/zlib/README | 6 ++--- sys/contrib/zlib/deflate.c | 47 +++++++++++++++++++++++++++++--------- sys/contrib/zlib/deflate.h | 35 ++++++++++++++++++++++++++-- sys/contrib/zlib/doc/algorithm.txt | 2 +- sys/contrib/zlib/gzguts.h | 8 ++----- sys/contrib/zlib/gzlib.c | 12 +++++----- sys/contrib/zlib/inflate.c | 2 +- sys/contrib/zlib/inftrees.c | 6 ++--- sys/contrib/zlib/inftrees.h | 4 ++-- sys/contrib/zlib/test/example.c | 3 ++- sys/contrib/zlib/test/minigzip.c | 2 +- sys/contrib/zlib/trees.c | 20 +++++++++++++--- sys/contrib/zlib/zconf.h | 10 +------- sys/contrib/zlib/zconf.h.in | 10 +------- sys/contrib/zlib/zlib.3 | 6 ++--- sys/contrib/zlib/zlib.h | 22 +++++++++--------- sys/contrib/zlib/zutil.h | 27 +++------------------- 19 files changed, 137 insertions(+), 98 deletions(-) diff --cc sys/contrib/zlib/deflate.c index 06eb2c0f6de5,000000000000..97b184a82868 mode 100644,000000..100644 --- a/sys/contrib/zlib/deflate.c +++ b/sys/contrib/zlib/deflate.c @@@ -1,2116 -1,0 +1,2141 @@@ +/* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler ++ * Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* + * ALGORITHM + * + * The "deflation" process depends on being able to identify portions + * of the input text which are identical to earlier input (within a + * sliding window trailing behind the input currently being processed). + * + * The most straightforward technique turns out to be the fastest for + * most input files: try all possible matches and select the longest. + * The key feature of this algorithm is that insertions into the string + * dictionary are very simple and thus fast, and deletions are avoided + * completely. Insertions are performed at each input character, whereas + * string matches are performed only when the previous match ends. So it + * is preferable to spend more time in matches to allow very fast string + * insertions and avoid deletions. The matching algorithm for small + * strings is inspired from that of Rabin & Karp. A brute force approach + * is used to find longer strings when a small match has been found. + * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze + * (by Leonid Broukhis). + * A previous version of this file used a more sophisticated algorithm + * (by Fiala and Greene) which is guaranteed to run in linear amortized + * time, but has a larger average cost, uses more memory and is patented. + * However the F&G algorithm may be faster for some highly redundant + * files if the parameter max_chain_length (described below) is too large. + * + * ACKNOWLEDGEMENTS + * + * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and + * I found it in 'freeze' written by Leonid Broukhis. + * Thanks to many people for bug reports and testing. + * + * REFERENCES + * + * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". + * Available in http://tools.ietf.org/html/rfc1951 + * + * A description of the Rabin and Karp algorithm is given in the book + * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. + * + * Fiala,E.R., and Greene,D.H. + * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 + * + */ + +/* @(#) $Id$ */ + +#include "deflate.h" + +const char deflate_copyright[] = - " deflate 1.3 Copyright 1995-2023 Jean-loup Gailly and Mark Adler "; ++ " deflate 1.3.1 Copyright 1995-2024 Jean-loup Gailly and Mark Adler "; +/* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot + include such an acknowledgment, I would appreciate that you keep this + copyright string in the executable of your product. + */ + +typedef enum { + need_more, /* block not completed, need more input or more output */ + block_done, /* block flush performed */ + finish_started, /* finish started, need only more output at next deflate */ + finish_done /* finish done, accept no more input or output */ +} block_state; + +typedef block_state (*compress_func)(deflate_state *s, int flush); +/* Compression function. Returns the block state after the call. */ + +local block_state deflate_stored(deflate_state *s, int flush); +local block_state deflate_fast(deflate_state *s, int flush); +#ifndef FASTEST +local block_state deflate_slow(deflate_state *s, int flush); +#endif +local block_state deflate_rle(deflate_state *s, int flush); +local block_state deflate_huff(deflate_state *s, int flush); + +/* =========================================================================== + * Local data + */ + +#define NIL 0 +/* Tail of hash chains */ + +#ifndef TOO_FAR +# define TOO_FAR 4096 +#endif +/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + +/* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to + * exclude worst case performance for pathological files. Better values may be + * found for specific files. + */ +typedef struct config_s { + ush good_length; /* reduce lazy search above this match length */ + ush max_lazy; /* do not perform lazy search above this match length */ + ush nice_length; /* quit search above this match length */ + ush max_chain; + compress_func func; +} config; + +#ifdef FASTEST +local const config configuration_table[2] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ +#else +local const config configuration_table[10] = { +/* good lazy nice chain */ +/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ +/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ +/* 2 */ {4, 5, 16, 8, deflate_fast}, +/* 3 */ {4, 6, 32, 32, deflate_fast}, + +/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ +/* 5 */ {8, 16, 32, 32, deflate_slow}, +/* 6 */ {8, 16, 128, 128, deflate_slow}, +/* 7 */ {8, 32, 128, 256, deflate_slow}, +/* 8 */ {32, 128, 258, 1024, deflate_slow}, +/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ +#endif + +/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 + * For deflate_fast() (levels <= 3) good is ignored and lazy has a different + * meaning. + */ + +/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ +#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0)) + +/* =========================================================================== + * Update a hash value with the given input byte + * IN assertion: all calls to UPDATE_HASH are made with consecutive input + * characters, so that a running hash key can be computed from the previous + * key instead of complete recalculation each time. + */ +#define UPDATE_HASH(s,h,c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask) + + +/* =========================================================================== + * Insert string str in the dictionary and set match_head to the previous head + * of the hash chain (the most recent string with same hash key). Return + * the previous length of the hash chain. + * If this file is compiled with -DFASTEST, the compression level is forced + * to 1, and no hash chains are maintained. + * IN assertion: all calls to INSERT_STRING are made with consecutive input + * characters and the first MIN_MATCH bytes of str are valid (except for + * the last MIN_MATCH-1 bytes of the input file). + */ +#ifdef FASTEST +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#else +#define INSERT_STRING(s, str, match_head) \ + (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ + match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ + s->head[s->ins_h] = (Pos)(str)) +#endif + +/* =========================================================================== + * Initialize the hash table (avoiding 64K overflow for 16 bit systems). + * prev[] will be initialized on the fly. + */ +#define CLEAR_HASH(s) \ + do { \ + s->head[s->hash_size - 1] = NIL; \ + zmemzero((Bytef *)s->head, \ + (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \ + } while (0) + +/* =========================================================================== + * Slide the hash table when sliding the window down (could be avoided with 32 + * bit values at the expense of memory usage). We slide even when level == 0 to + * keep the hash table consistent if we switch back to level > 0 later. + */ +#if defined(__has_feature) +# if __has_feature(memory_sanitizer) + __attribute__((no_sanitize("memory"))) +# endif +#endif +local void slide_hash(deflate_state *s) { + unsigned n, m; + Posf *p; + uInt wsize = s->w_size; + + n = s->hash_size; + p = &s->head[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + } while (--n); + n = wsize; +#ifndef FASTEST + p = &s->prev[n]; + do { + m = *--p; + *p = (Pos)(m >= wsize ? m - wsize : NIL); + /* If n is not on any hash chain, prev[n] is garbage but + * its value will never be used. + */ + } while (--n); +#endif +} + +/* =========================================================================== + * Read a new buffer from the current input stream, update the adler32 + * and total number of bytes read. All deflate() input goes through + * this function so some applications may wish to modify it to avoid + * allocating a large strm->next_in buffer and copying from it. + * (See also flush_pending()). + */ +local unsigned read_buf(z_streamp strm, Bytef *buf, unsigned size) { + unsigned len = strm->avail_in; + + if (len > size) len = size; + if (len == 0) return 0; + + strm->avail_in -= len; + + zmemcpy(buf, strm->next_in, len); + if (strm->state->wrap == 1) { + strm->adler = adler32(strm->adler, buf, len); + } +#ifdef GZIP + else if (strm->state->wrap == 2) { + strm->adler = crc32(strm->adler, buf, len); + } +#endif + strm->next_in += len; + strm->total_in += len; + + return len; +} + +/* =========================================================================== + * Fill the window when the lookahead becomes insufficient. + * Updates strstart and lookahead. + * + * IN assertion: lookahead < MIN_LOOKAHEAD + * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD + * At least one byte has been read, or avail_in == 0; reads are + * performed for at least two bytes (required for the zip translate_eol + * option -- not supported here). + */ +local void fill_window(deflate_state *s) { + unsigned n; + unsigned more; /* Amount of free space at the end of the window. */ + uInt wsize = s->w_size; + + Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); + + do { + more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); + + /* Deal with !@#$% 64K limit: */ + if (sizeof(int) <= 2) { + if (more == 0 && s->strstart == 0 && s->lookahead == 0) { + more = wsize; + + } else if (more == (unsigned)(-1)) { + /* Very unlikely, but possible on 16 bit machine if + * strstart == 0 && lookahead == 1 (input done a byte at time) + */ + more--; + } + } + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (s->strstart >= wsize + MAX_DIST(s)) { + + zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more); + s->match_start -= wsize; + s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ + s->block_start -= (long) wsize; + if (s->insert > s->strstart) + s->insert = s->strstart; + slide_hash(s); + more += wsize; + } + if (s->strm->avail_in == 0) break; + + /* If there was no sliding: + * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && + * more == window_size - lookahead - strstart + * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) + * => more >= window_size - 2*WSIZE + 2 + * In the BIG_MEM or MMAP case (not yet supported), + * window_size == input_size + MIN_LOOKAHEAD && + * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. + * Otherwise, window_size == 2*WSIZE so more >= 2. + * If there was sliding, more >= WSIZE. So in all cases, more >= 2. + */ + Assert(more >= 2, "more < 2"); + + n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); + s->lookahead += n; + + /* Initialize the hash value now that we have some input: */ + if (s->lookahead + s->insert >= MIN_MATCH) { + uInt str = s->strstart - s->insert; + s->ins_h = s->window[str]; + UPDATE_HASH(s, s->ins_h, s->window[str + 1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + while (s->insert) { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + s->insert--; + if (s->lookahead + s->insert < MIN_MATCH) + break; + } + } + /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, + * but this is not important since only literal bytes will be emitted. + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); + + /* If the WIN_INIT bytes after the end of the current data have never been + * written, then zero those bytes in order to avoid memory check reports of + * the use of uninitialized (or uninitialised as Julian writes) bytes by + * the longest match routines. Update the high water mark for the next + * time through here. WIN_INIT is set to MAX_MATCH since the longest match + * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. + */ + if (s->high_water < s->window_size) { + ulg curr = s->strstart + (ulg)(s->lookahead); + ulg init; + + if (s->high_water < curr) { + /* Previous high water mark below current data -- zero WIN_INIT + * bytes or up to end of window, whichever is less. + */ + init = s->window_size - curr; + if (init > WIN_INIT) + init = WIN_INIT; + zmemzero(s->window + curr, (unsigned)init); + s->high_water = curr + init; + } + else if (s->high_water < (ulg)curr + WIN_INIT) { + /* High water mark at or above current data, but below current data + * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up + * to end of window, whichever is less. + */ + init = (ulg)curr + WIN_INIT - s->high_water; + if (init > s->window_size - s->high_water) + init = s->window_size - s->high_water; + zmemzero(s->window + s->high_water, (unsigned)init); + s->high_water += init; + } + } + + Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, + "not enough room for search"); +} + +/* ========================================================================= */ +int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version, + int stream_size) { + return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, + Z_DEFAULT_STRATEGY, version, stream_size); + /* To do: ignore strm->next_in if we use it as window */ +} + +/* ========================================================================= */ +int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, + int windowBits, int memLevel, int strategy, + const char *version, int stream_size) { + deflate_state *s; + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; + } + if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; + if (strm->zalloc == (alloc_func)0) { +#if defined(Z_SOLO) && !defined(_KERNEL) + return Z_STREAM_ERROR; +#else + strm->zalloc = zcalloc; + strm->opaque = (voidpf)0; +#endif + } + if (strm->zfree == (free_func)0) +#if defined(Z_SOLO) && !defined(_KERNEL) + return Z_STREAM_ERROR; +#else + strm->zfree = zcfree; +#endif + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + + if (windowBits < 0) { /* suppress zlib wrapper */ + wrap = 0; + if (windowBits < -15) + return Z_STREAM_ERROR; + windowBits = -windowBits; + } +#ifdef GZIP + else if (windowBits > 15) { + wrap = 2; /* write gzip wrapper instead */ + windowBits -= 16; + } +#endif + if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || + windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) { + return Z_STREAM_ERROR; + } + if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ + s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); + if (s == Z_NULL) return Z_MEM_ERROR; + strm->state = (struct internal_state FAR *)s; + s->strm = strm; + s->status = INIT_STATE; /* to pass state test in deflateReset() */ + + s->wrap = wrap; + s->gzhead = Z_NULL; + s->w_bits = (uInt)windowBits; + s->w_size = 1 << s->w_bits; + s->w_mask = s->w_size - 1; + + s->hash_bits = (uInt)memLevel + 7; + s->hash_size = 1 << s->hash_bits; + s->hash_mask = s->hash_size - 1; + s->hash_shift = ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH); + + s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); + s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); + s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); + + s->high_water = 0; /* nothing written to s->window yet */ + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + + /* We overlay pending_buf and sym_buf. This works since the average size + * for length/distance pairs over any compressed block is assured to be 31 + * bits or less. + * + * Analysis: The longest fixed codes are a length code of 8 bits plus 5 + * extra bits, for lengths 131 to 257. The longest fixed distance codes are + * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest + * possible fixed-codes length/distance pair is then 31 bits total. + * + * sym_buf starts one-fourth of the way into pending_buf. So there are + * three bytes in sym_buf for every four bytes in pending_buf. Each symbol + * in sym_buf is three bytes -- two for the distance and one for the + * literal/length. As each symbol is consumed, the pointer to the next + * sym_buf value to read moves forward three bytes. From that symbol, up to + * 31 bits are written to pending_buf. The closest the written pending_buf + * bits gets to the next sym_buf symbol to read is just before the last + * code is written. At that time, 31*(n - 2) bits have been written, just + * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at + * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1 + * symbols are written.) The closest the writing gets to what is unread is + * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and + * can range from 128 to 32768. + * + * Therefore, at a minimum, there are 142 bits of space between what is + * written and what is read in the overlain buffers, so the symbols cannot + * be overwritten by the compressed data. That space is actually 139 bits, + * due to the three-bit fixed-code block header. + * + * That covers the case where either Z_FIXED is specified, forcing fixed + * codes, or when the use of fixed codes is chosen, because that choice + * results in a smaller compressed block than dynamic codes. That latter + * condition then assures that the above analysis also covers all dynamic + * blocks. A dynamic-code block will only be chosen to be emitted if it has + * fewer bits than a fixed-code block would for the same set of symbols. + * Therefore its average symbol length is assured to be less than 31. So + * the compressed data for a dynamic block also cannot overwrite the + * symbols from which it is being constructed. + */ + - s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); ++ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, LIT_BUFS); + s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { + s->status = FINISH_STATE; + strm->msg = ERR_MSG(Z_MEM_ERROR); + deflateEnd (strm); + return Z_MEM_ERROR; + } ++#ifdef LIT_MEM ++ s->d_buf = (ushf *)(s->pending_buf + (s->lit_bufsize << 1)); ++ s->l_buf = s->pending_buf + (s->lit_bufsize << 2); ++ s->sym_end = s->lit_bufsize - 1; ++#else + s->sym_buf = s->pending_buf + s->lit_bufsize; + s->sym_end = (s->lit_bufsize - 1) * 3; ++#endif + /* We avoid equality with lit_bufsize*3 because of wraparound at 64K + * on 16 bit machines and because stored blocks are restricted to + * 64K-1 bytes. + */ + + s->level = level; + s->strategy = strategy; + s->method = (Byte)method; + + return deflateReset(strm); +} + +/* ========================================================================= + * Check for a valid deflate stream state. Return 0 if ok, 1 if not. + */ +local int deflateStateCheck(z_streamp strm) { + deflate_state *s; + if (strm == Z_NULL || + strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) + return 1; + s = strm->state; + if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE && +#ifdef GZIP + s->status != GZIP_STATE && +#endif + s->status != EXTRA_STATE && + s->status != NAME_STATE && + s->status != COMMENT_STATE && + s->status != HCRC_STATE && + s->status != BUSY_STATE && + s->status != FINISH_STATE)) + return 1; + return 0; +} + +/* ========================================================================= */ +int ZEXPORT deflateSetDictionary(z_streamp strm, const Bytef *dictionary, + uInt dictLength) { + deflate_state *s; + uInt str, n; + int wrap; + unsigned avail; + z_const unsigned char *next; + + if (deflateStateCheck(strm) || dictionary == Z_NULL) + return Z_STREAM_ERROR; + s = strm->state; + wrap = s->wrap; + if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) + return Z_STREAM_ERROR; + + /* when using zlib wrappers, compute Adler-32 for provided dictionary */ + if (wrap == 1) + strm->adler = adler32(strm->adler, dictionary, dictLength); + s->wrap = 0; /* avoid computing Adler-32 in read_buf */ + + /* if dictionary would fill window, just replace the history */ + if (dictLength >= s->w_size) { + if (wrap == 0) { /* already empty otherwise */ + CLEAR_HASH(s); + s->strstart = 0; + s->block_start = 0L; + s->insert = 0; + } + dictionary += dictLength - s->w_size; /* use the tail */ + dictLength = s->w_size; + } + + /* insert dictionary into window and hash */ + avail = strm->avail_in; + next = strm->next_in; + strm->avail_in = dictLength; + strm->next_in = (z_const Bytef *)dictionary; + fill_window(s); + while (s->lookahead >= MIN_MATCH) { + str = s->strstart; + n = s->lookahead - (MIN_MATCH-1); + do { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + } while (--n); + s->strstart = str; + s->lookahead = MIN_MATCH-1; + fill_window(s); + } + s->strstart += s->lookahead; + s->block_start = (long)s->strstart; + s->insert = s->lookahead; + s->lookahead = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + strm->next_in = next; + strm->avail_in = avail; + s->wrap = wrap; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateGetDictionary(z_streamp strm, Bytef *dictionary, + uInt *dictLength) { + deflate_state *s; + uInt len; + + if (deflateStateCheck(strm)) + return Z_STREAM_ERROR; + s = strm->state; + len = s->strstart + s->lookahead; + if (len > s->w_size) + len = s->w_size; + if (dictionary != Z_NULL && len) + zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len); + if (dictLength != Z_NULL) + *dictLength = len; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateResetKeep(z_streamp strm) { + deflate_state *s; + + if (deflateStateCheck(strm)) { + return Z_STREAM_ERROR; + } + + strm->total_in = strm->total_out = 0; + strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ + strm->data_type = Z_UNKNOWN; + + s = (deflate_state *)strm->state; + s->pending = 0; + s->pending_out = s->pending_buf; + + if (s->wrap < 0) { + s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ + } + s->status = +#ifdef GZIP + s->wrap == 2 ? GZIP_STATE : +#endif + INIT_STATE; + strm->adler = +#ifdef GZIP + s->wrap == 2 ? crc32(0L, Z_NULL, 0) : +#endif + adler32(0L, Z_NULL, 0); + s->last_flush = -2; + + _tr_init(s); + + return Z_OK; +} + +/* =========================================================================== + * Initialize the "longest match" routines for a new zlib stream + */ +local void lm_init(deflate_state *s) { + s->window_size = (ulg)2L*s->w_size; + + CLEAR_HASH(s); + + /* Set the default configuration parameters: + */ + s->max_lazy_match = configuration_table[s->level].max_lazy; + s->good_match = configuration_table[s->level].good_length; + s->nice_match = configuration_table[s->level].nice_length; + s->max_chain_length = configuration_table[s->level].max_chain; + + s->strstart = 0; + s->block_start = 0L; + s->lookahead = 0; + s->insert = 0; + s->match_length = s->prev_length = MIN_MATCH-1; + s->match_available = 0; + s->ins_h = 0; +} + +/* ========================================================================= */ +int ZEXPORT deflateReset(z_streamp strm) { + int ret; + + ret = deflateResetKeep(strm); + if (ret == Z_OK) + lm_init(strm->state); + return ret; +} + +/* ========================================================================= */ +int ZEXPORT deflateSetHeader(z_streamp strm, gz_headerp head) { + if (deflateStateCheck(strm) || strm->state->wrap != 2) + return Z_STREAM_ERROR; + strm->state->gzhead = head; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePending(z_streamp strm, unsigned *pending, int *bits) { + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + if (pending != Z_NULL) + *pending = strm->state->pending; + if (bits != Z_NULL) + *bits = strm->state->bi_valid; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflatePrime(z_streamp strm, int bits, int value) { + deflate_state *s; + int put; + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; ++#ifdef LIT_MEM ++ if (bits < 0 || bits > 16 || ++ (uchf *)s->d_buf < s->pending_out + ((Buf_size + 7) >> 3)) ++ return Z_BUF_ERROR; ++#else + if (bits < 0 || bits > 16 || + s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; ++#endif + do { + put = Buf_size - s->bi_valid; + if (put > bits) + put = bits; + s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid); + s->bi_valid += put; + _tr_flush_bits(s); + value >>= put; + bits -= put; + } while (bits); + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateParams(z_streamp strm, int level, int strategy) { + deflate_state *s; + compress_func func; + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; + +#ifdef FASTEST + if (level != 0) level = 1; +#else + if (level == Z_DEFAULT_COMPRESSION) level = 6; +#endif + if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { + return Z_STREAM_ERROR; + } + func = configuration_table[s->level].func; + + if ((strategy != s->strategy || func != configuration_table[level].func) && + s->last_flush != -2) { + /* Flush the last buffer: */ + int err = deflate(strm, Z_BLOCK); + if (err == Z_STREAM_ERROR) + return err; + if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead) + return Z_BUF_ERROR; + } + if (s->level != level) { + if (s->level == 0 && s->matches != 0) { + if (s->matches == 1) + slide_hash(s); + else + CLEAR_HASH(s); + s->matches = 0; + } + s->level = level; + s->max_lazy_match = configuration_table[level].max_lazy; + s->good_match = configuration_table[level].good_length; + s->nice_match = configuration_table[level].nice_length; + s->max_chain_length = configuration_table[level].max_chain; + } + s->strategy = strategy; + return Z_OK; +} + +/* ========================================================================= */ +int ZEXPORT deflateTune(z_streamp strm, int good_length, int max_lazy, + int nice_length, int max_chain) { + deflate_state *s; + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; + s->good_match = (uInt)good_length; + s->max_lazy_match = (uInt)max_lazy; + s->nice_match = nice_length; + s->max_chain_length = (uInt)max_chain; + return Z_OK; +} + +/* ========================================================================= + * For the default windowBits of 15 and memLevel of 8, this function returns a + * close to exact, as well as small, upper bound on the compressed size. This + * is an expansion of ~0.03%, plus a small constant. + * + * For any setting other than those defaults for windowBits and memLevel, one + * of two worst case bounds is returned. This is at most an expansion of ~4% or + * ~13%, plus a small constant. + * + * Both the 0.03% and 4% derive from the overhead of stored blocks. The first + * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second + * is for stored blocks of 127 bytes (the worst case memLevel == 1). The + * expansion results from five bytes of header for each stored block. + * + * The larger expansion of 13% results from a window size less than or equal to + * the symbols buffer size (windowBits <= memLevel + 7). In that case some of + * the data being compressed may have slid out of the sliding window, impeding + * a stored block from being emitted. Then the only choice is a fixed or + * dynamic block, where a fixed block limits the maximum expansion to 9 bits + * per 8-bit byte, plus 10 bits for every block. The smallest block size for + * which this can occur is 255 (memLevel == 2). + * + * Shifts are used to approximate divisions, for speed. + */ +uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) { + deflate_state *s; + uLong fixedlen, storelen, wraplen; + + /* upper bound for fixed blocks with 9-bit literals and length 255 + (memLevel == 2, which is the lowest that may not use stored blocks) -- + ~13% overhead plus a small constant */ + fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) + + (sourceLen >> 9) + 4; + + /* upper bound for stored blocks with length 127 (memLevel == 1) -- + ~4% overhead plus a small constant */ + storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) + + (sourceLen >> 11) + 7; + + /* if can't get parameters, return larger bound plus a zlib wrapper */ + if (deflateStateCheck(strm)) + return (fixedlen > storelen ? fixedlen : storelen) + 6; + + /* compute wrapper length */ + s = strm->state; + switch (s->wrap) { + case 0: /* raw deflate */ + wraplen = 0; + break; + case 1: /* zlib wrapper */ + wraplen = 6 + (s->strstart ? 4 : 0); + break; +#ifdef GZIP + case 2: /* gzip wrapper */ + wraplen = 18; + if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ + Bytef *str; + if (s->gzhead->extra != Z_NULL) + wraplen += 2 + s->gzhead->extra_len; + str = s->gzhead->name; + if (str != Z_NULL) + do { + wraplen++; + } while (*str++); + str = s->gzhead->comment; + if (str != Z_NULL) + do { + wraplen++; + } while (*str++); + if (s->gzhead->hcrc) + wraplen += 2; + } + break; +#endif + default: /* for compiler happiness */ + wraplen = 6; + } + + /* if not default parameters, return one of the conservative bounds */ + if (s->w_bits != 15 || s->hash_bits != 8 + 7) + return (s->w_bits <= s->hash_bits && s->level ? fixedlen : storelen) + + wraplen; + + /* default settings: return tight bound for that case -- ~0.03% overhead + plus a small constant */ + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + + (sourceLen >> 25) + 13 - 6 + wraplen; +} + +/* ========================================================================= + * Put a short in the pending buffer. The 16-bit value is put in MSB order. + * IN assertion: the stream state is correct and there is enough room in + * pending_buf. + */ +local void putShortMSB(deflate_state *s, uInt b) { + put_byte(s, (Byte)(b >> 8)); + put_byte(s, (Byte)(b & 0xff)); +} + +/* ========================================================================= + * Flush as much pending output as possible. All deflate() output, except for + * some deflate_stored() output, goes through this function so some + * applications may wish to modify it to avoid allocating a large + * strm->next_out buffer and copying into it. (See also read_buf()). + */ +local void flush_pending(z_streamp strm) { + unsigned len; + deflate_state *s = strm->state; + + _tr_flush_bits(s); + len = s->pending; + if (len > strm->avail_out) len = strm->avail_out; + if (len == 0) return; + + zmemcpy(strm->next_out, s->pending_out, len); + strm->next_out += len; + s->pending_out += len; + strm->total_out += len; + strm->avail_out -= len; + s->pending -= len; + if (s->pending == 0) { + s->pending_out = s->pending_buf; + } +} + +/* =========================================================================== + * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1]. + */ +#define HCRC_UPDATE(beg) \ + do { \ + if (s->gzhead->hcrc && s->pending > (beg)) \ + strm->adler = crc32(strm->adler, s->pending_buf + (beg), \ + s->pending - (beg)); \ *** 3763 LINES SKIPPED *** From nobody Sun Feb 18 06:30: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 4TcwlX1fm3z5BgHC; Sun, 18 Feb 2024 06:30: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 4TcwlX1Q36z4jcY; Sun, 18 Feb 2024 06:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CW68HiT/GSF/jn4gyWCE2c9cuNXPkTMrWXAeCcOLbcQ=; b=rLBx6q1FKE18xuHNokROBACqnLwaofKYNcSYR56TTKDMkmfE9PXH5FH1MPyqRqElocpcSk bVW4lV9tPdsUo7MBa74gplpZU+nw3p1bT9gv+JKLV9mFp9rU20cJ6EpgDdxidJYxWZv/WS fsJn3aSbn/pxniUsR67IUv/xX4dmVBP+G8lLEOIlKzgOavQTsrVAmSCWwOp8KOoPB/zK/o I/w/0h5F5duZmu3GaLis4eAmF9MZ//kltP+EB8yel9gT2BNdMUZENYgCGWosMnB9Qp4zJi f8dBEmJZR6wvXPl5ToA7mkLFLE95+RUT5uuLEmuRohPFs+3vGjcrs4EvEKep5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CW68HiT/GSF/jn4gyWCE2c9cuNXPkTMrWXAeCcOLbcQ=; b=lMjMa+QMTPD9rK1Lv6d1IM04zmWBm5GwtrYHpg1wiYl1iSqzbS3hpT2wXyv49jZ2Q+Hpnj gNtXW1Iss1qINIBDlMQ1i3i8f7gOavkzahAzuAlwOF+LEj7zXa8kG/hNEgr5saZr54KpSj kxSQ04I7ndjHDHX8sxL5RyAKm5wMWGRsnXyjAkKNjEFbVm7qlhJaNtJdY7T/+fSjxauHP2 Jec40/GN6hNm2Mnv4uqKmDb6HmAtfyUbT4b4ypLlMNQzAzW4tdVk2nPhkR9B2bs58tZuA6 UrRVMtEEN0OOhuRKO2eV2dNWb/E01mhthHH4Aatu8hmRumc25kT/16WhWa8K6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708237832; a=rsa-sha256; cv=none; b=EXcnWF8WOeXqX1RAviDwHFyxvdYEys+OylzpUWmorxzzdRD2xNfwe1w1UD46u/sC6FcMao nbj0ayxPqL7B87nT+O8QxT9QVMITUx85d+1UQuVI18jJb5GEJr59fSmPlwNopynnaHJrdk LAZCWA+4Gu4Dpo3OBSdQ4hJOZsmLCTbDA81hCIS5K8ESLWhys5pEPG0fFwfT1f7X3CsvsJ g1RU3LI37Ppyp9mWNRzAQlsFZxi2nEmEzLWu0ajaWSDcR3xUsZhdCgdktsYJCb2AW3BeR4 YZWRbUptHGrq69S1vUDSNXwR6vrHkDlIq3yCL7Ryez6wZbP3gTcw3ItnSLT+Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcwlX0TR2zgY2; Sun, 18 Feb 2024 06:30: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 41I6UWLt023802; Sun, 18 Feb 2024 06:30:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I6UW1V023799; Sun, 18 Feb 2024 06:30:32 GMT (envelope-from git) Date: Sun, 18 Feb 2024 06:30:32 GMT Message-Id: <202402180630.41I6UW1V023799@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: 1954e5c1dc58 - main - loader: bring back old text-only video console 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1954e5c1dc583df602e6d7058f59eac71b4be6b2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1954e5c1dc583df602e6d7058f59eac71b4be6b2 commit 1954e5c1dc583df602e6d7058f59eac71b4be6b2 Author: Warner Losh AuthorDate: 2024-02-18 06:14:44 +0000 Commit: Warner Losh CommitDate: 2024-02-18 06:29:07 +0000 loader: bring back old text-only video console Bring back vidconsole.c as textvidc.c from 2a0e2c88db20. This console does no graphics stuff at all, supports no fancy logos, has known bugs in the terminal emulation, etc. However, it is small. It will be a build-time option to select between the two. The BIOS loader is running out of space when too many options are selected, so this allows people to select the smaller one to spend the space elsewhere. This is only the verbatim copy of the old vidconsole.c. It's not yet connected to the build. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43911 --- stand/i386/libi386/textvidc.c | 645 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 645 insertions(+) diff --git a/stand/i386/libi386/textvidc.c b/stand/i386/libi386/textvidc.c new file mode 100644 index 000000000000..f3ab6f4b98cf --- /dev/null +++ b/stand/i386/libi386/textvidc.c @@ -0,0 +1,645 @@ +/*- + * Copyright (c) 1998 Michael Smith (msmith@freebsd.org) + * Copyright (c) 1997 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp) + * 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. + * + * Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include "libi386.h" + +#if KEYBOARD_PROBE +#include + +static int probe_keyboard(void); +#endif +static void vidc_probe(struct console *cp); +static int vidc_init(int arg); +static void vidc_putchar(int c); +static int vidc_getchar(void); +static int vidc_ischar(void); + +static int vidc_started; + +void get_pos(int *x, int *y); + +#ifdef TERM_EMU +#define MAXARGS 8 +#define DEFAULT_FGCOLOR 7 +#define DEFAULT_BGCOLOR 0 + +void end_term(void); +void bail_out(int c); +void vidc_term_emu(int c); +void curs_move(int *_x, int *_y, int x, int y); +void write_char(int c, int fg, int bg); +void scroll_up(int rows, int fg, int bg); +void CD(void); +void CM(void); +void HO(void); + +static int args[MAXARGS], argc; +static int fg_c, bg_c, curx, cury; +static int esc; +#endif + + +struct console textvidc = { + "vidconsole", + "internal video/keyboard", + 0, + vidc_probe, + vidc_init, + vidc_putchar, + vidc_getchar, + vidc_ischar +}; + +static void +vidc_probe(struct console *cp) +{ + /* look for a keyboard */ +#if KEYBOARD_PROBE + if (probe_keyboard()) +#endif + { + cp->c_flags |= C_PRESENTIN; + } + + /* XXX for now, always assume we can do BIOS screen output */ + cp->c_flags |= C_PRESENTOUT; +} + +static int +vidc_init(int arg) +{ + int i; + + if (vidc_started && arg == 0) + return (0); + vidc_started = 1; +#ifdef TERM_EMU + /* Init terminal emulator */ + end_term(); + get_pos(&curx, &cury); + curs_move(&curx, &cury, curx, cury); + fg_c = DEFAULT_FGCOLOR; + bg_c = DEFAULT_BGCOLOR; +#endif + for (i = 0; i < 10 && vidc_ischar(); i++) + (void)vidc_getchar(); + return (0); /* XXX reinit? */ +} + +static void +vidc_biosputchar(int c) +{ + + v86.ctl = 0; + v86.addr = 0x10; + v86.eax = 0xe00 | (c & 0xff); + v86.ebx = 0x7; + v86int(); +} + +static void +vidc_rawputchar(int c) +{ + int i; + + if (c == '\t') { + int n; +#ifndef TERM_EMU + int curx, cury; + + get_pos(&curx, &cury); +#endif + + n = 8 - ((curx + 8) % 8); + for (i = 0; i < n; i++) + vidc_rawputchar(' '); + } else { +#ifndef TERM_EMU + vidc_biosputchar(c); +#else + /* Emulate AH=0eh (teletype output) */ + switch(c) { + case '\a': + vidc_biosputchar(c); + return; + case '\r': + curx = 0; + curs_move(&curx, &cury, curx, cury); + return; + case '\n': + cury++; + if (cury > 24) { + scroll_up(1, fg_c, bg_c); + cury--; + } else { + curs_move(&curx, &cury, curx, cury); + } + return; + case '\b': + if (curx > 0) { + curx--; + curs_move(&curx, &cury, curx, cury); + /* write_char(' ', fg_c, bg_c); XXX destructive(!) */ + return; + } + return; + default: + write_char(c, fg_c, bg_c); + curx++; + if (curx > 79) { + curx = 0; + cury++; + } + if (cury > 24) { + curx = 0; + scroll_up(1, fg_c, bg_c); + cury--; + } + } + curs_move(&curx, &cury, curx, cury); +#endif + } +} + +/* Get cursor position on the screen. Result is in edx. Sets + * curx and cury appropriately. + */ +void +get_pos(int *x, int *y) +{ + + v86.ctl = 0; + v86.addr = 0x10; + v86.eax = 0x0300; + v86.ebx = 0x0; + v86int(); + *x = v86.edx & 0x00ff; + *y = (v86.edx & 0xff00) >> 8; +} + +#ifdef TERM_EMU + +/* Move cursor to x rows and y cols (0-based). */ +void +curs_move(int *_x, int *_y, int x, int y) +{ + + v86.ctl = 0; + v86.addr = 0x10; + v86.eax = 0x0200; + v86.ebx = 0x0; + v86.edx = ((0x00ff & y) << 8) + (0x00ff & x); + v86int(); + *_x = x; + *_y = y; + /* If there is ctrl char at this position, cursor would be invisible. + * Make it a space instead. + */ + v86.ctl = 0; + v86.addr = 0x10; + v86.eax = 0x0800; + v86.ebx = 0x0; + v86int(); +#define isvisible(c) (((c) >= 32) && ((c) < 255)) + if (!isvisible(v86.eax & 0x00ff)) { + write_char(' ', fg_c, bg_c); + } +} + +/* Scroll up the whole window by a number of rows. If rows==0, + * clear the window. fg and bg are attributes for the new lines + * inserted in the window. + */ +void +scroll_up(int rows, int fgcol, int bgcol) +{ + + if (rows == 0) + rows = 25; + v86.ctl = 0; + v86.addr = 0x10; + v86.eax = 0x0600 + (0x00ff & rows); + v86.ebx = (bgcol << 12) + (fgcol << 8); + v86.ecx = 0x0; + v86.edx = 0x184f; + v86int(); +} + +/* Write character and attribute at cursor position. */ +void +write_char(int c, int fgcol, int bgcol) +{ + + v86.ctl = 0; + v86.addr = 0x10; + v86.eax = 0x0900 + (0x00ff & c); + v86.ebx = (bgcol << 4) + fgcol; + v86.ecx = 0x1; + v86int(); +} + +/**************************************************************/ +/* + * Screen manipulation functions. They use accumulated data in + * args[] and argc variables. + * + */ + +/* Clear display from current position to end of screen */ +void +CD(void) +{ + + get_pos(&curx, &cury); + if (curx > 0) { + v86.ctl = 0; + v86.addr = 0x10; + v86.eax = 0x0600; + v86.ebx = (bg_c << 4) + fg_c; + v86.ecx = (cury << 8) + curx; + v86.edx = (cury << 8) + 79; + v86int(); + if (++cury > 24) { + end_term(); + return; + } + } + v86.ctl = 0; + v86.addr = 0x10; + v86.eax = 0x0600; + v86.ebx = (bg_c << 4) + fg_c; + v86.ecx = (cury << 8) + 0; + v86.edx = (24 << 8) + 79; + v86int(); + end_term(); +} + +/* Absolute cursor move to args[0] rows and args[1] columns + * (the coordinates are 1-based). + */ +void +CM(void) +{ + + if (args[0] > 0) + args[0]--; + if (args[1] > 0) + args[1]--; + curs_move(&curx, &cury, args[1], args[0]); + end_term(); +} + +/* Home cursor (left top corner) */ +void +HO(void) +{ + + argc = 1; + args[0] = args[1] = 1; + CM(); +} + +/* Clear internal state of the terminal emulation code */ +void +end_term(void) +{ + + esc = 0; + argc = -1; +} + +/* Gracefully exit ESC-sequence processing in case of misunderstanding */ +void +bail_out(int c) +{ + char buf[16], *ch; + int i; + + if (esc) { + vidc_rawputchar('\033'); + if (esc != '\033') + vidc_rawputchar(esc); + for (i = 0; i <= argc; ++i) { + sprintf(buf, "%d", args[i]); + ch = buf; + while (*ch) + vidc_rawputchar(*ch++); + } + } + vidc_rawputchar(c); + end_term(); +} + +static void +get_arg(int c) +{ + + if (argc < 0) + argc = 0; + args[argc] *= 10; + args[argc] += c - '0'; +} + +/* Emulate basic capabilities of cons25 terminal */ +void +vidc_term_emu(int c) +{ + static int ansi_col[] = { + 0, 4, 2, 6, 1, 5, 3, 7, + }; + int t; + int i; + + switch (esc) { + case 0: + switch (c) { + case '\033': + esc = c; + break; + default: + vidc_rawputchar(c); + break; + } + break; + + case '\033': + switch (c) { + case '[': + esc = c; + args[0] = 0; + argc = -1; + break; + default: + bail_out(c); + break; + } + break; + + case '[': + switch (c) { + case ';': + if (argc < 0) /* XXX */ + argc = 0; + else if (argc + 1 >= MAXARGS) + bail_out(c); + else + args[++argc] = 0; + break; + case 'H': + if (argc < 0) + HO(); + else if (argc == 1) + CM(); + else + bail_out(c); + break; + case 'J': + if (argc < 0) + CD(); + else + bail_out(c); + break; + case 'm': + if (argc < 0) { + fg_c = DEFAULT_FGCOLOR; + bg_c = DEFAULT_BGCOLOR; + } + for (i = 0; i <= argc; ++i) { + switch (args[i]) { + case 0: /* back to normal */ + fg_c = DEFAULT_FGCOLOR; + bg_c = DEFAULT_BGCOLOR; + break; + case 1: /* bold */ + fg_c |= 0x8; + break; + case 4: /* underline */ + case 5: /* blink */ + bg_c |= 0x8; + break; + case 7: /* reverse */ + t = fg_c; + fg_c = bg_c; + bg_c = t; + break; + case 22: /* normal intensity */ + fg_c &= ~0x8; + break; + case 24: /* not underline */ + case 25: /* not blinking */ + bg_c &= ~0x8; + break; + case 30: case 31: case 32: case 33: + case 34: case 35: case 36: case 37: + fg_c = ansi_col[args[i] - 30]; + break; + case 39: /* normal */ + fg_c = DEFAULT_FGCOLOR; + break; + case 40: case 41: case 42: case 43: + case 44: case 45: case 46: case 47: + bg_c = ansi_col[args[i] - 40]; + break; + case 49: /* normal */ + bg_c = DEFAULT_BGCOLOR; + break; + } + } + end_term(); + break; + default: + if (isdigit(c)) + get_arg(c); + else + bail_out(c); + break; + } + break; + + default: + bail_out(c); + break; + } +} +#endif + +static void +vidc_putchar(int c) +{ +#ifdef TERM_EMU + vidc_term_emu(c); +#else + vidc_rawputchar(c); +#endif +} + +static int +vidc_getchar(void) +{ + + if (vidc_ischar()) { + v86.ctl = 0; + v86.addr = 0x16; + v86.eax = 0x0; + v86int(); + return (v86.eax & 0xff); + } else { + return (-1); + } +} + +static int +vidc_ischar(void) +{ + + v86.ctl = V86_FLAGS; + v86.addr = 0x16; + v86.eax = 0x100; + v86int(); + return (!V86_ZR(v86.efl)); +} + +#if KEYBOARD_PROBE + +#define PROBE_MAXRETRY 5 +#define PROBE_MAXWAIT 400 +#define IO_DUMMY 0x84 +#define IO_KBD 0x060 /* 8042 Keyboard */ + +/* selected defines from kbdio.h */ +#define KBD_STATUS_PORT 4 /* status port, read */ +#define KBD_DATA_PORT 0 /* data port, read/write + * also used as keyboard command + * and mouse command port + */ +#define KBDC_ECHO 0x00ee +#define KBDS_ANY_BUFFER_FULL 0x0001 +#define KBDS_INPUT_BUFFER_FULL 0x0002 +#define KBD_ECHO 0x00ee + +/* 7 microsec delay necessary for some keyboard controllers */ +static void +delay7(void) +{ + /* + * I know this is broken, but no timer is available yet at this stage... + * See also comments in `delay1ms()'. + */ + inb(IO_DUMMY); inb(IO_DUMMY); + inb(IO_DUMMY); inb(IO_DUMMY); + inb(IO_DUMMY); inb(IO_DUMMY); +} + +/* + * This routine uses an inb to an unused port, the time to execute that + * inb is approximately 1.25uS. This value is pretty constant across + * all CPU's and all buses, with the exception of some PCI implentations + * that do not forward this I/O address to the ISA bus as they know it + * is not a valid ISA bus address, those machines execute this inb in + * 60 nS :-(. + * + */ +static void +delay1ms(void) +{ + int i = 800; + while (--i >= 0) + (void)inb(0x84); +} + +/* + * We use the presence/absence of a keyboard to determine whether the internal + * console can be used for input. + * + * Perform a simple test on the keyboard; issue the ECHO command and see + * if the right answer is returned. We don't do anything as drastic as + * full keyboard reset; it will be too troublesome and take too much time. + */ +static int +probe_keyboard(void) +{ + int retry = PROBE_MAXRETRY; + int wait; + int i; + + while (--retry >= 0) { + /* flush any noise */ + while (inb(IO_KBD + KBD_STATUS_PORT) & KBDS_ANY_BUFFER_FULL) { + delay7(); + inb(IO_KBD + KBD_DATA_PORT); + delay1ms(); + } + + /* wait until the controller can accept a command */ + for (wait = PROBE_MAXWAIT; wait > 0; --wait) { + if (((i = inb(IO_KBD + KBD_STATUS_PORT)) + & (KBDS_INPUT_BUFFER_FULL | KBDS_ANY_BUFFER_FULL)) == 0) + break; + if (i & KBDS_ANY_BUFFER_FULL) { + delay7(); + inb(IO_KBD + KBD_DATA_PORT); + } + delay1ms(); + } + if (wait <= 0) + continue; + + /* send the ECHO command */ + outb(IO_KBD + KBD_DATA_PORT, KBDC_ECHO); + + /* wait for a response */ + for (wait = PROBE_MAXWAIT; wait > 0; --wait) { + if (inb(IO_KBD + KBD_STATUS_PORT) & KBDS_ANY_BUFFER_FULL) + break; + delay1ms(); + } + if (wait <= 0) + continue; + + delay7(); + i = inb(IO_KBD + KBD_DATA_PORT); +#ifdef PROBE_KBD_BEBUG + printf("probe_keyboard: got 0x%x.\n", i); +#endif + if (i == KBD_ECHO) { + /* got the right answer */ + return (1); + } + } + + return (0); +} +#endif /* KEYBOARD_PROBE */ From nobody Sun Feb 18 06:30: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 4TcwlY35lYz5BgKP; Sun, 18 Feb 2024 06:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TcwlY2SVzz4jlf; Sun, 18 Feb 2024 06:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fmrtzqf8pdLgyI1eQkYYo5pimUryg/qI7xc2u5kJoHA=; b=YmIP309C0aPwYz2bsVpBThrdTvM0M2jlceudG5CLTwAndJK8mAS+Y8T9tIFGiZ0Bg6gP2Z 6etX2Z6XqjIs4itK2VergUtaNeqTbyA08RuO1H9AP3/NQs+nlapoGgkWIome7FEf9DrHeq sEOY5paStmPF6LK389Ju5+Nbqi4ZgDOgtypQjEPWKzyaPeLGPdzHw4k58Q0qU1P9WoudYQ 4BYMZOaA/GqJ/c0hqDeCoZRxTdRHD/UYk2xZhUAKGDHjP5bA2aHAUuQ/a5lrhn+ZEAJ0gm C5Zx6hGCWGenauMPXEVZUJ6ksk5DB/RZwOEpiTh0W4+cEt/kK6/SU2pVThe+ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fmrtzqf8pdLgyI1eQkYYo5pimUryg/qI7xc2u5kJoHA=; b=uMnnHCx1DfwUpnsPhgDtdOJtoBdv41iqcJrn9Azl45zM4eRSRfB+iaBxIVHINALm2d/c1h O73qsPn+U324qusELmm/euVkhlEl8Jj0bQr0s/VYSkEInXECMJ4EAF+BgWVElPWyfOAiWf Qmh55hzs4XUvtelh0Aw3BAU6DTRUQ25lM3liV57gu2dhbvXV7gpdJ+7OesdQhAIJbncf7w jWHr1Nv1MAIqoLYgShWwLXXLRKb/Hce2+EkGPnY0WriOcC1xhAPPBI6Au9vxfrFtSOZc1J d/owUm6fUdGhszG6AUSkMzfvtBzp67SrXMDJ5AHqrHCor5tUhSxd3myJmzsQFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708237833; a=rsa-sha256; cv=none; b=x3Ry9VBkij3bajG3YUYKzlrlMZrY3YdEuXU4XdFL1/uLYGtRnSzObE7tRxsFx/H8FerwDC M0YNJ1kjXc972KwWggr5e/z4mi0+DCnCSVOFCqwg54tursGHTg7XO2BqJUsbQ7sYoiyQXt TM33Y5/3ekh+3JF/S71LDxY43YVZ/MYzYd3x32UxFLxXFPtvtY0mY1dNgMEPgNbixMkEyo CbZtvH7v7L/fOqYBD6adP3k3xpBgPYF33VA+1MBV7TbD5IjFaTzXjmPw+Z5c0LK22yCbtS GzOW/iMWUit/J25mjF1/snwD25lcYPvlcu0ofQ8qF735j94IOLZRCe+llGyotA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcwlY1Z7bzgP3; Sun, 18 Feb 2024 06:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41I6UXqE023844; Sun, 18 Feb 2024 06:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I6UXso023841; Sun, 18 Feb 2024 06:30:33 GMT (envelope-from git) Date: Sun, 18 Feb 2024 06:30:33 GMT Message-Id: <202402180630.41I6UXso023841@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: 63e9c976640d - main - loader: Add new option WITH_LOADER_BIOS_TEXTONLY 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63e9c976640d05ef65842eaf3d54de9a8d48cbdc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=63e9c976640d05ef65842eaf3d54de9a8d48cbdc commit 63e9c976640d05ef65842eaf3d54de9a8d48cbdc Author: Warner Losh AuthorDate: 2024-02-18 06:14:50 +0000 Commit: Warner Losh CommitDate: 2024-02-18 06:29:07 +0000 loader: Add new option WITH_LOADER_BIOS_TEXTONLY This option will omit all the graphics support, the teken terminal library, video mode support, etc and support a simple, basic, text-only video console for the x86 BIOS boot loader. It uses the FreeBSD 12 version of vidconsole.c. It defaults to NO. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43912 --- share/man/man5/src.conf.5 | 6 +++++- share/mk/src.opts.mk | 1 + tools/build/options/WITH_LOADER_BIOS_TEXTONLY | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index a32b267afeb4..2713e7416a52 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd February 16, 2024 +.Dd February 17, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -990,6 +990,10 @@ Do not build LLVM target support for X86. The .Va LLVM_TARGET_ALL option should be used rather than this in most cases. +.It Va WITH_LOADER_BIOS_TEXTONLY +Use the old, FreeBSD 12 vidconsole.c. +This only supports text mode without teken, without any graphics, font or video mode support. +This setting only affects the i386 and amd64 BIOS boot loader. .It Va WITH_LOADER_EFI_SECUREBOOT Enable building .Xr loader 8 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 20c98cf45567..e154fbd4059d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -202,6 +202,7 @@ __DEFAULT_NO_OPTIONS = \ DTRACE_TESTS \ EXPERIMENTAL \ HESIOD \ + LOADER_BIOS_TEXTONLY \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ LLVM_BINUTILS \ diff --git a/tools/build/options/WITH_LOADER_BIOS_TEXTONLY b/tools/build/options/WITH_LOADER_BIOS_TEXTONLY new file mode 100644 index 000000000000..08804c19c691 --- /dev/null +++ b/tools/build/options/WITH_LOADER_BIOS_TEXTONLY @@ -0,0 +1,3 @@ +Use the old, FreeBSD 12 vidconsole.c. +This only supports text mode without teken, without any graphics, font or video mode support. +This setting only affects the i386 and amd64 BIOS boot loader. From nobody Sun Feb 18 06:30: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 4TcwlZ5zQfz5Bg65; Sun, 18 Feb 2024 06:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TcwlZ3QSQz4jcq; Sun, 18 Feb 2024 06:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Szw4hDGA+NyMp39kcVawfmTX5x1APhicEhPj35UzntM=; b=HNYtSaB+tyXEbvtdyLw6Vn4WN2iNyFwRPILVOMIDk5Jg6lxDI8cNgxiKl/eXeltbsCJLFo OBIMN9M+1pV6nhKN25h/3PU3brjho4Q8rOE4nOpdM4YCp3MoPOrTdyGfLJcExpqUenCn43 9rjWQIad+Zru0qfNi/UN/Qf7SPIbWC7UsuifMx4+vO8Mt1TnIw7PcdD+dNz8mSihG8e3tU 91x6CbkoGaHwLIjEyDenptBpx7ChaZySFIgMPbWMffcwcduuWN/ASUM0odbtCYPIAXWebs uj82p1vKa+cf2ddCSCKtLWCrSd8PmxX3T34L3kWjtUwFBqhVH8zAhwhO+mw9hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Szw4hDGA+NyMp39kcVawfmTX5x1APhicEhPj35UzntM=; b=rPflX9rhj+YwrPlip0plZH4xCtFibl5gvwNxve/2dWAPRzKYhHW8/HiG6DgDz8eeYWoO2q pv0/IlaYV4ETW3Vs/dvottUlIsjSPx7eXvbjz7JSl4gQ4TqbAV0VeorKHzHqfd/dcZMk3A Ltt+jHXIkrZ83/wQrraS2FLAVaFmXFhJ1U/NAnv6Z796Detx3OM4jD5yJRAiQL1BBvr2y3 rHcw9vjb+7/3xK+WPFb8WC3xg+T66QpbNHevRhaBu0ZLiLrj13hOjWRdwaGtY/GenK+ulg iVC220mQT2Mr7IoVdhTQGarCdVmsPx5hMaa6fjEn4WdSmCeXiQy5/m4j+183sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708237834; a=rsa-sha256; cv=none; b=iPEgGMpz5hRBGuS4elFtr578aLfmt7GJAqC7kF1kkr5v9uUR8nbv4tZYPDk0iVRcrJJa1S 9SKQxQy9Mwd0xJcK4As/avMxtlj1xBOgMXBg7UuyBEmru8Svg5eAsM6JVXtzJyG9J13RGr uVk3RKVpKAAp+oiq5KpiYxwhwmtJpFhOPx5/QBLfvTD98Tv3OTb5Q6HMXz1ZeBfYVQzxMh tp+Is76mgINToOo43F3VjiaU1gplxRncoK0bGZ7qU3gKxNyYlM298HOtcyv9lfh0H9Gwev K2P0u1j6OoJeBVn2rOAx0GRHtwVGe1LTVs5NVoyyO6AKcK69S2K5xRihNwRGDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcwlZ2XN3zg5x; Sun, 18 Feb 2024 06:30: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 41I6UYsD023893; Sun, 18 Feb 2024 06:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I6UYKs023890; Sun, 18 Feb 2024 06:30:34 GMT (envelope-from git) Date: Sun, 18 Feb 2024 06:30:34 GMT Message-Id: <202402180630.41I6UYKs023890@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: e36afddf11eb - main - loader: Add textvidc to 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e36afddf11eb9f83ee867532a32ef2373434d670 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e36afddf11eb9f83ee867532a32ef2373434d670 commit e36afddf11eb9f83ee867532a32ef2373434d670 Author: Warner Losh AuthorDate: 2024-02-18 06:14:56 +0000 Commit: Warner Losh CommitDate: 2024-02-18 06:29:07 +0000 loader: Add textvidc to build Add textvidc to the build. And use -DTERM_EMU to build it. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43915 --- stand/i386/libi386/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile index ac12d67e3475..8608c369a118 100644 --- a/stand/i386/libi386/Makefile +++ b/stand/i386/libi386/Makefile @@ -28,6 +28,7 @@ SRCS+= pxetramp.S SRCS+= relocater_tramp.S SRCS+= spinconsole.c SRCS+= time.c +SRCS+= textvidc.c SRCS+= vbe.c SRCS+= vidconsole.c @@ -56,6 +57,8 @@ CFLAGS.teken.c+= -I${SRCTOP}/sys/teken CFLAGS.bootinfo.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite CFLAGS.vbe.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite +CFLAGS.textvidc.c+= -DTERM_EMU + CFLAGS+= -I${LDRSRC} -I${BOOTSRC}/i386/common \ -I${SYSDIR}/contrib/dev/acpica/include From nobody Sun Feb 18 06:30: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 4Tcwlb6K71z5BgHH; Sun, 18 Feb 2024 06:30: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 4Tcwlb4S45z4jXj; Sun, 18 Feb 2024 06:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bswt9QWUnE497J8Z8QUR8D7OY5A4tZkKCikYKSV1mOs=; b=eFi7Ktfxho5ks/VyVSACSsSJqbxsF6Lmfo+N9nCxbfvfvravApDD6uwKgRh6KrARdtDovF WoWWM5axGSxmM/6kUOr8yEnrfa8sNprmjBpAvaGk5zlvrR6NdDSh8d1flgQmS+MktzDF23 xEPein15BwblIc9kEaXYYUezjdGXtxW63Ep1sQsMX+oRYeKLwCWrl0qT7P4mJPkGTxdg/e j+VvrTTvR6l/r2Cxax2BeCbdtU6v9IISOju6RdniYd/xpsKtG37tIg7FAmuTETxi8wcCH2 4Xkyv3xmdBp/CgoA8CMM79AT5KNOI5FejfbWblSAcG8swuZQpGNYNmPw3cmX0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bswt9QWUnE497J8Z8QUR8D7OY5A4tZkKCikYKSV1mOs=; b=hvb6IsnWL0dqUj/wC7g077o/0r5Gra+H+xczPaZ964qhI5/XBYjXHVr0gmUAtY1whuzSrn NLt1ixrPri5pDqsYaft51tJ5FBm1d4YRu95zwdPdzd4U0X3H6Ltnw928ESQAaf8ewlCmkx 7VLAIiMhrsp+ntiFP3TMaSchuqXp+NDFr90QnVeQdlaoWxNSr2apDWseNSUYr3buCDoSiO P2aXJ3LfhoYpQfF+GBSyX+Y+1Jsa+RtP6UjW+F2aSzmqv3UYZeQ9A18IJCdb8x1dZHcuIm Q9WqLZA6+v4KvrnO9GoqoKTm+ghSxZohtVcg2gyu//oIIUe6xhRwq4S6i5QuSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708237835; a=rsa-sha256; cv=none; b=gbzW29HXNyi/58rp4HK1d7b/aibgtmFs/HlvA7gIAv87X/a3ecrGJUP3QGp+ESp88/H5Qv W3RnphM/2MNj9SURmOJXQzOWU+w1lRZ4cbEmNQKMXisy70cCAHSIsIg602vE0AQwWKk3s4 OyK+5Wk2DqpaD0cS0BDumHzWUG6JXDwcCEQKEQMs3egnYfjL4VApDI9BDQVwSNrU+RysMS a5v10dWKyTg74KK17AbbihovirAjMcal89xE9DYnKW79vr7ltGegrDh+jHXf1O/guTWlI2 SxRQO+5aZ5XlW0Ckq+yM/YXxWg1Jx4fy9x/BJEMbcDcfM3ADj3Q93Ryr/pGTsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tcwlb3XnNzg0w; Sun, 18 Feb 2024 06:30: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 41I6UZMn023935; Sun, 18 Feb 2024 06:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I6UZpR023932; Sun, 18 Feb 2024 06:30:35 GMT (envelope-from git) Date: Sun, 18 Feb 2024 06:30:35 GMT Message-Id: <202402180630.41I6UZpR023932@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: bbfc01c2d29c - main - loader: Make MK_LOADER_BIOS_TEXTONLY work 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbfc01c2d29c462a95346f7916a692de396438e6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bbfc01c2d29c462a95346f7916a692de396438e6 commit bbfc01c2d29c462a95346f7916a692de396438e6 Author: Warner Losh AuthorDate: 2024-02-18 06:15:01 +0000 Commit: Warner Losh CommitDate: 2024-02-18 06:29:07 +0000 loader: Make MK_LOADER_BIOS_TEXTONLY work Select between text-only and graphical frame buffer consoles for the BIOS boot loader. Pull one or the other in with #ifdef in conf.c. Add gfx_bios.c for the few routines that are needed for the BIOS support of gfx. These are stubbed out for text-only mode. Move bi_load_vbe_data here since it's only used for the graphical frame buffer. Note: This setup also allows us to build multiple BIOS loaders if we have to, some with text-only and some graphical. We don't do this today. We may be forced to turn this on in the future if ZFS keeps growing. The size savings is 41k, which helps a lot with some of our users that want to enable more options in the BIOS boot loader than are normally safe to do, and they don't need graphics. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D43917 --- stand/i386/libi386/bootinfo.c | 19 ------------ stand/i386/loader/Makefile | 16 +++++++++- stand/i386/loader/conf.c | 5 ++++ stand/i386/loader/gfx_bios.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 20 deletions(-) diff --git a/stand/i386/libi386/bootinfo.c b/stand/i386/libi386/bootinfo.c index cc9a42164ed3..4f652632b755 100644 --- a/stand/i386/libi386/bootinfo.c +++ b/stand/i386/libi386/bootinfo.c @@ -36,25 +36,6 @@ #include "vbe.h" #include "btxv86.h" -void -bi_load_vbe_data(struct preloaded_file *kfp) -{ - if (!kfp->f_tg_kernel_support) { - /* - * Loaded kernel does not have vt/vbe backend, - * switch console to text mode. - */ - if (vbe_available()) - bios_set_text_mode(VGA_TEXT_MODE); - return; - } - - if (vbe_available()) { - file_addmetadata(kfp, MODINFOMD_VBE_FB, - sizeof(gfx_state.tg_fb), &gfx_state.tg_fb); - } -} - int bi_getboothowto(char *kargs) { diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index 525561b7c4d1..ab446d67225b 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -37,13 +37,27 @@ LOADERSIZE?= 560000 # Largest known safe size for loader.bin .PATH: ${BOOTSRC}/i386/loader # architecture-specific loader code -SRCS= main.c conf.c vers.c chain.c gfx_fb.c 8x16.c +SRCS+= chain.c +SRCS+= conf.c +SRCS+= gfx_bios.c +SRCS+= main.c +SRCS+= vers.c + +.if ${MK_LOADER_BIOS_TEXTONLY} == "no" +SRCS+= gfx_fb.c +SRCS+= 8x16.c CFLAGS.gfx_fb.c += -I${.CURDIR}/../libi386 CFLAGS.gfx_fb.c += -I$(SRCTOP)/sys/teken CFLAGS.gfx_fb.c += -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 CFLAGS.gfx_fb.c += -I${SRCTOP}/contrib/pnglite CFLAGS.gfx_fb.c += -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib +CFLAGS.gfx_bios.c += -I$(SRCTOP)/sys/teken +CFLAGS.gfx_bios.c += -I${SRCTOP}/contrib/pnglite +.else +CFLAGS.gfx_bios.c += -DBIOS_TEXT_ONLY +CFLAGS.conf.c += -DBIOS_TEXT_ONLY +.endif # Include bcache code. HAVE_BCACHE= yes diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c index 329bcd577fbe..b4e9f401ded7 100644 --- a/stand/i386/loader/conf.c +++ b/stand/i386/loader/conf.c @@ -128,13 +128,18 @@ struct file_format *file_formats[] = { * We don't prototype these in libi386.h because they require * data structures from bootstrap.h as well. */ +extern struct console textvidc; extern struct console vidconsole; extern struct console comconsole; extern struct console nullconsole; extern struct console spinconsole; struct console *consoles[] = { +#ifdef BIOS_TEXT_ONLY + &textvidc, +#else &vidconsole, +#endif &comconsole, &nullconsole, &spinconsole, diff --git a/stand/i386/loader/gfx_bios.c b/stand/i386/loader/gfx_bios.c new file mode 100644 index 000000000000..a0b08a7cbcde --- /dev/null +++ b/stand/i386/loader/gfx_bios.c @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2024 Netflix, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * This file provides all the gfx glue, or stubs, so that we can build, if we + * want, two versions of the bios loader: one with graphics support and one + * without. This allows us to keep the calls in other places, like libraries + * that are tricky to compile twice. It also reduces the number of ifdefs we + * need to support the old text-only video console. This could also be two + * separate files, but it is short and having it all here helps to constrain + * dependency creap somewhat. + */ + +#include +#ifndef BIOS_TEXT_ONLY +#include "bootstrap.h" +#include "libi386/libi386.h" +#include "libi386/vbe.h" +#include +#endif + +#ifdef BIOS_TEXT_ONLY +void autoload_font(bool bios); + +void +autoload_font(bool bios) +{ +} + +vm_offset_t build_font_module(vm_offset_t addr); + +vm_offset_t +build_font_module(vm_offset_t addr) +{ + return addr; +} + +struct preloaded_file; +void bi_load_vbe_data(struct preloaded_file *kfp); + +void bi_load_vbe_data(struct preloaded_file *kfp) +{ +} + +#else + +void +bi_load_vbe_data(struct preloaded_file *kfp) +{ + if (!kfp->f_tg_kernel_support) { + /* + * Loaded kernel does not have vt/vbe backend, + * switch console to text mode. + */ + if (vbe_available()) + bios_set_text_mode(VGA_TEXT_MODE); + return; + } + + if (vbe_available()) { + file_addmetadata(kfp, MODINFOMD_VBE_FB, + sizeof(gfx_state.tg_fb), &gfx_state.tg_fb); + } +} +#endif From nobody Sun Feb 18 06:30: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 4Tcwld0kp6z5Bg3S; Sun, 18 Feb 2024 06:30: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 4Tcwlc5TQdz4jmY; Sun, 18 Feb 2024 06:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=61TbyapXpufUWVWRXNmyQjKsZ+eJE3MgNVvufbOprqg=; b=irwkkkak/8m9RHq7o6bA9G2Bo+5bVLqjD8M8vGovC56RftBog4apEZKtCVRkyBh3fM+NNO eGCfk5tUGEGX/PqpDqdSN+A1Y5aGW6Z+bhte1em4Z2b5x3ZiOAXLdQsLOcvjgQXKkBIiUv N9Bqc8IO7aLKquNFesudT7b15i82O9RgX37jZVbz/5LK/Ccet8uVPLXaBxgn/7ol1zTGLw VWZ+hUsOL0GlSrq5Zs8pH6ahv1i0HPMAWJXDN5gxvBTvWi6sVY3UZgK1whtgpC7UqXz0/v +3U/WVWM3Z+DRODw4JPVnR+mdMcgbUygwug/8ZDQM+ddsBeBQQP+4RirQaInmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708237836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=61TbyapXpufUWVWRXNmyQjKsZ+eJE3MgNVvufbOprqg=; b=EZsOwaje6Nn5KlF3zwuty5ANoKya+UVNjz76HugKg06sGEk+4PPrhN85FdV0SyspqqVgOW Ld31I7eMk1KWxKDWWbsZ8dYOIT2y6yY7Pa0pCXxt2HeDPtvCHfZvdZaF0+3tqYWqSv/OJK xjDDURh1BCBI+qKpgBXwTANxnMkqJr9Zl0bLKCeMTurhcTgCHwN2/crssLmy0lHq/TYrkr VJ28mYOgD/zg2LBi4Of5Ef+YP91JmFBwAED2lqWU+35cO75L1EAhfebltQzbmWzNDzt7VI zZNgbk/OYxVbp9qod/NIH12ndMSCQ0IoF8HJJPxjVprNO9GAlOZUCgDx6vmqIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708237836; a=rsa-sha256; cv=none; b=yszbHWvlx382nHjZKru6asR50yMw5F2kztVRcUNzs7n1dtQDJB7mYtl5MeLNho9aGNmIyh yA/SbmeWyqeQg4APywVksghDMn2tAqkP/6FpzCMw1tbUHzc4JB9yLuyVn40+UDm7EB5WNo BMvv5h2m0otWhjtwdJll+b5RqmteByXxitf6m3TmSRcx8TQEv+CiwflkQ+1LXXx4/Wvy5N 078dgPrxyGnTLHa3fr9aKcqrAydZnlt033xB8F4KNxv2u9F4Xsru06tkZlUKTJ8W0QyQch 5uCntcIL1IVq8pMoY8GpVxiZOChLF3pJaWQbxjXFjkhMJRzptbU7xoPashY2Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tcwlc4ZqYzgDZ; Sun, 18 Feb 2024 06:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41I6UaZD023983; Sun, 18 Feb 2024 06:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I6UaHm023980; Sun, 18 Feb 2024 06:30:36 GMT (envelope-from git) Date: Sun, 18 Feb 2024 06:30:36 GMT Message-Id: <202402180630.41I6UaHm023980@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: 078a31136c8c - main - boot/universe.sh: Add tests to keep MK_LOADER_BIOS_TEXTONLY working 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: Sender: owner-dev-commits-src-main@freebsd.org 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 078a31136c8ce89c23c0fae0b24f98c0bd4d45e6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=078a31136c8ce89c23c0fae0b24f98c0bd4d45e6 commit 078a31136c8ce89c23c0fae0b24f98c0bd4d45e6 Author: Warner Losh AuthorDate: 2024-02-18 06:28:33 +0000 Commit: Warner Losh CommitDate: 2024-02-18 06:29:07 +0000 boot/universe.sh: Add tests to keep MK_LOADER_BIOS_TEXTONLY working Sponsored by: Netflix --- tools/boot/universe.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh index b46c36f173e6..3e033ce26ae2 100755 --- a/tools/boot/universe.sh +++ b/tools/boot/universe.sh @@ -94,3 +94,12 @@ for i in \ ta=${i##*/} dobuild $ta _.boot.${ta}.no_zfs.log "MK_LOADER_ZFS=no" done + +# Build w/ LOADER_BIOS_TEXTONLY +for i in \ + amd64/amd64 \ + i386/i386 \ + ; do + ta=${i##*/} + dobuild $ta _.boot.${ta}.no_zfs.log "MK_LOADER_BIOS_TEXTONLY=yes" +done From nobody Sun Feb 18 09:56:03 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 4Td1Jg2CFDz5C78Z; Sun, 18 Feb 2024 09:56: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 4Td1Jg1j5lz46jk; Sun, 18 Feb 2024 09:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708250163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXUI2OPPW87kiJPYU382DsuL3HBwCqU3pHnULZqCAvE=; b=ZCS390U6Z1apWunJ8/twbMdyNVZBFHPDhspBJ09ym35eVY8bgdC98pSNonmI4s/H3O2ZOo 9clLUslBcYqtFqDckunWy7Vt0OsQvHOdz1RvId7Sg0ghcLWdgUz1vwv+xmbHzbEDnKUo1K 2JpTLqJB76nIwIXOl7STSXPtjAQxHRUd2A2JkO7yNeWf6QUI2r6KIxRHkS6M1lvF/35qYj OJGfrQpAxZhpxxiU/63lmNakeKIEo/RHwHS3XUK7bsHgZX+YkIoRVdqQNTund+yPxzhmTB cJqKq52wP1hVfLK3juG972f+Q6QTuSqUiF37xfDWHyA2z3U/BQ7Cj5RkVxBEog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708250163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXUI2OPPW87kiJPYU382DsuL3HBwCqU3pHnULZqCAvE=; b=i3aPuHqKc5cSExwc2HvVW2OuNrlno1vgObC3oLhRj+4mS4QLSA31prLwXbecMAt4FnTpEG ioogOXqdOeBFEc4RePUbSiXIufGDit/uJITOQcoKxsWB3blBNEzMbk6/73paNnEciKl5wh 1GzEjNyrEizQGKVoaSl/4eie/xRFAaiodH8RTBDaz4N8spvOPT56Roap0/8X2C5jSSVxii /+D3IXeVN5ktCOVpLE7AVPl2t5xj3Umqw96E0W3PODRHrb3qTXE/EuUMeXc3brvjJJQBks kBZjyTzxuRLYbYGo25BBzxNtGY0gx1dKRmd+0G1C5L3tSBBIamDuu8XohQctRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708250163; a=rsa-sha256; cv=none; b=fD0d9WNftGFdJzjix1RCd3SOmXCUFtk2MJ1wGM4HRC5HGtN1DwQPpat5XdeDJaWFdhrVjA JPDbhtDTva3txIHYB2gNiYESa1ZIh1Ppo9rg8+kbJHWPHdthm49nQtZ5rMTii/fw5hNui8 avky82t0XtxTYj/jurDMX73r5kILxYaEIheXLOfHMAKjjalR1EztWcFnayFQ2Yn4TCujup YCb1+BtN4WVyvG8sVFPEAnJW7FH2B/UPHZl55Oz9vKnXAcwP52Z36N8H/v1d212KYAuA/D MhxSCkJ6GCF41ojc80l2OkaEzutFDY+eh/bnfcOMJ9qisGwGT9nY2bRWCjwqmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td1Jg0lcmzmH3; Sun, 18 Feb 2024 09:56: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 41I9u3vE067251; Sun, 18 Feb 2024 09:56:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I9u3gM067248; Sun, 18 Feb 2024 09:56:03 GMT (envelope-from git) Date: Sun, 18 Feb 2024 09:56:03 GMT Message-Id: <202402180956.41I9u3gM067248@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: 1365bb722af1 - main - tzcode: Fix overflow handling in TZ parser. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1365bb722af1365baee6ea1e3d44917533908d53 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1365bb722af1365baee6ea1e3d44917533908d53 commit 1365bb722af1365baee6ea1e3d44917533908d53 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-18 09:48:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-18 09:51:49 +0000 tzcode: Fix overflow handling in TZ parser. Obtained from: upstream 9fc11a27 MFC after: 1 week PR: 276281 --- contrib/tzcode/localtime.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 2b33cce1ec50..25a65385256b 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -1246,11 +1246,13 @@ tzparse(const char *name, struct state *sp, struct state const *basep) do { int_fast32_t yearsecs = year_lengths[isleap(yearbeg - 1)] * SECSPERDAY; + time_t janfirst1 = janfirst; yearbeg--; - if (increment_overflow_time(&janfirst, -yearsecs)) { + if (increment_overflow_time(&janfirst1, -yearsecs)) { janoffset = -yearsecs; break; } + janfirst = janfirst1; } while (atlo < janfirst && EPOCH_YEAR - YEARSPERREPEAT / 2 < yearbeg); From nobody Sun Feb 18 12:01: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 4Td45c0921z541ZQ; Sun, 18 Feb 2024 12:01: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 4Td45b546tz4ZSS; Sun, 18 Feb 2024 12:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708257699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tMG1ORZoWq3a7Uj+VRGyl5PwA/cPElOJavWSIt/mBeM=; b=FXceSwu3LcDf2q9xRQXCR3ifWLMzMpOM2e4UVrT1eNJqVzTDkuVvVNUfzQasOjL4EUXAjQ hAAvZNjoLGc7YKBSbYEdeQiUXlB1Frnr5JzXG8zh/51C9cWB0qxRfkI3VXTO63gJn26U4H C+KZ7SVvQkfz0kkgDuEjndvz8+cM3ApAgd5/i5bXzYP9HFnztUzf6YKSS8Y+rtRUzRHyW/ m/nLGBgRArO1gOIc6qZ8GGitRgr0WHFNwfVA2nIDFaqG9Sytkx50marHDd+sVFvyneaKpC 4H42GZFI6XTN0oOanFVHeEwBNeLCvuXTe0Da/OtCGFrnAt4abUuKYC8xAvoDyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708257699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tMG1ORZoWq3a7Uj+VRGyl5PwA/cPElOJavWSIt/mBeM=; b=cUatuKwF/nwJVrDnRxAcH31kt36459KIQ3qJfxNzWSRn1JOrbEzaAU04Vc95rFKVl2bE84 vx1fY64WPqjJJxLxoRwHpzYWrnDs+FpRYlfH2ktGkkXZjvChCxvYlpS/3riDFVD1jTZT98 NUgTDh3LxB+zrie1H4pXDA5QZ+tXyg0CitGjrYGir49oIIqPgbEvPr8qWu/X0sHF2Ip739 63AfTF/1ih/Dbm8BBlYtHJUt8k2qnqGaB+f6J8AMO0S9MIzFv08xpHNYZKmrIpDdQ7hhSv 5f38RRcK5UdjXYdYxcsLfX4Jlvpbov3XOEXXD31Fk26a5RsFnfLmGYrjdTdZFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708257699; a=rsa-sha256; cv=none; b=BjkF2QQ0aU+SqL+/hS8Rwb4Nx2KT368WeEK1n/QuO+t7gN7r41mW5X6arXhXnup89rDwa2 QaNE55V7/5T3A46imBttA4+KhPoB9BCZ4ekoARzy9iUihQs81TsdVZEM27xkDeOSdjYCSV VQxfS4gwPg7yZ+i2qGigQn7AIRBMN1REm3NNfdR9knYCaYrHsKtdae7ZJnVJisk4MEbRNL zbF9RWYJdFwDE2rgYdd0UBrU1ZtatmRiUTESlBv5PrjNookZeypG8/5qbyn0tYFs9vZzw8 AGQbZMhWO6KGRrIOC7/pui/hHwR0kVFbhIEEM3gwxWN7+TVwOyJR2lr1obrdIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td45b48kqzqc5; Sun, 18 Feb 2024 12:01: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 41IC1dch085301; Sun, 18 Feb 2024 12:01:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IC1drA085298; Sun, 18 Feb 2024 12:01:39 GMT (envelope-from git) Date: Sun, 18 Feb 2024 12:01:39 GMT Message-Id: <202402181201.41IC1drA085298@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: 2fb174d18a42 - main - sctp(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: Sender: owner-dev-commits-src-main@freebsd.org 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fb174d18a42d1b2965164186843540ee65881ea Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb174d18a42d1b2965164186843540ee65881ea commit 2fb174d18a42d1b2965164186843540ee65881ea Author: Gordon Bergling AuthorDate: 2024-02-18 12:01:04 +0000 Commit: Gordon Bergling CommitDate: 2024-02-18 12:01:04 +0000 sctp(4): Fix a typo in a source code comment - s/anthing/anything/ MFC after: 3 days --- sys/netinet/sctp_indata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index c195cce96f39..a30fd95fef30 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -1359,7 +1359,7 @@ out: /* * Dump onto the re-assembly queue, in its proper place. After dumping on the - * queue, see if anthing can be delivered. If so pull it off (or as much as + * queue, see if anything can be delivered. If so pull it off (or as much as * we can. If we run out of space then we must dump what we can and set the * appropriate flag to say we queued what we could. */ From nobody Sun Feb 18 13:57: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 4Td6fw2JY0z59kd6; Sun, 18 Feb 2024 13:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Td6fw1nZTz4qws; Sun, 18 Feb 2024 13:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708264632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQM8LAmbU/IgjN8aLJDxRXjOJLFEmd+P0nDnnjmzzE4=; b=FiYZv5d3laTEH/nXPYtQVxuaE7hAfrlYMy8oDmurwgZqOvVEbg1D3wv4ho40iFSHFNR7gY /EFFQI3ayCNeKAuUSGVPTHA3QGiMJGt4lQmJcRSOgSKotdi/c51G+vN2um9c1+4wNR9LwJ jJ80IkCqlaq0kqXP7cUCayvn8K4IKOw/fHS+saDtGvT6BjJXkPmNgm4EONe69CVVfwfw7m NG0dz4bUsqUYGqiT1OKXXpP8v/9SW6k6F3s6uQs28sgBDIs0x+oOoJp/rldGm/zDxASURX 9bju+5LYric1hK8l+IFgO5WS+gecQcCvOJmkcPskyzaJPpKTiTbSxxRZmz55jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708264632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQM8LAmbU/IgjN8aLJDxRXjOJLFEmd+P0nDnnjmzzE4=; b=wxLGY+23HRidGORzjEeNEyG/j2GdkvZOvOTfxB8dnBANnFtlWU3CdOH2bGpz6LJzZwENNW JK6jLQ/lHJgUqu1Wz/uOXqCoTl8XZTkw90lNCYLN5YeAcvZ8M/GlkU+JNIq852iALJb42z yYKKqh9dMiOmMwCQs+biIMJXV1I9+W3uM0p1XRusm4uNQwn7IwcoIErbSYWpQYOzyMe4Cf Aof8ujG0ZVMDrg+N6fzhKfLr5Wwzxj3NKruakigrffLRtwPxR0PD/452L5cwZEnB33bS2e saxOJNAN+8AJlAw3Cs7tg7A9lM/KqLZpGhVO+gAsevKOoqUQSkqwambRGZ18Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708264632; a=rsa-sha256; cv=none; b=GqG3rdOO0QgLG4c5O/zx9rP4XK4UX9/RlNC/Akk8/RMSVCB63Jmb3cO0fJjqYkWF3a5VQ8 94rQOeQVWhm2NuZKhMXl0MUlrVyDkQx0Iu65dqN45adrQFqXW0qppwnGXr0jVLMz4Onofr 5HnHxx2uvwpM94ERZ/HlZ4STGkSl/mOadg24b3m60uf+iTDsEhrr6/Si1qbtutbS6szB74 x+nHquN6aZvJFtV3aW/mA3Nlmb7xBuNwdu8iOOOHllU0fEjQ5/gf7peKuPolu1SI1+IB9t NexvuVbwom6NxqOCXgCYXcgitidHbzpC9dqM82sbkebT8zPOLmk8gndQTHQ29Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td6fw0rzLzt9q; Sun, 18 Feb 2024 13:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41IDvCuJ072512; Sun, 18 Feb 2024 13:57:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IDvC28072509; Sun, 18 Feb 2024 13:57:12 GMT (envelope-from git) Date: Sun, 18 Feb 2024 13:57:12 GMT Message-Id: <202402181357.41IDvC28072509@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: b98558e69b0a - main - aw_gpio: temporarily switch to input function if read in eint mode 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: Sender: owner-dev-commits-src-main@freebsd.org 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b98558e69b0aefbb99120a8a6ca7efbb8cafab5b Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=b98558e69b0aefbb99120a8a6ca7efbb8cafab5b commit b98558e69b0aefbb99120a8a6ca7efbb8cafab5b Author: Andriy Gapon AuthorDate: 2024-02-18 13:55:20 +0000 Commit: Andriy Gapon CommitDate: 2024-02-18 13:55:20 +0000 aw_gpio: temporarily switch to input function if read in eint mode This is needed for gpiokeys driver that needs to read input state after receiving an interrupt for either edge. PR: 248138 MFC after: 1 month --- sys/arm/allwinner/aw_gpio.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c index cee2cf056f42..6ff0516acb3f 100644 --- a/sys/arm/allwinner/aw_gpio.c +++ b/sys/arm/allwinner/aw_gpio.c @@ -654,18 +654,30 @@ aw_gpio_pin_get_locked(struct aw_gpio_softc *sc,uint32_t pin, unsigned int *val) { uint32_t bank, reg_data; + int32_t func; + int err; AW_GPIO_LOCK_ASSERT(sc); if (pin > sc->conf->padconf->npins) return (EINVAL); + func = aw_gpio_get_function(sc, pin); + if (func == sc->conf->padconf->pins[pin].eint_func) { /* "pl_eintX */ + err = aw_gpio_set_function(sc, pin, AW_GPIO_INPUT); + if (err != 0) + return (err); + } + bank = sc->conf->padconf->pins[pin].port; pin = sc->conf->padconf->pins[pin].pin; reg_data = AW_GPIO_READ(sc, AW_GPIO_GP_DAT(bank)); *val = (reg_data & (1 << pin)) ? 1 : 0; + if (func == sc->conf->padconf->pins[pin].eint_func) + (void)aw_gpio_set_function(sc, pin, func); + return (0); } From nobody Sun Feb 18 14:08: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 4Td6wV5tvRz59mCM; Sun, 18 Feb 2024 14:08: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 4Td6wV5Gx2z4t5H; Sun, 18 Feb 2024 14:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708265338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zwgxky6FdhQRdkyMPJvyCQq6bpPbZPvgQeOOsT6nXOc=; b=Lsm7wBhW+bLTmQRhk/0d9KJ3KhUmqmSOhDfOJk4mZhiG0k4Era0TRHdkUklWb4LPwP+Vai 8cQKUkY8L2o82a6kpO5GPBrJ+YklFOzuEsWZrSASsTzX7gyshX8PdMy/7SMlWLbshocjlU ZzEzrx201pLejQ1Z6kmZVkIQTZ6nbdp8iMItVJPApR+8Ut/F2esdvujuzPQ/Nb+3MGn9yL x4tx3YjRfK6mjDoYbH97NOrwRlp9R687t3uk/xTatybEbClfjtqxNjgsV4K0pTygXYlLvY a17CdmxU7Gz78fVe5IzG+yUugJp1FK+Hf5NM7SPcpxTr/YweN/sSp/QvgSua1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708265338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zwgxky6FdhQRdkyMPJvyCQq6bpPbZPvgQeOOsT6nXOc=; b=T2h1CjRgzZp2SS5pS53LRPnE08c9iRDCQC2HfdVAwczt4Ore+ygwXevDdR1IBHtJgRaeLf ETAg1kbJhw2dg5icaCZw/tUn7iwWRNrQIevG/9vuimjsPseayuzsUwlIYUoNmYTQ8Hh0Bo tPq4/CtjNChYlEuW9qN1hGB1/rteF+aQGcbpqk6NleabeRRPvaZCmgiQAIVOTrToDGtCjU QbpXqYlW7cQEjTvqZ4FjLS5PfzSsaSFS2exG1a9+cfsxImQAjw41E7GevVcOApqp4ilrM0 6Jvn6q0kHJ1CNAGYHktYWUsz2u4G4gbX4rd1d83CNtXrJSFmhXCxs7vbqBYFnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708265338; a=rsa-sha256; cv=none; b=A5/QJRbSEBwUGLkRthSmfa7um+aqPXDthfEA0szrxrmNbvjFZq8MdKz+VMWhyivtkBs/AR 94qAE3ur/1jEpuILzalqfS/xQKkPr0N1QXwPRC5frbd6NA3Oz/fsdujTKc0mlenxupIjgW mj1V9C4iGIQeRQm7aNurIIH4PDs3SgXDdLPoA4MSu9qtkjyTgpnepHV1zmsyqbo3aJeY/D DGjICImokcigucfWMzAZqogjkYB7fM4wgarGVaUCwNiSG5Sq0AsdUx+6+fD735pxlFddU5 4rSuF3k/KGE3pSL47S3RvusGKD8W5eBAJAn7HFy421rw3D2W85Hpbjo2UsxWGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td6wV45fLztVd; Sun, 18 Feb 2024 14:08: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 41IE8wW0090425; Sun, 18 Feb 2024 14:08:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IE8wSo090422; Sun, 18 Feb 2024 14:08:58 GMT (envelope-from git) Date: Sun, 18 Feb 2024 14:08:58 GMT Message-Id: <202402181408.41IE8wSo090422@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: 8b408fc6f2f6 - main - rk8xx_poweroff: enable power-cycling on support hardware 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: Sender: owner-dev-commits-src-main@freebsd.org 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b408fc6f2f6dab2bfc200edee96917abf425cb2 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=8b408fc6f2f6dab2bfc200edee96917abf425cb2 commit 8b408fc6f2f6dab2bfc200edee96917abf425cb2 Author: Andriy Gapon AuthorDate: 2024-02-18 13:57:34 +0000 Commit: Andriy Gapon CommitDate: 2024-02-18 14:04:29 +0000 rk8xx_poweroff: enable power-cycling on support hardware Previously, the function would return early if RB_POWERCYCLE was specified without RB_POWEROFF. Those flags are exclusive at the moment, that is, they are never set together. Søren Schmidt (sos) uses a similar but extended patch locally. MFC after: 2 weeks --- sys/dev/iicbus/pmic/rockchip/rk8xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx.c b/sys/dev/iicbus/pmic/rockchip/rk8xx.c index 9e29c62f95bd..6cbfd19ff443 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk8xx.c +++ b/sys/dev/iicbus/pmic/rockchip/rk8xx.c @@ -108,7 +108,7 @@ rk8xx_poweroff(void *arg, int howto) int error; uint8_t val; - if ((howto & RB_POWEROFF) == 0) + if (howto & (RB_POWEROFF | RB_POWERCYCLE) == 0) return; device_printf(sc->dev, "Powering off...\n"); From nobody Sun Feb 18 14:38: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 4Td7Zw3yPrz59qpt; Sun, 18 Feb 2024 14:38: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 4Td7Zw3RZnz3xxn; Sun, 18 Feb 2024 14:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708267128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mJnHAX2VihfzE+8sejHts1tsdFRyLaLn2Eo2vsxchus=; b=DuRqIoanhW7II4COxd43Q6yZxdXzJ+bTNe4jsYsJd65Xb7jNlm6agXVjkuhpoHtc4B1HYE bxLEiXx6213Lfi9sXCdKbdHBgfcrkejy53WIou0V1EjZDV6amSv+UdhEfHqPrb55mtdwR0 m6tDGa4e8HroEzc0XQjWKDju3DP6HdYqAqUaHR4cx4o/meRvTFCFy4mtWIynHT6/42vOVD f4CrQ7ZDJ6HGHaxLSwe3XdlubGDZUT8Eelx1yUPgFC6pPUnhKotlDoMwjnhLXEzgg0JTzy AJ0L3Yjhe/5kWiQPB29OxQAZiN+qq6OLJ23bAcX5lD5JXG7Fw6oZiK8YofWbOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708267128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mJnHAX2VihfzE+8sejHts1tsdFRyLaLn2Eo2vsxchus=; b=lfzLnD0fmEeRhPlkWnDbGqDLfr5zdrZthvWFmmbOepD4SbLUN9UiAIzalroxLRFdd11JT+ p5O3kiyqypoSNT/6d6PLRctgY6wojuAvmXFCUKnWj6eNTRCKFpmK6OgkL0og8cqicVE2SD 0gzmi5ZhrooEF3gFsTu7fKSEYU9DchQ3FyH3TUPJYt5Chv7ykrJCmQLznmldz/UR06H2FW N4+Hl2/713/vu53/dRj/yyDjYRR/U2iwsTetCdW5RcRxSlxq9MkzX6UDDIPWzyJl3RLt4v y2Gbc0GhQcvw19l/NKA8mHKAzcpk41ALPF8Fo9qXG3lJ/ef/GKj9aUfz4KbDew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708267128; a=rsa-sha256; cv=none; b=GV6TPK98kBa+rTn6x11BuNVFUZ3+Lo46U94E0BPCjnIAG1uLPaf3lhSt/DsSH+x1DZYbN7 hEFtQ+Et040WsjhKD2XA1WatAn48Xk7nUo4q+V3ShRQ5gamdu/0XvQfQWwMv6lM3Ynq76G sZ9PiQkRd3mrrdnl8+pPsLq0Mzb9Bo1FyYQdxowsrTW63+tki/+EGuf4WMfKofPTx4twzZ w8AYAgPiMtDuXjBke25gMh9U5I+4tZUrLWoxDAQ4Xm/p7lxgSXFeLBIxzjGEBGJ147WjZF ycidfmcJJ584bQ3eS5DolPHRowvKHrDZAoSh8rmWERS4RrqHmK6ramF6ipsogw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td7Zw2SKZzvQp; Sun, 18 Feb 2024 14:38: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 41IEcmoC040847; Sun, 18 Feb 2024 14:38:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IEcm9Z040844; Sun, 18 Feb 2024 14:38:48 GMT (envelope-from git) Date: Sun, 18 Feb 2024 14:38:48 GMT Message-Id: <202402181438.41IEcm9Z040844@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: 0f354b2b588b - main - psci: split off psci_reboot from psci_shutdown 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: Sender: owner-dev-commits-src-main@freebsd.org 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f354b2b588b60e2ef119ff2f480f7905c5db587 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=0f354b2b588b60e2ef119ff2f480f7905c5db587 commit 0f354b2b588b60e2ef119ff2f480f7905c5db587 Author: Andriy Gapon AuthorDate: 2021-07-09 15:01:57 +0000 Commit: Andriy Gapon CommitDate: 2024-02-18 14:38:27 +0000 psci: split off psci_reboot from psci_shutdown Priority of psci_reboot set so that it is run after shutdown_panic is executed. This is to provide uniform experience with other platforms. MFC after: 3 weeks --- sys/dev/psci/psci.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/dev/psci/psci.c b/sys/dev/psci/psci.c index 0c8f094e0037..e1e9c1880b54 100644 --- a/sys/dev/psci/psci.c +++ b/sys/dev/psci/psci.c @@ -124,7 +124,6 @@ static struct ofw_compat_data compat_data[] = { #endif static int psci_attach(device_t, psci_initfn_t, int); -static void psci_shutdown(void *, int); static int psci_find_callfn(psci_callfn_t *); static int psci_def_callfn(register_t, register_t, register_t, register_t, @@ -471,12 +470,24 @@ psci_shutdown(void *xsc, int howto) if (psci_softc == NULL) return; - /* PSCI system_off and system_reset werent't supported in v0.1. */ if ((howto & RB_POWEROFF) != 0) fn = psci_softc->psci_fnids[PSCI_FN_SYSTEM_OFF]; - else if ((howto & RB_HALT) == 0) - fn = psci_softc->psci_fnids[PSCI_FN_SYSTEM_RESET]; + if (fn) + psci_call(fn, 0, 0, 0); + + /* System reset and off do not return. */ +} +static void +psci_reboot(void *xsc, int howto) +{ + uint32_t fn = 0; + + if (psci_softc == NULL) + return; + + if ((howto & RB_HALT) == 0) + fn = psci_softc->psci_fnids[PSCI_FN_SYSTEM_RESET]; if (fn) psci_call(fn, 0, 0, 0); @@ -487,7 +498,7 @@ void psci_reset(void) { - psci_shutdown(NULL, 0); + psci_reboot(NULL, 0); } #ifdef FDT @@ -585,6 +596,10 @@ psci_v0_2_init(device_t dev, int default_version) EVENTHANDLER_REGISTER(shutdown_final, psci_shutdown, sc, SHUTDOWN_PRI_LAST); + /* Handle reboot after shutdown_panic. */ + EVENTHANDLER_REGISTER(shutdown_final, psci_reboot, sc, + SHUTDOWN_PRI_LAST + 150); + return (0); } From nobody Sun Feb 18 14:38: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 4Td7Zx5MKMz59qsV; Sun, 18 Feb 2024 14:38: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 4Td7Zx4Zqlz3xgp; Sun, 18 Feb 2024 14:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708267129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxT/x8xQwLqK5xyt1yvtN1x+8G+QCNz7fE5BNgJ4Up4=; b=WuTIgtnk8tlcyZlqz5vxPzsAYxg0Udg1sbtVSpHGQangCf50BkMRV7oSGE8ERjPyG1n/GH QOUCmzFjBnS9iYiAu/2hEBtsdul9vx2YNqgjx9rt/grc4RO8HbSNsAaulY0ILcNpyCzBUR S7PtdmCc+n41YIY8uSMKuGS31yCwAHYfw/3pP3ah9hl4Jpxy/dVKo1rO6BGhVusaOmHTfa x4Wv8myeXr9pyOE0eAt8yQE4x/nIiimb3vPTu5e8vFs4xIvZ+yBaXIRRwri68nJSncRTp8 l8P1jC3e1ocXnqdTtia/FUYYMeK1ceoIbnQ0ZFbe0nQ/6o6/SzxN7xet+fMc+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708267129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxT/x8xQwLqK5xyt1yvtN1x+8G+QCNz7fE5BNgJ4Up4=; b=VBVSe05nyz+Bj9Fl7uA+YAtQr4mEbtapOp758bOxesqR6MEnOs/aeA0223RkY+/pSo14+Z zTy5ZOEiRy2FMQxpv+d/LQn9L7NIRT7j2A15zVF48A8ixmZFaPWiiHWVOFfF6hCOOmBIDZ 7AkkOxFV9sXXn2/zWHM3oIAVjkgviXDXVYcMoFbAHioIQSuWLrjBtk42h647qXoHdD0CoE 3pQsZYX3jas2sh5RZ5KHlfZsx7+3k6FreQb3TOvsOIqCcd/L46zQpMATGjpO4KVcR7huov 9SBljxTkS7x8txzXLBQfPXn7XxeVIUAFidFbiY6QIEC4l5lDzgtAGzmRIfKbBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708267129; a=rsa-sha256; cv=none; b=PTwB+A0PemiWr9lfwRh0/YbbFn3WwfTnghQ3zuEKcggzXiusHXHcX+W+I7ruiNtdEyxKah UestoHy3ZGWusOSIcJipDfV9VR6yuGFmGJzCuM2y2l1i2tcmJlimy++U2D+5QmfBchLpF8 KvSCATVp3mkGAo8Gd2SMy6edYW/RdDPr+OI1VT+1Xr7JC3N4XYpugSskEgSMDvPVKExm0q 9FVtAhWkaxwzq2wruxaA+qLUzxXmSYzJ9g1g4IsvuAptgqml3zzJ91SRxUo6VOagkfj9LC tUYj+8lwzkUi319yQ/mxblZTIbj4FMaY+RGZ9a3+GFPCMsBeM3OcAo6Q1b76Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td7Zx3flQzvTF; Sun, 18 Feb 2024 14:38: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 41IEcnbd040902; Sun, 18 Feb 2024 14:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IEcnCx040899; Sun, 18 Feb 2024 14:38:49 GMT (envelope-from git) Date: Sun, 18 Feb 2024 14:38:49 GMT Message-Id: <202402181438.41IEcnCx040899@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: 5f7312a0d70c - main - syscon_power: do reboot after shutdown_panic is executed 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: Sender: owner-dev-commits-src-main@freebsd.org 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f7312a0d70c607afa9ce24ccd757321d043e02c Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7312a0d70c607afa9ce24ccd757321d043e02c commit 5f7312a0d70c607afa9ce24ccd757321d043e02c Author: Andriy Gapon AuthorDate: 2021-07-09 15:00:21 +0000 Commit: Andriy Gapon CommitDate: 2024-02-18 14:38:27 +0000 syscon_power: do reboot after shutdown_panic is executed A syscon_power instance can handle either poweroff or reboot, but not both. If the instance handles reboot then set its priority to be after shutdown_panic. This is to provide uniform experience with other platforms. MFC after: 3 weeks --- sys/dev/syscon/syscon_power.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/syscon/syscon_power.c b/sys/dev/syscon/syscon_power.c index 365dc0252417..6897cf3df422 100644 --- a/sys/dev/syscon/syscon_power.c +++ b/sys/dev/syscon/syscon_power.c @@ -161,9 +161,11 @@ syscon_power_attach(device_t dev) OF_getencprop(node, "value", &sc->value, sizeof(sc->value)); } + /* Handle reboot after shutdown_panic. */ sc->reboot = ofw_bus_is_compatible(dev, "syscon-reboot"); sc->shutdown_tag = EVENTHANDLER_REGISTER(shutdown_final, - syscon_power_shutdown_final, dev, SHUTDOWN_PRI_LAST); + syscon_power_shutdown_final, dev, + sc->reboot ? SHUTDOWN_PRI_LAST + 150 : SHUTDOWN_PRI_LAST); return (0); } From nobody Sun Feb 18 15:15: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 4Td8Np5BDfz59whg; Sun, 18 Feb 2024 15:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Td8Np4Xrvz44sW; Sun, 18 Feb 2024 15:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708269306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H8ZYUq+y/CSOZjxB8+yvP5dk8SdcPopgA5MkJvywtD4=; b=DrF7PQo9ujxduNU5bjpw2JSJdZH+QDd/E3wMU4mSnGe/OISP9u9k3MZwlrJEIItKcylAq0 NIdLZY7N9TSVBRQkuIfLkZTW3p5Ou748VwarMKU3fCWm0JRswOvQP97A6pjyKLJt3RIz3Y bcAft5s4To3dRA0Ux53EoJKnHNRVhmEpQdO8t9hQQjmvwFqc2qUOdIVETNYATndgBZtC2q UUHL/CGxlzJ+OrfLdZGaSY0qXRe+HqI/iUnmWabiyVjTXRKafiYJFmjBWt/yqpDToZOcQq 5VRy0ADdBc5rT5pLgUiDCOjnmsOCST/SYmNLwqMTroH3z3NpQp7LYjBdY5Yniw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708269306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H8ZYUq+y/CSOZjxB8+yvP5dk8SdcPopgA5MkJvywtD4=; b=ynmwkyYP+Td1xsccZzLuCgOtzKVyNONhp8UC1OzZ3KUzHVypDCLS0dssADGM5eIo9a+t0z WOp1FRR4pgsOp+XHdJUNXK1yWle0OULrIBIXBBzOHacPzcYp8v3jIcLEo7DMI9HK0Znlij JmkJpSAR8QnfaYWFVx8Qtkx68xQVM5mHrXhN4PMQ1SzPZQ06SZrIsvJsU5runpf7wlWSuu pXVuCj74X3zOWLybtZY4w0PJrOL1VQF4Htl3EISVzBsFo8K/DHP/XYybzB1Ccm7kVFD/2A 1iIq2ZHFc79P8JnQPXTOHR8XbQmpPJ7EZYyhaf498KGSJZg1V7++Dno7NxgYuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708269306; a=rsa-sha256; cv=none; b=KmbIj17sTOA9Xv4d6Nm14/IWp8NPw5/y7SBFZQIo0/Tha4lPiIh5ZjI7hW42DrdiUjkOLW B6RryvjZfbizTvn8O0/rbuCYaU8VqNbhffx99nIaE8Un8Cnu4WSRUnBHfjayoDzxKtYIKB 8o1y9Oeid2+4hYuFUyx/QXWej60GhAEj4JaeMiGxBySWDTW9Ro2muxSXQfBVuVdySNDy+Y Oh5Aqo6GCU1SQx5OXa+czOOzRPQiSD8I7aVx0Di2Xh375XY9HylHe1bO7PlFMPPQqQjIHr stpDdxenolhehH8WVu52Ey8AH+Y5a1+maxggFH7u2q2fm6FIaMmZLI0mYFWdTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td8Np3bc6zvtf; Sun, 18 Feb 2024 15:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41IFF6nA008409; Sun, 18 Feb 2024 15:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IFF68A008406; Sun, 18 Feb 2024 15:15:06 GMT (envelope-from git) Date: Sun, 18 Feb 2024 15:15:06 GMT Message-Id: <202402181515.41IFF68A008406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: cc3ec9f75978 - main - unionfs: cache upper/lower mount objects 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc3ec9f7597882d36ee487fd436d1b90bed0ebfd Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=cc3ec9f7597882d36ee487fd436d1b90bed0ebfd commit cc3ec9f7597882d36ee487fd436d1b90bed0ebfd Author: Jason A. Harmening AuthorDate: 2023-12-22 20:13:35 +0000 Commit: Jason A. Harmening CommitDate: 2024-02-18 15:14:05 +0000 unionfs: cache upper/lower mount objects Store the upper/lower FS mount objects in unionfs per-mount data and use these instead of the v_mount field of the upper/lower root vnodes. As described in the referenced PR, it is unsafe to access this field on the unionfs unmount path as ZFS rollback may have obliterated the v_mount field of the upper or lower root vnode. Use these stored objects to slightly simplify other code that needs access to the upper/lower mount objects as well. PR: 275870 Reported by: Karlo Miličević Tested by: Karlo Miličević Reviewed by: kib (prior version), olce MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43815 --- sys/fs/unionfs/union.h | 2 ++ sys/fs/unionfs/union_vfsops.c | 37 ++++++++++++++++++++----------------- sys/fs/unionfs/union_vnops.c | 4 ++-- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h index 01bc7185e5fc..0d678b4fed41 100644 --- a/sys/fs/unionfs/union.h +++ b/sys/fs/unionfs/union.h @@ -51,6 +51,8 @@ typedef enum _unionfs_whitemode { } unionfs_whitemode; struct unionfs_mount { + struct mount *um_lowermp; /* MNT_REFed lower mount object */ + struct mount *um_uppermp; /* MNT_REFed upper mount object */ struct vnode *um_lowervp; /* VREFed once */ struct vnode *um_uppervp; /* VREFed once */ struct vnode *um_rootvp; /* ROOT vnode */ diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 6c801998fcfb..8635600549b1 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -71,7 +71,6 @@ static struct vfsops unionfs_vfsops; static int unionfs_domount(struct mount *mp) { - struct mount *lowermp, *uppermp; struct vnode *lowerrootvp; struct vnode *upperrootvp; struct unionfs_mount *ump; @@ -303,18 +302,18 @@ unionfs_domount(struct mount *mp) * reused until that happens. We assume the caller holds a reference * to lowerrootvp as it is the mount's covered vnode. */ - lowermp = vfs_register_upper_from_vp(ump->um_lowervp, mp, + ump->um_lowermp = vfs_register_upper_from_vp(ump->um_lowervp, mp, &ump->um_lower_link); - uppermp = vfs_register_upper_from_vp(ump->um_uppervp, mp, + ump->um_uppermp = vfs_register_upper_from_vp(ump->um_uppervp, mp, &ump->um_upper_link); vrele(upperrootvp); - if (lowermp == NULL || uppermp == NULL) { - if (lowermp != NULL) - vfs_unregister_upper(lowermp, &ump->um_lower_link); - if (uppermp != NULL) - vfs_unregister_upper(uppermp, &ump->um_upper_link); + if (ump->um_lowermp == NULL || ump->um_uppermp == NULL) { + if (ump->um_lowermp != NULL) + vfs_unregister_upper(ump->um_lowermp, &ump->um_lower_link); + if (ump->um_uppermp != NULL) + vfs_unregister_upper(ump->um_uppermp, &ump->um_upper_link); vflush(mp, 1, FORCECLOSE, curthread); free(ump, M_UNIONFSMNT); mp->mnt_data = NULL; @@ -346,8 +345,8 @@ unionfs_domount(struct mount *mp) } MNT_ILOCK(mp); - if ((lowermp->mnt_flag & MNT_LOCAL) != 0 && - (uppermp->mnt_flag & MNT_LOCAL) != 0) + if ((ump->um_lowermp->mnt_flag & MNT_LOCAL) != 0 && + (ump->um_uppermp->mnt_flag & MNT_LOCAL) != 0) mp->mnt_flag |= MNT_LOCAL; mp->mnt_kern_flag |= MNTK_NOMSYNC | MNTK_UNIONFS; MNT_IUNLOCK(mp); @@ -400,8 +399,8 @@ unionfs_unmount(struct mount *mp, int mntflags) vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE); mp->mnt_vnodecovered->v_vflag &= ~VV_CROSSLOCK; VOP_UNLOCK(mp->mnt_vnodecovered); - vfs_unregister_upper(ump->um_lowervp->v_mount, &ump->um_lower_link); - vfs_unregister_upper(ump->um_uppervp->v_mount, &ump->um_upper_link); + vfs_unregister_upper(ump->um_lowermp, &ump->um_lower_link); + vfs_unregister_upper(ump->um_uppermp, &ump->um_upper_link); free(ump, M_UNIONFSMNT); mp->mnt_data = NULL; @@ -439,7 +438,11 @@ unionfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, bool unbusy; ump = MOUNTTOUNIONFSMOUNT(mp); - uppermp = atomic_load_ptr(&ump->um_uppervp->v_mount); + /* + * Issue a volatile load of um_uppermp here, as the mount may be + * torn down after we call vfs_unbusy(). + */ + uppermp = atomic_load_ptr(&ump->um_uppermp); KASSERT(*mp_busy == true, ("upper mount not busy")); /* * See comment in sys_quotactl() for an explanation of why the @@ -479,7 +482,7 @@ unionfs_statfs(struct mount *mp, struct statfs *sbp) mstat = malloc(sizeof(struct statfs), M_STATFS, M_WAITOK | M_ZERO); - error = VFS_STATFS(ump->um_lowervp->v_mount, mstat); + error = VFS_STATFS(ump->um_lowermp, mstat); if (error) { free(mstat, M_STATFS); return (error); @@ -491,7 +494,7 @@ unionfs_statfs(struct mount *mp, struct statfs *sbp) lbsize = mstat->f_bsize; - error = VFS_STATFS(ump->um_uppervp->v_mount, mstat); + error = VFS_STATFS(ump->um_uppermp, mstat); if (error) { free(mstat, M_STATFS); return (error); @@ -558,10 +561,10 @@ unionfs_extattrctl(struct mount *mp, int cmd, struct vnode *filename_vp, unp = VTOUNIONFS(filename_vp); if (unp->un_uppervp != NULLVP) { - return (VFS_EXTATTRCTL(ump->um_uppervp->v_mount, cmd, + return (VFS_EXTATTRCTL(ump->um_uppermp, cmd, unp->un_uppervp, namespace, attrname)); } else { - return (VFS_EXTATTRCTL(ump->um_lowervp->v_mount, cmd, + return (VFS_EXTATTRCTL(ump->um_lowermp, cmd, unp->un_lowervp, namespace, attrname)); } } diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 150fbffe0a4a..cb2bed925399 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -764,7 +764,7 @@ unionfs_access(struct vop_access_args *ap) if (lvp != NULLVP) { if (accmode & VWRITE) { - if (ump->um_uppervp->v_mount->mnt_flag & MNT_RDONLY) { + if ((ump->um_uppermp->mnt_flag & MNT_RDONLY) != 0) { switch (ap->a_vp->v_type) { case VREG: case VDIR: @@ -835,7 +835,7 @@ unionfs_getattr(struct vop_getattr_args *ap) error = VOP_GETATTR(lvp, ap->a_vap, ap->a_cred); - if (error == 0 && !(ump->um_uppervp->v_mount->mnt_flag & MNT_RDONLY)) { + if (error == 0 && (ump->um_uppermp->mnt_flag & MNT_RDONLY) == 0) { /* correct the attr toward shadow file/dir. */ if (ap->a_vp->v_type == VREG || ap->a_vp->v_type == VDIR) { unionfs_create_uppervattr_core(ump, ap->a_vap, &va, td); From nobody Sun Feb 18 15:16: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 4Td8QL49MCz59wvL; Sun, 18 Feb 2024 15:16: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 4Td8QL3MCVz45QL; Sun, 18 Feb 2024 15:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708269386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jr5C0Ok6rR9n02x+CAXb9P9H2XdB1dujy/0GSBI76XM=; b=os9OSywgChsDYQPQMtwyUbdO9Fw+L26jRD/cNhpLnfgTUug3r024nD+gI8zowxfYlwnhHF C0uxLS1fBA44/hzesmTdW6KvTBlO25VrjNF8k0uthnz2Z48MxwmdV5XYLCTVl6VO93rCAO L70halNs6HADpCN8shlUefR7OS6OrvqFxgPJYDm7s8oUM6g9oQmYsgvZDh/jPNsOvA3uw/ XTNd6Rvfob+aJxGClq0kEENMoAZxfSxWHsgU5zUDKa02xQL37Mcn2+x/lonCpf8B1invwC 9NkFglHObDhiX0f9ql/h8eo0sk5Xu0dEogcwwVXFDc6QNKOVGZTcTxxky7sUEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708269386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jr5C0Ok6rR9n02x+CAXb9P9H2XdB1dujy/0GSBI76XM=; b=RpYxvMyf4bU732VqiFMIbcH+qk23AeY+FqP1jhOjrUPaCj2QGqDmwuvsDAFVkWDjK9Kc8N Prq3LStPRZi2oLbq64gI2DDRu1XnRCSLgzl8XglR2HZLcZpZssFo6u1xiwexFlPS5JRvW4 SghaaXrfI9KitLHt9Re7blnWn/Auntkdjm4KIVejz1ajg4cQuh043Ip6RLpNHkpa+RuL/m QT1ZxtA2l2Q/hG9d67+QnkjwHRTDbsY8lSitRKlsu+9qaK19qMqp4mJ67oEuP3RCVanlL5 Uj2TJPBKiC19y98v7OyyW38PpVrY0vDZXUqWEMDqZ/4R7Ikx9faL61xxlUaX1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708269386; a=rsa-sha256; cv=none; b=xOVAorxMFqeiue7DRdrSAQ+hIMTgk7L/MimGlDx4wJHQuOcTQFisFuJt7LVlLdamBQc5Jg RLBDgEATwpt0sAHJkegznMkWcMq/TmZLK+ARpoHEMdp36Z7sOZh1leEKjAT6pepEN5D3vs gK42F84q4IVH9yYx0Bmt4iVY77Cg2dqD2ogGRZdjg6vZL7+aYIldp785Y09Hvkjk4W2s/p Y+JfYVF+fZ979HlFJ7BfVmjsJS1nZbtZdX8XSvIsC3/FlLS5k8hgPzh1tPHDJhrXyx5utv ssnXswPOhs+vbJ22dYW/de8YExck+7ZDJagTt7Azd8+Ml1PYGKDVBhbj1pMcnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td8QL2QDyzwBj; Sun, 18 Feb 2024 15:16: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 41IFGQHw008773; Sun, 18 Feb 2024 15:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IFGQut008770; Sun, 18 Feb 2024 15:16:26 GMT (envelope-from git) Date: Sun, 18 Feb 2024 15:16:26 GMT Message-Id: <202402181516.41IFGQut008770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 9530182e371d - main - VFS: update VOP_FSYNC() debug check to reflect actual locking policy 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9530182e371dee382b76d8594f65633a304b396f Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=9530182e371dee382b76d8594f65633a304b396f commit 9530182e371dee382b76d8594f65633a304b396f Author: Jason A. Harmening AuthorDate: 2023-12-26 02:02:25 +0000 Commit: Jason A. Harmening CommitDate: 2024-02-18 15:16:16 +0000 VFS: update VOP_FSYNC() debug check to reflect actual locking policy Shared vs. exclusive locking is determined not by MNT_EXTENDED_SHARED but by MNT_SHARED_WRITES (although there are several places that ignore this and simply always use an exclusive lock). Also add a comment on the possible difference between VOP_GETWRITEMOUNT(vp) and vp->v_mount on this path. Found by local testing of unionfs atop ZFS with DEBUG_VFS_LOCKS. MFC after: 2 weeks Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D43816 --- sys/kern/vfs_subr.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 20e220135b15..8f0b00a87cb5 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5830,7 +5830,22 @@ vop_fsync_debugprepost(struct vnode *vp, const char *name) { if (vp->v_type == VCHR) ; - else if (MNT_EXTENDED_SHARED(vp->v_mount)) + /* + * The shared vs. exclusive locking policy for fsync() + * is actually determined by vp's write mount as indicated + * by VOP_GETWRITEMOUNT(), which for stacked filesystems + * may not be the same as vp->v_mount. However, if the + * underlying filesystem which really handles the fsync() + * supports shared locking, the stacked filesystem must also + * be prepared for its VOP_FSYNC() operation to be called + * with only a shared lock. On the other hand, if the + * stacked filesystem claims support for shared write + * locking but the underlying filesystem does not, and the + * caller incorrectly uses a shared lock, this condition + * should still be caught when the stacked filesystem + * invokes VOP_FSYNC() on the underlying filesystem. + */ + else if (MNT_SHARED_WRITES(vp->v_mount)) ASSERT_VOP_LOCKED(vp, name); else ASSERT_VOP_ELOCKED(vp, name); From nobody Sun Feb 18 15:18: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 4Td8SX5TQfz59x71; Sun, 18 Feb 2024 15:18: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 4Td8SX4xvwz45xg; Sun, 18 Feb 2024 15:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708269500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jwvhoR3qE4WsY6qPyTK0k8S0P3VF7S7W0rVtb5PVo2U=; b=P706yg5eb44eBJcIhAk54KV5WC0CKD7Uz//wjHvYH05g08KgzE3iuX/MXHYXfMglMy1hF6 ceHdyR3+EY8QM968dybUbiGLFsdMzCJG4y316RRSutyOBuMdUPq+lsNJxIdL7RkkO31Vkz I8Emy+wzaamOWsVysWIOz+umGo2MS5z0Svb/rj3fqxfp0eDPWAYWbwy8hdhP5wg5i1Hhwp 8HxKd8l7q9o7lDKcDS3JP/EAscCjbrIazp7YMjPZvhrtQlFeIYACj3P2UlZLIvvZDxvmFu YXN6s62ZDSir4AyzSrwSWaI2dZNrBWLLKdy070UiyfRhdACE1WV43XnCIOuhKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708269500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jwvhoR3qE4WsY6qPyTK0k8S0P3VF7S7W0rVtb5PVo2U=; b=sQOptztVKxM15cTarAy3V2G7I3ItLvjhyWX9Yc8ikBsJEKswlQEzzwV39beSfo74uiZYqI krfhn7T7QNJ7HylOgSTfaLwNgsGTFMAQoQOOI36cz/cIYIkGJNhcOgHb7HTpA/hDgIYqbP t7T/lf+5iWT71qPd7VJJHl5deg2qxucjcUCTvvmBAqMHNg5mkIzvLVJ3Y4r9mgQQNZQ/Aa 5Fddv1Y46U0KnxcYaKvHXGbWSxBBBgwUiRWCgCOpOCHbC/OSIQxrcIv1aGKjYc7AFM8uAJ hLbLHtOrAtBijfJgRSLxW5MGQQlzB9VZ+aUl6wdOVqCwvRi3Z4zJfcOYlZ6qtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708269500; a=rsa-sha256; cv=none; b=k/RrgsVmf76PYwStb6jEyqaBQNRjJJsq+HPlgCtsDTRBt0/nO1VFgNP5t8LqQdnr456JM1 RCtSKnnP1HGgm1vqeu3cNPPGE78pBCaJj3VfR+WjGzJGeI+KGoHasxokNNP+MkE4/S1uC/ 9yLBh7UA493nUIOQFQVqGjkLQRIqX6PJORuugcIvdNydcJhgnAHm0l0ZzTHBtO0U+8Xwv9 ibP9KnFj+Kd6V/b0gXsfP5qE1j9nVY5dpam9vdsFzQaZ/lI4NDiTYYzmPcswhzn+cZJtas wZM0Wa2mUZUT+PfCFJAIwWOgbdOhMM+K1nn9JtKH2u9+wlhH7QeTqJoKt3UJwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td8SX40mgzwBk; Sun, 18 Feb 2024 15:18: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 41IFIKgK009297; Sun, 18 Feb 2024 15:18:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IFIKf4009294; Sun, 18 Feb 2024 15:18:20 GMT (envelope-from git) Date: Sun, 18 Feb 2024 15:18:20 GMT Message-Id: <202402181518.41IFIKf4009294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 2656fc29be8b - main - unionfs: upgrade the vnode lock during fsync() if necessary 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2656fc29be8b0fc1cd9e64ed52aa0a61fe87744c Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=2656fc29be8b0fc1cd9e64ed52aa0a61fe87744c commit 2656fc29be8b0fc1cd9e64ed52aa0a61fe87744c Author: Jason A. Harmening AuthorDate: 2023-12-24 04:42:28 +0000 Commit: Jason A. Harmening CommitDate: 2024-02-18 15:18:07 +0000 unionfs: upgrade the vnode lock during fsync() if necessary If the underlying upper FS supports shared locking for write ops, as is the case with ZFS, VOP_FSYNC() may only be called with the vnode lock held shared. In this case, temporarily upgrade the lock for those unionfs maintenance operations which require exclusive locking. While here, make unionfs inherit the upper FS' support for shared write locking. Since the upper FS is the target of VOP_GETWRITEMOUNT() this is what will dictate the locking behavior of any unionfs caller that uses vn_start_write() + vn_lktype_write(), so unionfs must be prepared for the caller to only hold a shared vnode lock in these cases. Found in local testing of unionfs atop ZFS with DEBUG_VFS_LOCKS. MFC after: 2 weeks Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D43817 --- sys/fs/unionfs/union_vfsops.c | 3 ++- sys/fs/unionfs/union_vnops.c | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 8635600549b1..cb55c2dd6474 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -348,7 +348,8 @@ unionfs_domount(struct mount *mp) if ((ump->um_lowermp->mnt_flag & MNT_LOCAL) != 0 && (ump->um_uppermp->mnt_flag & MNT_LOCAL) != 0) mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_NOMSYNC | MNTK_UNIONFS; + mp->mnt_kern_flag |= MNTK_NOMSYNC | MNTK_UNIONFS | + (ump->um_uppermp->mnt_kern_flag & MNTK_SHARED_WRITES); MNT_IUNLOCK(mp); /* diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index cb2bed925399..3ea427b5b53c 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -998,14 +998,22 @@ unionfs_fsync(struct vop_fsync_args *ap) struct unionfs_node *unp; struct unionfs_node_status *unsp; struct vnode *ovp; + enum unionfs_lkupgrade lkstatus; KASSERT_UNIONFS_VNODE(ap->a_vp); unp = VTOUNIONFS(ap->a_vp); + lkstatus = unionfs_upgrade_lock(ap->a_vp); + if (lkstatus == UNIONFS_LKUPGRADE_DOOMED) { + unionfs_downgrade_lock(ap->a_vp, lkstatus); + return (ENOENT); + } unionfs_get_node_status(unp, ap->a_td, &unsp); ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp); unionfs_tryrem_node_status(unp, unsp); + unionfs_downgrade_lock(ap->a_vp, lkstatus); + if (ovp == NULLVP) return (EBADF); From nobody Sun Feb 18 15:20: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 4Td8VV3KTGz59xJk; Sun, 18 Feb 2024 15:20: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 4Td8VV2dQpz46Nf; Sun, 18 Feb 2024 15:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708269602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Wyb4vQS2NKTYytZ6bZ3JoZ0QIFvCv5RjKIDSDj6rTg=; b=i5SYv1oFIZTCAUICkOz/zM2V6/dkB6Wi55C386zvD5LLGZ35Gy7lSQA/UmSvJhpKTZTXBT x2nGWUSVhg8ajTJAdWp9MKuJ7mECiJlt/s746sp0YBlmIbw9YM/fuKgt1gPVYnTsBeui7d mFbv/Oj1sufb48lg8hbeJzw7yXZq7mx8g9fMiM7y/Ps6RMVLsYznvoFB4vG8b8HZaa+Bme VMBg+iAGRUDHC+xyNVThrZCi29sE+zk+VSPa0LiQrx7yb27JZv1zYXKFd3PMR7N+3QcX52 ZRN+L3opjbjYW8Re1bz1xVrX6FqOB+6YjZO8HDC0M9x5QdSbCQyE3/WbPJwWww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708269602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Wyb4vQS2NKTYytZ6bZ3JoZ0QIFvCv5RjKIDSDj6rTg=; b=qDn9zLGhXgboEs3fIRQAkQgrR6iPHwLAbWubx9Y2izcR7XK+3YUs3PB8Kfy3sz9iRO/VRo OZWiGZL1FiP37bis5BcYrWRcCnPkX6U9QBCLuUofDfzfBbvuOyNnhqzLmmDVv7bMVwQ+oa d8Alb6amNbp2GZKIIB+8Pt+LyZ+NpT4C3td7rMNMZOIQlzp2rxHGO7TeyHpXBsvxnGsL7x tpQQ46sOSl3TBYzuxln9IRnEJj80+aYHAvi/dbb6BSXx3qQje4K7Fuiml1619guH19gFmj X5cDNe81Y0GahAQeMKHbdmghk6s+/ZD+kNi0mBAfMbwjbjBSLbr7AteXCAwOcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708269602; a=rsa-sha256; cv=none; b=UrJeT+q5vkstlZIjWv6kdRFmM9TR/sSPboW2Hu0A0M6VQ19vYDKr1pzhWY5HcTus39DpuP uG0537q+dqB0+POCNSfE970th/7S8ua0hx2GU88DFsU1zdkZBWzFnuGeSheKMB7lca+Ukc y9QY1m4HOm0FWGbk1HE9AkA1Nnkut236GKGZlt+XdeG9cgqo2AOSLQBKht8NkaPG6mc1ym sCiSw/+0jstoo8HbAYriSRRS/pxdhpQw+UaxZv7des80RcqohnQKVcGVSTUpMlJDd/Jpfm 8XbsbFLo0OsIkzZbEeoggcnyvTB8EYhL2k/oVZg4i4MIoB+dQIPBZzrIKoxHsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Td8VV1jRFzwBp; Sun, 18 Feb 2024 15:20: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 41IFK2lv011765; Sun, 18 Feb 2024 15:20:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IFK2or011761; Sun, 18 Feb 2024 15:20:02 GMT (envelope-from git) Date: Sun, 18 Feb 2024 15:20:02 GMT Message-Id: <202402181520.41IFK2or011761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: a2ddbe019d51 - main - unionfs: work around underlying FS failing to respect cn_namelen 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: Sender: owner-dev-commits-src-main@freebsd.org 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2ddbe019d51b35f9da2cb5ddca8c69f0ee422da Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=a2ddbe019d51b35f9da2cb5ddca8c69f0ee422da commit a2ddbe019d51b35f9da2cb5ddca8c69f0ee422da Author: Jason A. Harmening AuthorDate: 2023-12-24 04:48:19 +0000 Commit: Jason A. Harmening CommitDate: 2024-02-18 15:19:23 +0000 unionfs: work around underlying FS failing to respect cn_namelen unionfs_mkshadowdir() may be invoked on a non-leaf pathname component during lookup, in which case the NUL terminator of the pathname buffer will be well beyond the end of the current component. cn_namelen in this case will still (correctly) indicate the length of only the current component, but ZFS in particular does not currently respect cn_namelen, leading to the creation on inacessible files with slashes in their names. Work around this behavior by temporarily NUL- terminating the current pathname component for the call to VOP_MKDIR(). https://github.com/openzfs/zfs/issues/15705 has been filed to track a proper upstream fix for the issue at hand. PR: 275871 Reported by: Karlo Miličević Tested by: Karlo Miličević Reviewed by: kib, olce MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43818 --- sys/fs/unionfs/union_subr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index b438131dc820..686043cc93de 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -916,7 +916,24 @@ unionfs_mkshadowdir(struct unionfs_mount *ump, struct vnode *udvp, goto unionfs_mkshadowdir_abort; unionfs_create_uppervattr_core(ump, &lva, &va, td); + /* + * Temporarily NUL-terminate the current pathname component. + * This function may be called during lookup operations in which + * the current pathname component is not the leaf, meaning that + * the NUL terminator is some distance beyond the end of the current + * component. This *should* be fine, as cn_namelen will still + * correctly indicate the length of only the current component, + * but ZFS in particular does not respect cn_namelen in its VOP_MKDIR + * implementation + * Note that this assumes nd.ni_cnd.cn_pnbuf was allocated by + * something like a local namei() operation and the temporary + * NUL-termination will not have an effect on other threads. + */ + char *pathend = &nd.ni_cnd.cn_nameptr[nd.ni_cnd.cn_namelen]; + char pathterm = *pathend; + *pathend = '\0'; error = VOP_MKDIR(udvp, &uvp, &nd.ni_cnd, &va); + *pathend = pathterm; if (!error) { unionfs_node_update(unp, uvp, td); From nobody Sun Feb 18 16:29: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 4TdB2G4p90z5B7Hj; Sun, 18 Feb 2024 16:29: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 4TdB2G3wtDz4K38; Sun, 18 Feb 2024 16:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708273750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aSgWFUYPxE+zN5V831wP1GFlyGrJtJowszWKTXHUVmo=; b=jrWXEYZzZw9G+dNRjNVEAPkkSFtqLAZuk5aTKiAj94PfhYNRsRijX12e7GI4bvd44H5M61 x1MIwE8WIp0o2EepvH6WGfE5XrWbrQ9UN9HxuaZkF4RIxKTJBghdhe5fb2qSFfijfhoV0g k1HYsjCzGkKO1Kmm4YQ+jCnl+BUs6q/h/6IbnEd8OoSNThk8+7l0BVF41A1M48DjWN+POl lgz4yRCa/BwDRYXfMm4U4tMVXGkwqeZEA17yyaj3e7mm9TkY/R8UwNB1oYyAh8VTtj28UB aZodF9WrTrivvglVyGdZ/7ye3yB7NPOY1WjQVmxbEc4XesaZvmTp9MafqBJr1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708273750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aSgWFUYPxE+zN5V831wP1GFlyGrJtJowszWKTXHUVmo=; b=T+XStaYUl9gxThwIUrmmenv8axDwMmGIvjtX3FfkVXu3Z1whX5HAJNYjbPnbGTrN9WG9dp JhCe9J+8D9tW+g6PTwEh843qWSRdr6QPmQRr14FXblUq7kG5SsjhRWVOKnTtVSmx8KveJv kktRhFjpZ6ubF8xuL93XSE+s4LBso9WNSKa2tDWMyj5TuYhSI/w2Ps/VtkZdyC8VJDSKOn jEulg+IbL5/fCgzXk5gTc51/Ernj6WqyJjvDMzF4KsANyMOb+hmjFi4abs82Asscmq1ZxQ gzTiBO4WG5UuZb1jMtLl6Lit/qQ9SyfhTC/LY4i3MHx0goITIgB3W8jnSkgv0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708273750; a=rsa-sha256; cv=none; b=Q8VAusdN8XfP1Ocy+K6Ti0CF61itRklI1brQzo3jKEQFh4A8GF/Y1162rbG0j+r54GpQQn pIYsij7CFBftpHKtG7y89fROgxSqnFV50uDz528Rmwfgr8RuOhi3rRptCR8PgCFdFfI14g kuo5iQ8ig5q+bQ7W0md/3RJBuXbXkqev2MYZB8jH9H6SociVY38s73Gk0UvRDg8nA8tOJF cgzitD0lidjavnU9mF/v1zKMfzcXimngah6UuWnMWRvCPBvHxlvmNX8IHTErb3DFZAeJQx fa8PTBx6j9wDEbFN80+X00nFTmZCBrDQc41qDhMeGuRwsiTTooJJykIU/m/JGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdB2G30tQzyDj; Sun, 18 Feb 2024 16:29: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 41IGTAYK027986; Sun, 18 Feb 2024 16:29:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IGTAZM027983; Sun, 18 Feb 2024 16:29:10 GMT (envelope-from git) Date: Sun, 18 Feb 2024 16:29:10 GMT Message-Id: <202402181629.41IGTAZM027983@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: a044cf60bd37 - main - rk8xx_poweroff: add parentheses missed in 8b408fc6f2 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: Sender: owner-dev-commits-src-main@freebsd.org 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a044cf60bd375f894b371fc87d148bf4704c05a8 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=a044cf60bd375f894b371fc87d148bf4704c05a8 commit a044cf60bd375f894b371fc87d148bf4704c05a8 Author: Andriy Gapon AuthorDate: 2024-02-18 16:26:20 +0000 Commit: Andriy Gapon CommitDate: 2024-02-18 16:29:00 +0000 rk8xx_poweroff: add parentheses missed in 8b408fc6f2 Fixes: 8b408fc6f2 MFC after: 2 weeks --- sys/dev/iicbus/pmic/rockchip/rk8xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx.c b/sys/dev/iicbus/pmic/rockchip/rk8xx.c index 6cbfd19ff443..fa3e95c9a68d 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk8xx.c +++ b/sys/dev/iicbus/pmic/rockchip/rk8xx.c @@ -108,7 +108,7 @@ rk8xx_poweroff(void *arg, int howto) int error; uint8_t val; - if (howto & (RB_POWEROFF | RB_POWERCYCLE) == 0) + if ((howto & (RB_POWEROFF | RB_POWERCYCLE)) == 0) return; device_printf(sc->dev, "Powering off...\n"); From nobody Sun Feb 18 17:08: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 4TdBvG5Vpqz5BDG1; Sun, 18 Feb 2024 17:08: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 4TdBvG4yG6z4Qd6; Sun, 18 Feb 2024 17:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708276090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4KQX/d0gQ+GXJ/tGJEk3bHoy552oNZbPPDu9T7US2+E=; b=mOE/WhlvTqKu66k1xaLaRvbuTRqT0ABv2WeypK3zC/nvwqqJtxvzRIC1gr/B1JE8+pXOKB ft524/dR+xf7kkwIPUfSu1jwMPtATeuoK/RbN+/9VVzme4APm8UipEtSWHNZCllxFeH12+ UkqH0NkhGg7/QpeYnVz/VsD2gQ4ql5tOv6M87EDrP/4xrOTCey4Rv/UlH+sVGBqCeepBQu /mrgk4pVZROy2FmiVgYMH1KX2T8YjvD9fZh1INIOCxXkJeJfgwIyHvceyoZXWscKHEEgH3 pVfRoRlcyKSq0wloo1tzrpWcONUnmNUITSdNtcM7aEpSPEyLdM3VxU6thjanxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708276090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4KQX/d0gQ+GXJ/tGJEk3bHoy552oNZbPPDu9T7US2+E=; b=s20jmaOgczPoC6OWS6jZOJfFfJg/j52BdtUq3roxnLKgmh+tV1vOmWDWGiWehnL8mjjshx qbfO5XdLc+QMw7nmpMBwUtDXlS04eo3UizPfC0ECkpkkp1VqlADzuLTikFoFc0YNnZKgyY JsTHoMX6oS4IOlUHTghK4K1KJNqhGiK8/gmxKKTohCk9//Wb9h85+ucu3PVkWlFhUtOEaJ IJo9w+uPA9egIeZ4BrpORjEjEY50IxuG8gJratJBvQz6tr6c/uQy6xJXZn88djwKqGkIu7 crcaO9Fy8o22VOfIfKUAjuSG2qqg+4JdFJ0gKmMXumgDm7rwdsh3hgFXU/eC0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708276090; a=rsa-sha256; cv=none; b=xIy6wnZLVHSHxiVwYHdNdsWSCt0QOF7VKURuQHSLbnikS+Wfhaj10cZIyHj+DLTHDcufDX fn36H44hoY6wKeUwTapb954CohkdIXYhoM5dIycZyC/ezsINrywTGyEfRkfZAm0b25wxHO e0mB0BctO6zPnFBfEdF0RFktKsaj4rrWCtD6xhxtIHgWwFJuvyRy92fuVZTYSSIhykdMEK yflGc2UV7MVTt/efFwmDx5u3mVES+fPPg/qEuPouIlOEnRhYHbmJqF6ACbufJHiIRjQnIk 6ujbd3d0LDtc4y3yg/Jy14sc7QCgVXmJV2Dv8ZslSacwkPK4PlB+4TEt7cSx1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdBvG3jFMz10N3; Sun, 18 Feb 2024 17:08: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 41IH8AQX097462; Sun, 18 Feb 2024 17:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IH8AOY097459; Sun, 18 Feb 2024 17:08:10 GMT (envelope-from git) Date: Sun, 18 Feb 2024 17:08:10 GMT Message-Id: <202402181708.41IH8AOY097459@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: 5968e477a560 - main - snd_hda: Add patches for the Lenovo Ideapad 330-15 and ThinkPad X230 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: Sender: owner-dev-commits-src-main@freebsd.org 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5968e477a560406c480d78ebe438a04f57121119 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5968e477a560406c480d78ebe438a04f57121119 commit 5968e477a560406c480d78ebe438a04f57121119 Author: Dmitry Lukhtionov AuthorDate: 2024-02-18 17:07:39 +0000 Commit: Christos Margiolis CommitDate: 2024-02-18 17:07:39 +0000 snd_hda: Add patches for the Lenovo Ideapad 330-15 and ThinkPad X230 PR: 259640 MFC after: 2 weeks Reviewed by: delphij, markj Differential Revision: https://reviews.freebsd.org/D43804 --- sys/dev/sound/pci/hda/hdaa_patches.c | 20 ++++++++++++++++++++ sys/dev/sound/pci/hda/hdac.h | 2 ++ sys/dev/sound/pci/hda/hdacc.c | 1 + 3 files changed, 23 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 5bb4dcd79af7..3a7dfc63637a 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -338,6 +338,26 @@ hdac_pin_patch(struct hdaa_widget *w) patch_str = "as=3 seq=15 color=Black loc=Left"; break; } + } else if (id == HDA_CODEC_ALC230 && + subid == LENOVO_I330_SUBVENDOR) { + switch (nid) { + case 20: + patch_str = "as=1 seq=0 device=Speaker"; + break; + case 33: + patch_str = "as=1 seq=15 device=Headphones"; + break; + } + } else if (id == HDA_CODEC_ALC269 && + subid == LENOVO_X230_SUBVENDOR) { + switch (nid) { + case 21: + patch_str = "as=1 seq=15"; + break; + case 24: + patch_str = "as=4 seq=15"; + break; + } } else { /* * loop over hdaa_model_pin_patch diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index c3951edd362c..31bdc9130d9b 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -377,6 +377,7 @@ #define LENOVO_L5AMD_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x381b) #define LENOVO_L5INTEL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x380f) #define LENOVO_3000_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x384e) +#define LENOVO_I330_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0x3808) #define LENOVO_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(LENOVO, 0xffff) /* Samsung */ @@ -537,6 +538,7 @@ #define HDA_CODEC_ALC221 HDA_CODEC_CONSTRUCT(REALTEK, 0x0221) #define HDA_CODEC_ALC222 HDA_CODEC_CONSTRUCT(REALTEK, 0x0222) #define HDA_CODEC_ALC225 HDA_CODEC_CONSTRUCT(REALTEK, 0x0225) +#define HDA_CODEC_ALC230 HDA_CODEC_CONSTRUCT(REALTEK, 0x0230) #define HDA_CODEC_ALC231 HDA_CODEC_CONSTRUCT(REALTEK, 0x0231) #define HDA_CODEC_ALC233 HDA_CODEC_CONSTRUCT(REALTEK, 0x0233) #define HDA_CODEC_ALC234 HDA_CODEC_CONSTRUCT(REALTEK, 0x0234) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index f815e39392d4..123c64d9c487 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -79,6 +79,7 @@ static const struct { { HDA_CODEC_ALC221, 0, "Realtek ALC221" }, { HDA_CODEC_ALC222, 0, "Realtek ALC222" }, { HDA_CODEC_ALC225, 0, "Realtek ALC225" }, + { HDA_CODEC_ALC230, 0, "Realtek ALC230" }, { HDA_CODEC_ALC231, 0, "Realtek ALC231" }, { HDA_CODEC_ALC233, 0, "Realtek ALC233" }, { HDA_CODEC_ALC234, 0, "Realtek ALC234" }, From nobody Sun Feb 18 17:41: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 4TdCdv0jVBz5BJS6; Sun, 18 Feb 2024 17:41: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 4TdCdv0C0Bz4WM3; Sun, 18 Feb 2024 17:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708278099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DV293anmKwqFytbYZgUvwpCFrz8M3RYUHc0rWZqPcEU=; b=ZaIuuoHjsvAxUyabD7WsCQWsqjNcoybclP4sPMf2OyaOlZyh695vWwFgvIFpIa4rfNgApw vbnbODfLHapq1UGZHQHfiyT9FQkje58vUXDPEul7GYPZq0CQrmRqSx3dRYKSe3fbr1m285 GB4WxDSJufnrqb0Wuif4fCvgLl269t9L5d/BQ70koEFUoxDc/oXwKHopKJo0kulp+Y+J3F zDGdiEsfDw+YCyjXp0oKL0c8enpz+uVnuxOyR1AVDrrOxcS96gIBNdHNzFnStCu13QTgfj YRQvT5BDnwvj4BqwfS1+a90RU8+qkZ15INmBxtRZf9XKxK/Gx4D2QfCmTClKBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708278099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DV293anmKwqFytbYZgUvwpCFrz8M3RYUHc0rWZqPcEU=; b=Ij0RKdstL1zm20nFgvVEeHoMe34wRvC1BHTnQxxhgl57lKbdFCwrQQokr1KLdu/sRSNIyc v99MrsAH3+y+UmDYC/4WYV7KSBH7ClutUk78r1KcJPuUUneeq4KsD+3cKBz4NUF3BG2HsV 3bEsW6JUmdUHAgf4Zotx2eTV7W7uKAL6QNGD0EeqI7BIsqYUHUESSyDR6FXEvX14FJ2P4q l4cb9dPYXm+sWndpcqRBsqo0YlfjZ/0xVGayw1FxuMfM/6Tr7udxMCrb89egt2ZQ3pkRoR W6ugKEwtI9emOZkpVftftg/O9/J/t1e7+URUp37fC477fjAYwjrb7qoiYyT3PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708278099; a=rsa-sha256; cv=none; b=hRhxkZwfzervDYhEtUl7lcCtCnunojm5jcA48+2yGDhp3NeA78Skx9bOiAF6Y+cE7oaSW4 JvWPqCr1dsTP9fXQumcJXVFLNjjXd4Ql05VELNesSLW8Gj4poQxUEvvx8oGo/aR9LsUAK+ VYUORJsGP2NdQKB9uelCQFrbNrcFgXq+ZMumLEnSOdgSkrHiAjaUpPaLsUp935F9kP7bGX YuSGCE9W9uqu0nYLi8LhBUkYZwI2/uiML6NyjM1MxKDlG4t/VlMSXr7mV8UynODkxdpoO5 mNMBpqKwgckbF+HL5i6K5o1e6DbYSCsZ2NG0PSSShHbDcG7P28uOH2tTkq8seQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdCdt6BCGz11LQ; Sun, 18 Feb 2024 17:41: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 41IHfcE0060635; Sun, 18 Feb 2024 17:41:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IHfc8X060632; Sun, 18 Feb 2024 17:41:38 GMT (envelope-from git) Date: Sun, 18 Feb 2024 17:41:38 GMT Message-Id: <202402181741.41IHfc8X060632@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: 3cc86989bfbe - main - sdiff: Misc cleanup. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cc86989bfbe27c91b5db592c2af33fef153e230 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3cc86989bfbe27c91b5db592c2af33fef153e230 commit 3cc86989bfbe27c91b5db592c2af33fef153e230 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-18 17:39:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-18 17:39:50 +0000 sdiff: Misc cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43943 --- usr.bin/sdiff/sdiff.c | 102 +++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c index f177f11e9156..c6a4c5f9c477 100644 --- a/usr.bin/sdiff/sdiff.c +++ b/usr.bin/sdiff/sdiff.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -18,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -68,11 +68,11 @@ static STAILQ_HEAD(, diffline) diffhead = STAILQ_HEAD_INITIALIZER(diffhead); static size_t line_width; /* width of a line (two columns and divider) */ static size_t width; /* width of each column */ static size_t file1ln, file2ln; /* line number of file1 and file2 */ -static int Iflag = 0; /* ignore sets matching regexp */ -static int lflag; /* print only left column for identical lines */ -static int sflag; /* skip identical lines */ -FILE *outfp; /* file to save changes to */ -const char *tmpdir; /* TMPDIR or /tmp */ +static bool Iflag; /* ignore sets matching regexp */ +static bool lflag; /* print only left column for identical lines */ +static bool sflag; /* skip identical lines */ +FILE *outfp; /* file to save changes to */ +const char *tmpdir; /* TMPDIR or /tmp */ enum { HELP_OPT = CHAR_MAX + 1, @@ -205,14 +205,13 @@ FAIL: int main(int argc, char **argv) { - FILE *diffpipe=NULL, *file1, *file2; - size_t diffargc = 0, wflag = WIDTH; - int ch, fd[2] = {-1}, status; - pid_t pid=0; - const char *outfile = NULL; - char **diffargv, *diffprog = diff_path, *filename1, *filename2, - *tmp1, *tmp2, *s1, *s2; - int i; + FILE *diffpipe, *file1, *file2; + size_t diffargc = 0, flagc = 0, wval = WIDTH; + int ch, fd[2], i, status; + pid_t pid; + const char *errstr, *outfile = NULL; + char **diffargv, *diffprog = diff_path, *flagv; + char *filename1, *filename2, *tmp1, *tmp2, *s1, *s2; char I_arg[] = "-I"; char speed_lf[] = "--speed-large-files"; @@ -227,20 +226,21 @@ main(int argc, char **argv) * waste some memory; however we need an extra space for the * NULL at the end, so it sort of works out. */ - if (!(diffargv = calloc(argc, sizeof(char **) * 2))) - err(2, "main"); + if ((diffargv = calloc(argc, sizeof(char *) * 2)) == NULL) + err(2, NULL); /* Add first argument, the program name. */ diffargv[diffargc++] = diffprog; - /* create a dynamic string for merging single-switch options */ - if ( asprintf(&diffargv[diffargc++], "-") < 0 ) - err(2, "main"); + /* create a dynamic string for merging single-character options */ + if ((flagv = malloc(flagc + 2)) == NULL) + err(2, NULL); + flagv[flagc] = '-'; + flagv[flagc + 1] = '\0'; + diffargv[diffargc++] = flagv; while ((ch = getopt_long(argc, argv, "aBbdEHI:ilo:stWw:", longopts, NULL)) != -1) { - const char *errstr; - switch (ch) { /* only compatible --long-name-form with diff */ case FCASE_IGNORE_OPT: @@ -258,14 +258,13 @@ main(int argc, char **argv) case 'i': case 't': case 'W': - diffargv[1] = realloc(diffargv[1], sizeof(char) * strlen(diffargv[1]) + 2); + flagc++; + flagv = realloc(flagv, flagc + 2); /* * In diff, the 'W' option is 'w' and the 'w' is 'W'. */ - if (ch == 'W') - sprintf(diffargv[1], "%sw", diffargv[1]); - else - sprintf(diffargv[1], "%s%c", diffargv[1], ch); + flagv[flagc] = ch == 'W' ? 'w' : ch; + flagv[flagc + 1] = '\0'; break; case 'H': diffargv[diffargc++] = speed_lf; @@ -274,21 +273,21 @@ main(int argc, char **argv) diffargv[0] = diffprog = optarg; break; case 'I': - Iflag = 1; + Iflag = true; diffargv[diffargc++] = I_arg; diffargv[diffargc++] = optarg; break; case 'l': - lflag = 1; + lflag = true; break; case 'o': outfile = optarg; break; case 's': - sflag = 1; + sflag = true; break; case 'w': - wflag = strtonum(optarg, WIDTH_MIN, + wval = strtonum(optarg, WIDTH_MIN, INT_MAX, &errstr); if (errstr) errx(2, "width is %s: %s", errstr, optarg); @@ -304,13 +303,12 @@ main(int argc, char **argv) } } - /* no single switches were used */ - if (strcmp(diffargv[1], "-") == 0 ) { - for ( i = 1; i < argc-1; i++) { - diffargv[i] = diffargv[i+1]; - } - diffargv[diffargc-1] = NULL; + /* no single-character options were used */ + if (flagc == 0) { + memmove(diffargv + 1, diffargv + 2, + sizeof(char *) * (diffargc - 2)); diffargc--; + free(flagv); } argc -= optind; @@ -355,7 +353,7 @@ main(int argc, char **argv) diffargv[diffargc++] = NULL; /* Subtract column divider and divide by two. */ - width = (wflag - 3) / 2; + width = (wval - 3) / 2; /* Make sure line_width can fit in size_t. */ if (width > (SIZE_MAX - 3) / 2) errx(2, "width is too large: %zu", width); @@ -364,21 +362,18 @@ main(int argc, char **argv) if (pipe(fd)) err(2, "pipe"); - switch (pid = fork()) { - case 0: + if ((pid = fork()) < 0) + err(1, "fork()"); + if (pid == 0) { /* child */ /* We don't read from the pipe. */ close(fd[0]); - if (dup2(fd[1], STDOUT_FILENO) == -1) - err(2, "child could not duplicate descriptor"); + if (dup2(fd[1], STDOUT_FILENO) != STDOUT_FILENO) + _exit(2); /* Free unused descriptor. */ close(fd[1]); execvp(diffprog, diffargv); - err(2, "could not execute diff: %s", diffprog); - break; - case -1: - err(2, "could not fork"); - break; + _exit(2); } /* parent */ @@ -452,6 +447,9 @@ main(int argc, char **argv) processq(); /* Return diff exit status. */ + free(diffargv); + if (flagc > 0) + free(flagv); return (WEXITSTATUS(status)); } @@ -551,7 +549,7 @@ prompt(const char *s1, const char *s2) const char *p; /* Skip leading whitespace. */ - for (p = cmd; isspace(*p); ++p) + for (p = cmd; isspace((unsigned char)*p); ++p) ; switch (*p) { case 'e': @@ -577,10 +575,10 @@ prompt(const char *s1, const char *s2) /* End of command parsing. */ break; case 's': - sflag = 1; + sflag = true; goto PROMPT; case 'v': - sflag = 0; + sflag = false; /* FALLTHROUGH */ default: /* Interactive usage help. */ @@ -701,7 +699,7 @@ parsecmd(FILE *diffpipe, FILE *file1, FILE *file2) p = line; /* Go to character after line number. */ - while (isdigit(*p)) + while (isdigit((unsigned char)*p)) ++p; c = *p; *p++ = 0; @@ -713,7 +711,7 @@ parsecmd(FILE *diffpipe, FILE *file1, FILE *file2) if (c == ',') { q = p; /* Go to character after file2end. */ - while (isdigit(*p)) + while (isdigit((unsigned char)*p)) ++p; c = *p; *p++ = 0; @@ -732,7 +730,7 @@ parsecmd(FILE *diffpipe, FILE *file1, FILE *file2) q = p; /* Go to character after line number. */ - while (isdigit(*p)) + while (isdigit((unsigned char)*p)) ++p; c = *p; *p++ = 0; From nobody Sun Feb 18 17:41: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 4TdCdw2Z6qz5BJV7; Sun, 18 Feb 2024 17:41: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 4TdCdw0SgFz4WGl; Sun, 18 Feb 2024 17:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708278100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H7bcNdLBhMn4I2cYhDEBY0dzYZLeyoqrjJDOuRU/WEQ=; b=ris007VhP44oBpdYoBUj9u7EiGx6thNb9YaFwPt52ZN/HTkdhA6qyZBQnPOpp30kk2zXUT cbKPriBk7Tc4Vpa4k3PAKbyMSvz4eufB+vb4tRatpOKeas4w6wrTaMiwic7r5tuR2KE4J4 kWHWFLVVZyzogkALV9LRp+e48dMiLybjjAQpFzLicsbdKzhC3/HItn+wdVskf+6lCb2WdN gNdUiRQoNAClaUZiIVAddm59C5t8AifCKIb/sTmv1PuijA1otsel/XCX1cVAyxxMONwflJ 1JwDm67LL+9K1GELiP4pXQ+ZBXV8ULVIWdiXLTS32V0zt0MzMACW/ffEbkRcbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708278100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H7bcNdLBhMn4I2cYhDEBY0dzYZLeyoqrjJDOuRU/WEQ=; b=uypmlCtIYxxHsWWwi/wyzKL3Tc74D/8aKur/88ewtpTQsWyaHdJwK0v4ui0DIXPpj5cOSz r38tQZiUH7PQmnd2nhAdpm/dX9yYL/qdiba1+gQfHeAtCoD6Yai+ZtcjQI4oiuFlR+EpyM StuPUdJrQo51OYeNHoSS4Cc3Jdor7avyF8bDZe1OyRDSgm5qe0TCsdvFyjF37isuBJW6hI 4M7aod3Ak8FTSC7hWWkM5YCAhk2CZX2my/PxfyTki49Ai4S4lMVL6BS3397xQq5J28/BUu xNLs8P6isfNgb5+Z+ozYh1uwux7EkY+F2f92eyNSX9nQYXlP/BEz56WcB8Ibrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708278100; a=rsa-sha256; cv=none; b=nCUOeuUoH+2dKZMomgakPpOvAwc5QbNYbmRQxIlS+Fsw01/IR7A09aGqYHaeR6XrS7S97q gkijwH3BPIadOEVP/F8q9T92dQ/5KGHpQrGQMEnuxwJjoa//zPhYO3eHHFulLzgrc4/JX3 qx1uezrqf8VjXEh068SV0b9fOzOMd4HgoPvZWNay8c+chLQt2LiiscOhvQcZjbT9/SsDYK c5M/O8uUNBG5lDD/jAzSJrSksk6Tyq15yd9D6iLO4f0DE8T4ow04KrrNkZjlqG01p1OSf0 5gSaAvufhgz8MVI18MI0exdPy0Pax6d1GHLuzZfiVJO/EAKrxZY8Bwohk8YDUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdCdv6KDnz114J; Sun, 18 Feb 2024 17:41: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 41IHfdsE060685; Sun, 18 Feb 2024 17:41:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IHfdSa060682; Sun, 18 Feb 2024 17:41:39 GMT (envelope-from git) Date: Sun, 18 Feb 2024 17:41:39 GMT Message-Id: <202402181741.41IHfdSa060682@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: a834edfccd14 - main - sdiff: Fix --expand-tabs and --tabsize. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a834edfccd14a8c0f152a3b0078469af8e05f3fd Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a834edfccd14a8c0f152a3b0078469af8e05f3fd commit a834edfccd14a8c0f152a3b0078469af8e05f3fd Author: Dag-Erling Smørgrav AuthorDate: 2024-02-18 17:39:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-18 17:39:50 +0000 sdiff: Fix --expand-tabs and --tabsize. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43941 --- usr.bin/sdiff/sdiff.1 | 4 +--- usr.bin/sdiff/sdiff.c | 32 ++++++++++++++++++++++++-------- usr.bin/sdiff/tests/sdiff_test.sh | 18 ++++++++++++++++++ 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/usr.bin/sdiff/sdiff.1 b/usr.bin/sdiff/sdiff.1 index ef9bb95a0990..ca6594c6479a 100644 --- a/usr.bin/sdiff/sdiff.1 +++ b/usr.bin/sdiff/sdiff.1 @@ -3,7 +3,7 @@ .\" Written by Raymond Lai . .\" Public domain. .\" -.Dd April 8, 2017 +.Dd February 16, 2024 .Dt SDIFF 1 .Os .Sh NAME @@ -117,8 +117,6 @@ Ignore all spaces. Ignore blank lines. .It Fl E -ignore-tab-expansion Treat tabs and eight spaces as the same. -.It Fl t -ignore-tabs -Ignore tabs. .It Fl H -speed-large-files Assume scattered small changes in a large file. .It Fl -ignore-file-name-case diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c index c6a4c5f9c477..41284d54f869 100644 --- a/usr.bin/sdiff/sdiff.c +++ b/usr.bin/sdiff/sdiff.c @@ -71,6 +71,8 @@ static size_t file1ln, file2ln; /* line number of file1 and file2 */ static bool Iflag; /* ignore sets matching regexp */ static bool lflag; /* print only left column for identical lines */ static bool sflag; /* skip identical lines */ +static bool tflag; /* expand tabs */ +static int tabsize = 8; /* tab size */ FILE *outfp; /* file to save changes to */ const char *tmpdir; /* TMPDIR or /tmp */ @@ -126,7 +128,7 @@ static const char *help_msg[] = { "\t-d, --minimal: minimize diff size.", "\t-I RE, --ignore-matching-lines=RE: ignore changes whose line matches RE.", "\t-i, --ignore-case: do a case-insensitive comparison.", - "\t-t, --expand-tabs: sxpand tabs to spaces.", + "\t-t, --expand-tabs: expand tabs to spaces.", "\t-W, --ignore-all-spaces: ignore all spaces.", "\t--speed-large-files: assume large file with scattered changes.", "\t--strip-trailing-cr: strip trailing carriage return.", @@ -246,7 +248,6 @@ main(int argc, char **argv) case FCASE_IGNORE_OPT: case FCASE_SENSITIVE_OPT: case STRIPCR_OPT: - case TSIZE_OPT: case 'S': break; /* combine no-arg single switches */ @@ -256,7 +257,6 @@ main(int argc, char **argv) case 'd': case 'E': case 'i': - case 't': case 'W': flagc++; flagv = realloc(flagv, flagc + 2); @@ -286,6 +286,9 @@ main(int argc, char **argv) case 's': sflag = true; break; + case 't': + tflag = true; + break; case 'w': wval = strtonum(optarg, WIDTH_MIN, INT_MAX, &errstr); @@ -297,6 +300,11 @@ main(int argc, char **argv) printf("%s\n", help_msg[i]); exit(0); break; + case TSIZE_OPT: + tabsize = strtonum(optarg, 1, INT_MAX, &errstr); + if (errstr) + errx(2, "tabsize is %s: %s", errstr, optarg); + break; default: usage(); break; @@ -511,11 +519,11 @@ printcol(const char *s, size_t *col, const size_t col_max) * If rounding to next multiple of eight causes * an integer overflow, just return. */ - if (*col > SIZE_MAX - 8) + if (*col > SIZE_MAX - tabsize) return; /* Round to next multiple of eight. */ - new_col = (*col / 8 + 1) * 8; + new_col = (*col / tabsize + 1) * tabsize; /* * If printing the tab goes past the column @@ -523,12 +531,20 @@ printcol(const char *s, size_t *col, const size_t col_max) */ if (new_col > col_max) return; - *col = new_col; + + if (tflag) { + do { + putchar(' '); + } while (++*col < new_col); + } else { + putchar(*s); + *col = new_col; + } break; default: - ++(*col); + ++*col; + putchar(*s); } - putchar(*s); } } diff --git a/usr.bin/sdiff/tests/sdiff_test.sh b/usr.bin/sdiff/tests/sdiff_test.sh index 100fa1b123b0..c701c1704d3c 100755 --- a/usr.bin/sdiff/tests/sdiff_test.sh +++ b/usr.bin/sdiff/tests/sdiff_test.sh @@ -191,6 +191,23 @@ short_body() $(atf_get_srcdir)/d_input2 >/dev/null ; cat merge.out" } +atf_test_case tflag +tflag_head() +{ + atf_set "descr" "Checks tab expansion" +} +tflag_body() +{ + printf "a\tb\n" >a + printf "b\ta\n" >b + atf_check -s exit:1 -o match:$'a\tb' \ + sdiff a b + atf_check -s exit:1 -o match:"a {7}b" \ + sdiff -t a b + atf_check -s exit:1 -o match:"a {3}b" \ + sdiff -t --tabsize 4 a b +} + atf_init_test_cases() { atf_add_test_case flags @@ -203,4 +220,5 @@ atf_init_test_cases() atf_add_test_case dot atf_add_test_case stdin atf_add_test_case short + atf_add_test_case tflag } From nobody Sun Feb 18 17:41: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 4TdCdx3CZFz5BJgF; Sun, 18 Feb 2024 17:41: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 4TdCdx1Lryz4Wcj; Sun, 18 Feb 2024 17:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708278101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CGavI2UB7qfaHERwHgQgiX1Yxlc3VeTOya4C0l+GgEI=; b=oOZJtDmMkWI0KStz2TI2dlL1574K7XyESumdW1Bql9CHnWNXGLGcdmMgtPkeNQGc6COdMA YKjpEzeT31pbt/Uyl3Ws0RNVrO9g2ZIf96POjVirNBFoyj3t0jERQq8Ui72QyhIvBm8X1T o45vcRkOLtkFrjfXSZhnbRBWgNwIr9vhsdviZxcDETV14TeTrmeevPzGoSOuqeyVLczCd8 QwPNC3CO2xl4YGJi2XqnTKQ/PY72YDa3cyhAmjd4Zt/BDjRUEYDVItA4l/ABCwSg1q/ugq 9neh3OqlXE10thD/FE6r3PzczRV5vu1PvOFYYnyjh1A3/jbsRQVEbOvbeljlEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708278101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CGavI2UB7qfaHERwHgQgiX1Yxlc3VeTOya4C0l+GgEI=; b=rN6mBZHVanS/3erYZTf5Fx237svqfc4kfvUQjlIiqpxaDvSpIQmaSoL21CnGuPUuwUoe0T KDVExtg2VNI41BXNfIfjqHg1NhYFelIl5Ho8UwcrlfdkpL0BZgcd4FS3yEHflb8W1pHyjf iLSawGrJo+DvVBd6WG0qvbQW76BHXrVsjkreYJxPJhXv5Cy5hzyl812K2SKhBltNNQZCbD v6iJqTHDt2udgEhwlY5cwVWgEDwASOM2Ngd856KpagfT4ull1Lxxz1vHBtr95vCg8ViCZy fJP9/i0s6oB/fqCQyQF7oxwmWQl42ft6uEjQFFLPiuOSUAMzB3+Whnh7xff1qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708278101; a=rsa-sha256; cv=none; b=a1CBaDKVJxb38BWtFZmRUXxfxLUAja83GimiquXo6aAOyQnkYvYOfqS++yFdXw0JOhZCUd CQzb4F4eLFlhWeG9uxKRqEWz8Gn0gLx9Tif+fu9c6LPl1v6E+y3aM+7//AuD8kuRg/9SDs jHykvcXzaxnN8r93GhmCoJu8YutrfJKwldk4DT0Lr8ki7pdZqCn1bS5M1ef1kPgZiI7Rbc cNN+iHW8YpMBulzWqAtUMduLs+g3Lu7VSd0i96OI5spJPz7Yez2cs4lnv5KAqBm/DHnO8a bbyk+X3Vkwwjx6XgJNC6AGMsKoPxNwBdBMB/MblMHPwbVuT3EqrhQsLwLFZXfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdCdx09QGz114K; Sun, 18 Feb 2024 17:41: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 41IHfeZ3060734; Sun, 18 Feb 2024 17:41:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IHfexD060731; Sun, 18 Feb 2024 17:41:40 GMT (envelope-from git) Date: Sun, 18 Feb 2024 17:41:40 GMT Message-Id: <202402181741.41IHfexD060731@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: ad7bef8b8907 - main - sdiff: Fix binary case. 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: Sender: owner-dev-commits-src-main@freebsd.org 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad7bef8b890768e68a48bbfa6b92ebf635068504 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ad7bef8b890768e68a48bbfa6b92ebf635068504 commit ad7bef8b890768e68a48bbfa6b92ebf635068504 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-18 17:39:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-18 17:39:50 +0000 sdiff: Fix binary case. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43942 --- usr.bin/sdiff/sdiff.c | 100 ++++++++++++++++++++------------------ usr.bin/sdiff/tests/sdiff_test.sh | 18 +++++++ 2 files changed, 72 insertions(+), 46 deletions(-) diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c index 41284d54f869..05e3ee82212c 100644 --- a/usr.bin/sdiff/sdiff.c +++ b/usr.bin/sdiff/sdiff.c @@ -50,7 +50,7 @@ static void astrcat(char **, const char *); static void enqueue(char *, char, char *); static char *mktmpcpy(const char *); static int istextfile(FILE *); -static void binexec(char *, char *, char *) __dead2; +static int bindiff(FILE *, char *, FILE *, char *); static void freediff(struct diffline *); static void int_usage(void); static int parsecmd(FILE *, FILE *, FILE *); @@ -209,7 +209,7 @@ main(int argc, char **argv) { FILE *diffpipe, *file1, *file2; size_t diffargc = 0, flagc = 0, wval = WIDTH; - int ch, fd[2], i, status; + int ch, fd[2], i, ret, status; pid_t pid; const char *errstr, *outfile = NULL; char **diffargv, *diffprog = diff_path, *flagv; @@ -355,6 +355,15 @@ main(int argc, char **argv) filename2 = tmp2; } + if ((file1 = fopen(filename1, "r")) == NULL) + err(2, "could not open %s", filename1); + if ((file2 = fopen(filename2, "r")) == NULL) + err(2, "could not open %s", filename2); + if (!istextfile(file1) || !istextfile(file2)) { + ret = bindiff(file1, filename1, file2, filename2); + goto done; + } + diffargv[diffargc++] = filename1; diffargv[diffargc++] = filename2; /* Add NULL to end of array to indicate end of array. */ @@ -392,26 +401,6 @@ main(int argc, char **argv) if ((diffpipe = fdopen(fd[0], "r")) == NULL) err(2, "could not open diff pipe"); - if ((file1 = fopen(filename1, "r")) == NULL) - err(2, "could not open %s", filename1); - if ((file2 = fopen(filename2, "r")) == NULL) - err(2, "could not open %s", filename2); - if (!istextfile(file1) || !istextfile(file2)) { - /* Close open files and pipe, delete temps */ - fclose(file1); - fclose(file2); - if (diffpipe != NULL) - fclose(diffpipe); - if (tmp1) - if (unlink(tmp1)) - warn("Error deleting %s.", tmp1); - if (tmp2) - if (unlink(tmp2)) - warn("Error deleting %s.", tmp2); - free(tmp1); - free(tmp2); - binexec(diffprog, filename1, filename2); - } /* Line numbers start at one. */ file1ln = file2ln = 1; @@ -423,20 +412,10 @@ main(int argc, char **argv) /* Wait for diff to exit. */ if (waitpid(pid, &status, 0) == -1 || !WIFEXITED(status) || WEXITSTATUS(status) >= 2) - err(2, "diff exited abnormally."); + errx(2, "diff exited abnormally"); + ret = WEXITSTATUS(status); - /* Delete and free unneeded temporary files. */ - if (tmp1) - if (unlink(tmp1)) - warn("Error deleting %s.", tmp1); - if (tmp2) - if (unlink(tmp2)) - warn("Error deleting %s.", tmp2); - free(tmp1); - free(tmp2); - filename1 = filename2 = tmp1 = tmp2 = NULL; - - /* No more diffs, so print common lines. */ + /* No more diffs, so enqueue common lines. */ if (lflag) while ((s1 = xfgets(file1))) enqueue(s1, ' ', NULL); @@ -454,26 +433,55 @@ main(int argc, char **argv) /* Process unmodified lines. */ processq(); +done: + /* Delete and free unneeded temporary files. */ + if (tmp1 != NULL) { + if (unlink(tmp1) != 0) + warn("failed to delete %s", tmp1); + free(tmp1); + } + if (tmp2 != NULL) { + if (unlink(tmp2) != 0) + warn("failed to delete %s", tmp2); + free(tmp2); + } + /* Return diff exit status. */ free(diffargv); if (flagc > 0) free(flagv); - return (WEXITSTATUS(status)); + return (ret); } /* - * When sdiff detects a binary file as input, executes them with - * diff to maintain the same behavior as GNU sdiff with binary input. + * When sdiff detects a binary file as input. */ -static void -binexec(char *diffprog, char *f1, char *f2) +static int +bindiff(FILE *f1, char *fn1, FILE *f2, char *fn2) { - - char *args[] = {diffprog, f1, f2, (char *) 0}; - execv(diffprog, args); - - /* If execv() fails, sdiff's execution will continue below. */ - errx(1, "could not execute diff process"); + int ch1, ch2; + + flockfile(f1); + flockfile(f2); + do { + ch1 = getc_unlocked(f1); + ch2 = getc_unlocked(f2); + } while (ch1 != EOF && ch2 != EOF && ch1 == ch2); + funlockfile(f2); + funlockfile(f1); + if (ferror(f1)) { + warn("%s", fn1); + return (2); + } + if (ferror(f2)) { + warn("%s", fn2); + return (2); + } + if (ch1 != EOF || ch2 != EOF) { + printf("Binary files %s and %s differ\n", fn1, fn2); + return (1); + } + return (0); } /* diff --git a/usr.bin/sdiff/tests/sdiff_test.sh b/usr.bin/sdiff/tests/sdiff_test.sh index c701c1704d3c..83ed93503f18 100755 --- a/usr.bin/sdiff/tests/sdiff_test.sh +++ b/usr.bin/sdiff/tests/sdiff_test.sh @@ -208,6 +208,23 @@ tflag_body() sdiff -t --tabsize 4 a b } +atf_test_case binary +binary_head() +{ + atf_set "descr" "Checks binary file handling" +} +binary_body() +{ + printf "a\0\n" >a + printf "b\0\n" >b + atf_check -o empty sdiff a a + atf_check -o empty sdiff a - To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a890a3a5ddf3 - main - net80211: increase number of spares in struct ieee80211_vap 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a890a3a5ddf33acb0a4000885945b89156799b07 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a890a3a5ddf33acb0a4000885945b89156799b07 commit a890a3a5ddf33acb0a4000885945b89156799b07 Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 17:47:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 17:55:39 +0000 net80211: increase number of spares in struct ieee80211_vap Turns out MFCing 713db49d06deee90dd358b2e4b9ca05368a5eaf6 does not leave us with enough spares. Given wireless will likely see more changes in the near future add more spares. This is especially necessary given 'struct ieee80211_vap' gets allocated by drivers. Bumps size of struct ieee80211_vap to (7 * 512) on 64bit. --- sys/net80211/ieee80211_var.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index b69bb5f7ad87..4c9cdcbfccd9 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -611,7 +611,7 @@ struct ieee80211vap { struct ieee80211_rx_histogram *rx_histogram; struct ieee80211_tx_histogram *tx_histogram; - uint64_t iv_spare[6]; + uint64_t iv_spare[36]; }; MALLOC_DECLARE(M_80211_VAP); From nobody Sun Feb 18 18:58: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 4TdFL74fmZz5BTrk; Sun, 18 Feb 2024 18:58: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 4TdFL741lrz4gHH; Sun, 18 Feb 2024 18:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708282687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S5mtgk4k5ZaE5tNRXmQKe9WtOn74YYWrmmpul18vU3o=; b=G4dZowSFQcFYqTfoLcQwCSClNTbWCw99Rfri/nAmD4x8iA7sBQy35ikG5nNRYBeZapjtcB /UVfy7SjEYxmk/G59PFGPFRo/orw/Xl6i+wmrExg5Lfu9Aryqs3xfoGEtvituY+UeKnWvI WCV1xs0QArW495ugRXyHy0wxcc1d2Ae5M9Q3+dU47yxNGCsIzKF3aJuU2qXUZyW94UCZ2V RDZHLRAuZQaHVkS885GLzfDwg4gDgRdWWjHmSJL/OPCsCUReJfBCO0VF23wxKjzyn6sYLg G6m0qX7h0S6j5cG82yAuWTpOJZCifQQYl9RKHJQN92+MOguPPOmmpjZeATrWXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708282687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S5mtgk4k5ZaE5tNRXmQKe9WtOn74YYWrmmpul18vU3o=; b=SZSX042YO1+welGE0NHICVG0XzCqWfoZyb4O2XK+loyks4L4KHLZlQRE28H1gdN/ZgY4Dk 39sgihII7aVZJuPYeJlMNwzgLbFq9XxbLgVt/aJXMVRLO1L/iuEXo5O+6NqqBGziN5PLnJ Q56N3eg1sI7Q20gB/6irP8uv+/IJjpbdiwVvJ7OV1JAPepKRPMj9kh2nScaEmVwPG/3091 1X/oCujiqx9W7ejDvScRi9igASfNNOb3bzg62pdvufX7rjbIG37g+dVyTryDIfsCvKWzsK cTXbMalEb0MjHX6vrO9AWHhGJvDjIgqWJVbVaXkoh9sRHXdS5EimSc1EvG7h4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708282687; a=rsa-sha256; cv=none; b=ed5DMgb3QUxHCwZBg+SuIC3zYT2zEmBRkzeUsO8k0QSE1vbgBJm3O2tJrfIUeaCFGUu1aP V+ETP3eDkcikL0yGCmNTml1phPjSuGYwX+QS1S+q5rdLtT7JJww+FALaxis7MTka45qNpS N6kyh/bUI7BvFro8KzqZAVGC60VhH7cIUuic4ZCOMfXVPZudU6RRwq4rnLGD0TNDLU/mkP 43BRcijetOuqOqbL+fV8Tbcwu6pxMHaaZixPhuCVJSmaCy5vuGCw3CvaHsqjPOC2t9aZc+ p6HWKnJJFSTwWyyDkRHE70dVxaLY4/9AkCwERSig3Ri/VsWH8keTAusziDHLkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdFL735qJz132S; Sun, 18 Feb 2024 18:58: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 41IIw7Y6082444; Sun, 18 Feb 2024 18:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IIw7Tw082441; Sun, 18 Feb 2024 18:58:07 GMT (envelope-from git) Date: Sun, 18 Feb 2024 18:58:07 GMT Message-Id: <202402181858.41IIw7Tw082441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: d0bf8b5aaccb - main - wc: Fix SIGINFO race with casper 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0bf8b5aaccbe082d3728279620b8f8474d9ca8a Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=d0bf8b5aaccbe082d3728279620b8f8474d9ca8a commit d0bf8b5aaccbe082d3728279620b8f8474d9ca8a Author: Bryan Drewery AuthorDate: 2024-02-18 18:55:11 +0000 Commit: Bryan Drewery CommitDate: 2024-02-18 18:57:42 +0000 wc: Fix SIGINFO race with casper init. If a file is specified then fileargs_init(3) may return [EINTR]. With the SIGINFO handler not being SA_RESTART this causes an early exit if a SIGINFO comes in. Rather than checking for [EINTR] or changing the handler just move it later which resolves the problem. --- usr.bin/wc/wc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 76b65e5f870d..4e8a2d8a8b59 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -117,8 +117,6 @@ main(int argc, char *argv[]) argv += optind; argc -= optind; - (void)signal(SIGINFO, siginfo_handler); - fa = fileargs_init(argc, argv, O_RDONLY, 0, cap_rights_init(&rights, CAP_READ, CAP_FSTAT), FA_OPEN); if (fa == NULL) @@ -137,6 +135,7 @@ main(int argc, char *argv[]) xo_open_container("wc"); xo_open_list("file"); + (void)signal(SIGINFO, siginfo_handler); errors = 0; total = 0; if (argc == 0) { From nobody Sun Feb 18 23:58: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 4TdN0D3NW8z5C5yn; Sun, 18 Feb 2024 23:58: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 4TdN0D2sdfz4TlZ; Sun, 18 Feb 2024 23:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708300684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C9SO367mIO7d5jELjUufzzwImarNpzJUkql/aeIUtKU=; b=iYBB3Se+E3GEMeFWwH1GafmBdpBz4J/hVScILr4UnOFdE8gqubJD9HPvMpJQDyie5Yb6rF ibgLnXke8DCE1zZ1lPEXaLEmSv0s6MBufT9gWjDuhFRkUDDKYabNI+tc4tto70sxrtSdI9 vgdYj9Kw4xdT5myq7GruvniZUbhUHNJ2dMXh/j3qA8T1eznV5016MJeOTEzZM/6SW4ugEs ouOeDXMnoaOZ1ywX8bG8C3lqHleL7NcUo9sSaM4r7Kq6AekI1Tc+nNKefrsVSfJEcyiKWY avkM9xS1NyvGiqGpfE48NS/LOn8tbkjxi2/bAZqGQId3wkpnylpw0jKsB+5O7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708300684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C9SO367mIO7d5jELjUufzzwImarNpzJUkql/aeIUtKU=; b=ecc1tFVermqiNOv+6ydF2s/d5bBp3xEn+KvF/iOUj/l5L7OOKgVKe8eTnGbvGuIiSXUZjc ZqMLhIKKUh7usy4gb0wfU8utkPkj3SI303cP8GZ0CZHIvkVRz1DxVGYRT7hS0Qxy7gMOZa CJh0Oy8BWsCaZNzuzxPGb5EdMQihARhZMxrh5HWmdQ20imE6Vjsi3Qayu7vz6XP/DLXcAa mbeMk6edZIitrX77Rf5On8LiqiSUY5i0zt44j/vLxlAbwTk/n5rNpFuwbRhYXepOq98r2X 41TxHTMjr0wNLzyJpuGjtvvyV9b2xlcK1ekftKHL90cTtFEUtHOsv6EZsVQsUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708300684; a=rsa-sha256; cv=none; b=YmFqod2yVUfpY7kioPE6PKSoc3Hc87FgShaVUgATOiYjI6zgGbaA3ZyGjcmelHY85+MGIV MuE/69FaxIwIQlMntffXgm3inriteddBbag7LpmcY4EYZan/XmDTLyIBdk2of2nbrpN59y liQPb7kc8jwXTvkkFuPXGWOlWdOOH9XUBdV8ZiZORRzpHGraLEHCt9GsdtQC0BK/VLAcOC KO9qVxNpHdr7MUVwaiDBKClvkRtFvl9rt1ahN23hkbDKyB7llP83DxalzbQWeRbosGEJr9 NDBXBLcPZXXfImtfD0heNMGGX8/h0GGnMT5kqC5DMCazGW+WpBzfF5WtrB0q8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdN0D1pZBz1Bj2; Sun, 18 Feb 2024 23:58: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 41INw43k086849; Sun, 18 Feb 2024 23:58:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41INw4xo086846; Sun, 18 Feb 2024 23:58:04 GMT (envelope-from git) Date: Sun, 18 Feb 2024 23:58:04 GMT Message-Id: <202402182358.41INw4xo086846@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: 65190700cb0f - main - release/tools: Add support for building armv7 vm 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65190700cb0f94560458a479cd30f921208deb28 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=65190700cb0f94560458a479cd30f921208deb28 commit 65190700cb0f94560458a479cd30f921208deb28 Author: Muhammad Moinur Rahman AuthorDate: 2024-02-18 23:49:52 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-02-18 23:49:52 +0000 release/tools: Add support for building armv7 vm Currently there is no support for generating armv7 vm images in the release artifacts. In fact in terms of release artifacts and architecture there is no good reason to have a vm release artifact for armv7 as those are mostly used in SOCs or embedded boards. However considering that developers actually do need an easy way to test armv7 with a vm running this is really important. As part of pre-commit ci for developers this can be really helpful for the end developers. Approved by: cperciva, imp, re Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43952 --- release/tools/vmimage.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index f6a0ace21564..41437a9e1edb 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -271,7 +271,7 @@ vm_create_disk() { ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}" MAKEFSARGS="$MAKEFSARGS -B little" ;; - arm64:aarch64 | riscv:riscv64*) + arm:armv7 | arm64:aarch64 | riscv:riscv64*) ESP=yes BOOTPARTS= ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}" From nobody Sun Feb 18 23:58: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 4TdN0F4GCGz5C5fx; Sun, 18 Feb 2024 23:58: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 4TdN0F3P8qz4TX4; Sun, 18 Feb 2024 23:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708300685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MOjgFuITPLxlODXik420Xgkob9jWx68/z640UWqO9YY=; b=oIHTWsa4Hcw/KKj5A1NeTm92OE5uzPlmt1ybE/DH5r/HHq9RntdEpm0eM5lWX+DF/lRBwY 71KiC2rUv/VlFpLAzJDIAkI3IWsHVcVm2rL9htU0hcA4Gshl/rMfMKBN9wV5E8Nj+tFXJ3 Xgas+aPV/bB6CTH+prThxPNvokUYyTdzEer/UzirpfZcdXHktB4zgxbZb+Bld5G5Bt4j9h Et4KLRoCQ8FlKFwjUCjj+EwY+ueLXgSAc6PLnDTi5DMdZ6BDIw4wXdO2S+ppQCxgQY0+1Z /TYXFYlVoxok03NzqEXnlKFcuaiP0VWJJpiNj4nKsYr3KnTJF3di8S7n0iI8Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708300685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MOjgFuITPLxlODXik420Xgkob9jWx68/z640UWqO9YY=; b=G60/1YZA93a5Vu7o9H0UH/err4ac0iwuBhGSN1uqW/5MLC4mRwTvU53aUSa23q92YV2lx3 9ffQoZn3D3LvVX6GFoJ+qTFMHcZw9k2dNE+TkAW3IcCXUJq0hPlXNMSZ3CNCepHMpWrAVO PWKF11sXJtbA6qTY0lB7+/gvh619ZyDOjmHmC+svjPlXDr2x6GlXyxc+5tap9yp1kEFceu 8zKQbOsWSMzPpka64zU4vC4qNuPLgfaUqeatDQOaL0lrP+TzdJ80lCZOu/EdiifT5I/AT0 CMHpriaUxRMFlnfRO2gpHKoAWA22eClaO8aioKtLHm+ZQESqwcFDhQg81uaZfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708300685; a=rsa-sha256; cv=none; b=RtpG4KAW30dbOV0OOWgZ/dfXA+2hm2EySPXmXzuAeEEt0g9k/Fby51tIqVJt0WZFC80vh9 crYYnSfUFY46/4NPiWrn2ijFIqlD7LDe9ucE3y3J3kPxnLegB2byO2U/irqtykz3joa7bg phv0S8/nUUrVGIIwsCgfVDqYzldqVRXh6qdzXdL4ZTCaI+L8K04zBRdBxoW1PRenVKoznS JJUML09IRvLcwy7GksYAlLi6bxqIoPFmNjN5Xl0S+jUjMD50p6yegXqQ1u3QMjP0h6FGXA ysOvpVd1d25AU6EOY7/MYM+7+x9PHSDnaB4WNCU1nEBYETTxAJ18Rm6nqP9Pkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdN0F2TsLz1BQs; Sun, 18 Feb 2024 23:58: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 41INw5RU086901; Sun, 18 Feb 2024 23:58:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41INw5kB086898; Sun, 18 Feb 2024 23:58:05 GMT (envelope-from git) Date: Sun, 18 Feb 2024 23:58:05 GMT Message-Id: <202402182358.41INw5kB086898@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: da9cd485d095 - main - crontab/crontab.1: Fix crontab path in man 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: Sender: owner-dev-commits-src-main@freebsd.org 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: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da9cd485d0950de83c9762ca99532114aeb394d4 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=da9cd485d0950de83c9762ca99532114aeb394d4 commit da9cd485d0950de83c9762ca99532114aeb394d4 Author: Muhammad Moinur Rahman AuthorDate: 2024-02-18 23:56:16 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-02-18 23:56:16 +0000 crontab/crontab.1: Fix crontab path in man In FreeBSD the crontabs are stored in /var/cron/tabs directory and not in /var directory. Approved by: kevans Differential Revision: https://reviews.freebsd.org/D43181 --- usr.sbin/cron/crontab/crontab.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1 index 00e188c0e87c..3919486c7c71 100644 --- a/usr.sbin/cron/crontab/crontab.1 +++ b/usr.sbin/cron/crontab/crontab.1 @@ -46,7 +46,7 @@ used to drive the daemon in Vixie Cron. Each user can have their own crontab, and though these are files in -.Pa /var , +.Pa /var/cron/tabs , they are not intended to be edited directly. .Pp If the