From nobody Sat Nov 25 21:55:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd5JK44rsz51wjR; Sat, 25 Nov 2023 21:55:45 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sd5JK2D6zz3XgC; Sat, 25 Nov 2023 21:55:45 +0000 (UTC) (envelope-from delphij@delphij.net) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=delphij.net; i=@delphij.net; q=dns/txt; s=y07n; t=1700949338; h=message-id : date : mime-version : reply-to : subject : to : cc : references : from : in-reply-to : content-type : from; bh=Y4rQLyUBakLz3QOdAOPgIzPuVplSIxs8LsendCmGmys=; b=vuneRy3+vr8pRsWdgJONvBdvQJ5wP6c32eI2IOKLJ9fC3l300g150IhRKYHOEeKb2o4/T QNM8CeNdaQJlwaqBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=delphij.net; i=@delphij.net; q=dns/txt; s=w44o; t=1700949338; h=message-id : date : mime-version : reply-to : subject : to : cc : references : from : in-reply-to : content-type : from; bh=Y4rQLyUBakLz3QOdAOPgIzPuVplSIxs8LsendCmGmys=; b=PcNvUlg84e3YAbvqxIqfbK8OgSLM2FWX5l23+gkVdabVC/dpwgo77TlvKD5a4Lwec2n5/ kpw6hvFtbx2I1JGKFJoAVo3pglf3tvi5Fiy2u1rZesLX5XLQ8d/grBzhvEGCniF5sQ0twit TEgUvcA0LaocvIiwvgFxY6J08/v06lwUcf5Yfz1wzT6wf+eTrk8MoPPX0FSWKZW/IPmoY2M TJI+gAVFFibIV5fxz5aABOpCrUFkEBvVucwL9yTibYbsQfqi1GR4atUfkrAFKHknnUSIUkq faoZ82lboZS9bIgh+0PrNhMDSScSXKOCWjVAO6LwsW0zK81ZqPECFLIEvhtQ== Received: from xins-laptop (unknown [IPv6:2601:646:9a00:3b0a:5ec:4435:d01b:d397]) by anubis.delphij.net (Postfix) with ESMTPSA id 31BF82E7E2; Sat, 25 Nov 2023 13:55:38 -0800 (PST) Message-ID: <1b464edd-7196-43d8-ae35-fdfd40eae0bf@delphij.net> Date: Sat, 25 Nov 2023 13:55:37 -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 Reply-To: d@delphij.net Subject: Re: git: 19f073c612af - main - new-bus: Add resource_validate_map_request function To: John Baldwin , Konstantin Belousov , d@delphij.net Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202311231707.3ANH758D008755@gitrepo.freebsd.org> <934faa57-60d2-4be7-bdd3-e64c62ae71ad@delphij.net> <0e2a051b-d676-4f28-b0c6-60b5409d931e@FreeBSD.org> Content-Language: en-US From: Xin Li Autocrypt: addr=delphij@delphij.net; keydata= xjMEZPbDoRYJKwYBBAHaRw8BAQdAsUNmxEWz6QiGdFbBrVVEpjNpgQV9FXjDWsLsY0UwRPvN HFhpbiBMSSA8ZGVscGhpakBkZWxwaGlqLm5ldD7ClgQTFgoAPhYhBLskk2pXNatsapeNzxED 4uuXWeTFBQJk9sRMAhsDBQkKBDXmBQsJCAcDBRUKCQgLBRYCAwEAAh4FAheAAAoJEBED4uuX WeTF6yIA/2Ls3Rb/qC8mQZ6D2S0UO5vblPghJfboFJLNJFw3i4GYAQCsTmQg3ahgbNEJu/vU xgtro2kTxa6kKnZ35IbqPqPcCc44BGT2w6ESCisGAQQBl1UBBQEBB0Cxji+sQgVPajLNA/Lw yHx0ogSalPQszdkfVgeg3iR3FAMBCAfCeAQYFgoAIBYhBLskk2pXNatsapeNzxED4uuXWeTF BQJk9sOhAhsMAAoJEBED4uuXWeTF3BQBAIx/gPCTFN2DPBrKLkE3oC/+j9EkmNLMUCGidlP/ Zb6HAP4nL1kStTsOldIGhi/3m1LvU7r3Kel3MnlIK8/9BlLPAg== In-Reply-To: <0e2a051b-d676-4f28-b0c6-60b5409d931e@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------5LmLcPGlxZqxBZap6Z0QUlRu" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:64.62.128.0/18, country:US] X-Rspamd-Queue-Id: 4Sd5JK2D6zz3XgC This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------5LmLcPGlxZqxBZap6Z0QUlRu Content-Type: multipart/mixed; boundary="------------l97ORIQyi8JzxHsmqqS3fUAF"; protected-headers="v1" From: Xin Li Reply-To: d@delphij.net To: John Baldwin , Konstantin Belousov , d@delphij.net Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: <1b464edd-7196-43d8-ae35-fdfd40eae0bf@delphij.net> Subject: Re: git: 19f073c612af - main - new-bus: Add resource_validate_map_request function References: <202311231707.3ANH758D008755@gitrepo.freebsd.org> <934faa57-60d2-4be7-bdd3-e64c62ae71ad@delphij.net> <0e2a051b-d676-4f28-b0c6-60b5409d931e@FreeBSD.org> In-Reply-To: <0e2a051b-d676-4f28-b0c6-60b5409d931e@FreeBSD.org> --------------l97ORIQyi8JzxHsmqqS3fUAF Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMjAyMy0xMS0yNSAxMDozMCwgSm9obiBCYWxkd2luIHdyb3RlOg0KPiBIb3dldmVyLCBm aXhpbmcgYWxsIHRoYXQgcmVxdWlyZXMgaGF2aW5nIHByb3BlciBidXNfbWFwL3VubWFwIHVw IGluIGFsbA0KPiB0aGUgbmV4dXMgZHJpdmVycyB3aGljaCB3ZSBkb24ndCBoYXZlIHlldCAo SSBoYXZlIG1vc3QgKGFsbD8pIG9mIHRoZW0NCj4gZml4ZWQgaW4gYSBicmFuY2ggdGhhdCB0 aGVzZSByZWNlbnQgcGF0Y2hlcyBjYW1lIGZyb20pLsKgIEknbSBub3Qgc3VyZSB3aHkNCj4g dGhlIFZNIEkgdGVzdGVkIGJvb3RlZCBkaWRuJ3QgdHJpcCBvdmVyIHRoaXMgY2FzZSB0aG91 Z2ggYXMgYmh5dmUgVk1zIGRvDQo+IGhhdmUgQUNQSSBkZXZpY2VzIHRoYXQgYWxsb2NhdGUg ZnJvbSBzeXNyZXMgcmFuZ2VzLiA6KA0KDQpUaGFua3MhICBDYW4gY29uZmlybSB0aGF0IHdp dGggZWQ4OGVlZjE0MGExIHRoZSBrZXJuZWwgYm9vdHMgZmluZSBub3cuIA0KTG9va2luZyBm b3J3YXJkIGZvciB0aGUgcmVhbCBmaXguDQoNCkNoZWVycywNCg== --------------l97ORIQyi8JzxHsmqqS3fUAF-- --------------5LmLcPGlxZqxBZap6Z0QUlRu Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQS7JJNqVzWrbGqXjc8RA+Lrl1nkxQUCZWJtWQUDAAAAAAAKCRARA+Lrl1nkxZF9 AP9uhw3ENC7RFrNgvdBBYhZ9ANqlBK8E8E9asp+xudwb2AEAkw0oAAnR29cQzex7nR/qNebIEiCm V6cbF+LaIurOfAg= =amJS -----END PGP SIGNATURE----- --------------5LmLcPGlxZqxBZap6Z0QUlRu-- From nobody Sun Nov 26 01:03:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd9T36whSz52F8p; Sun, 26 Nov 2023 01:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sd9T36m59z3QrX; Sun, 26 Nov 2023 01:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rRMFviUvQ6xYAJ4hWB9BAqL2CiM4SvN+5bRvjAjQPYI=; b=vA3ApHbYNqo4Ogl9Sz4mBAHiSskwNewH+Z4lzMWTHp8BmHWD4ziCLCAXnk+uNQME+bQkvJ 8MnQIh/yrJkhBFiCRwA96yjUxbJ7iLWqjr41xMY/k8H8TCFiPO7yOpVHecoHfHO21g/dp5 fMDxEcLPDINDDPAMs8tVltjalV9rfdPWlOpETUGmofb2Fo4zrnXxzMoC9y7gySvux3Xhn3 YOfCrbj7blLUzk9Gt88Rgtd8R4D2ESwxHPL70T0mwVoDHLIEbw/IRq7FnZX371YWLAscxr ULFXVbMQ7QclSv71B2oF0g5YMzqM63gBq4cyfA9OJrosMw2JViAhaGyX/RxDHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700960615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rRMFviUvQ6xYAJ4hWB9BAqL2CiM4SvN+5bRvjAjQPYI=; b=pmj274Q6+mCYrpDesurzag3qbE4Xaf21lMc9Cql6Gx+qulEK2nC4XSh7ir/4o6vBWjfzj3 CrmoqrQ8sGtv2OO0isrj3CqHcKBGXMbrlzKigqggWfALluTuXtyDrKM/CM8kMDbEpXDnkf 7Bt4/03ChBA8e+3YPh2Kw2DrKDNKYzLPF1eDPwimhKeVDQUKl9w+mNU0euM4sac6Isgwev iTVOFE1yp3Nh7M3/souRPMAZz8Uni6BE4RuREP2STk6m0mE+hHngvYTW2TtCanJJaQs9g+ hbmwzkisOoY83S06LnXmSSDpFgMRwWvlHZ0CG7K7lBcvyr2feitgk+5NAxSv8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700960615; a=rsa-sha256; cv=none; b=gMA2L7xhGFoiZseVinOwgyD/WZqQysbTt8wUdi2BonSlsXS6ylSxQ1LAbxCAZCtVUAAZ9B CBD5Py018L1b5ajPZH/dF3ZxZle/143KOYt5vGnFFjhyueHnAjMCjOqDhxoeK3mtgK3Vrb ngcieXiyjXIzfjC2kcM/2rQmuLOt5uX68xPc/OrhBquafD48bkJv2moNp4DzAEDJbqHyty v1uod/fpJdsJFkIs0xPns7qaVg1CyqnGGzXKYFB9C3A22wCef98GMwPyL28ggbOSeJrBmR DbbLYJTGjxPjEZdvJheWiHCbwsdjaJPR7msmUVVMSmfk1aQLsIDETiKOHEXq8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sd9T35qyXzb2L; Sun, 26 Nov 2023 01:03: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 3AQ13ZMi025038; Sun, 26 Nov 2023 01:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ13XLH025034; Sun, 26 Nov 2023 01:03:33 GMT (envelope-from git) Date: Sun, 26 Nov 2023 01:03:33 GMT Message-Id: <202311260103.3AQ13XLH025034@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: ca6a6373bdae - main - MFV: xz 5.4.5 List-Id: Commit messages for the main 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: ca6a6373bdaed010d6cbfb27f7249ae96009409d Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ca6a6373bdaed010d6cbfb27f7249ae96009409d commit ca6a6373bdaed010d6cbfb27f7249ae96009409d Merge: a9758e46473b 039b23c9238c Author: Xin LI AuthorDate: 2023-11-26 00:55:52 +0000 Commit: Xin LI CommitDate: 2023-11-26 01:02:59 +0000 MFV: xz 5.4.5 MFC after: 2 weeks contrib/xz/ChangeLog | 870 ++++++++++++++++++++- contrib/xz/FREEBSD-Xlist | 1 - contrib/xz/FREEBSD-upgrade | 2 - contrib/xz/THANKS | 4 + contrib/xz/doxygen/Doxyfile | 7 +- contrib/xz/src/common/mythread.h | 2 +- contrib/xz/src/common/sysdefs.h | 10 +- contrib/xz/src/common/tuklib_integer.h | 282 +++++-- contrib/xz/src/liblzma/api/lzma.h | 4 +- contrib/xz/src/liblzma/api/lzma/version.h | 4 +- contrib/xz/src/liblzma/check/check.h | 7 + contrib/xz/src/liblzma/check/crc64_fast.c | 8 + contrib/xz/src/liblzma/check/crc64_table.c | 6 +- contrib/xz/src/liblzma/common/common.c | 6 +- contrib/xz/src/liblzma/common/common.h | 36 +- contrib/xz/src/liblzma/common/index.c | 6 + contrib/xz/src/liblzma/common/index.h | 2 +- contrib/xz/src/liblzma/common/memcmplen.h | 2 +- .../xz/src/liblzma/common/stream_flags_common.h | 3 + contrib/xz/src/liblzma/liblzma.pc.in | 1 + contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 1 + contrib/xz/src/liblzma/lzma/fastpos.h | 1 + contrib/xz/src/liblzma/lzma/fastpos_tablegen.c | 2 + contrib/xz/src/liblzma/rangecoder/price.h | 1 + contrib/xz/src/lzmainfo/lzmainfo.c | 6 +- contrib/xz/src/xz/coder.c | 3 +- contrib/xz/src/xz/file_io.c | 40 +- contrib/xz/src/xz/file_io.h | 4 +- contrib/xz/src/xz/hardware.h | 3 +- contrib/xz/src/xz/message.h | 30 +- contrib/xz/src/xz/options.c | 3 +- contrib/xz/src/xz/util.c | 89 +-- contrib/xz/src/xz/util.h | 10 +- contrib/xz/src/xz/xz.1 | 1 - contrib/xz/src/xzdec/xzdec.c | 9 +- lib/liblzma/config.h | 6 +- 36 files changed, 1298 insertions(+), 174 deletions(-) diff --cc contrib/xz/FREEBSD-Xlist index 060a6718b73c,000000000000..fdbd69ce6d82 mode 100644,000000..100644 --- a/contrib/xz/FREEBSD-Xlist +++ b/contrib/xz/FREEBSD-Xlist @@@ -1,41 -1,0 +1,40 @@@ - $FreeBSD$ +*/*/*/Makefile.* +*/*/Makefile.* +*/.gitignore +*/Makefile.* +.git +.gitignore +ABOUT-NLS +CMakeLists.txt +COPYING.GPLv2 +COPYING.GPLv3 +COPYING.LGPLv2.1 +Doxyfile.in +INSTALL +INSTALL.generic +Makefile +Makefile.* +NEWS +PACKAGERS +aclocal.m4 +autogen.sh +build-aux/ +cmake/ +config.h.in +configure +configure.ac +debug/ +doc/ +dos/ +extra/ +lib/ +m4/ +macosx/ +makefile.am +po/ +po4a/ +src/*/*.rc +src/scripts/ +tests/ +version.sh +windows/ diff --cc contrib/xz/FREEBSD-upgrade index 986197c1463b,000000000000..400bfe70eee7 mode 100644,000000..100644 --- a/contrib/xz/FREEBSD-upgrade +++ b/contrib/xz/FREEBSD-upgrade @@@ -1,31 -1,0 +1,29 @@@ - $FreeBSD$ - +xz + +The source code is pulled with git: + + git clone --branch=v5.0 http://git.tukaani.org/xz.git xz + +ChangeLog is generated with: + + git log > ChangeLog + +For the import files and directories were pruned by: + +sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done' + +You may check if there are any new files that we don't need. + +You should run ``configure'' to make sure you use a more recent +config.h. Running ``make check'' in the xz source tree is also useful. + +The instructions for importing new release and merging to HEAD can be found +at FreeBSD wiki: + + http://wiki.freebsd.org/SubversionPrimer/VendorImports + +To make local changes to xz, simply patch and commit to the trunk +branch (aka HEAD). Never make local changes on the vendor branch. + +mm@FreeBSD.org +11-July-2011 diff --cc lib/liblzma/config.h index c3fa947ec5fb,000000000000..cfa53becb2ad mode 100644,000000..100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@@ -1,618 -1,0 +1,618 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* How many MiB of RAM to assume if the real amount cannot be determined. */ +#define ASSUME_RAM 128 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* FreeBSD - disabled intentionally */ +/* #undef ENABLE_NLS */ + +/* Define to 1 if bswap_16 is available. */ +/* #undef HAVE_BSWAP_16 */ + +/* Define to 1 if bswap_32 is available. */ +/* #undef HAVE_BSWAP_32 */ + +/* Define to 1 if bswap_64 is available. */ +/* #undef HAVE_BSWAP_64 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +#ifndef WITHOUT_CAPSICUM +/* Define to 1 if Capsicum is available. */ +#define HAVE_CAPSICUM 1 +#endif + +/* Define to 1 if the system has the type `CC_SHA256_CTX'. */ +/* #undef HAVE_CC_SHA256_CTX */ + +/* Define to 1 if you have the `CC_SHA256_Init' function. */ +/* #undef HAVE_CC_SHA256_INIT */ + +/* 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 */ + +/* Define to 1 if crc32 integrity check is enabled. */ +#define HAVE_CHECK_CRC32 1 + +/* Define to 1 if crc64 integrity check is enabled. */ +#define HAVE_CHECK_CRC64 1 + +/* Define to 1 if sha256 integrity check is enabled. */ +#define HAVE_CHECK_SHA256 1 + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if `CLOCK_MONOTONIC' is declared in . */ +#define HAVE_CLOCK_MONOTONIC 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CPUID_H 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if any of HAVE_DECODER_foo have been defined. */ +#define HAVE_DECODERS 1 + +/* Define to 1 if arm decoder is enabled. */ +#define HAVE_DECODER_ARM 1 + +/* Define to 1 if arm64 decoder is enabled. */ +#define HAVE_DECODER_ARM64 1 + +/* Define to 1 if armthumb decoder is enabled. */ +#define HAVE_DECODER_ARMTHUMB 1 + +/* Define to 1 if delta decoder is enabled. */ +#define HAVE_DECODER_DELTA 1 + +/* Define to 1 if ia64 decoder is enabled. */ +#define HAVE_DECODER_IA64 1 + +/* Define to 1 if lzma1 decoder is enabled. */ +#define HAVE_DECODER_LZMA1 1 + +/* Define to 1 if lzma2 decoder is enabled. */ +#define HAVE_DECODER_LZMA2 1 + +/* Define to 1 if powerpc decoder is enabled. */ +#define HAVE_DECODER_POWERPC 1 + +/* Define to 1 if sparc decoder is enabled. */ +#define HAVE_DECODER_SPARC 1 + +/* Define to 1 if x86 decoder is enabled. */ +#define HAVE_DECODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */ +#define HAVE_ENCODERS 1 + +/* Define to 1 if arm encoder is enabled. */ +#define HAVE_ENCODER_ARM 1 + +/* Define to 1 if arm64 encoder is enabled. */ +#define HAVE_ENCODER_ARM64 1 + +/* Define to 1 if armthumb encoder is enabled. */ +#define HAVE_ENCODER_ARMTHUMB 1 + +/* Define to 1 if delta encoder is enabled. */ +#define HAVE_ENCODER_DELTA 1 + +/* Define to 1 if ia64 encoder is enabled. */ +#define HAVE_ENCODER_IA64 1 + +/* Define to 1 if lzma1 encoder is enabled. */ +#define HAVE_ENCODER_LZMA1 1 + +/* Define to 1 if lzma2 encoder is enabled. */ +#define HAVE_ENCODER_LZMA2 1 + +/* Define to 1 if powerpc encoder is enabled. */ +#define HAVE_ENCODER_POWERPC 1 + +/* Define to 1 if sparc encoder is enabled. */ +#define HAVE_ENCODER_SPARC 1 + +/* Define to 1 if x86 encoder is enabled. */ +#define HAVE_ENCODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if __attribute__((__constructor__)) is supported for functions. + */ +#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1 + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +/* #undef HAVE_FUTIMES */ + +/* Define to 1 if you have the `futimesat' function. */ +/* #undef HAVE_FUTIMESAT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_GETTEXT */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +/* FreeBSD - only with clang because the base gcc does not support it */ +#if defined(__clang__) && defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_IMMINTRIN_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if .lz (lzip) decompression support is enabled. */ +#define HAVE_LZIP_DECODER 1 + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 to enable bt2 match finder. */ +#define HAVE_MF_BT2 1 + +/* Define to 1 to enable bt3 match finder. */ +#define HAVE_MF_BT3 1 + +/* Define to 1 to enable bt4 match finder. */ +#define HAVE_MF_BT4 1 + +/* Define to 1 to enable hc3 match finder. */ +#define HAVE_MF_HC3 1 + +/* Define to 1 to enable hc4 match finder. */ +#define HAVE_MF_HC4 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if getopt.h declares extern int optreset. */ +#define HAVE_OPTRESET 1 + +/* Define to 1 if you have the `pledge' function. */ +/* #undef HAVE_PLEDGE */ + +/* Define to 1 if you have the `posix_fadvise' function. */ +#define HAVE_POSIX_FADVISE 1 + +/* Define to 1 if `program_invocation_name' is declared in . */ +/* #undef HAVE_PROGRAM_INVOCATION_NAME */ + +/* Define to 1 if you have the `pthread_condattr_setclock' function. */ +#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if you have the `SHA256Init' function. */ +/* #undef HAVE_SHA256INIT */ + +/* Define to 1 if the system has the type `SHA256_CTX'. */ +#define HAVE_SHA256_CTX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SHA256_H 1 + +/* Define to 1 if you have the `SHA256_Init' function. */ +#define HAVE_SHA256_INIT 1 + +/* Define to 1 if the system has the type `SHA2_CTX'. */ +/* #undef HAVE_SHA2_CTX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHA2_H */ + +/* Define to 1 if optimizing for size. */ +/* #undef HAVE_SMALL */ + +/* Define to 1 if stdbool.h conforms to C99. */ +#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 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 `st_atimensec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1 + +/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 + +/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */ + +/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 + +/* Define to 1 if `st_uatime' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_UATIME */ + +/* Define to 1 to if GNU/Linux-specific details are unconditionally wanted for + symbol versioning. Define to 2 to if these are wanted only if also PIC is + defined (allows building both shared and static liblzma at the same time + with Libtool if neither --with-pic nor --without-pic is used). This define + must be used together with liblzma_linux.map. */ +/* #undef HAVE_SYMBOL_VERSIONS_LINUX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BYTEORDER_H */ + +#ifndef WITHOUT_CAPSICUM +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_CAPSICUM_H 1 +#endif + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_ENDIAN_H */ + +/* 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_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if the system has the type `uintptr_t'. */ +#define HAVE_UINTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if _mm_set_epi64x and _mm_clmulepi64_si128 are usable. See + configure.ac for details. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_USABLE_CLMUL 1 +#endif + +/* Define to 1 if you have the `utime' function. */ +/* #undef HAVE_UTIME */ + +/* Define to 1 if you have the `utimes' function. */ +/* #undef HAVE_UTIMES */ + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#define HAVE_VISIBILITY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if you have the `wcwidth' function. */ +#define HAVE_WCWIDTH 1 + +/* Define to 1 if the system has the type `_Bool'. */ +#define HAVE__BOOL 1 + +/* Define to 1 if you have the `_futime' function. */ +/* #undef HAVE__FUTIME */ + +/* Define to 1 if _mm_movemask_epi8 is available. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE__MM_MOVEMASK_EPI8 1 +#endif + +/* Define to 1 if the GNU C extension __builtin_assume_aligned is supported. + */ +#define HAVE___BUILTIN_ASSUME_ALIGNED 1 + +/* Define to 1 if the GNU C extensions __builtin_bswap16/32/64 are supported. + */ +#define HAVE___BUILTIN_BSWAPXX 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 when using POSIX threads (pthreads). */ +#define MYTHREAD_POSIX 1 + +/* Define to 1 when using Windows Vista compatible threads. This uses features + that are not available on Windows XP. */ +/* #undef MYTHREAD_VISTA */ + +/* Define to 1 when using Windows 95 (and thus XP) compatible threads. This + avoids use of features that were added in Windows Vista. */ +/* #undef MYTHREAD_WIN95 */ + +/* Define to 1 to disable debugging code. */ +#define NDEBUG 1 + +/* Name of package */ +#define PACKAGE "xz" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "xz@tukaani.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "XZ Utils" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "XZ Utils 5.4.4" ++#define PACKAGE_STRING "XZ Utils 5.4.5" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "xz" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://tukaani.org/xz/" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "5.4.4" ++#define PACKAGE_VERSION "5.4.5" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* The size of `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 + +/* 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 + +/* Define to 1 if the number of available CPU cores can be detected with + cpuset(2). */ +#define TUKLIB_CPUCORES_CPUSET 1 + +/* Define to 1 if the number of available CPU cores can be detected with + pstat_getdynamic(). */ +/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */ + +/* Define to 1 if the number of available CPU cores can be detected with + sched_getaffinity() */ +/* #undef TUKLIB_CPUCORES_SCHED_GETAFFINITY */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */ +/* #undef TUKLIB_CPUCORES_SYSCONF */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysctl(). */ +/* #undef TUKLIB_CPUCORES_SYSCTL */ + +/* Define to 1 if the system supports fast unaligned access to 16-bit, 32-bit, + and 64-bit integers. */ +/* FreeBSD - derive from __NO_STRICT_ALIGNMENT */ +/* #undef TUKLIB_FAST_UNALIGNED_ACCESS */ + +/* Define to 1 if the amount of physical memory can be detected with + _system_configuration.physmem. */ +/* #undef TUKLIB_PHYSMEM_AIX */ + +/* Define to 1 if the amount of physical memory can be detected with + getinvent_r(). */ +/* #undef TUKLIB_PHYSMEM_GETINVENT_R */ + +/* Define to 1 if the amount of physical memory can be detected with + getsysinfo(). */ +/* #undef TUKLIB_PHYSMEM_GETSYSINFO */ + +/* Define to 1 if the amount of physical memory can be detected with + pstat_getstatic(). */ +/* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */ + +/* Define to 1 if the amount of physical memory can be detected with + sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES). */ +#define TUKLIB_PHYSMEM_SYSCONF 1 + +/* Define to 1 if the amount of physical memory can be detected with sysctl(). + */ +/* #undef TUKLIB_PHYSMEM_SYSCTL */ + +/* Define to 1 if the amount of physical memory can be detected with Linux + sysinfo(). */ +/* #undef TUKLIB_PHYSMEM_SYSINFO */ + +/* Define to 1 to use unsafe type punning, e.g. char *x = ...; *(int *)x = + 123; which violates strict aliasing rules and thus is undefined behavior + and might result in broken code. */ +/* #undef TUKLIB_USE_UNSAFE_TYPE_PUNNING */ + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Version number of package */ - #define VERSION "5.4.4" ++#define VERSION "5.4.5" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined(__FreeBSD__) +#include +#if defined(__NO_STRICT_ALIGNMENT) +#define TUKLIB_FAST_UNALIGNED_ACCESS 1 +#endif +#include +#if _BYTE_ORDER == _BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +#endif +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT64_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +/* #undef __GETOPT_PREFIX */ + +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int32_t */ + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint64_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ + +/* Define to the type of an unsigned integer type wide enough to hold a + pointer, if such a type exists, and if the system does not define it. */ +/* #undef uintptr_t */ From nobody Sun Nov 26 01:14:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sd9jh0Wtcz52KXB; Sun, 26 Nov 2023 01: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 4Sd9jg6yXFz3TQ3; Sun, 26 Nov 2023 01:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700961272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJN9jNlD1tIMyFXAGB1UPC77kDkYdKhFMk0vLqPAs8g=; b=o77+SRODYjEPNzgKrZyiU7QW9DUKETv54d7JY5xH3EIK8/aRkbKr37220wbH7DCzZk2iGy Ick7NWJHHIs1mc8sD4Ol4tcaWIGiovsefiXrKBFqb3rQxlXhUVIXCLvWtbu8P1QTJ7MW/1 SiTeh/cu7NgorilUtbzPwNQabNC8uarOWxXHeXBD98I4xXx2QP94RFFCV2K1dUvmEX3H0p mGPtL+oP/gWyfQ5Vy1SYxxFIuRhErLPiTsTMyPsc+5AOJXIVj2PYRPoR2POteG7FzAVkPd 5cgdjh/E+44ETpNJOcXZzdBgjIAXLWG4VycByOk6hjWAUsUS+uYz7z/q/Ee2Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700961272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJN9jNlD1tIMyFXAGB1UPC77kDkYdKhFMk0vLqPAs8g=; b=QCqJ0GIo2sz1cwy/7ERJuqncHFBQMZJRsbjGS8TKbkjZeNyTJ+9rvKY2zcIUKScu0UDKEy 8YoIGE1noCLkKSGo5L9hIhFm+V1XLgvIsDPwKVOCCPWVD2f78Nox59PdAidwliVDrFAtOY 8yaEZ+A1q1dh6cHvFnHjIgQTePI5b9l7KSwQEiFQGjyDS0mk3Hj9SbxRWRqBrdUcm0VoKm +XTcwNsHBy/i/vB21pX8RQ8PpffLo7Rj52zamer/jEt9qLQ+cxD1X/3S9wTdtrJbWT1frM yQEi9gq0IqcgxSscrN+uYdNEzuPtqarkXHJ9XA9CBkbTMXIke7KB7UOu5ydW8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700961272; a=rsa-sha256; cv=none; b=R+0Hzuu984oaPejPBxED30u8ofFJ0Je56+7agf8lrCiZX2hhOu4d4o4qMbZmqJygWJZoQM MIx+zPvNLUfFlKiLkPo5udOYMz1+jUd1TNSpdb/6K9VIt0NJjFx2jJzmOKYqwL3BK/6KKc MrIKehoAiLaogtebUZGWIvOolFl/5MomdXK4v0u+4HkGP5e1zQ2EQa2U/joDLin+gC9Fwo SAbCBhy7Ogn5CVxM4HvJaTyN3fptboSYm2A/ctIWHsUgE6IgYSRR+rrdZQDu4+6B7rxsvl 4PEhAOctipbqBjyiddb2UfuguR1yfwhwHKAxfWcvCPfEcV1YgM1/QiriUlIyhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sd9jg61ydzbsT; Sun, 26 Nov 2023 01:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ1EVJK041973; Sun, 26 Nov 2023 01:14:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ1EVMP041970; Sun, 26 Nov 2023 01:14:31 GMT (envelope-from git) Date: Sun, 26 Nov 2023 01:14:31 GMT Message-Id: <202311260114.3AQ1EVMP041970@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: 832c63f5e07e - main - Update leap-seconds to leap-seconds.3676924800 List-Id: Commit messages for the main 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: 832c63f5e07e6f960d051747ccb4358695a393ec Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=832c63f5e07e6f960d051747ccb4358695a393ec commit 832c63f5e07e6f960d051747ccb4358695a393ec Author: Xin LI AuthorDate: 2023-11-26 01:13:23 +0000 Commit: Xin LI CommitDate: 2023-11-26 01:13:23 +0000 Update leap-seconds to leap-seconds.3676924800 Obtained from: ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.3676924800 MFC after: 3 days --- usr.sbin/ntp/ntpd/leap-seconds | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ntp/ntpd/leap-seconds b/usr.sbin/ntp/ntpd/leap-seconds index 17e3a100f943..3fe9a1210e3c 100644 --- a/usr.sbin/ntp/ntpd/leap-seconds +++ b/usr.sbin/ntp/ntpd/leap-seconds @@ -204,10 +204,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C65 -# File expires on: 28 December 2023 +# Updated through IERS Bulletin C66 +# File expires on: 28 June 2024 # -#@ 3912710400 +#@ 3928521600 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -252,4 +252,4 @@ # the hash line is also ignored in the # computation. # -#h e76a99dc 65f15cc7 e613e040 f5078b5e b23834fe +#h 16edd0f0 3666784f 37db6bdd e74ced87 59af48f1 From nobody Sun Nov 26 04:10:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFd425Vxz52kyw; Sun, 26 Nov 2023 04: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 4SdFd41Vb9z3K3q; Sun, 26 Nov 2023 04:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lljoR0r8+kRgRYOuchQM2nQIsGcYwZjowXCJaqnZcX0=; b=AQ8N97X6D4DIJm6BO6mGNruzTyg7QCdwzyjXL9g2K6yoZ1Cs2SueEHrLjEl0Yu/KLbU36M 9B46kJXVjc+6a88v+BqnpzvFrO95OMQSB0h+E0t78UAdSo5vW+M8lpkL/o15oNnhLDynen jk6rDrrvCzRpBThWW1URD+wHIddE7Ix/WLlFTdpr2jOejZhWj0RN49Wlp0pvRZdtw6B27u Duexvyd6Q28mnOR5EFItbEX+RttxQZyQ6goBzlWYcnqJ6ajUKo0qYmhVxSec9DKl0PFAmC JIU6N6v586RIeutzgQ7TQLRUp1q7fuwn4Ossmm3O5QgN2f/HnJomhcnX29sEHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lljoR0r8+kRgRYOuchQM2nQIsGcYwZjowXCJaqnZcX0=; b=Z2QcSXaVeq3NqqmyY3KH0X3EbdylYJlBrmm8HgY8tHjDwKBGfpGglrGkR5JDtFdlQmI523 TIm7OPA5HgUXaEv3NRzxx8nfChvjTZTqh6D7H501Fb6trvmhOFDWL6RSocNkSK+ZtlUAE/ 4nkMXq4oa/Kj7Pq000BFAXnAU+oqkXo2NqrZot6klVB3TFTGSLGO1vxwtWh5E6a0aDoLIw VGS2BjUXWdnbdrkV+URClgl6fzNw6L9kObmlB5Uf+2s/2JUa2RjNCCoI4+/hs5YsETXQ/O wI4AZGEruvzRrUEaPC9NuswKofmfRjGPB16l4373bBnEUifH41x0JWxjZ00OiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971848; a=rsa-sha256; cv=none; b=GPCLCB43Kl1lDSQEHrjsJg66Q1OldOdKyR0k1ulOxc1p15W05QKM8/659FamppEn+pPlEd EEAbv6aQGZODgIAbwOlDTZrjmxhyuoLjOX993VpoKGrw274DmilKS5xYS+DzsXiyRq/1Fx tZhnEZF4+/szXt78nm1XyobguiwEBDWFNMj81PX7+QB/k0UnnBRIRkmjkOA3Qyak3mx2R1 OzZdk/VsGxR0KhosOpBDSfR4M0aVGv85/UDGYDiaJkiTABzQ7X62y6tOOXs/JJ436a/MO7 lcK0KeAYBoH14G3GZWulpHvJFY33y4hA9Y0nwv7EtgY2sckNw+nyysJTmacZYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFd40VVnzgd7; Sun, 26 Nov 2023 04:10: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 3AQ4AlxH038025; Sun, 26 Nov 2023 04: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 3AQ4AlpE038022; Sun, 26 Nov 2023 04:10:47 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:10:47 GMT Message-Id: <202311260410.3AQ4AlpE038022@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: 3041e6950d07 - main - lockf: hide unavailable error with -n -s List-Id: Commit messages for the main 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: 3041e6950d07f0d11c9f91fefbf3c273cbbe4407 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3041e6950d07f0d11c9f91fefbf3c273cbbe4407 commit 3041e6950d07f0d11c9f91fefbf3c273cbbe4407 Author: Kyle Evans AuthorDate: 2023-11-22 04:41:36 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:08:40 +0000 lockf: hide unavailable error with -n -s The error message is expected, allow -s to suppress just that one since it would loosely fall under the definition of "failure to acquire the lock" described in the manpage for the -s option. Reviewed by: 0mp, allanjude Feedback from: des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42711 --- usr.bin/lockf/lockf.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index c98c584bc6a9..246f134f10f9 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -38,7 +38,7 @@ #include #include -static int acquire_lock(const char *name, int flags); +static int acquire_lock(const char *name, int flags, int silent); static void cleanup(void); static void killed(int sig); static void timeout(int sig); @@ -125,13 +125,14 @@ main(int argc, char **argv) * avoiding the separate step of waiting for the lock. This * yields fairness and improved performance. */ - lockfd = acquire_lock(lockname, flags | O_NONBLOCK); + lockfd = acquire_lock(lockname, flags | O_NONBLOCK, silent); while (lockfd == -1 && !timed_out && waitsec != 0) { if (keep) - lockfd = acquire_lock(lockname, flags); + lockfd = acquire_lock(lockname, flags, silent); else { wait_for_lock(lockname); - lockfd = acquire_lock(lockname, flags | O_NONBLOCK); + lockfd = acquire_lock(lockname, flags | O_NONBLOCK, + silent); } } if (waitsec > 0) @@ -168,15 +169,18 @@ main(int argc, char **argv) * on success, or -1 on failure. */ static int -acquire_lock(const char *name, int flags) +acquire_lock(const char *name, int flags, int silent) { int fd; if ((fd = open(name, O_EXLOCK|flags, 0666)) == -1) { if (errno == EAGAIN || errno == EINTR) return (-1); - else if (errno == ENOENT && (flags & O_CREAT) == 0) - err(EX_UNAVAILABLE, "%s", name); + else if (errno == ENOENT && (flags & O_CREAT) == 0) { + if (!silent) + warn("%s", name); + exit(EX_UNAVAILABLE); + } err(EX_CANTCREAT, "cannot open %s", name); } return (fd); From nobody Sun Nov 26 04:10:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFd52wFwz52lJk; Sun, 26 Nov 2023 04:10: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 4SdFd52TrJz3KKH; Sun, 26 Nov 2023 04:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPAPhZSzBO+Yrgi5mgMRAUwqhTkSawGAccI9tveh8F0=; b=qA0gQEF2S+tAvlI5e5jQskwbUpNYQ4qt4VeLYGbppMPuIr9458/nGZ4/xu8XF/RwsihaPy MuQZJpy0yaUcNtv5tJcz1ei+UKW0Sr5l57MDJscdWgfwBLN1ZzY8lUZX4g87Jn/jaLC7pK /VMh7gt2jjWoTcDtjghA3RjgGLkGeJ+Fzq+7jbK4rFAqKzSjMPdcOqBkXtXz5MuiBFdzAB mGM9C8iZ/Xx6B+6voUg1QQMDlJE1fHtTod5V+LFTtxLlUft56GGDH/LjKEMPEvvFoH9sfU 9aezVx6qU+dwM+kn0Q6gky6xXUz09/qbEWMy856y7nPv6Bc5cC6Zm5ga5azdZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPAPhZSzBO+Yrgi5mgMRAUwqhTkSawGAccI9tveh8F0=; b=GhpRtJiplUp8nZuzqYzFw3fVugolLLUmEm4Y6anA3SMwRWMffXOOsJEX9H8chLluaRTh0v hw3ItUKlIzTtJsXo254wsKG0bYUyjPwbhh9oplZ9kXGmU9RR314nwarddNMvCT9LwT4VKb RNAAHwmInJHDS9g8C0XIgPuS2nUvPKUCa5EbeQr8/s4fEOCD8fmu20DOP+hvDXc+zizJ3k Jy3ImewcoUD9vSdbjjdj5LCuj60RiUTuMkWzJyV/PLpGgRpN6QsmHlGO4+5uqQ5efdm77A 1gHQ9l7x/4+tRQPAWPKuxoxH/LSdAEcb4ZQ4GzEuuDEfQDnI5XBN2ATGRsudtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971849; a=rsa-sha256; cv=none; b=XvmP2+ZMeIFh0WT4O3x2GCQrLM+6K9zEalmX5VX8FCF1j1dg2jaCKYA7cqC9Bz7s28L3Fy +V9FjBFI6jS34NZVo7h6QPHbkoUk/U/GKN/AUM8/FmicHWfiPPfRCdQ8N076OPVpZq5KJX 2lDY5+GNJS0bw69PFwuWuBKFuA9/QXC8FBIg10YUTPhkIwuG3mbLH18GMBltopEtLbt05q 3NH3Gk+Y7h1UuGeSagLujT6xmdsD7nv5CFltWkBqBTQTWKbT/7+xKACPwCmw3ZFRKMKmh/ 8upc68i+H8vJzpO47nIeHUgHufbm9G507Wq7JJESlT/XcDlbxGj2aXZNnVoTnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFd51WBrzh4D; Sun, 26 Nov 2023 04:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ4An6I038073; Sun, 26 Nov 2023 04:10:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ4An0t038070; Sun, 26 Nov 2023 04:10:49 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:10:49 GMT Message-Id: <202311260410.3AQ4An0t038070@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: 35095fd23f07 - main - lockf: correct omission in the usage statement List-Id: Commit messages for the main 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: 35095fd23f071d03633312b91a5b460eaf811efa Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=35095fd23f071d03633312b91a5b460eaf811efa commit 35095fd23f071d03633312b91a5b460eaf811efa Author: Kyle Evans AuthorDate: 2023-11-22 04:45:42 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:08:40 +0000 lockf: correct omission in the usage statement The -w flag was added without being noted in the usage statement; fix that now. While we're here, re-sort the getopt() string. Reviewed by: 0mp, allanjude, des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42712 --- usr.bin/lockf/lockf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index 246f134f10f9..ff1e7a6d6216 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -62,7 +62,7 @@ main(int argc, char **argv) silent = keep = 0; flags = O_CREAT | O_RDONLY; waitsec = -1; /* Infinite. */ - while ((ch = getopt(argc, argv, "sknt:w")) != -1) { + while ((ch = getopt(argc, argv, "knst:w")) != -1) { switch (ch) { case 'k': keep = 1; @@ -228,7 +228,7 @@ usage(void) { fprintf(stderr, - "usage: lockf [-kns] [-t seconds] file command [arguments]\n"); + "usage: lockf [-knsw] [-t seconds] file command [arguments]\n"); exit(EX_USAGE); } From nobody Sun Nov 26 04:10:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFd65rMhz52lJt; Sun, 26 Nov 2023 04:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdFd64TmXz3KSl; Sun, 26 Nov 2023 04:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kisFp+h1tIU03LhcjbFQBS3C638ElFQjiCnBaGXFyJ8=; b=ngv15GQadaJVA/N1f2TfgG36213Jvc0tqqmxkaD50/PTiuXShlTRV3Ni9yodhmQOUEZnep pQDeHasON1N2vodav/CaP9LyRt2LhwEDd1Y3Y7DnmBmj4FBEHuPUemglgQ5Fp237wzYqmE xN2Aw0smUF2GT/ujWZhhryY7smfabr4kcG7aoBo96pckzBNivRJCnADP9syx7R2UcsSeQ6 7hdKnbw6wuecdIE+6mT0+cJb6IsYWrcv08hsQ9d30XkwiiLQLTcRZS+Hc795TTW+qrtxhN AvO4pZtyLpOvX5kumu1ZdGKhryqESsxbiMkbog2+UPJ72zdpl6oRvYwyBybLyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kisFp+h1tIU03LhcjbFQBS3C638ElFQjiCnBaGXFyJ8=; b=JsvFbSCajRrqI/OV6OLY2ggNJ/Xi7vlTZQQWR/Tklr3rXYdxcRUkrOEAUuV5oUPq7UTjC7 A3eRgzlVHMeHIz0NCO8cmqwtbIlSzopvlE2JlZo+0J94cKZ1Hu0y5NBEj2xgQT50YeHha9 Wfn0J+P1inWHf1ainHr4362YLdRfb/y+iJ01MeNSBZcaZDR/so25Hj+SvaM7PTG2kyp+nU vzaQ7teb+ZCVVzTs3qi4lUDPvRqKpkk4C1teUnaHW9j0y7+E+vyzDx+WCo82+EYMJ16VuW hprMy+lMQInIupso0rXNkP/PSf4LA7Zlj1xwJld7hs83fdM20LetsfdmWKyJVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971850; a=rsa-sha256; cv=none; b=Y+pTwDfrwZsZotQp7024FeIysU/gD0IUARQEMlxD47CMMfvqHt+Te2wGmBvkKB7on4dKds fXIlfrr+RnoiKNUE1pIq4QpvKHLif6QwmV4+uF5/9+XAoC32O3Po/fGgAr0lr663xGGtBt DST1Fz3cTalaUI6JI63OjPPT1tsppdYAM47cQ+sdNGZQkVkkrwwhLXGIbTzAdOfWP2/NRT mVhlyanLozSg2vnE14IEBQqRg+WDba5oO4+o/kiARAT/jF/8BxSPER4t4+RQ3PhuTykhN4 PMZeVotdzsHV4MhRmPF6+v+03+shH3AWF23lFWZJQ4AhPHtcQ5CLKfWJ4pNjPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFd62Y9rzgPM; Sun, 26 Nov 2023 04:10: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 3AQ4Aoj5038115; Sun, 26 Nov 2023 04:10:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ4Ao3B038112; Sun, 26 Nov 2023 04:10:50 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:10:50 GMT Message-Id: <202311260410.3AQ4Ao3B038112@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: 18425c19cae0 - main - lockf: don't hold stdin/stdout/stderr open List-Id: Commit messages for the main 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: 18425c19cae08cbe41801845457ed67285806688 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=18425c19cae08cbe41801845457ed67285806688 commit 18425c19cae08cbe41801845457ed67285806688 Author: Alexander Melkov AuthorDate: 2023-11-22 04:46:28 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:09:27 +0000 lockf: don't hold stdin/stdout/stderr open None of these are essential in the lockf monitor (parent post-fork), so close them to maintain the illusion that lockf hasn't been inserted into the pipeline. This ensures that the correct effects happen on other programs in the pipeline if the locked command closes or redirects these elsewhere. The original patch used -s to close stdout/stderr rather than closing them unconditionally, but it's not clear that we really care that much. kevans dropped that part when taking the patch, patch is otherwise by listed author. PR: 112379 Reviewed by: 0mp, allanjude (both earlier version), kevans Feedback from: des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42713 --- usr.bin/lockf/lockf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index ff1e7a6d6216..620193cba1d7 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -157,8 +157,11 @@ main(int argc, char **argv) signal(SIGINT, SIG_IGN); signal(SIGQUIT, SIG_IGN); signal(SIGTERM, killed); + fclose(stdin); + fclose(stdout); + fclose(stderr); if (waitpid(child, &status, 0) == -1) - err(EX_OSERR, "waitpid failed"); + exit(EX_OSERR); return (WIFEXITED(status) ? WEXITSTATUS(status) : EX_SOFTWARE); } @@ -210,7 +213,7 @@ killed(int sig) cleanup(); signal(sig, SIG_DFL); if (kill(getpid(), sig) == -1) - err(EX_OSERR, "kill failed"); + _Exit(EX_OSERR); } /* From nobody Sun Nov 26 04:10:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFd759mmz52lJx; Sun, 26 Nov 2023 04:10: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 4SdFd74cfsz3KHq; Sun, 26 Nov 2023 04:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMq+VxJFRs87HKvDxbnqzF82IMSWIhMZWOHdUkZblUM=; b=SJ19q4T8G2HHCCeWEa3fXZ2Cq9uy4kgGuaWabQL3rB3F0CSdxrtMbIBmUZm5mYo93psEIl NLDvSULaRqjTGJAnalSMyjaURrHpYdD6WdvPRHa3Ty6K19IelzQM0WNsuTQnGNScxm7CBa EwYKkA63D+gTQvmZrdZWsqbmacFrB2AiPH6SCedsKJ/8+9V4ucc+e72tr5jSz7ZsnmUW0Z lghtJmMs9IBr+3NUjX14RSEZ5Wk6qhJRMioKojHMmefHlcUNlX4VfFVc4hB6tD5WYXoE91 jM6swCbG//RQc5gHua1it//P2FzZMB8MJruCkCe26fQ/SG+a1cOI2GRrXYXe8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eMq+VxJFRs87HKvDxbnqzF82IMSWIhMZWOHdUkZblUM=; b=qOHxwwa4zUJf+yKvnqSPOSReSXXmwsjfyBCmAh0R6h/LYN5+XYeiXUjvlaawEi7ymV2zhk 3q/woxe/RbJhtHMiCqUHXB3GNwDm8V0Sq/G9VenLmh6kGfcjBoOj6YlVCQr8lrKZma8Asp Q9uuyivqM+EgcAR8HWq4mtYtBeoOmYUZOwLJJiwBm+dYhZ+TrvQpuG+tne0HJGQ2w6EGP1 haJ7cuM71exBStlvt+hm2sHF/gt4tmJqN63qKn55iN4zg0dReaPay6iir+wkN38bby/Iy/ QnsnzoP90WRsYVIIvmdKnZCpbZaLCV3DY1urQciP+TVurw8803ZzHn8i5NfB7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971851; a=rsa-sha256; cv=none; b=C8H9IBINvL3FQkL1rgQ8ewvUNJfTBGKvoo4+pj10BmcKTXTq7RwjXUVRMNzTQ/N1shDZ0o DdLxio6ZNVPO5ooTcJtU5Myw8tSsMZb5d3oHk638rX1ZojUx504Zr41KUZnBRX+z8BBnPs psYW9/QJIko5p/GlN0bsc77IPqzxOuDMeQpFF/3xxoAuiWx4axOuUPygO/tV73xtTOxJxE MYA7z0MAT2P7p1wAt531GDFE7xFbyK6KM2DT2ByTfpnTb/tNVqXgGH08hBmuPKPbRQWQKZ HmBz983k06Mgpj5W4/QNoXKdoeWbeWQ0rXSvAHpi4LMD/sTjIA2NuCsZhi3ghA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFd73ZXFzgsm; Sun, 26 Nov 2023 04:10: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 3AQ4ApKD038161; Sun, 26 Nov 2023 04:10:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ4AphP038158; Sun, 26 Nov 2023 04:10:51 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:10:51 GMT Message-Id: <202311260410.3AQ4AphP038158@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: 296a5a4db1fc - main - lockf: add some 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: 296a5a4db1fc8203f5f6aa8f68321e6ab4652b56 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=296a5a4db1fc8203f5f6aa8f68321e6ab4652b56 commit 296a5a4db1fc8203f5f6aa8f68321e6ab4652b56 Author: Kyle Evans AuthorDate: 2023-11-22 05:09:11 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:09:58 +0000 lockf: add some tests Provide basic coverage for the existing options, nothing deeper (e.g., pipe closing behavior) is tested in this set. Reviewed by: allanjude Feedback from: des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42714 --- etc/mtree/BSD.tests.dist | 2 + usr.bin/lockf/Makefile | 5 ++ usr.bin/lockf/tests/Makefile | 6 ++ usr.bin/lockf/tests/lockf_test.sh | 148 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 4239de67478a..bc3dcda60913 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1083,6 +1083,8 @@ .. locale .. + lockf + .. m4 .. mkimg diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile index d1905a4510ba..b7d916f20d13 100644 --- a/usr.bin/lockf/Makefile +++ b/usr.bin/lockf/Makefile @@ -1,4 +1,9 @@ +.include + PROG= lockf +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.bin/lockf/tests/Makefile b/usr.bin/lockf/tests/Makefile new file mode 100644 index 000000000000..88a936cc583d --- /dev/null +++ b/usr.bin/lockf/tests/Makefile @@ -0,0 +1,6 @@ + +PACKAGE= tests + +ATF_TESTS_SH+= lockf_test + +.include diff --git a/usr.bin/lockf/tests/lockf_test.sh b/usr.bin/lockf/tests/lockf_test.sh new file mode 100644 index 000000000000..8696ab82a996 --- /dev/null +++ b/usr.bin/lockf/tests/lockf_test.sh @@ -0,0 +1,148 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Klara, 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. +# + +# sysexits(3) +: ${EX_USAGE:=64} +: ${EX_UNAVAILABLE:=69} +: ${EX_CANTCREAT:=73} +: ${EX_TEMPFAIL:=75} + +atf_test_case badargs +badargs_body() +{ + atf_check -s exit:${EX_USAGE} -e not-empty lockf + atf_check -s exit:${EX_USAGE} -e not-empty lockf "testlock" +} + +atf_test_case basic +basic_body() +{ + # Something innocent so that it does eventually go away without our + # intervention. + lockf "testlock" sleep 10 & + lpid=$! + + # Make sure that the lock exists... + atf_check test -e "testlock" + + # Attempt both verbose and silent re-lock + atf_check -s exit:${EX_TEMPFAIL} -e not-empty \ + lockf -t 0 "testlock" sleep 0 + atf_check -s exit:${EX_TEMPFAIL} -e empty \ + lockf -t 0 -s "testlock" sleep 0 + + # Make sure it cleans up after the initial sleep 10 is over. + wait "$lpid" + atf_check test ! -e "testlock" +} + +atf_test_case keep +keep_body() +{ + lockf -k "testlock" sleep 10 & + lpid=$! + + # Make sure that the lock exists now... + while ! test -e "testlock"; do + sleep 0.5 + done + + kill "$lpid" + wait "$lpid" + + # And it still exits after the lock has been relinquished. + atf_check test -e "testlock" +} + +atf_test_case needfile +needfile_body() +{ + # Hopefully the clock doesn't jump. + start=$(date +"%s") + + # Should fail if the lockfile does not yet exist. + atf_check -s exit:"${EX_UNAVAILABLE}" lockf -sn "testlock" sleep 30 + + # It's hard to guess how quickly we should have finished that; one would + # hope that it exits fast, but to be safe we specified a sleep 30 under + # lock so that we have a good margin below that duration that we can + # safely test to make sure we didn't actually execute the program, more + # or less. + now=$(date +"%s") + tpass=$((now - start)) + atf_check test "$tpass" -lt 10 +} + +atf_test_case timeout +timeout_body() +{ + lockf "testlock" sleep 30 & + lpid=$! + + while ! test -e "testlock"; do + sleep 0.5 + done + + start=$(date +"%s") + timeout=2 + atf_check -s exit:${EX_TEMPFAIL} lockf -st "$timeout" "testlock" sleep 0 + + # We should have taken no less than our timeout, at least. + now=$(date +"%s") + tpass=$((now - start)) + atf_check test "$tpass" -ge "$timeout" + + kill "$lpid" + wait "$lpid" || true +} + +atf_test_case wrlock +wrlock_head() +{ + atf_set "require.user" "unprivileged" +} +wrlock_body() +{ + touch "testlock" + chmod -w "testlock" + + # Demonstrate that we can lock the file normally, but -w fails if we + # can't write. + atf_check lockf -kt 0 "testlock" sleep 0 + atf_check -s exit:${EX_CANTCREAT} -e not-empty \ + lockf -wt 0 "testlock" sleep 0 +} + +atf_init_test_cases() +{ + atf_add_test_case badargs + atf_add_test_case basic + atf_add_test_case keep + atf_add_test_case needfile + atf_add_test_case timeout + atf_add_test_case wrlock +} From nobody Sun Nov 26 04:16:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdFl61t5bz52nMH; Sun, 26 Nov 2023 04:16: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 4SdFl61QXhz3N4p; Sun, 26 Nov 2023 04:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700972162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=alYVHda3GKkgeimQioSRfLgwNLB6ldfH1SBdlvXUNfg=; b=FHHDcnjgj1eHW9PLmmjryO44fQ45OcU9rUod88WTMLia4U2o5vPZUkqD7Pfn63+jJZ60h2 LH8fAOeHIXPpxCdHJwPmsfdsKQIFMogmppY1IEjl6XZuvHZV5jgcTHudxbGYKxh8aNl/aW O5OtgHaNUWlHp3Q4QOlHtigVhU4Bo3pY+Y78HbxN7QQJlecv50FXMiS3syMdAUdwZ4MdDN YQfZiA29Ob3HzeKrVkvtPgzE05/JJ+UGGf6pYUOshJpqPG9DlddnNiTqMH7fnrAHwFcgBa f612NpouoCdNnqLitU+LGbHoWsLizdwkqZmMoktKpuB74t8qdVUHl7rbsvQ/cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700972162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=alYVHda3GKkgeimQioSRfLgwNLB6ldfH1SBdlvXUNfg=; b=LwL7tGvnmVQtfcTMDZmBC2f3kVO4ZLg6eOkyEobnBkup0p7wKBAIx6ZjEcigURrk3THXGk gu89YkoXk58iXUkBnzsOk5yBXno5uqD6gBnh4uRrvzZYGLx+DyCmM1Fym+1ZZ4i3PMlFeH YrkeEsQRyc9KkX6UCXfqOolJVeTVx6jEJrDgUEGjA5WWWR3UxjvVpT8gc2GDYBvt5YIbWr FLCHsPgmJuogJrBdzD9fGPbdudVkVALsSB8Bl4fArX4S9rWZlIfHACNY+oYWuwlqH1HTFg 1kHY8YIgDGs7hAKsj1H16B9yiAdg+Uwnd2zq2dagz3XEFgWkYnL70nqGeSZbNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700972162; a=rsa-sha256; cv=none; b=eQkxhDu7k4XVczLjR/84wHKfWrz0NlPwWGemksYgfgDjVCki26VVKfrHMsfhXCs4ADzqHc a7IFzfwNLvdLZGqUZQuWPhp+q3DOe/Lh7tI9ZF3sALt9PpiuGH1wIjmvwAgec7W+FzywEQ w9mwW86MHKa+Q9BRlUwxU35lRzKqbjROsu6uUvKkG50HnDYKsK4Tubw0aa0Iu4bMMOtmWc qs4se1nrgito9F3FaG8PkZGpQWKnFz1Z/1Z1r/yWcpWaL2W+oiOsDwGBRyEPQWRGUYA2U7 rQk5vKhOSqxT8VTUh4UgvGQvu33cPMf9nvyCJ4VhMlgBtnJwlF5+Gc4YCXvG3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdFl60MZjzhGT; Sun, 26 Nov 2023 04:16: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 3AQ4G1WO045536; Sun, 26 Nov 2023 04:16:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ4G1BN045533; Sun, 26 Nov 2023 04:16:01 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:16:01 GMT Message-Id: <202311260416.3AQ4G1BN045533@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: 09a7fe0a5523 - main - lockf: allow locking file descriptors List-Id: Commit messages for the main 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: 09a7fe0a5523d53ff6c26ddef9a947f293e18c22 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=09a7fe0a5523d53ff6c26ddef9a947f293e18c22 commit 09a7fe0a5523d53ff6c26ddef9a947f293e18c22 Author: Kyle Evans AuthorDate: 2023-11-22 07:46:14 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:15:05 +0000 lockf: allow locking file descriptors This is most useful inside a shell script, allowing one to lock just portions of a script rather than having to wrap the entire script in a lock. PR: 262738 Reviewed by: 0mp, allanjude (both previous versions) Co-authored-by: Daniel O'Connor Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42718 --- usr.bin/lockf/lockf.1 | 63 ++++++++++++++++++- usr.bin/lockf/lockf.c | 128 +++++++++++++++++++++++++++++++++----- usr.bin/lockf/tests/lockf_test.sh | 91 +++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 16 deletions(-) diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1 index 8120b2ed7630..d73033101632 100644 --- a/usr.bin/lockf/lockf.1 +++ b/usr.bin/lockf/lockf.1 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 26, 2020 +.Dd November 25, 2023 .Dt LOCKF 1 .Os .Sh NAME @@ -35,6 +35,10 @@ .Ar file .Ar command .Op Ar arguments +.Nm +.Op Fl s +.Op Fl t Ar seconds +.Ar fd .Sh DESCRIPTION The .Nm @@ -64,6 +68,27 @@ the mere existence of the .Ar file is not considered to constitute a lock. .Pp +.Nm +may also be used to operate on a file descriptor instead of a file. +If no +.Ar command +is supplied, then +.Ar fd +must be a file descriptor. +The version with a +.Ar command +may also be used with a file descriptor by supplying it as a path +.Pa /dev/fd/N , +where N is the desired file descriptor. +The +.Fl k +option is implied when a file descriptor is in use, and the +.Fl n +and +.Fl w +options are silently ignored. +This can be used to lock inside a shell script. +.Pp If the .Nm utility is being used to facilitate concurrency between a number @@ -186,6 +211,42 @@ $ lockf mylock sleep 1 & lockf -t 5 mylock echo "Success" Success [1]+ Done lockf mylock sleep 1 .Ed +Lock a file and run a script, return immediately if the lock is not +available. Do not delete the file afterward so lock order is +guaranteed. +.Pp +.Dl $ lockf -t 0 -k /tmp/my.lock myscript +.Pp +Protect a section of a shell script with a lock, wait up to 5 seconds +for it to become available. +Note that the shell script has opened the lock file +.Fa /tmp/my.lock , +and +.Nm +is performing the lock call exclusively via the passed in file descriptor (9). +In this case +.Fl k +is implied, and +.Fl w +has no effect because the file has already been opened by the shell. +This example assumes that +.Ql > +is implemented in the shell by opening and truncating +.Pa /tmp/my.lock , +rather than by replacing the lock file. +.Bd -literal -offset indent +( + lockf -s -t 5 9 + if [ $? -ne 0 ]; then + echo "Failed to obtain lock" + exit 1 + fi + + echo Start + # Do some stuff + echo End +) 9>/tmp/my.lock +.Ed .Sh SEE ALSO .Xr flock 2 , .Xr lockf 3 , diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index 620193cba1d7..db45f7a6b2e7 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -29,16 +29,26 @@ #include #include +#include #include #include #include +#include #include #include #include +#include #include #include -static int acquire_lock(const char *name, int flags, int silent); +#define FDLOCK_PREFIX "/dev/fd/" + +union lock_subject { + long subj_fd; + const char *subj_name; +}; + +static int acquire_lock(union lock_subject *subj, int flags, int silent); static void cleanup(void); static void killed(int sig); static void timeout(int sig); @@ -48,8 +58,34 @@ static void wait_for_lock(const char *name); static const char *lockname; static int lockfd = -1; static int keep; +static int fdlock; static volatile sig_atomic_t timed_out; +/* + * Check if fdlock is implied by the given `lockname`. We'll write the fd that + * is represented by it out to ofd, and the caller is expected to do any + * necessary validation on it. + */ +static int +fdlock_implied(const char *name, long *ofd) +{ + char *endp; + long fd; + + if (strncmp(name, FDLOCK_PREFIX, sizeof(FDLOCK_PREFIX) - 1) != 0) + return (0); + + /* Skip past the prefix. */ + name += sizeof(FDLOCK_PREFIX) - 1; + errno = 0; + fd = strtol(name, &endp, 10); + if (errno != 0 || *endp != '\0') + return (0); + + *ofd = fd; + return (1); +} + /* * Execute an arbitrary command while holding a file lock. */ @@ -58,6 +94,7 @@ main(int argc, char **argv) { int ch, flags, silent, status, waitsec; pid_t child; + union lock_subject subj; silent = keep = 0; flags = O_CREAT | O_RDONLY; @@ -89,11 +126,54 @@ main(int argc, char **argv) usage(); } } - if (argc - optind < 2) - usage(); - lockname = argv[optind++]; + argc -= optind; argv += optind; + + if (argc == 0) + usage(); + + lockname = argv[0]; + + argc--; + argv++; + + /* + * If there aren't any arguments left, then we must be in fdlock mode. + */ + if (argc == 0 && *lockname != '/') { + fdlock = 1; + subj.subj_fd = -1; + } else { + fdlock = fdlock_implied(lockname, &subj.subj_fd); + if (argc == 0 && !fdlock) { + fprintf(stderr, "Expected fd, got '%s'\n", lockname); + usage(); + } + } + + if (fdlock) { + if (subj.subj_fd < 0) { + char *endp; + + errno = 0; + subj.subj_fd = strtol(lockname, &endp, 10); + if (errno != 0 || *endp != '\0') { + fprintf(stderr, "Expected fd, got '%s'\n", + lockname); + usage(); + } + } + + if (subj.subj_fd < 0 || subj.subj_fd > INT_MAX) { + fprintf(stderr, "fd '%ld' out of range\n", + subj.subj_fd); + usage(); + } + } else { + subj.subj_name = lockname; + } + if (waitsec > 0) { /* Set up a timeout. */ struct sigaction act; @@ -125,13 +205,13 @@ main(int argc, char **argv) * avoiding the separate step of waiting for the lock. This * yields fairness and improved performance. */ - lockfd = acquire_lock(lockname, flags | O_NONBLOCK, silent); + lockfd = acquire_lock(&subj, flags | O_NONBLOCK, silent); while (lockfd == -1 && !timed_out && waitsec != 0) { - if (keep) - lockfd = acquire_lock(lockname, flags, silent); + if (keep || fdlock) + lockfd = acquire_lock(&subj, flags, silent); else { wait_for_lock(lockname); - lockfd = acquire_lock(lockname, flags | O_NONBLOCK, + lockfd = acquire_lock(&subj, flags | O_NONBLOCK, silent); } } @@ -142,7 +222,15 @@ main(int argc, char **argv) exit(EX_TEMPFAIL); errx(EX_TEMPFAIL, "%s: already locked", lockname); } + /* At this point, we own the lock. */ + + /* Nothing else to do for FD lock, just exit */ + if (argc == 0) { + assert(fdlock); + return 0; + } + if (atexit(cleanup) == -1) err(EX_OSERR, "atexit failed"); if ((child = fork()) == -1) @@ -166,25 +254,34 @@ main(int argc, char **argv) } /* - * Try to acquire a lock on the given file, creating the file if + * Try to acquire a lock on the given file/fd, creating the file if * necessary. The flags argument is O_NONBLOCK or 0, depending on * whether we should wait for the lock. Returns an open file descriptor * on success, or -1 on failure. */ static int -acquire_lock(const char *name, int flags, int silent) +acquire_lock(union lock_subject *subj, int flags, int silent) { int fd; - if ((fd = open(name, O_EXLOCK|flags, 0666)) == -1) { + if (fdlock) { + assert(subj->subj_fd >= 0 && subj->subj_fd <= INT_MAX); + fd = (int)subj->subj_fd; + + if (flock(fd, LOCK_EX | LOCK_NB) == -1) { + if (errno == EAGAIN || errno == EINTR) + return (-1); + err(EX_CANTCREAT, "cannot lock fd %d", fd); + } + } else if ((fd = open(subj->subj_name, O_EXLOCK|flags, 0666)) == -1) { if (errno == EAGAIN || errno == EINTR) return (-1); else if (errno == ENOENT && (flags & O_CREAT) == 0) { if (!silent) - warn("%s", name); + warn("%s", subj->subj_name); exit(EX_UNAVAILABLE); } - err(EX_CANTCREAT, "cannot open %s", name); + err(EX_CANTCREAT, "cannot open %s", subj->subj_name); } return (fd); } @@ -196,7 +293,7 @@ static void cleanup(void) { - if (keep) + if (keep || fdlock) flock(lockfd, LOCK_UN); else unlink(lockname); @@ -231,7 +328,8 @@ usage(void) { fprintf(stderr, - "usage: lockf [-knsw] [-t seconds] file command [arguments]\n"); + "usage: lockf [-knsw] [-t seconds] file command [arguments]\n" + " lockf [-s] [-t seconds] fd\n"); exit(EX_USAGE); } diff --git a/usr.bin/lockf/tests/lockf_test.sh b/usr.bin/lockf/tests/lockf_test.sh index 8696ab82a996..cc6938d2306e 100644 --- a/usr.bin/lockf/tests/lockf_test.sh +++ b/usr.bin/lockf/tests/lockf_test.sh @@ -60,6 +60,96 @@ basic_body() atf_check test ! -e "testlock" } +atf_test_case fdlock +fdlock_body() +{ + # First, make sure we don't get a false positive -- existing uses with + # numeric filenames shouldn't switch to being fdlocks automatically. + atf_check lockf -k "9" sleep 0 + atf_check test -e "9" + rm "9" + + subexit_lockfail=1 + subexit_created=2 + subexit_lockok=3 + subexit_concurrent=4 + ( + lockf -s -t 0 9 + if [ $? -ne 0 ]; then + exit "$subexit_lockfail" + fi + + if [ -e "9" ]; then + exit "$subexit_created" + fi + ) 9> "testlock1" + rc=$? + + atf_check test "$rc" -eq 0 + + sub_delay=5 + + # But is it actually locking? Child 1 will acquire the lock and then + # signal that it's ok for the second child to try. The second child + # will try to acquire the lock and fail immediately, signal that it + # tried, then try again with an indefinite timeout. On that one, we'll + # just check how long we ended up waiting -- it should be at least + # $sub_delay. + ( + lockf -s -t 0 /dev/fd/9 + if [ $? -ne 0 ]; then + exit "$subexit_lockfail" + fi + + # Signal + touch ".lock_acquired" + + while [ ! -e ".lock_attempted" ]; do + sleep 0.5 + done + + sleep "$sub_delay" + + if [ -e ".lock_acquired_again" ]; then + exit "$subexit_concurrent" + fi + ) 9> "testlock2" & + lpid1=$! + + ( + while [ ! -e ".lock_acquired" ]; do + sleep 0.5 + done + + # Got the signal, try + lockf -s -t 0 9 + if [ $? -ne "${EX_TEMPFAIL}" ]; then + exit "$subexit_lockok" + fi + + touch ".lock_attempted" + start=$(date +"%s") + lockf -s 9 + touch ".lock_acquired_again" + now=$(date +"%s") + elapsed=$((now - start)) + + if [ "$elapsed" -lt "$sub_delay" ]; then + exit "$subexit_concurrent" + fi + ) 9> "testlock2" & + lpid2=$! + + wait "$lpid1" + status1=$? + + wait "$lpid2" + status2=$? + + atf_check test "$status1" -eq 0 + atf_check test "$status2" -eq 0 +} + atf_test_case keep keep_body() { @@ -141,6 +231,7 @@ atf_init_test_cases() { atf_add_test_case badargs atf_add_test_case basic + atf_add_test_case fdlock atf_add_test_case keep atf_add_test_case needfile atf_add_test_case timeout From nobody Sun Nov 26 04:45:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdGNw6X1pz50ppr; Sun, 26 Nov 2023 04:45: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 4SdGNw5xH9z3VRJ; Sun, 26 Nov 2023 04:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700973920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQ9jvGRV8Q96sypdqXPozoBrA14NoxWlcZwWY7I7ksY=; b=hRXXyn4adOEWj7GoUVeZ+GzPdjafS/lFWYBoIUjS4r4759dUgt3RUaxqgYpOXXv169eZov zUONS1nSMscobZbZDVWJztkue02XIs4JuZzX0R1ZSMcZTB/8cGhkhl0o4UX9OClx0Dhm2u ofQYEMvYgVX/Dox+XP/xd8QC8aPmxeTIu0EMfqwBiCBp8BXJ4mcHlY4itUFiYIQeUmVUu6 fwfkbtgvYJpoLfA08/vvlgTAjlps3sDKrCtoWcN9VuFGNHagJdcR/0LY8TEGcvLn2/vM2J lwJV87iS3xDppbQLkwF7CdvCp4pxM5w4PEewZ/LmDyZk1G3FhhhSiA/tNffA3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700973920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQ9jvGRV8Q96sypdqXPozoBrA14NoxWlcZwWY7I7ksY=; b=YmiMw8uzYB9C6efdom542MHhrVJY722dHKWCOpNHKXoP2gPWG2DSfXoQTZRVcDsvPeOhK0 lgF3hualYVfpcXzXjE9y2y1P9vTNfXyLl6E+cOKC/uv2sm+E2Dg2pldoWAFzXMBUdEZMON bGga7aXHfx+NkIJPtNlttEBMGempUgQ/Yjg0/N5L3ydj660dIYJKY9/Qux8BTvt7mIEzfQ E21o/ulqTQu7/Kc0xNORW5g/101/ebD7jBfhLfUSKmUycrVZyMui2Nap/4OzoBAjvbLHIh 5Ouzf0K4tot7F+TNsiGG4ABKzZou2EiI78Ksyrc2MpmQT/FI8hsnMgdghDJ8qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700973920; a=rsa-sha256; cv=none; b=gwLCmqIlguleMZ9YpZKLwUsXtSEba5U2xCzFgfco24gPrvP1wAUHZwoIvXXjcFefkwS/py bsLG7XJR312Rq66v0XVMlnoh0ARE11UVZHrdyQ6RkwvI1sLKZyzvAhAoE6BWPVGUOyckZi fXSRkLCJgWA0NJZQ5TpbzR5fUwuGL1UatLFKCI+nfmrLOcWw3ak10ciK2VumF/UqE1j9ix VQCDtbhuKLMoPckTY/T8Z2icQslxU+0cGL5kP55Wx/RtGjIfM77m2SF8QOOkg0FvFnrkZn DsrNGSd2Hz1K6QElN6ChUwCmtoIM4H9OeMXHSQu8BiR3dHi7gbZ9cD6njB4XCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdGNw51RTzhqZ; Sun, 26 Nov 2023 04:45: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 3AQ4jKET095048; Sun, 26 Nov 2023 04:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ4jKg2095045; Sun, 26 Nov 2023 04:45:20 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:45:20 GMT Message-Id: <202311260445.3AQ4jKg2095045@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: e4967d4d48b0 - main - lockf: switch to strtonum() for parsing timeout List-Id: Commit messages for the main 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: e4967d4d48b0a7d873e4f778c0a6e560e09d4dc3 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e4967d4d48b0a7d873e4f778c0a6e560e09d4dc3 commit e4967d4d48b0a7d873e4f778c0a6e560e09d4dc3 Author: Kyle Evans AuthorDate: 2023-11-26 04:27:11 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:41:05 +0000 lockf: switch to strtonum() for parsing timeout Convert waitsec to a long long to be able to hold the full domain of alarm(3) timeout on all platforms, and let strtonum(3) handle the input validation. strtonum(3) also happens to provide a neater interface for error handling, and it already includes our pre-existing empty input check. Sponsored by: Klara, Inc. --- usr.bin/lockf/lockf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index db45f7a6b2e7..dd02bf2a5417 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -92,7 +92,8 @@ fdlock_implied(const char *name, long *ofd) int main(int argc, char **argv) { - int ch, flags, silent, status, waitsec; + int ch, flags, silent, status; + long long waitsec; pid_t child; union lock_subject subj; @@ -112,9 +113,10 @@ main(int argc, char **argv) break; case 't': { - char *endptr; - waitsec = strtol(optarg, &endptr, 0); - if (*optarg == '\0' || *endptr != '\0' || waitsec < 0) + const char *errstr; + + waitsec = strtonum(optarg, 0, UINT_MAX, &errstr); + if (errstr != NULL) errx(EX_USAGE, "invalid timeout \"%s\"", optarg); } @@ -181,7 +183,7 @@ main(int argc, char **argv) sigemptyset(&act.sa_mask); act.sa_flags = 0; /* Note that we do not set SA_RESTART. */ sigaction(SIGALRM, &act, NULL); - alarm(waitsec); + alarm((unsigned int)waitsec); } /* * If the "-k" option is not given, then we must not block when From nobody Sun Nov 26 18:26:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdccZ3gydz52cDv; Sun, 26 Nov 2023 18:26:38 +0000 (UTC) (envelope-from gbe@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 4SdccZ174bz4P8g; Sun, 26 Nov 2023 18:26:38 +0000 (UTC) (envelope-from gbe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701023198; 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=1KNyVvzfPN/NJGb3xhiGe09zIp/5CzLS0MkijEcWLU0=; b=mJozW3cPCkYXyQ/Muf3nzauKsh8XFoUmPhw9e7DzN3lCgcQcDJXad1/PzhBRUAFvWfUw7t JM08w3wISzMbE4cpP047BIIuFmtzj/LpGx9VWV7+Sf834mrwN5hodHTkUSQleaDi9yfnwM oulcKHs/r0uQMkKAHk6ShY7JmZqlBImUWp+S2ItbdpcIPSpBrDZGxEko0JO4it54t6laIu ygvFf48iRmVY8tIPcVxXrTih9jJGgVXKoUP/vIcBZSMsEX30AVOduvdocglE2klRgSZyQC WyxxrkER3Z6CevI7jhWAf5ND2khhGg3NHYWvDwSsc8FHuxFTLsHFxsSrWTFrjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701023198; 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=1KNyVvzfPN/NJGb3xhiGe09zIp/5CzLS0MkijEcWLU0=; b=ePWkRb7WVuL6IeZbuoEJVaS2SkWhCLqJM6B4TbaomfteHEfgc2XOTPAhmaVFQdzJrnOw7u CnlAm4pzlZo6ZJ0X1xt+cRXiKNF/OCDr9AUOCSC0yCFD70hZFgg2xTWOfZZY9Ow5l67VZh GLT/uqtFNtmsgnOzZjC1IkAHkzEBqpvGaeDbJucCOIqt15jlIW/sWYVCLetQrAyiQ9C7KD 1q9hmLtfjaDJZCHeNUSRJeq7bhUjfjZxuC7D8rGQhJs100wbjCgAm1wv/RgPWHpYibzI9m vEYzk9pkG1pmj7hzeE7bHxAwWrQF1eAhNmj+sDN7Qjim719Fu/xXId7JFdU0GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701023198; a=rsa-sha256; cv=none; b=Ahb8jc5BvoWQvhJTaIeEmcP13URfjvX/cVp+upNbvLEq0XTu6WJUG6IWQiFov9URIClNci naieAlUNrlSCuCZOLs8Zpl0G5qrXqG1iNR2PbkYBFg1IqBv0RdGDKL/t8aba7qC+Nmdd/U xcd9yL1Yk7f945GPZlzmQUgykxV7CILYhNVhoNxF2aSieXtdzgNN32CE4aaqVaQnwWw68s o/9eQNbOtWmtN2IzYRH14+IXVXfQw2gt7JaajqTh7S66be3+tBpMHcHQFiqxdmDEuEWG/N nntDl9LmuOdTzfcIjwlnO7G/WMj0kET2qk7wDBC/AvuDzy/19alpo+wOVR5c6Q== Received: from localhost (p200300cb87078219405f699cd58532eb.dip0.t-ipconnect.de [IPv6:2003:cb:8707:8219:405f:699c:d585:32eb]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SdccY4Pn8z28C; Sun, 26 Nov 2023 18:26:37 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Sun, 26 Nov 2023 19:26:33 +0100 From: Gordon Bergling To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a6ed8c959303 - main - Fix /root permissions after 'make installworld' Message-ID: References: <202311161000.3AGA0Cxc058517@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: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="PVoNsnnJuMct7nza" Content-Disposition: inline In-Reply-To: X-Url: X-Operating-System: FreeBSD 14.0-RELEASE amd64 X-Host-Uptime: 7:22PM up 7:55, 3 users, load averages: 0.12, 0.19, 0.18 --PVoNsnnJuMct7nza Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Mateusz, On Thu, Nov 16, 2023 at 02:21:53PM +0100, Mateusz Guzik wrote: > On 11/16/23, Gordon Bergling wrote: > > The branch main has been updated by gbe: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3Da6ed8c9593031abf6fa73661be55c= 226caa362d6 > > > > commit a6ed8c9593031abf6fa73661be55c226caa362d6 > > Author: Thomas Eberhardt > > AuthorDate: 2023-11-16 09:59:38 +0000 > > Commit: Gordon Bergling > > CommitDate: 2023-11-16 09:59:38 +0000 > > > > Fix /root permissions after 'make installworld' > > > > According to /etc/mtree/BSD.root.dist /root should have > > 0750 permissions, but the build target 'make installworld' > > changes these to 0755. > > > > This is caused by the installation of the configuration > > files of sh(1) and csh(1). > > > > Correct this by specifying the correct default /root permissions. > > > > PR: 273342 > > Reviewed by: jilles > > Approved by: jilles > > MFC after: 2 weeks > > Differential Revision:https://reviews.freebsd.org/D42395 > > --- > > bin/csh/Makefile | 1 + > > bin/sh/Makefile | 1 + > > 2 files changed, 2 insertions(+) > > > > diff --git a/bin/csh/Makefile b/bin/csh/Makefile > > index 1f996df3999b..94e1ba763d6e 100644 > > --- a/bin/csh/Makefile > > +++ b/bin/csh/Makefile > > @@ -15,6 +15,7 @@ ROOTPACKAGE=3D csh > > ETC=3D csh.cshrc csh.login csh.logout > > ROOT=3D dot.cshrc dot.login > > ROOTDIR=3D /root > > +ROOTDIR_MODE=3D 0750 >=20 > This is at best a total workaround, the real bug is that root dir gets > modified to begin with and there will be other cases prone to cause > the same problem. >=20 > More importantly, is not this a regression from security pov? I am unsure if this is a regression, but it fixed the problem about overrid= en permissions from 'make installworld'. I keep an eye on the PR and when I ha= ve time I'll try to come up with a better solution, but I am far from beeing an expert in the build framework. --Gordon --PVoNsnnJuMct7nza Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEYbWI0KY5X7yH/Fy4OQX2V8rP09wFAmVjjdEACgkQOQX2V8rP 09zA0QgAvNy1Bv7xCO5ozp+/2laO3zVhXoixnjjh8puaMs8DUrA3BzR4Z/lWLJ58 HL9S8EEXHwmcPdWYpRY8hdjJdYpIu5j9YsENGqesMvqngRiAnfNC+lngOYWZXp9Y 3OssaD5CIRNwK+y8L2YCGAqZOtciCJqXMOCkFtiKJLlX9lnkDbVmEms6r30uNzZd DacckGh6UZiX/OSlsrzw6FGyqOZ7hRTj7/rlUo8We++xNgZTCPTVRLi0X2bfqdrL kPZ2cmUXXTFmsBrePoHYfrv2nKXDkD2mIk281akS08x7Sco6PhSi9BLyYizkhSjw MB9eCmxyfIrRkcZeCm3nqlRS4BnMCw== =N7pr -----END PGP SIGNATURE----- --PVoNsnnJuMct7nza-- From nobody Sun Nov 26 18:31:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sdck12wxnz52fLp; Sun, 26 Nov 2023 18:31: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 4Sdck12S6Hz4QNm; Sun, 26 Nov 2023 18:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701023481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SXa/Y99WCOFqkRB0DkhQf2gSi/78Sw2/ElwqAN0i8u4=; b=YIEFXF0+fxWPvqPGxsSQNPO0UxrNDHGpa+Q+zxzrEDdUOHFZtjg6RKW6uuPo1YbvCQEdL4 pJATZyliwotxAZ/z9Agly26N7YaDg7srw50jJ3onEZhEH3kV5Y8uMudCWRO7XMHMfyHfjq iGywtcj81X+PgvMwMcUqrK/Tita7z+L8ZB7ZGRgJz8HmUC+pNbkMMbUUoCNMo6gLlIPTs1 RzDdgd7QljE91XBafkvLEmfcYh7SiHxoyj1TAO1QIhy8udx1gaRUQJKy5Bz2xBeGHp/QSB OEXzA1q8v0SsYKNZ8TUybznoAYVaVpt+9Uftxq63Z8/gl5q0URQsyUbP7N4K/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701023481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SXa/Y99WCOFqkRB0DkhQf2gSi/78Sw2/ElwqAN0i8u4=; b=oKFIOxXQOhU9NwmyRAPz3B+xsPfBYp61lTrn/jTZ18BSWio8/b9WRwPKD2qQl3YCVN3z7D 8eOVAkDo1cA1y0PBF4vG8rLWoaFy7oaTfc7QfAQb83UJrGAykFohFw4l3/Siax9iCel+81 mQYE21O56u9zyWGE4KT/81bq3fRECKUv9reouZcXEuQjOxiYL3lFvhPuGV9L2ud9DFn6u7 dWVc19qu3t+0qruJNu7SJdS2Ytr/pjESj3+dGm5f1pWo5XPlcnsYssDnzrKBoPcbFwjVib kICwcx5qbuA9FpRL06j5wmx0j4sohfDsdbusRg8KEB92mfXlhzVKVxC//YxmJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701023481; a=rsa-sha256; cv=none; b=j0gAbOXh4rxwfsnjnwO65ZJ/qQ0BRychMs0Z0/74fzk5rEw+Rqc2wI1dSHkIbXLV7w5ykt 698D2/0YiomvlRYkzdr6D3csRb4e/HzOCdo9S0AMJHmj05/CEdfon2F4xLlD6hknID9Sci LaP8dH3OsUTAwH/tK3Nn2BomRlwwHEWcdjPTxt5jqvnSr4DOdCLkVmdfoxiOOwWRoH+iYZ vvU9maqyJQxBhtpnsRvqdHYWay6pTkbJkf0Wwd629hzvMKRMwv17gHr5adl4A2dzv1XlAv FrmQ2rI+8geshCz1/iVvDOLIXBYVmwcVxpWUhhfVvavEPqKgV9L5fwkl1bUL2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sdck11Wfsz15PC; Sun, 26 Nov 2023 18:31: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 3AQIVLiO072901; Sun, 26 Nov 2023 18:31:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQIVLaf072898; Sun, 26 Nov 2023 18:31:21 GMT (envelope-from git) Date: Sun, 26 Nov 2023 18:31:21 GMT Message-Id: <202311261831.3AQIVLaf072898@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: 502e8f44fcc1 - main - iostat.8: Better wording for some use cases List-Id: Commit messages for the main 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: 502e8f44fcc18bfc6dadca56801d66cbce4c07ec Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=502e8f44fcc18bfc6dadca56801d66cbce4c07ec commit 502e8f44fcc18bfc6dadca56801d66cbce4c07ec Author: Gordon Bergling AuthorDate: 2023-11-26 18:30:58 +0000 Commit: Gordon Bergling CommitDate: 2023-11-26 18:30:58 +0000 iostat.8: Better wording for some use cases The iostat(8) manual page should be more specific when using options. Also extented the BUGS section. PR: 153012 Reviewed by: bcr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42633 --- usr.sbin/iostat/iostat.8 | 64 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index a08a62dc694d..a749b410d071 100644 --- a/usr.sbin/iostat/iostat.8 +++ b/usr.sbin/iostat/iostat.8 @@ -54,7 +54,7 @@ .\" .\" @(#)iostat.8 8.1 (Berkeley) 6/6/93 .\" -.Dd August 29, 2023 +.Dd November 26, 2023 .Dt IOSTAT 8 .Os .Sh NAME @@ -83,7 +83,12 @@ The utility displays kernel .Tn I/O statistics on terminal, device and cpu operations. -The first statistics that are printed are averaged over the system uptime. +The first statistics that are printed are averaged over the system uptime +(unless +.Fl I +is specified). +Any references to repetitions in this man page implicitly include the first +statistics output. To get information about the current activity, a suitable wait time should be specified, so that the subsequent sets of printed statistics will be averaged over that time. @@ -101,14 +106,11 @@ is specified. Repeat the display .Ar count times. -If no repeat -.Ar count -is specified, the default depends on whether -.Fl w -is specified. -With -.Fl w -the default repeat count is infinity, otherwise it is 1. +If +.Fl c +is not specified and a wait interval is specified, +the default repeat count is infinity. +If no wait interval is specified, the default repeat count is 1. .It Fl d Display only device statistics. If this flag is turned on, only device statistics will be displayed, unless @@ -130,8 +132,11 @@ per measurement cycle. Display total statistics for a given time period, rather than average statistics for each second during that time period. .It Fl K -In the blocks transferred display (-o), display block count in kilobytes rather -then the device native block size. +In the old-style blocks transferred display +.Po Fl I +and +.Fl o Pc , +display block count in kilobytes rather than the device native block size. .It Fl M Extract values associated with the name list from the specified core instead of the default @@ -145,7 +150,7 @@ Display up to number of devices. The .Nm -utility will display fewer devices if there are not +utility will display fewer devices if there are less than .Ar devs devices present. .It Fl o @@ -222,7 +227,7 @@ Passthrough devices The user must specify at least one device type, and may specify at most one device type from each category. Multiple device types in a single device type statement must be separated by -commas. +commas and are ANDed together. .Pp Any number of .Fl t @@ -236,14 +241,16 @@ Any device that fully matches any argument will be included in the .Nm output, up to the number of devices that can be displayed in -80 columns, or the maximum number of devices specified by the user. +80 columns, or the maximum number of devices +.Pq Fl n +specified by the user. .It Fl w Pause .Ar wait seconds between each display. -If no -.Ar wait -interval is specified, the default is 1 second. +If +.Fl w +is not specified, the default interval is 1 second. .Pp The .Nm @@ -518,3 +525,24 @@ The use of as a debugging tool for crash dumps is probably limited because there is currently no way to get statistics that only cover the time immediately before the crash. +.Pp +Each +.Ar drives +argument is passed to +.Fn isdigit . +If +.Fn isdigit +returns true, +.Nm +switches into an undocumented traditional syntax and subsequent arguments, +if any, will not be interpreted as drive names. +This behavior collides with the one documented in this man page and prevents +specifying drive names starting with a number. +E.g., the following +.Bd -literal -offset indent +iostat ada0 ada1 2 3 cd0 +.Ed +.Pp +This document's use of +.Dq device type +is misleading. From nobody Sun Nov 26 20:48:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sdgm42p13z51tjT; Sun, 26 Nov 2023 20:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sdgm42MKXz3crM; Sun, 26 Nov 2023 20:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701031700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSpvRvVCPHNo+zeBWd1ghJaWIcyaEk5oMvpfBlDzCJg=; b=hM8Kmk8Of59wmEkJvt7XjxZ8x74TU5Z5h4Qw+T7xwMkA/rkIG/Qiu6vbF2sTxfD/Q10PYp nFT4GJ2Av3Cw2pWPSuM91bctnsO/QnnMPPKoBQ/c5rkmlp5qVrIVOs/24yE6ZPZq++GyK0 L/B1glZ3nNVmbJMaHG2bd+RHob2dJUCdI1StnctU0sviL5FE2G7Wyq9HLHbUxCs6GT+yFc 0jlc7zvkrX9Zj61s/Am2WMlzDK0dpB1uAqtF5LDJ2cwuID78SUvZzrCPswXY4Lk0uaK0XV h3VgfuzDT0iaavkiqAjOEuvjBOjQ1alVtG67lTVSKOeJ8AV8GH1S+WecFPmEDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701031700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSpvRvVCPHNo+zeBWd1ghJaWIcyaEk5oMvpfBlDzCJg=; b=Xf1OANYVdY0p25/aEHj0cq/LH3b/mLJdF5uRiPWzDbkaJb64ulqyo2jw1FD0PYT/OLGprL Tj8ro4GIeMBfNVCXbbDGLNnbedQG+08WwnEFGd0nVaKj5zKtqTDXZr2fq7lMcYH7yaRp23 LnC9Aa28tr9+aH+p7NxZJK/UZhMpsL42sAGzsFkaYMZYJkcxoaHnP9p+ZNTLGXW3/NiWbS 625vONpWyo1zRvAh3TtfYA3binWYsh6DXialYCdbSiGduec5slvvOf+bXAgm9vjzkHOhQz kM9qYPOWG2KUkIRSQPYHZvqxHt8httfF09a3IMPxGh8/aEeuAQqE3Z65rTUbEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701031700; a=rsa-sha256; cv=none; b=yH6IejVZJaA9Af2fjihGatnZAIctqUNzm7Uj6XmVsBCsdSUfawfRttX5jngBimiA8damBE yvS6dGhZawZahD9YMaZ5eYvsg4iY5x7tnmioDx9khsxUKbDkP/1YgQmPZLnxvgt0oCKJMC zIARs7uMI2W6z/3S5UXeH1a/+bGcno3TheqkQD5qgWJkmtXOEmVcHRgkFwK8RWNJCxAGfi izYNoasRLAWLcGOA8vbzF5NevxkXL727tVCOXVSBRBZZncVlyGH2N9z2cj2iyoJlg/zQOy s8n8LgfUpfGWJJXbMbhklPT40tNL8KEq7Djfb/8LtQH12ot7DWTaHscQSDzNTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sdgm41RpYz18tP; Sun, 26 Nov 2023 20:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQKmKKf097666; Sun, 26 Nov 2023 20:48:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQKmK3m097664; Sun, 26 Nov 2023 20:48:20 GMT (envelope-from git) Date: Sun, 26 Nov 2023 20:48:20 GMT Message-Id: <202311262048.3AQKmK3m097664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 3244c9c673a9 - main - dirdeps: Remove $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: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3244c9c673a9b06bf797bbc79f7775417bb40475 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=3244c9c673a9b06bf797bbc79f7775417bb40475 commit 3244c9c673a9b06bf797bbc79f7775417bb40475 Author: Ka Ho Ng AuthorDate: 2023-11-26 20:46:36 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-26 20:47:54 +0000 dirdeps: Remove $FreeBSD$ There was a $FreeBSD$ line in lib/liblua/Makefile.depend. MFC after: 3 days --- lib/liblua/Makefile.depend | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/liblua/Makefile.depend b/lib/liblua/Makefile.depend index c210061155d2..ecc8fe860f5e 100644 --- a/lib/liblua/Makefile.depend +++ b/lib/liblua/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ From nobody Mon Nov 27 01:52:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdpVS46kdz52s63; Mon, 27 Nov 2023 01:52: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 4SdpVS3xHYz4VhY; Mon, 27 Nov 2023 01:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701049920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNA7uojhVBJQ+lTr0IcVlDZ4JD7HFPKRwXCFJmygHxA=; b=l3Ex5csdMv2T3ziAte3p/9aR6UKsAYU/Fy/PymBi9u0PmUODuzKETrqrNOhRq5caR6OGqO ecHRgS7Ab/+gz83HLTfsGaBkMj5972hB50greLH3OVHMvO1QqkA+3cjlc9kCKHcX11pnj3 JNbwRNy33Gyl0chXzCBJK1LUzdD05WnqCtlmVw+xIPVz6X0Da/5C6cLjF6gFzcc8Q3ETm2 10g3e04Yd4+YylxqU5VtFBQT5CpSadQr0sf+IzO6PZbcPehuacdvR6dy46ofXkFIE7DuTG F9zIv34scvoS5VlqJPWkFhUurkg5vvtY6u1nUJSofopGa6cB9DvA4itLh7SMYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701049920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNA7uojhVBJQ+lTr0IcVlDZ4JD7HFPKRwXCFJmygHxA=; b=A/M6e+5EywMNk8jsKrNEWMErBeal1s1Ook4z5poN0EiAhjfazinHdOWgQhlLjE00aAJwG8 uQKJ6QSVYZJEEc7XmKARgjwFOgGWIGFajODKPwkX+R/Xm8c8TkS4ZqcmxCDJW/t0qM5Ms9 GBki9kggs4WF3UlzapxXZJiD0Ym/D/GSyhJo/Rge54+9QVod/zTu8oKDJYJa0RdSydQ1rB pcQm6cmlCTWurVl0Elhms0ssy7JSc6UMu1YiTjgMCaTq8UaPvy4l8U9rZgc039ipwaetnM mmS0OQCK5mze4/AJhWmRRqLGsOQMSv73xIZaMw7YtdQf0YkumtgcIcBcfVUvug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701049920; a=rsa-sha256; cv=none; b=obFXxSQjIU5MjAxta1kzjGvmjgec0ViGOWGgWnZcpQFOUO40EXfeG8EUOQ+b9oL271flsU ELZL4m5QfAu7rX1C32WQOcPuI0vDP10zuxo+n0C0NIGf+KgmzBtIP5lEM4TkOIxp58vUBA jBdeBzCHod/44kwYBiIGNppn6cisJtuqkwhKhbShisxu5U0Orbm5GQS2sb44PXf08t2sOa CtU4kUxqkYi53TTrT0BD41mVnk4TnR/FkVYoLya0KMtoOzbstFGmE+nAu9BPgG2MZd+/vt wlQVt9tVttQvIxLu2Ezh1/A1HsYlRPIwablysWsESULBI1ZdDfUKrMHRpFgIow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdpVS31jrz494; Mon, 27 Nov 2023 01:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR1q0ap009585; Mon, 27 Nov 2023 01:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR1q0AA009582; Mon, 27 Nov 2023 01:52:00 GMT (envelope-from git) Date: Mon, 27 Nov 2023 01:52:00 GMT Message-Id: <202311270152.3AR1q0AA009582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: d030761168eb - main - dirdeps: Update/fix Makefile.depend* for toolchain List-Id: Commit messages for the main 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d030761168ebd624131517855360bb1d62653c9b Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=d030761168ebd624131517855360bb1d62653c9b commit d030761168ebd624131517855360bb1d62653c9b Author: Ka Ho Ng AuthorDate: 2023-11-26 09:16:06 +0000 Commit: Ka Ho Ng CommitDate: 2023-11-27 01:50:13 +0000 dirdeps: Update/fix Makefile.depend* for toolchain This fixes make pseudo/toolchain. --- include/Makefile.depend | 1 + lib/clang/libllvm/Makefile.depend | 1 - lib/libc/Makefile.depend | 1 + lib/libclang_rt/asan/Makefile.depend | 3 ++- lib/libclang_rt/asan_dynamic/Makefile.depend | 4 ++-- lib/libclang_rt/safestack/Makefile.depend | 2 -- lib/libclang_rt/stats/Makefile.depend | 3 ++- lib/libclang_rt/ubsan_standalone/Makefile.depend | 3 ++- lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend | 1 + lib/libedit/Makefile.depend | 2 ++ lib/libgcc_s/Makefile.depend | 1 + lib/liblzma/Makefile.depend | 1 + lib/libthr/Makefile.depend | 1 + lib/libz/Makefile.depend | 1 + lib/msun/Makefile.depend | 1 + lib/ncurses/ncurses/Makefile.depend | 2 ++ lib/ncurses/panel/Makefile.depend | 2 ++ lib/ncurses/tinfo/Makefile.depend | 2 ++ usr.bin/addr2line/Makefile.depend | 3 ++- usr.bin/clang/clang-tblgen/Makefile.depend | 8 ++++++-- usr.bin/clang/clang-tblgen/Makefile.depend.host | 1 + usr.bin/clang/clang/Makefile.depend | 7 +++++-- usr.bin/clang/lld/Makefile.depend | 5 +++-- usr.bin/clang/lldb/Makefile.depend | 9 +++++++-- usr.bin/clang/llvm-objdump/Makefile.depend | 6 ++++-- usr.bin/clang/llvm-tblgen/Makefile.depend | 6 ++++-- usr.bin/clang/llvm-tblgen/Makefile.depend.host | 1 + usr.bin/cxxfilt/Makefile.depend | 3 ++- usr.bin/nm/Makefile.depend | 1 - usr.bin/readelf/Makefile.depend | 2 +- usr.bin/size/Makefile.depend | 1 - usr.bin/strings/Makefile.depend | 1 - 32 files changed, 60 insertions(+), 26 deletions(-) diff --git a/include/Makefile.depend b/include/Makefile.depend index 2e9fb38de990..346d718d8511 100644 --- a/include/Makefile.depend +++ b/include/Makefile.depend @@ -2,6 +2,7 @@ DIRDEPS = \ bin/sh.host \ + usr.bin/awk.host \ usr.bin/xinstall.host \ diff --git a/lib/clang/libllvm/Makefile.depend b/lib/clang/libllvm/Makefile.depend index df413109f8f9..d2461af845e4 100644 --- a/lib/clang/libllvm/Makefile.depend +++ b/lib/clang/libllvm/Makefile.depend @@ -4,7 +4,6 @@ DIRDEPS = \ include \ include/xlocale \ lib/libc++ \ - lib/libedit \ lib/libexecinfo \ lib/libz \ lib/msun \ diff --git a/lib/libc/Makefile.depend b/lib/libc/Makefile.depend index 7f0811b3ca91..69e7d1f9c9fd 100644 --- a/lib/libc/Makefile.depend +++ b/lib/libc/Makefile.depend @@ -6,6 +6,7 @@ DIRDEPS = \ include/rpcsvc \ lib/${CSU_DIR} \ lib/libcompiler_rt \ + usr.bin/awk.host \ usr.bin/yacc.host \ diff --git a/lib/libclang_rt/asan/Makefile.depend b/lib/libclang_rt/asan/Makefile.depend index df8ef0ca0c02..2427fe0ab42b 100644 --- a/lib/libclang_rt/asan/Makefile.depend +++ b/lib/libclang_rt/asan/Makefile.depend @@ -5,7 +5,8 @@ DIRDEPS = \ include/arpa \ include/xlocale \ lib/libc++ \ - lib/ncurses/ncursesw \ + lib/libmd \ + lib/ncurses/tinfo \ .include diff --git a/lib/libclang_rt/asan_dynamic/Makefile.depend b/lib/libclang_rt/asan_dynamic/Makefile.depend index 0bbb1c4aee2a..04eb25a6e4f8 100644 --- a/lib/libclang_rt/asan_dynamic/Makefile.depend +++ b/lib/libclang_rt/asan_dynamic/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -10,8 +9,9 @@ DIRDEPS = \ lib/libc++ \ lib/libcompiler_rt \ lib/libcxxrt \ + lib/libmd \ lib/msun \ - lib/ncurses/ncursesw \ + lib/ncurses/tinfo \ .include diff --git a/lib/libclang_rt/safestack/Makefile.depend b/lib/libclang_rt/safestack/Makefile.depend index df8ef0ca0c02..37aec7f3693e 100644 --- a/lib/libclang_rt/safestack/Makefile.depend +++ b/lib/libclang_rt/safestack/Makefile.depend @@ -2,10 +2,8 @@ DIRDEPS = \ include \ - include/arpa \ include/xlocale \ lib/libc++ \ - lib/ncurses/ncursesw \ .include diff --git a/lib/libclang_rt/stats/Makefile.depend b/lib/libclang_rt/stats/Makefile.depend index df8ef0ca0c02..2427fe0ab42b 100644 --- a/lib/libclang_rt/stats/Makefile.depend +++ b/lib/libclang_rt/stats/Makefile.depend @@ -5,7 +5,8 @@ DIRDEPS = \ include/arpa \ include/xlocale \ lib/libc++ \ - lib/ncurses/ncursesw \ + lib/libmd \ + lib/ncurses/tinfo \ .include diff --git a/lib/libclang_rt/ubsan_standalone/Makefile.depend b/lib/libclang_rt/ubsan_standalone/Makefile.depend index df8ef0ca0c02..2427fe0ab42b 100644 --- a/lib/libclang_rt/ubsan_standalone/Makefile.depend +++ b/lib/libclang_rt/ubsan_standalone/Makefile.depend @@ -5,7 +5,8 @@ DIRDEPS = \ include/arpa \ include/xlocale \ lib/libc++ \ - lib/ncurses/ncursesw \ + lib/libmd \ + lib/ncurses/tinfo \ .include diff --git a/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend b/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend index 11aba52f82cf..993ab0638f4a 100644 --- a/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend +++ b/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend @@ -1,6 +1,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + include \ .include diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend index dd06faaab7bf..b9e2f5783b84 100644 --- a/lib/libedit/Makefile.depend +++ b/lib/libedit/Makefile.depend @@ -1,12 +1,14 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + bin/sh.host \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ lib/ncurses/tinfo \ + usr.bin/awk.host \ .include diff --git a/lib/libgcc_s/Makefile.depend b/lib/libgcc_s/Makefile.depend index 77f8f90c31c3..ae1125555d77 100644 --- a/lib/libgcc_s/Makefile.depend +++ b/lib/libgcc_s/Makefile.depend @@ -5,6 +5,7 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + usr.bin/awk.host \ .include diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend index c6f50333f539..b5c5616d53c7 100644 --- a/lib/liblzma/Makefile.depend +++ b/lib/liblzma/Makefile.depend @@ -8,6 +8,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libmd \ lib/libthr \ + usr.bin/awk.host \ .include diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend index 6ef78fac5cbf..40575a605e97 100644 --- a/lib/libthr/Makefile.depend +++ b/lib/libthr/Makefile.depend @@ -6,6 +6,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + usr.bin/awk.host \ .include diff --git a/lib/libz/Makefile.depend b/lib/libz/Makefile.depend index 6ef78fac5cbf..40575a605e97 100644 --- a/lib/libz/Makefile.depend +++ b/lib/libz/Makefile.depend @@ -6,6 +6,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + usr.bin/awk.host \ .include diff --git a/lib/msun/Makefile.depend b/lib/msun/Makefile.depend index 6ef78fac5cbf..40575a605e97 100644 --- a/lib/msun/Makefile.depend +++ b/lib/msun/Makefile.depend @@ -6,6 +6,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + usr.bin/awk.host \ .include diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend index dd06faaab7bf..b9e2f5783b84 100644 --- a/lib/ncurses/ncurses/Makefile.depend +++ b/lib/ncurses/ncurses/Makefile.depend @@ -1,12 +1,14 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + bin/sh.host \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ lib/ncurses/tinfo \ + usr.bin/awk.host \ .include diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend index 04dbb4f44313..bafa0452da91 100644 --- a/lib/ncurses/panel/Makefile.depend +++ b/lib/ncurses/panel/Makefile.depend @@ -1,6 +1,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + bin/sh.host \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -8,6 +9,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/ncurses/ncurses \ lib/ncurses/tinfo \ + usr.bin/awk.host \ .include diff --git a/lib/ncurses/tinfo/Makefile.depend b/lib/ncurses/tinfo/Makefile.depend index be2eeefbac96..2be5fb18fb00 100644 --- a/lib/ncurses/tinfo/Makefile.depend +++ b/lib/ncurses/tinfo/Makefile.depend @@ -1,12 +1,14 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + bin/sh.host \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ lib/ncurses/tinfo.host \ + usr.bin/awk.host \ .include diff --git a/usr.bin/addr2line/Makefile.depend b/usr.bin/addr2line/Makefile.depend index 5e1d92875019..b8bf644ceaa1 100644 --- a/usr.bin/addr2line/Makefile.depend +++ b/usr.bin/addr2line/Makefile.depend @@ -1,11 +1,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ + lib/libcasper/libcasper \ lib/libcompiler_rt \ lib/libdwarf \ lib/libelf \ diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend b/usr.bin/clang/clang-tblgen/Makefile.depend index dd4c6894d092..336677c3fcb8 100644 --- a/usr.bin/clang/clang-tblgen/Makefile.depend +++ b/usr.bin/clang/clang-tblgen/Makefile.depend @@ -1,18 +1,22 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ + lib/clang/libclang \ lib/clang/libllvm \ lib/libc \ lib/libc++ \ lib/libcompiler_rt \ lib/libcxxrt \ + lib/libexecinfo \ lib/libthr \ + lib/libz \ + lib/libzstd \ lib/msun \ - lib/ncurses/ncursesw \ + lib/ncurses/ncurses \ + lib/ncurses/tinfo \ .include diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend.host b/usr.bin/clang/clang-tblgen/Makefile.depend.host index 5ae6e1d38324..8127b03d8797 100644 --- a/usr.bin/clang/clang-tblgen/Makefile.depend.host +++ b/usr.bin/clang/clang-tblgen/Makefile.depend.host @@ -3,6 +3,7 @@ DIRDEPS = \ lib/clang/libclangminimal \ lib/clang/libllvmminimal \ + lib/ncurses/tinfo \ .include diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend index bfeda97b8f9e..336677c3fcb8 100644 --- a/usr.bin/clang/clang/Makefile.depend +++ b/usr.bin/clang/clang/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -10,10 +9,14 @@ DIRDEPS = \ lib/libc \ lib/libc++ \ lib/libcompiler_rt \ + lib/libcxxrt \ + lib/libexecinfo \ lib/libthr \ lib/libz \ + lib/libzstd \ lib/msun \ - lib/ncurses/ncursesw \ + lib/ncurses/ncurses \ + lib/ncurses/tinfo \ .include diff --git a/usr.bin/clang/lld/Makefile.depend b/usr.bin/clang/lld/Makefile.depend index d8fae90875c1..006fa45dd459 100644 --- a/usr.bin/clang/lld/Makefile.depend +++ b/usr.bin/clang/lld/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -10,10 +9,12 @@ DIRDEPS = \ lib/libc++ \ lib/libcompiler_rt \ lib/libcxxrt \ + lib/libexecinfo \ lib/libthr \ lib/libz \ + lib/libzstd \ lib/msun \ - lib/ncurses/ncursesw \ + lib/ncurses/tinfo \ usr.bin/clang/llvm-tblgen.host \ diff --git a/usr.bin/clang/lldb/Makefile.depend b/usr.bin/clang/lldb/Makefile.depend index 168f0ebd6936..a395caaea392 100644 --- a/usr.bin/clang/lldb/Makefile.depend +++ b/usr.bin/clang/lldb/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -13,12 +12,18 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcxxrt \ lib/libedit \ + lib/libexecinfo \ + lib/libkvm \ + lib/liblua \ + lib/liblzma \ lib/libthr \ lib/libz \ + lib/libzstd \ lib/msun \ lib/ncurses/ncurses \ - lib/ncurses/ncursesw \ lib/ncurses/panel \ + lib/ncurses/tinfo \ + usr.bin/clang/llvm-tblgen.host \ .include diff --git a/usr.bin/clang/llvm-objdump/Makefile.depend b/usr.bin/clang/llvm-objdump/Makefile.depend index 73df5dd192a7..006fa45dd459 100644 --- a/usr.bin/clang/llvm-objdump/Makefile.depend +++ b/usr.bin/clang/llvm-objdump/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -10,10 +9,13 @@ DIRDEPS = \ lib/libc++ \ lib/libcompiler_rt \ lib/libcxxrt \ + lib/libexecinfo \ lib/libthr \ lib/libz \ + lib/libzstd \ lib/msun \ - lib/ncurses/ncursesw \ + lib/ncurses/tinfo \ + usr.bin/clang/llvm-tblgen.host \ .include diff --git a/usr.bin/clang/llvm-tblgen/Makefile.depend b/usr.bin/clang/llvm-tblgen/Makefile.depend index dd4c6894d092..bb8d5321da66 100644 --- a/usr.bin/clang/llvm-tblgen/Makefile.depend +++ b/usr.bin/clang/llvm-tblgen/Makefile.depend @@ -1,7 +1,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -10,9 +9,12 @@ DIRDEPS = \ lib/libc++ \ lib/libcompiler_rt \ lib/libcxxrt \ + lib/libexecinfo \ lib/libthr \ + lib/libz \ + lib/libzstd \ lib/msun \ - lib/ncurses/ncursesw \ + lib/ncurses/tinfo \ .include diff --git a/usr.bin/clang/llvm-tblgen/Makefile.depend.host b/usr.bin/clang/llvm-tblgen/Makefile.depend.host index e41a35dcde12..2f7a10cf10d6 100644 --- a/usr.bin/clang/llvm-tblgen/Makefile.depend.host +++ b/usr.bin/clang/llvm-tblgen/Makefile.depend.host @@ -2,6 +2,7 @@ DIRDEPS = \ lib/clang/libllvmminimal \ + lib/ncurses/tinfo \ .include diff --git a/usr.bin/cxxfilt/Makefile.depend b/usr.bin/cxxfilt/Makefile.depend index b3c4b1cf1adc..d2870652b0bf 100644 --- a/usr.bin/cxxfilt/Makefile.depend +++ b/usr.bin/cxxfilt/Makefile.depend @@ -1,11 +1,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ + lib/libcasper/libcasper \ lib/libcompiler_rt \ lib/libelf \ lib/libelftc \ diff --git a/usr.bin/nm/Makefile.depend b/usr.bin/nm/Makefile.depend index 3d7fea5a719a..2f0bc69cb09a 100644 --- a/usr.bin/nm/Makefile.depend +++ b/usr.bin/nm/Makefile.depend @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libdwarf \ lib/libelf \ lib/libelftc \ - lib/libnv \ .include diff --git a/usr.bin/readelf/Makefile.depend b/usr.bin/readelf/Makefile.depend index 3d7fea5a719a..ddc284fa26a2 100644 --- a/usr.bin/readelf/Makefile.depend +++ b/usr.bin/readelf/Makefile.depend @@ -10,7 +10,7 @@ DIRDEPS = \ lib/libdwarf \ lib/libelf \ lib/libelftc \ - lib/libnv \ + lib/libz \ .include diff --git a/usr.bin/size/Makefile.depend b/usr.bin/size/Makefile.depend index 3cacb80eb23c..fff85220223b 100644 --- a/usr.bin/size/Makefile.depend +++ b/usr.bin/size/Makefile.depend @@ -9,7 +9,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libelf \ lib/libelftc \ - lib/libnv \ .include diff --git a/usr.bin/strings/Makefile.depend b/usr.bin/strings/Makefile.depend index 3cacb80eb23c..fff85220223b 100644 --- a/usr.bin/strings/Makefile.depend +++ b/usr.bin/strings/Makefile.depend @@ -9,7 +9,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libelf \ lib/libelftc \ - lib/libnv \ .include From nobody Mon Nov 27 05:24:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvCq0yv4z51gts; Mon, 27 Nov 2023 05: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 4SdvCp6ZVVz4WNf; Mon, 27 Nov 2023 05:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJ21xw+uMDjh3eTF6Ej2RqRHneqkGvnkw+W9JNdDgbs=; b=lBxx7uwmTD0toOel5wUkbn7/0UJa1oSpElh+nXpEoUHrRImX4kt4FNh9j/gphP2+xfylFg Y/yGCIDmD4SgpB6lPBMkldU4LvZ90dcPY8xQ/cuXbQBnFofmz83Y+SDstBIu+LGkTgSEs7 0OhSlvH1dr48COZn0zpKLsWmvPCZtLmx4hIYrG0CWMI0daOW/vcwCzoIGqBG0ehIpozaAe UhX8hGA/B2wEC0Nv1A7lInuV57LEGwf67F8Mpu7Y+A4xDBk1M0H7XJxy2tpx/zlNuA4AX+ W8PA0WdZPv9X+iPtUND3tNtaYKyxZa8PEgX6Axm1I8RLK0W5xHjLESDRy96EMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJ21xw+uMDjh3eTF6Ej2RqRHneqkGvnkw+W9JNdDgbs=; b=jkj10ty5QwinjdtANEY8WSo7LLFaZ612tAlBLord7wfDE4tz4DFRx3e4oY4biPoYfjp6JR hKY8NbRkwd24TNPTjdCiA065t+Ft8/bKDPT1NeNLhHmsRG9hLPUO1md6vJX3CBas0Wrifb /L/oJKM1Y3SWZvkvLqHAhBgBl63M1e9xGQk04hbMT4U3AnTy9IQLp7YaAEAPxmOza0c/sa EnjskXkY+yd2Ja17CrHeG2p5tsqTXDyLbunZAoJIFqFvPsXOQSjsoFTUQLl7qloN6Xh7le 1TNhyCmKHxhkHHwmAbwSSk4fAXh0HZWgaBWzRvDBMOS4ksEXM31svrl3OUB0hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062678; a=rsa-sha256; cv=none; b=imBNWh0R77SveUTd5K5ZU14vZ6/LAIvYxX9mtUk5B1gL1Bd5TTKkJSQKZlgUyrdySfiGsQ asqW4EP5WHLbSF/JpAXmJ0tNbk0Ru4ZNS/sXrz5C5tsxd5RB2GPGuZISOjERQTBIlBaZZf 23E69qLM03EcVPYrJ6n7ZkF+bFseMTO0Cr7UCr6DCaoTumiIVr0YKntEIZqjLriVXMcJV/ OfT0dSnhuGIWBz/PUFYRN+ZrkkJpVCGlKVXJlOo6Zq4hfproB8wwGbK1NeJPY0hIkP2G/S vnNv3sb6f+JfEPWX4CIae+QOwkFMAF8UK9HI4Ox8WgEDeLYJkacGxbtjf0J+lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvCp5fB3z9nK; Mon, 27 Nov 2023 05: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 3AR5Oc5Q065666; Mon, 27 Nov 2023 05: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 3AR5OcN2065663; Mon, 27 Nov 2023 05:24:38 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:38 GMT Message-Id: <202311270524.3AR5OcN2065663@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: e717cb04bec1 - main - misc: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: e717cb04bec1a0a911dee2fbbef6079f7107adc5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e717cb04bec1a0a911dee2fbbef6079f7107adc5 commit e717cb04bec1a0a911dee2fbbef6079f7107adc5 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:27 +0000 misc: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. This is for the misfits that have only a few: COPYRIGHT, gnu, tools, rescue, and etc. Sponsored by: Netflix --- COPYRIGHT | 1 - etc/Makefile | 1 - etc/mail/aliases | 2 -- etc/sendmail/Makefile | 1 - gnu/Makefile | 1 - rescue/rescue/Makefile | 1 - tools/bsdbox/Makefile | 1 - tools/tools/nanobsd/pcengines/Files/etc/ttys | 3 --- tools/tools/nanobsd/rescue/Files/etc/ttys | 3 --- 9 files changed, 14 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 9ed4f98d95a5..9bc4e3c04fc9 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,3 @@ -# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: diff --git a/etc/Makefile b/etc/Makefile index b76d6e6462f4..b2a80d4a7b57 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,3 @@ -# from: @(#)Makefile 5.11 (Berkeley) 5/21/91 .include .include diff --git a/etc/mail/aliases b/etc/mail/aliases index 09143a70ed94..cca448388ce5 100644 --- a/etc/mail/aliases +++ b/etc/mail/aliases @@ -1,5 +1,3 @@ -# @(#)aliases 5.3 (Berkeley) 5/24/90 -# # Aliases in this file will NOT be expanded in the header from # Mail, but WILL be visible over networks. # diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index 065e9ffe3f0e..93260e2e49d9 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.19 (Berkeley) 1/14/97 M4= m4 CHMOD= chmod diff --git a/gnu/Makefile b/gnu/Makefile index f0b6f7a36fc3..6a264d80e6a6 100644 --- a/gnu/Makefile +++ b/gnu/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 5.33.1.1 (Berkeley) 5/6/91 .include diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 0283aed9391c..7bf3299f4d48 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/2/93 .include .include diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile index 9233ff8b827c..008b66647077 100644 --- a/tools/bsdbox/Makefile +++ b/tools/bsdbox/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/2/93 MAN= diff --git a/tools/tools/nanobsd/pcengines/Files/etc/ttys b/tools/tools/nanobsd/pcengines/Files/etc/ttys index 9c9c9612d72b..7158696e7c3d 100644 --- a/tools/tools/nanobsd/pcengines/Files/etc/ttys +++ b/tools/tools/nanobsd/pcengines/Files/etc/ttys @@ -1,6 +1,3 @@ -# -# @(#)ttys 5.1 (Berkeley) 4/17/89 -# # This file specifies various information about terminals on the system. # It is used by several different programs. Common entries for the # various columns include: diff --git a/tools/tools/nanobsd/rescue/Files/etc/ttys b/tools/tools/nanobsd/rescue/Files/etc/ttys index 151ea5446d76..8bf8e51dfedb 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ttys +++ b/tools/tools/nanobsd/rescue/Files/etc/ttys @@ -1,6 +1,3 @@ -# -# @(#)ttys 5.1 (Berkeley) 4/17/89 -# # This file specifies various information about terminals on the system. # It is used by several different programs. Common entries for the # various columns include: From nobody Mon Nov 27 05:24:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvCr0vDxz51gtx; Mon, 27 Nov 2023 05: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 4SdvCr0dKYz4WXL; Mon, 27 Nov 2023 05: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=1701062680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgYwa92CGms78rygNezI5YVmLHCCyegr3L2E/SxQbK4=; b=RUlnOw50l57qNVhjXWYS/o62TeUj8oiLWuaR35gZxPNak2nROrUFmcW80Xt3BaWfG6i4Ce VIokS0jrQ4t+BQ07Fb77/92RtzJiK222U2lDNTQqX3dXKGFxEmLvVAOdnz0HateTcw0Ibp 0QEkmdDmhU7f/Yah2rVR9H5QU66fT97t8Je56qCatDDdrsuAU1AUl1U+8I0lGIUMM4VMVZ F/DumWynL1jNhYE1Tcp6WKRtEJJqURrFPEkl0qzZTya9CFvCToo4cMTecEUiM/1ccxNtv/ xuS+VNMsiUrSZ19tmk99C7uxFBCRekfn6MBUbaHF1q8EVU6kNG6XQBqgX03YbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgYwa92CGms78rygNezI5YVmLHCCyegr3L2E/SxQbK4=; b=l63ulDCZWREkZkT6VYcVLyCgEgs3cAoEhjLtoxtRHoJDBHTW+1nyjM+lJgiM4ImKOvNQqu yIsXeMsJrr+Ai3pt5Zhffvz4wvw3xpVqqC9oFKSnpNjHQxy5WTGxSGaNVxKb4rWI2k8Qvz zuzkaiyQ3fyB3tdOUhFqw1dUyGP6w67EqsemMqNG4XIhzU9VoQfocbfxT8ywn2FgRdIdJ9 SzoOiuIIAO/g6jCAcFu2fH8hCY/kh/xHtWoJDxpgBg1XB9nseP1scCqJP3SPkF2oz6eS1w YqbIqSV7jPBY6acm65KnDJLmgBFXb7IDqGml+ltb3JoHwVBJiIDOZZwmbWj3Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062680; a=rsa-sha256; cv=none; b=kCIc+jLi5y18/XG5P88fk32k4vSOZP3bhSoe/nzbxm22/pz0VBDNsHSFEkYU6c9P/pBYMn HfUwbav7hwucTuODoSW17Xs2aAtVkgX76f8BH5PDV1AOGhxkow8IiOHUAWfOvTbDy+4KvT liwjtaOVZrwIMcn05pDszaMY5ZCfJqgDgeDcYj1WJWTL7kX61pW5X54lK5mB2RClvh6Tsa 1NhfXsaKc0t9W9MqByUi4CkuuxEddafrOE0PvDra1C+YNAlhlLB2ZU8jRqaIKkbCHUIes+ oR2zhIo5p5CIOzG8vemWOe9fVv1RQOVf6LloeiyOat+cZHKFd8Vg2Hy0EFUr2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvCq6ScLzB7Q; Mon, 27 Nov 2023 05:24: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 3AR5OdwX065710; Mon, 27 Nov 2023 05: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 3AR5Odqh065707; Mon, 27 Nov 2023 05:24:39 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:39 GMT Message-Id: <202311270524.3AR5Odqh065707@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: 90aea514c624 - main - bin: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 90aea514c6249118e880d75972d063362f4bf492 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=90aea514c6249118e880d75972d063362f4bf492 commit 90aea514c6249118e880d75972d063362f4bf492 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:28 +0000 bin: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- bin/Makefile | 1 - bin/Makefile.inc | 1 - bin/cat/Makefile | 1 - bin/cat/cat.1 | 2 -- bin/cat/cat.c | 3 --- bin/chflags/Makefile | 1 - bin/chflags/chflags.1 | 2 -- bin/chflags/chflags.c | 3 --- bin/chio/Makefile | 1 - bin/chmod/Makefile | 1 - bin/chmod/chmod.1 | 2 -- bin/chmod/chmod.c | 3 --- bin/cp/Makefile | 1 - bin/cp/cp.1 | 2 -- bin/cp/cp.c | 3 --- bin/cp/extern.h | 2 -- bin/cp/utils.c | 3 --- bin/csh/Makefile | 2 -- bin/date/Makefile | 1 - bin/date/date.1 | 2 -- bin/date/date.c | 3 --- bin/dd/Makefile | 1 - bin/dd/args.c | 3 --- bin/dd/conv.c | 3 --- bin/dd/conv_tab.c | 3 --- bin/dd/dd.1 | 2 -- bin/dd/dd.c | 3 --- bin/dd/dd.h | 2 -- bin/dd/extern.h | 2 -- bin/dd/misc.c | 3 --- bin/dd/position.c | 3 --- bin/df/Makefile | 1 - bin/df/df.1 | 2 -- bin/df/df.c | 3 --- bin/domainname/domainname.1 | 2 -- bin/domainname/domainname.c | 3 --- bin/echo/Makefile | 1 - bin/echo/echo.1 | 2 -- bin/echo/echo.c | 3 --- bin/ed/ed.h | 2 -- bin/hostname/Makefile | 1 - bin/hostname/hostname.1 | 2 -- bin/hostname/hostname.c | 3 --- bin/kill/Makefile | 1 - bin/kill/kill.1 | 2 -- bin/kill/kill.c | 3 --- bin/ln/Makefile | 1 - bin/ln/ln.1 | 2 -- bin/ln/ln.c | 3 --- bin/ln/symlink.7 | 2 -- bin/ls/Makefile | 1 - bin/ls/cmp.c | 3 --- bin/ls/extern.h | 2 -- bin/ls/ls.1 | 2 -- bin/ls/ls.c | 3 --- bin/ls/ls.h | 2 -- bin/ls/print.c | 3 --- bin/ls/util.c | 3 --- bin/mkdir/Makefile | 1 - bin/mkdir/mkdir.1 | 2 -- bin/mkdir/mkdir.c | 3 --- bin/mv/Makefile | 1 - bin/mv/mv.1 | 2 -- bin/mv/mv.c | 3 --- bin/pax/Makefile | 1 - bin/pax/ar_io.c | 3 --- bin/pax/ar_subs.c | 3 --- bin/pax/buf_subs.c | 3 --- bin/pax/cache.c | 3 --- bin/pax/cache.h | 2 -- bin/pax/cpio.c | 3 --- bin/pax/cpio.h | 2 -- bin/pax/extern.h | 2 -- bin/pax/file_subs.c | 3 --- bin/pax/ftree.c | 3 --- bin/pax/ftree.h | 2 -- bin/pax/gen_subs.c | 3 --- bin/pax/options.c | 3 --- bin/pax/options.h | 2 -- bin/pax/pat_rep.c | 3 --- bin/pax/pat_rep.h | 2 -- bin/pax/pax.1 | 2 -- bin/pax/pax.c | 3 --- bin/pax/pax.h | 2 -- bin/pax/sel_subs.c | 3 --- bin/pax/sel_subs.h | 2 -- bin/pax/tables.c | 3 --- bin/pax/tables.h | 2 -- bin/pax/tar.c | 3 --- bin/pax/tar.h | 2 -- bin/pax/tty_subs.c | 3 --- bin/ps/Makefile | 1 - bin/ps/extern.h | 2 -- bin/ps/fmt.c | 3 --- bin/ps/keyword.c | 3 --- bin/ps/nlist.c | 3 --- bin/ps/print.c | 3 --- bin/ps/ps.1 | 2 -- bin/ps/ps.c | 3 --- bin/ps/ps.h | 2 -- bin/pwd/Makefile | 1 - bin/pwd/pwd.1 | 2 -- bin/pwd/pwd.c | 3 --- bin/realpath/realpath.1 | 2 -- bin/rm/Makefile | 1 - bin/rm/rm.1 | 2 -- bin/rm/rm.c | 3 --- bin/rmail/Makefile | 1 - bin/rmdir/Makefile | 1 - bin/rmdir/rmdir.1 | 2 -- bin/rmdir/rmdir.c | 3 --- bin/sh/Makefile | 1 - bin/sh/TOUR | 1 - bin/sh/alias.c | 3 --- bin/sh/alias.h | 2 -- bin/sh/arith.h | 2 -- bin/sh/bltin/bltin.h | 2 -- bin/sh/bltin/echo.c | 2 -- bin/sh/builtins.def | 2 -- bin/sh/cd.c | 3 --- bin/sh/error.c | 3 --- bin/sh/error.h | 2 -- bin/sh/eval.c | 3 --- bin/sh/eval.h | 2 -- bin/sh/exec.c | 3 --- bin/sh/exec.h | 2 -- bin/sh/expand.c | 3 --- bin/sh/expand.h | 2 -- bin/sh/funcs/cmv | 2 -- bin/sh/funcs/dirs | 2 -- bin/sh/funcs/login | 2 -- bin/sh/funcs/newgrp | 2 -- bin/sh/funcs/popd | 2 -- bin/sh/funcs/pushd | 2 -- bin/sh/funcs/suspend | 2 -- bin/sh/histedit.c | 3 --- bin/sh/input.c | 3 --- bin/sh/input.h | 2 -- bin/sh/jobs.c | 3 --- bin/sh/jobs.h | 2 -- bin/sh/mail.c | 3 --- bin/sh/mail.h | 2 -- bin/sh/main.c | 3 --- bin/sh/main.h | 2 -- bin/sh/memalloc.c | 3 --- bin/sh/memalloc.h | 2 -- bin/sh/miscbltin.c | 3 --- bin/sh/mkbuiltins | 2 -- bin/sh/mknodes.c | 3 --- bin/sh/mksyntax.c | 3 --- bin/sh/mktokens | 2 -- bin/sh/myhistedit.h | 2 -- bin/sh/mystring.c | 3 --- bin/sh/mystring.h | 2 -- bin/sh/nodes.c.pat | 2 -- bin/sh/nodetypes | 2 -- bin/sh/options.c | 3 --- bin/sh/options.h | 2 -- bin/sh/output.c | 3 --- bin/sh/output.h | 2 -- bin/sh/parser.c | 3 --- bin/sh/parser.h | 2 -- bin/sh/redir.c | 3 --- bin/sh/redir.h | 2 -- bin/sh/sh.1 | 2 -- bin/sh/shell.h | 2 -- bin/sh/show.c | 3 --- bin/sh/show.h | 2 -- bin/sh/trap.c | 3 --- bin/sh/trap.h | 2 -- bin/sh/var.c | 3 --- bin/sh/var.h | 2 -- bin/sleep/Makefile | 1 - bin/sleep/sleep.1 | 2 -- bin/sleep/sleep.c | 3 --- bin/stty/Makefile | 1 - bin/stty/cchar.c | 3 --- bin/stty/extern.h | 2 -- bin/stty/gfmt.c | 3 --- bin/stty/key.c | 3 --- bin/stty/modes.c | 3 --- bin/stty/print.c | 3 --- bin/stty/stty.1 | 2 -- bin/stty/stty.c | 3 --- bin/stty/stty.h | 2 -- bin/stty/util.c | 3 --- bin/sync/Makefile | 1 - bin/sync/sync.8 | 2 -- bin/sync/sync.c | 3 --- bin/test/Makefile | 1 - bin/test/test.1 | 2 -- 191 files changed, 432 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index ca6decd316b9..bf352b4d78da 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/Makefile.inc b/bin/Makefile.inc index e29b6c9aab86..8f9ef366e9a4 100644 --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -1,4 +1,3 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/cat/Makefile b/bin/cat/Makefile index ffa36f5e77ac..46c7fd5e4ec6 100644 --- a/bin/cat/Makefile +++ b/bin/cat/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/cat/cat.1 b/bin/cat/cat.1 index b6bc2c4453ce..b34c6fbf842b 100644 --- a/bin/cat/cat.1 +++ b/bin/cat/cat.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" .Dd January 29, 2013 .Dt CAT 1 .Os diff --git a/bin/cat/cat.c b/bin/cat/cat.c index c69bbc4911cb..7b39caa84d00 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -41,9 +41,6 @@ static char const copyright[] = #endif #ifndef lint -#if 0 -static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; -#endif #endif /* not lint */ #include #include diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile index 1dc69a8f0668..fd19a4e4f848 100644 --- a/bin/chflags/Makefile +++ b/bin/chflags/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 .include diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1 index 061a0c3296d9..31a4211fb25c 100644 --- a/bin/chflags/chflags.1 +++ b/bin/chflags/chflags.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" .Dd June 12, 2018 .Dt CHFLAGS 1 .Os diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index a08ac88ab3cd..6704f569cd33 100644 --- a/bin/chflags/chflags.c +++ b/bin/chflags/chflags.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif -#ifndef lint -static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; -#endif #endif #include diff --git a/bin/chio/Makefile b/bin/chio/Makefile index b317dd469637..0783e1d8372d 100644 --- a/bin/chio/Makefile +++ b/bin/chio/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 PACKAGE=utilities PROG= chio diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile index 2f855f0e76b6..e6de3a834c45 100644 --- a/bin/chmod/Makefile +++ b/bin/chmod/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1 index 426381f77211..b4c79d0f037a 100644 --- a/bin/chmod/chmod.1 +++ b/bin/chmod/chmod.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" .Dd January 7, 2017 .Dt CHMOD 1 .Os diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c index 23239d647643..67dc03e1f99d 100644 --- a/bin/chmod/chmod.c +++ b/bin/chmod/chmod.c @@ -36,9 +36,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; -#endif /* not lint */ #endif #include #include diff --git a/bin/cp/Makefile b/bin/cp/Makefile index a9c310afc409..6da92d982f63 100644 --- a/bin/cp/Makefile +++ b/bin/cp/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/cp/cp.1 b/bin/cp/cp.1 index b67718bd39b1..0bf28937d7fc 100644 --- a/bin/cp/cp.1 +++ b/bin/cp/cp.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" .Dd February 23, 2022 .Dt CP 1 .Os diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 24156e4b4a0b..f8610229e4c8 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -39,9 +39,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; -#endif /* not lint */ #endif #include /* diff --git a/bin/cp/extern.h b/bin/cp/extern.h index a5b86c12b2f9..742b5676f1d7 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)extern.h 8.2 (Berkeley) 4/1/94 */ typedef struct { diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 02d78350067c..107e6638e453 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94"; -#endif #endif /* not lint */ #include #include diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 94e1ba763d6e..b482e32024ad 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,5 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 -# # C Shell with process control; VM/UNIX VAX Makefile # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria # diff --git a/bin/date/Makefile b/bin/date/Makefile index cfde78792454..85c269aa10b1 100644 --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/date/date.1 b/bin/date/date.1 index 90e8c1bda81b..194635e923b3 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" .Dd May 19, 2023 .Dt DATE 1 .Os diff --git a/bin/date/date.c b/bin/date/date.c index 74e8c82c5304..abc51c307f47 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -36,9 +36,6 @@ static char const copyright[] = #endif /* not lint */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include diff --git a/bin/dd/Makefile b/bin/dd/Makefile index 90561ada199a..fde8e08db42a 100644 --- a/bin/dd/Makefile +++ b/bin/dd/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/dd/args.c b/bin/dd/args.c index 0e4edb6e2ca5..c16b37528f94 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -34,9 +34,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ #include #include diff --git a/bin/dd/conv.c b/bin/dd/conv.c index b7cc1e5b5383..2ac1e1229976 100644 --- a/bin/dd/conv.c +++ b/bin/dd/conv.c @@ -34,9 +34,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ #include #include diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c index e6cc873bf9b1..7f256e8fd032 100644 --- a/bin/dd/conv_tab.c +++ b/bin/dd/conv_tab.c @@ -34,9 +34,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)conv_tab.c 8.1 (Berkeley) 5/31/93"; -#endif #endif /* not lint */ #include #include diff --git a/bin/dd/dd.1 b/bin/dd/dd.1 index 8971566bdeab..fa04b3673d39 100644 --- a/bin/dd/dd.1 +++ b/bin/dd/dd.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" .Dd June 4, 2020 .Dt DD 1 .Os diff --git a/bin/dd/dd.c b/bin/dd/dd.c index c1e8a4efdc5f..a2997ea12249 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -40,9 +40,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; -#endif /* not lint */ #endif #include #include diff --git a/bin/dd/dd.h b/bin/dd/dd.h index ce00412073e3..d2d564494a54 100644 --- a/bin/dd/dd.h +++ b/bin/dd/dd.h @@ -31,8 +31,6 @@ * 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.h 8.3 (Berkeley) 4/2/94 */ /* Input/output stream state. */ diff --git a/bin/dd/extern.h b/bin/dd/extern.h index 760eecb14b59..505f107221c4 100644 --- a/bin/dd/extern.h +++ b/bin/dd/extern.h @@ -31,8 +31,6 @@ * 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. - * - * @(#)extern.h 8.3 (Berkeley) 4/2/94 */ void block(void); diff --git a/bin/dd/misc.c b/bin/dd/misc.c index 2cb0cad8bcc2..c9c99a13280f 100644 --- a/bin/dd/misc.c +++ b/bin/dd/misc.c @@ -34,9 +34,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ #include #include diff --git a/bin/dd/position.c b/bin/dd/position.c index c8ec531e6000..07a46e4a53fb 100644 --- a/bin/dd/position.c +++ b/bin/dd/position.c @@ -34,9 +34,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)position.c 8.3 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ #include #include diff --git a/bin/df/Makefile b/bin/df/Makefile index 2735fd835a1c..6584f8901cfc 100644 --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.3 (Berkeley) 5/8/95 PACKAGE=runtime diff --git a/bin/df/df.1 b/bin/df/df.1 index f4eb2ff9ab5f..e3cd9be71dfe 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" .Dd March 29, 2023 .Dt DF 1 .Os diff --git a/bin/df/df.c b/bin/df/df.c index 51e1e17de4a6..f59b21963eb2 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -41,9 +41,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; -#endif /* not lint */ #endif #include #include diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1 index d955f86ba6c1..d83169788f2a 100644 --- a/bin/domainname/domainname.1 +++ b/bin/domainname/domainname.1 @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" From: @(#)hostname.1 8.1 (Berkeley) 5/31/93 -.\" .Dd April 22, 2013 .Dt DOMAINNAME 1 .Os diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index 4607ce543084..54be99392865 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.c @@ -36,9 +36,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char const sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; -#endif /* not lint */ #endif #include #include diff --git a/bin/echo/Makefile b/bin/echo/Makefile index 53d756566487..385e459f81cb 100644 --- a/bin/echo/Makefile +++ b/bin/echo/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/echo/echo.1 b/bin/echo/echo.1 index dc87cf43cbc7..aa547d2350f5 100644 --- a/bin/echo/echo.1 +++ b/bin/echo/echo.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)echo.1 8.1 (Berkeley) 7/22/93 -.\" .Dd October 5, 2016 .Dt ECHO 1 .Os diff --git a/bin/echo/echo.c b/bin/echo/echo.c index 168ff6299728..b2e82e9990d9 100644 --- a/bin/echo/echo.c +++ b/bin/echo/echo.c @@ -36,9 +36,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93"; -#endif /* not lint */ #endif #include #include diff --git a/bin/ed/ed.h b/bin/ed/ed.h index e4562be8d331..788106e68b51 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -23,8 +23,6 @@ * 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. - * - * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp */ #include diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile index 6e1b79f0348f..683611b17299 100644 --- a/bin/hostname/Makefile +++ b/bin/hostname/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 PACKAGE=runtime PROG= hostname diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1 index 7192640beae0..da9c12d0278a 100644 --- a/bin/hostname/hostname.1 +++ b/bin/hostname/hostname.1 @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" .Dd October 5, 2020 .Dt HOSTNAME 1 .Os diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c index 83959348bc76..3b2d51230955 100644 --- a/bin/hostname/hostname.c +++ b/bin/hostname/hostname.c @@ -36,9 +36,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93"; -#endif /* not lint */ #endif #include #include diff --git a/bin/kill/Makefile b/bin/kill/Makefile index 064c0191101b..4023586d2aa7 100644 --- a/bin/kill/Makefile +++ b/bin/kill/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 PACKAGE=runtime PROG= kill diff --git a/bin/kill/kill.1 b/bin/kill/kill.1 index f3f0d27bb89b..ce9cb06382f8 100644 --- a/bin/kill/kill.1 +++ b/bin/kill/kill.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)kill.1 8.2 (Berkeley) 4/28/95 -.\" .Dd October 3, 2016 .Dt KILL 1 .Os diff --git a/bin/kill/kill.c b/bin/kill/kill.c index dba32981c050..500f9384cbb9 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -40,9 +40,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include #include diff --git a/bin/ln/Makefile b/bin/ln/Makefile index d919938d9ff8..141aa57aab5b 100644 --- a/bin/ln/Makefile +++ b/bin/ln/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.2 (Berkeley) 5/31/93 .include diff --git a/bin/ln/ln.1 b/bin/ln/ln.1 index 9ef8c43d12d2..43522e0c1cb8 100644 --- a/bin/ln/ln.1 +++ b/bin/ln/ln.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" .Dd June 12, 2017 .Dt LN 1 .Os diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 546bfba1c7c3..3481d40ccb4f 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -36,9 +36,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; -#endif /* not lint */ #endif #include #include diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7 index 5c5d0a64026c..1789cbe5bc80 100644 --- a/bin/ln/symlink.7 +++ b/bin/ln/symlink.7 @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 -.\" .Dd February 16, 2015 .Dt SYMLINK 7 .Os diff --git a/bin/ls/Makefile b/bin/ls/Makefile index 5cf29e09a94a..b9aa06775e7f 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/2/93 .include diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c index 590a848e512f..cc8263f227c2 100644 --- a/bin/ls/cmp.c +++ b/bin/ls/cmp.c @@ -33,9 +33,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)cmp.c 8.1 (Berkeley) 5/31/93"; -#endif /* not lint */ #endif #include #include diff --git a/bin/ls/extern.h b/bin/ls/extern.h index c3a4eafc353d..fd9a3f111a47 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -27,8 +27,6 @@ * 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. - * - * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 */ #include diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 9c62f2cc1e38..fdfcb50beb06 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" .Dd July 18, 2023 .Dt LS 1 .Os diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 842364b67f1f..1bd5b7f2c88d 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -39,9 +39,6 @@ static const char copyright[] = #endif /* not lint */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)ls.c 8.5 (Berkeley) 4/2/94"; -#endif /* not lint */ #endif #include #include diff --git a/bin/ls/ls.h b/bin/ls/ls.h index 79e917545386..1c3c1cb786f6 100644 --- a/bin/ls/ls.h +++ b/bin/ls/ls.h @@ -30,8 +30,6 @@ * 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. - * - * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 */ #define NO_PRINT 1 diff --git a/bin/ls/print.c b/bin/ls/print.c index 16c4f48624d0..75917d60002b 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -33,9 +33,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)print.c 8.4 (Berkeley) 4/17/94"; -#endif /* not lint */ #endif #include #include diff --git a/bin/ls/util.c b/bin/ls/util.c index 6930633fb744..b10169b2d321 100644 --- a/bin/ls/util.c +++ b/bin/ls/util.c @@ -33,9 +33,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/2/94"; -#endif /* not lint */ #endif #include #include diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile index ba9017b1bf4f..8bf3cfb0e081 100644 --- a/bin/mkdir/Makefile +++ b/bin/mkdir/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 .include diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1 index 8d376460db15..599ac7e4a7ff 100644 --- a/bin/mkdir/mkdir.1 +++ b/bin/mkdir/mkdir.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 -.\" .Dd March 15, 2013 .Dt MKDIR 1 .Os diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 4d5f151ba214..725d88235645 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -36,9 +36,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94"; -#endif /* not lint */ #endif #include #include diff --git a/bin/mv/Makefile b/bin/mv/Makefile index 2d23ea864f9b..2413f572874f 100644 --- a/bin/mv/Makefile +++ b/bin/mv/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.2 (Berkeley) 4/2/94 .include diff --git a/bin/mv/mv.1 b/bin/mv/mv.1 index bad805c94489..138ce99f586f 100644 --- a/bin/mv/mv.1 +++ b/bin/mv/mv.1 @@ -29,8 +29,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" .Dd March 15, 2013 .Dt MV 1 .Os diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 1320f603b3c4..1104a2710174 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -39,9 +39,6 @@ static char const copyright[] = *** 1666 LINES SKIPPED *** From nobody Mon Nov 27 05:24:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvCs1ypDz51hDR; Mon, 27 Nov 2023 05: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 4SdvCs1W32z4WY3; Mon, 27 Nov 2023 05: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=1701062681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sX6IKnslnu8dFfuiomiN6NQJ4sHJcowz8vXn+EY7/sI=; b=FmZ11a1butu1JZYCVGrcYlYEEo4BlUXN/qWwJcHECYjuJoImHTtL6x3ODRI3/9++jTkGDD 5YU+90bFcE8vMj+2xcbj8W4xxvy7YpaBgvZnl4kDFccjXz7BhN+3a25yHgTir1aGhnr/Bg SMHoca1CT6uhjrcB0Qw9nyQtqSopvZ+kFC1qjf309lHZsqV58kR+N8Y9EDl84XpQXrB6BW 5xgs7kBLgI9po9onOaWMMbP9gmdvcPlI/gJrtsIkAqtndItuoZEOk22Qa1QhwtrvZQQy8A 8XnRPMAaYowUcgeDwYpkXabCB6xVD8LLK3FwXtFVxiS90sMinsYHtuFbNI+VtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sX6IKnslnu8dFfuiomiN6NQJ4sHJcowz8vXn+EY7/sI=; b=Jdz2Eio8dpgaY6ba0Lmule90trxYART2RxuFhxRrBJL8skxIEb0/eAas30zHPXJjUvuBTD aHDwbyw0grFt15wnw+a0QhAzCdDpLn/8GjFVFqZMjhmfu6MsjkRLXD1i5OFJRzQ1IOMK6P 4CetKE1tPIjPBjAsvT0MOwr8yOavNPVB1sBol2oE0u7DEVmXzrd/H8nUPt9NYVfHaiIJom e3GxNyVEX7kvbC0pns3236Y/+NprzEpIeEOTS6vgDdE0cmhqu7fQe8FI6vEkgiwiODHctZ JHcSMLlSqD8Zt2RR6asUMuPcG7JBc7DNDHgvCqcboJY9EDutM3Dn8cpXALHrYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062681; a=rsa-sha256; cv=none; b=Rc1Yjqt91tCTqD3lVsUIE6a9N0kUA53Qz3DSIBOB05LONqXSC0WCj9QWSZrnN4vmzdh9Ea QhRZ5VdeOnDoEDSKINptn+nSmxCENYYzZiyIXQ12FcWr3dMMLdc3xoKMhTSeXVjBz8Tzzw t4aqM8Iw1Ay9q5QoH4B3dnqV0w7jUzuFE4eWfAyWkM5g2W01T/AStDgPXenM79/Um9fH4m 5bwbei//RjloZdaeAnMjMcDtM8KFfAT8EGbTxgAXdw5pGMi5skgqf2vB7PWlsl5ULU05tm 1Y3Y1ZD3LZVHjfZwNDAE+RDprXeNOjM2srNydRlz6QrS8/E36A63Iq2PvwsAgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvCs0Q82zB9s; Mon, 27 Nov 2023 05: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 3AR5Of9e065753; Mon, 27 Nov 2023 05: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 3AR5OeaD065750; Mon, 27 Nov 2023 05:24:40 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:40 GMT Message-Id: <202311270524.3AR5OeaD065750@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: 5a1d14419a5b - main - include: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 5a1d14419a5b620430949a46cb6ee63148a43cb9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5a1d14419a5b620430949a46cb6ee63148a43cb9 commit 5a1d14419a5b620430949a46cb6ee63148a43cb9 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:28 +0000 include: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- include/Makefile | 2 -- include/_ctype.h | 2 -- include/a.out.h | 2 -- include/ar.h | 2 -- include/arpa/ftp.h | 2 -- include/arpa/inet.h | 1 - include/arpa/telnet.h | 2 -- include/arpa/tftp.h | 2 -- include/assert.h | 2 -- include/ctype.h | 2 -- include/db.h | 2 -- include/dirent.h | 2 -- include/err.h | 2 -- include/fnmatch.h | 1 - include/fstab.h | 2 -- include/fts.h | 2 -- include/glob.h | 2 -- include/grp.h | 2 -- include/limits.h | 2 -- include/locale.h | 2 -- include/memory.h | 2 -- include/mpool.h | 2 -- include/ndbm.h | 2 -- include/netdb.h | 1 - include/nlist.h | 2 -- include/paths.h | 2 -- include/protocols/dumprestore.h | 2 -- include/protocols/routed.h | 2 -- include/protocols/rwhod.h | 2 -- include/protocols/talkd.h | 2 -- include/protocols/timed.h | 2 -- include/pwd.h | 2 -- include/ranlib.h | 2 -- include/regex.h | 2 -- include/resolv.h | 1 - include/rpc/Makefile | 1 - include/rpc/auth.h | 4 ---- include/rpc/auth_des.h | 3 --- include/rpc/auth_unix.h | 3 --- include/rpc/clnt.h | 3 --- include/rpc/clnt_stat.h | 2 -- include/rpc/des.h | 1 - include/rpc/des_crypt.h | 1 - include/rpc/pmap_clnt.h | 3 --- include/rpc/pmap_prot.h | 3 --- include/rpc/pmap_rmt.h | 3 --- include/rpc/raw.h | 3 --- include/rpc/rpc.h | 3 --- include/rpc/rpc_com.h | 2 -- include/rpc/rpc_msg.h | 3 --- include/rpc/rpcb_clnt.h | 1 - include/rpc/rpcent.h | 4 ---- include/rpc/svc.h | 3 --- include/rpc/svc_auth.h | 3 --- include/rpc/svc_soc.h | 1 - include/rpc/xdr.h | 3 --- include/rpcsvc/Makefile | 1 - include/rpcsvc/nis.x | 1 - include/rpcsvc/nis_cache.x | 2 -- include/rpcsvc/nis_callback.x | 3 --- include/rpcsvc/nis_db.h | 2 -- include/rpcsvc/nis_object.x | 2 -- include/rpcsvc/nis_tags.h | 1 - include/rpcsvc/nislib.h | 2 -- include/rpcsvc/rquota.x | 3 --- include/rpcsvc/sm_inter.x | 3 --- include/rpcsvc/yp.x | 2 -- include/runetype.h | 2 -- include/setjmp.h | 2 -- include/signal.h | 2 -- include/stab.h | 2 -- include/stddef.h | 2 -- include/stdio.h | 2 -- include/stdlib.h | 2 -- include/string.h | 2 -- include/sysexits.h | 2 -- include/tar.h | 2 -- include/termios.h | 2 -- include/time.h | 2 -- include/timeconv.h | 2 -- include/ttyent.h | 2 -- include/unistd.h | 2 -- include/utime.h | 2 -- 83 files changed, 173 deletions(-) diff --git a/include/Makefile b/include/Makefile index 5a3cb66eb3e3..c15446010a52 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,5 +1,3 @@ -# @(#)Makefile 8.2 (Berkeley) 1/4/94 -# # Doing a "make install" builds /usr/include. .include diff --git a/include/_ctype.h b/include/_ctype.h index 91e6b1d14f6b..28815f9f4571 100644 --- a/include/_ctype.h +++ b/include/_ctype.h @@ -35,8 +35,6 @@ * 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. - * - * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp */ diff --git a/include/a.out.h b/include/a.out.h index 8e0a3c34bfe1..02d9fca15441 100644 --- a/include/a.out.h +++ b/include/a.out.h @@ -27,8 +27,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)a.out.h 8.1 (Berkeley) 6/2/93 */ #ifndef _AOUT_H_ diff --git a/include/ar.h b/include/ar.h index 039b01985487..70bf8ca206b6 100644 --- a/include/ar.h +++ b/include/ar.h @@ -35,8 +35,6 @@ * 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. - * - * @(#)ar.h 8.2 (Berkeley) 1/21/94 */ #ifndef _AR_H_ diff --git a/include/arpa/ftp.h b/include/arpa/ftp.h index 3c654b8ecb83..3f7100e300e1 100644 --- a/include/arpa/ftp.h +++ b/include/arpa/ftp.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)ftp.h 8.1 (Berkeley) 6/2/93 */ #ifndef _ARPA_FTP_H_ diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 881027a0d63a..84c338140d11 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -52,7 +52,6 @@ */ /*% - * @(#)inet.h 8.1 (Berkeley) 6/2/93 * $Id: inet.h,v 1.3 2005/04/27 04:56:16 sra Exp $ */ diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h index 922a06563469..0fccf01e994d 100644 --- a/include/arpa/telnet.h +++ b/include/arpa/telnet.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)telnet.h 8.2 (Berkeley) 12/15/93 */ #ifndef _ARPA_TELNET_H_ diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h index c62429cf16aa..f6c31a6bcc09 100644 --- a/include/arpa/tftp.h +++ b/include/arpa/tftp.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)tftp.h 8.1 (Berkeley) 6/2/93 */ #ifndef _ARPA_TFTP_H_ diff --git a/include/assert.h b/include/assert.h index 54e1456b9e0d..cc2a5f8b9e64 100644 --- a/include/assert.h +++ b/include/assert.h @@ -32,8 +32,6 @@ * 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. - * - * @(#)assert.h 8.2 (Berkeley) 1/21/94 */ #include diff --git a/include/ctype.h b/include/ctype.h index 46e8f3b23d9e..e7b59c795846 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -35,8 +35,6 @@ * 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. - * - * @(#)ctype.h 8.4 (Berkeley) 1/21/94 */ #ifndef _CTYPE_H_ diff --git a/include/db.h b/include/db.h index 19db882f8eff..797eb98919f6 100644 --- a/include/db.h +++ b/include/db.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)db.h 8.7 (Berkeley) 6/16/94 */ #ifndef _DB_H_ diff --git a/include/dirent.h b/include/dirent.h index 5db7fe43b243..460be40c1064 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)dirent.h 8.2 (Berkeley) 7/28/94 */ #ifndef _DIRENT_H_ diff --git a/include/err.h b/include/err.h index 85b229a05d28..71bf2e5d73a6 100644 --- a/include/err.h +++ b/include/err.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)err.h 8.1 (Berkeley) 6/2/93 */ #ifndef _ERR_H_ diff --git a/include/fnmatch.h b/include/fnmatch.h index 71af5c52549c..4810b61570c5 100644 --- a/include/fnmatch.h +++ b/include/fnmatch.h @@ -27,7 +27,6 @@ * 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. - * @(#)fnmatch.h 8.1 (Berkeley) 6/2/93 */ #ifndef _FNMATCH_H_ diff --git a/include/fstab.h b/include/fstab.h index e61bb7c6d5d7..5edaa441ace0 100644 --- a/include/fstab.h +++ b/include/fstab.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)fstab.h 8.1 (Berkeley) 6/2/93 */ #ifndef _FSTAB_H_ diff --git a/include/fts.h b/include/fts.h index 6c6a30e2d8c5..dae1df80ddd7 100644 --- a/include/fts.h +++ b/include/fts.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)fts.h 8.3 (Berkeley) 8/14/94 */ #ifndef _FTS_H_ diff --git a/include/glob.h b/include/glob.h index c5d17ef65ec7..dc86cdf99929 100644 --- a/include/glob.h +++ b/include/glob.h @@ -30,8 +30,6 @@ * 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. - * - * @(#)glob.h 8.1 (Berkeley) 6/2/93 */ #ifndef _GLOB_H_ diff --git a/include/grp.h b/include/grp.h index 3798fd3ea43c..6c603a2e86dc 100644 --- a/include/grp.h +++ b/include/grp.h @@ -32,8 +32,6 @@ * 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. - * - * @(#)grp.h 8.2 (Berkeley) 1/21/94 */ #ifndef _GRP_H_ diff --git a/include/limits.h b/include/limits.h index 73036ca3ad7b..99cfa67b3ed2 100644 --- a/include/limits.h +++ b/include/limits.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)limits.h 8.2 (Berkeley) 1/4/94 */ #ifndef _LIMITS_H_ diff --git a/include/locale.h b/include/locale.h index 0e2abc04dcc8..d9aa63331744 100644 --- a/include/locale.h +++ b/include/locale.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)locale.h 8.1 (Berkeley) 6/2/93 */ #ifndef _LOCALE_H_ diff --git a/include/memory.h b/include/memory.h index c6e89633e112..dbdedb8bd82f 100644 --- a/include/memory.h +++ b/include/memory.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)memory.h 8.1 (Berkeley) 6/2/93 */ #include diff --git a/include/mpool.h b/include/mpool.h index 7fc66b62f042..3946eb2f6a5e 100644 --- a/include/mpool.h +++ b/include/mpool.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)mpool.h 8.4 (Berkeley) 11/2/95 */ #ifndef _MPOOL_H_ diff --git a/include/ndbm.h b/include/ndbm.h index c520999ee8a8..0aa378f7ffaf 100644 --- a/include/ndbm.h +++ b/include/ndbm.h @@ -30,8 +30,6 @@ * 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. - * - * @(#)ndbm.h 8.1 (Berkeley) 6/2/93 */ #ifndef _NDBM_H_ diff --git a/include/netdb.h b/include/netdb.h index 0f9e4b41032a..905b2e659cec 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -51,7 +51,6 @@ */ /* - * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ */ diff --git a/include/nlist.h b/include/nlist.h index 7243bbe633f7..656afa706a76 100644 --- a/include/nlist.h +++ b/include/nlist.h @@ -32,8 +32,6 @@ * 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. - * - * @(#)nlist.h 8.2 (Berkeley) 1/21/94 */ #ifndef _NLIST_H_ diff --git a/include/paths.h b/include/paths.h index 55f7d1175617..9f9071af915c 100644 --- a/include/paths.h +++ b/include/paths.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)paths.h 8.1 (Berkeley) 6/2/93 */ #ifndef _PATHS_H_ diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h index ea0071525837..4a1f0ec1ed52 100644 --- a/include/protocols/dumprestore.h +++ b/include/protocols/dumprestore.h @@ -32,8 +32,6 @@ * 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. - * - * @(#)dumprestore.h 8.2 (Berkeley) 1/21/94 */ #ifndef _PROTOCOLS_DUMPRESTORE_H_ diff --git a/include/protocols/routed.h b/include/protocols/routed.h index 3a7abe5faccf..1d80a233b737 100644 --- a/include/protocols/routed.h +++ b/include/protocols/routed.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)routed.h 8.1 (Berkeley) 6/2/93 * $Revision: 2.26 $ */ diff --git a/include/protocols/rwhod.h b/include/protocols/rwhod.h index 8439cf26aac9..3d4527da8ade 100644 --- a/include/protocols/rwhod.h +++ b/include/protocols/rwhod.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)rwhod.h 8.1 (Berkeley) 6/2/93 */ #ifndef _PROTOCOLS_RWHOD_H_ diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h index b120b7ec5c62..8864dba28085 100644 --- a/include/protocols/talkd.h +++ b/include/protocols/talkd.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)talkd.h 8.1 (Berkeley) 6/2/93 */ #ifndef _PROTOCOLS_TALKD_H_ diff --git a/include/protocols/timed.h b/include/protocols/timed.h index a9dfede80382..649fb248e2bf 100644 --- a/include/protocols/timed.h +++ b/include/protocols/timed.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)timed.h 8.1 (Berkeley) 6/2/93 */ #ifndef _PROTOCOLS_TIMED_H_ diff --git a/include/pwd.h b/include/pwd.h index 6b56e6f9c5ed..8640052770c8 100644 --- a/include/pwd.h +++ b/include/pwd.h @@ -32,8 +32,6 @@ * 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. - * - * @(#)pwd.h 8.2 (Berkeley) 1/21/94 */ #ifndef _PWD_H_ diff --git a/include/ranlib.h b/include/ranlib.h index 363c24f898c3..e0bad414413b 100644 --- a/include/ranlib.h +++ b/include/ranlib.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)ranlib.h 8.1 (Berkeley) 6/2/93 */ #ifndef _RANLIB_H_ diff --git a/include/regex.h b/include/regex.h index 2644040899f0..e859289d8340 100644 --- a/include/regex.h +++ b/include/regex.h @@ -31,8 +31,6 @@ * 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. - * - * @(#)regex.h 8.2 (Berkeley) 1/3/94 */ #ifndef _REGEX_H_ diff --git a/include/resolv.h b/include/resolv.h index 467648b2aa53..40ca2e8a467f 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -47,7 +47,6 @@ */ /*% - * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * $Id: resolv.h,v 1.30 2009/03/03 01:52:48 each Exp $ */ diff --git a/include/rpc/Makefile b/include/rpc/Makefile index 37cb77e2728e..0c8434ee3473 100644 --- a/include/rpc/Makefile +++ b/include/rpc/Makefile @@ -1,4 +1,3 @@ -# from: @(#)Makefile 2.3 88/08/11 4.0 RPCSRC .SUFFIXES: .x diff --git a/include/rpc/auth.h b/include/rpc/auth.h index a894625ac405..3f889134e93b 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -28,10 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)auth.h 1.17 88/02/08 SMI - * from: @(#)auth.h 2.3 88/08/07 4.0 RPCSRC - * from: @(#)auth.h 1.43 98/02/02 SMI */ /* diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h index d395dbf49a46..0ff43c13139b 100644 --- a/include/rpc/auth_des.h +++ b/include/rpc/auth_des.h @@ -1,4 +1,3 @@ -/* @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */ /*- * SPDX-License-Identifier: BSD-3-Clause * @@ -28,8 +27,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * from: @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC - * from: @(#)auth_des.h 1.14 94/04/25 SMI */ /* diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index 6d9d5e0f45e6..725da2154e1c 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -26,9 +26,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)auth_unix.h 1.8 88/02/08 SMI - * from: @(#)auth_unix.h 2.2 88/07/29 4.0 RPCSRC */ /* diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index a7112d496f07..eb5e1f5b350f 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)clnt.h 1.31 94/04/29 SMI - * from: @(#)clnt.h 2.1 88/07/29 4.0 RPCSRC */ /* diff --git a/include/rpc/clnt_stat.h b/include/rpc/clnt_stat.h index 7b367132f2d4..7672b32f3f85 100644 --- a/include/rpc/clnt_stat.h +++ b/include/rpc/clnt_stat.h @@ -11,8 +11,6 @@ #ifndef _RPC_CLNT_STAT_H #define _RPC_CLNT_STAT_H -/* #pragma ident "@(#)clnt_stat.h 1.2 97/04/28 SMI" */ - #ifdef __cplusplus extern "C" { #endif diff --git a/include/rpc/des.h b/include/rpc/des.h index 4c3ca16e8e39..5056e4b1545c 100644 --- a/include/rpc/des.h +++ b/include/rpc/des.h @@ -1,4 +1,3 @@ -/* @(#)des.h 2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI */ /*- * SPDX-License-Identifier: BSD-3-Clause * diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h index 0dcd897495d4..9a40e25934ee 100644 --- a/include/rpc/des_crypt.h +++ b/include/rpc/des_crypt.h @@ -1,5 +1,4 @@ /* - * @(#)des_crypt.h 2.1 88/08/11 4.0 RPCSRC; from 1.4 88/02/08 (C) 1986 SMI * * des_crypt.h, des library routine interface * Copyright (C) 1986, Sun Microsystems, Inc. diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index 363c283e6764..d3a67778530b 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)pmap_clnt.h 1.11 88/02/08 SMI - * from: @(#)pmap_clnt.h 2.1 88/07/29 4.0 RPCSRC */ /* diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index a14518802813..81d3d349b776 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)pmap_prot.h 1.14 88/02/08 SMI - * from: @(#)pmap_prot.h 2.1 88/07/29 4.0 RPCSRC */ /* diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h index 9a9042a71493..1fe75c0caf5b 100644 --- a/include/rpc/pmap_rmt.h +++ b/include/rpc/pmap_rmt.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)pmap_rmt.h 1.2 88/02/08 SMI - * from: @(#)pmap_rmt.h 2.1 88/07/29 4.0 RPCSRC */ /* diff --git a/include/rpc/raw.h b/include/rpc/raw.h index 9c4e8b05dd2c..e8ddf1d753ca 100644 --- a/include/rpc/raw.h +++ b/include/rpc/raw.h @@ -36,9 +36,6 @@ #ifndef _RPC_RAW_H #define _RPC_RAW_H -/* from: @(#)raw.h 1.11 94/04/25 SMI */ -/* from: @(#)raw.h 1.2 88/10/25 SMI */ - #ifdef __cplusplus extern "C" { #endif diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index 783c84280ae2..30aad8d00b92 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)rpc.h 1.9 88/02/08 SMI - * from: @(#)rpc.h 2.4 89/07/11 4.0 RPCSRC */ /* diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h index a0a8c8872efa..b1d533ba5945 100644 --- a/include/rpc/rpc_com.h +++ b/include/rpc/rpc_com.h @@ -44,8 +44,6 @@ #include -/* #pragma ident "@(#)rpc_com.h 1.11 93/07/05 SMI" */ - /* * The max size of the transport, if the size cannot be determined * by other means. diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index f1bd4935f3c3..2a34354eb4d1 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)rpc_msg.h 1.7 86/07/16 SMI - * from: @(#)rpc_msg.h 2.1 88/07/29 4.0 RPCSRC */ /* diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h index 4b1f58d273ff..6fb6b8c8f0ca 100644 --- a/include/rpc/rpcb_clnt.h +++ b/include/rpc/rpcb_clnt.h @@ -55,7 +55,6 @@ #ifndef _RPC_RPCB_CLNT_H #define _RPC_RPCB_CLNT_H -/* #pragma ident "@(#)rpcb_clnt.h 1.13 94/04/25 SMI" */ /* rpcb_clnt.h 1.3 88/12/05 SMI */ #include diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h index b9f154d4ebfe..92b083f7c391 100644 --- a/include/rpc/rpcent.h +++ b/include/rpc/rpcent.h @@ -42,10 +42,6 @@ #ifndef _RPC_RPCENT_H #define _RPC_RPCENT_H -/* #pragma ident "@(#)rpcent.h 1.13 94/04/25 SMI" */ -/* @(#)rpcent.h 1.1 88/12/06 SMI */ - - struct rpcent { char *r_name; /* name of server for this rpc program */ char **r_aliases; /* alias list */ diff --git a/include/rpc/svc.h b/include/rpc/svc.h index cb4b70a64ce7..d4a84384bb92 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)svc.h 1.35 88/12/17 SMI - * from: @(#)svc.h 1.27 94/04/25 SMI */ /* diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h index 6652deff085b..a46ee804c253 100644 --- a/include/rpc/svc_auth.h +++ b/include/rpc/svc_auth.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)svc_auth.h 1.6 86/07/16 SMI - * @(#)svc_auth.h 2.1 88/07/29 4.0 RPCSRC */ /* diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h index e82215b33d65..3afcf88c38f0 100644 --- a/include/rpc/svc_soc.h +++ b/include/rpc/svc_soc.h @@ -41,7 +41,6 @@ #define _RPC_SVC_SOC_H #include -/* #pragma ident "@(#)svc_soc.h 1.11 94/04/25 SMI" */ /* svc_soc.h 1.8 89/05/01 SMI */ /* diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 624a3c294650..11d6a8d13b49 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -28,9 +28,6 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * from: @(#)xdr.h 1.19 87/04/22 SMI - * from: @(#)xdr.h 2.2 88/07/29 4.0 RPCSRC */ /* diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile index e896d9e83382..8ede7636f50e 100644 --- a/include/rpcsvc/Makefile +++ b/include/rpcsvc/Makefile @@ -1,4 +1,3 @@ -# from: @(#)Makefile 2.3 88/08/11 4.0 RPCSRC .SUFFIXES: .x diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x index bd1e61828dec..e83784159fe5 100644 --- a/include/rpcsvc/nis.x +++ b/include/rpcsvc/nis.x @@ -34,7 +34,6 @@ #endif /* - * From 4.1 : @(#)nis.x 1.61 Copyright 1989 Sun Microsystems * * RPC Language Protocol description file for NIS Plus * This version : 1.61 diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x index e55173994c13..c728736e3213 100644 --- a/include/rpcsvc/nis_cache.x +++ b/include/rpcsvc/nis_cache.x @@ -35,8 +35,6 @@ * All Rights Reserved. */ -/* From: %#pragma ident "@(#)nis_cache.x 1.11 94/05/03 SMI" */ - #ifndef RPC_HDR %#include #endif diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x index 7b717e918dcc..af7a291d1baa 100644 --- a/include/rpcsvc/nis_callback.x +++ b/include/rpcsvc/nis_callback.x @@ -36,14 +36,11 @@ * All Rights Reserved. */ -/* From: %#pragma ident "@(#)nis_callback.x 1.7 94/05/03 SMI" */ - #ifndef RPC_HDR %#include #endif /* - * "@(#)zns_cback.x 1.2 90/09/10 Copyr 1990 Sun Micro" * * RPCL description of the Callback Service. */ diff --git a/include/rpcsvc/nis_db.h b/include/rpcsvc/nis_db.h index e45c604638aa..f3a59a0e9e96 100644 --- a/include/rpcsvc/nis_db.h +++ b/include/rpcsvc/nis_db.h @@ -42,8 +42,6 @@ #define _RPCSVC_NIS_DB_H -/* From: #pragma ident "@(#)nis_db.h 1.8 94/05/03 SMI" */ - /* * Note: although the version of shipped with Solaris * 2.5/2.5.x is actually older than this one (according to the ident diff --git a/include/rpcsvc/nis_object.x b/include/rpcsvc/nis_object.x index 1507828b60ff..4fac5b6b6a6b 100644 --- a/include/rpcsvc/nis_object.x +++ b/include/rpcsvc/nis_object.x @@ -36,8 +36,6 @@ * All Rights Reserved. */ -/* From: %#pragma ident "@(#)nis_object.x 1.10 94/05/03 SMI" */ - #if RPC_HDR % %#ifndef __nis_object_h diff --git a/include/rpcsvc/nis_tags.h b/include/rpcsvc/nis_tags.h index 0c30d9b33a82..20f1a0f7dcd7 100644 --- a/include/rpcsvc/nis_tags.h +++ b/include/rpcsvc/nis_tags.h @@ -45,7 +45,6 @@ #ifndef _RPCSVC_NIS_TAGS_H #define _RPCSVC_NIS_TAGS_H -/* From: #pragma ident "@(#)nis_tags.h 1.10 94/05/03 SMI" */ /* from file: zns_tags.h 1.7 Copyright (c) 1990 Sun Microsystems */ #ifdef __cplusplus diff --git a/include/rpcsvc/nislib.h b/include/rpcsvc/nislib.h index c36db36c17ff..7db1e94e8d33 100644 --- a/include/rpcsvc/nislib.h +++ b/include/rpcsvc/nislib.h @@ -39,8 +39,6 @@ #ifndef _RPCSVC_NISLIB_H #define _RPCSVC_NISLIB_H -/* From: #pragma ident "@(#)nislib.h 1.16 94/05/03 SMI" */ - #ifdef __cplusplus extern "C" { #endif diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x index b4ef0d3a6dda..31cf2f31e856 100644 --- a/include/rpcsvc/rquota.x +++ b/include/rpcsvc/rquota.x @@ -1,6 +1,3 @@ -/* @(#)rquota.x 2.1 88/08/01 4.0 RPCSRC */ -/* @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro */ - /* * Remote quota protocol * Requires unix authentication diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index a9a69c8b24eb..89c51ca1b543 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -1,6 +1,3 @@ -/* @(#)sm_inter.x 2.2 88/08/01 4.0 RPCSRC */ -/* @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro */ - /*- * Copyright (c) 2010, Oracle America, Inc. * diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index d11902c4a279..3567e2bd3fad 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -1,5 +1,3 @@ -/* @(#)yp.x 2.1 88/08/01 4.0 RPCSRC */ - /*- * Copyright (c) 2010, Oracle America, Inc. * diff --git a/include/runetype.h b/include/runetype.h index e0ea07b1ae60..10a78bb56199 100644 --- a/include/runetype.h +++ b/include/runetype.h @@ -30,8 +30,6 @@ * 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. - * - * @(#)runetype.h 8.1 (Berkeley) 6/2/93 */ #ifndef _RUNETYPE_H_ diff --git a/include/setjmp.h b/include/setjmp.h index 88980df9faa2..4739784c7ed2 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -32,8 +32,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY *** 189 LINES SKIPPED *** From nobody Mon Nov 27 05:24:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvCt4Vqpz51h7R; Mon, 27 Nov 2023 05:24: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 4SdvCt3kwWz4WPk; Mon, 27 Nov 2023 05:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JJg+bBXXno4eBjgG+q9moysJT1spmLqMUdRuh0PJgSQ=; b=NWUvbvOe5b9Kc3oCfX5swWPyfmAMm3cR9RKEFtC7/ky4c/pc/XqC8rOBZHWKMRVYaSUhmG jr3JaCRPROLzggGv5RuXjI0z2FoWv7YjyRXVtinNlLpR9cEpmjSglruNyiuXec7nrK+shm NcBKzM1OoV1td7VDBoA8gPXVO2cBzu6NDZx4BirXe24NFNYx7sX4PVq+RAAzO1hN7j2Q+l Z76n6CL42mFNy4eMotTx6rmODpelkN08tdHcD2K36RqnpgrrEGdraP1YpLfoimKY/YBClE DmanjbJ92TwmyLiEZ2dsxIPd5YMcksLguObCSd+ogJSVlZD+5hOLaeCJjkt2Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JJg+bBXXno4eBjgG+q9moysJT1spmLqMUdRuh0PJgSQ=; b=Zkjlm8heLNcNmc2S+O1+fPxPlxNz/+mIGlh20xj/RPnwUpRlcsiNCoiTtxA0qyQHJ/9um3 ovY3DVFPzLxwY2kYoqfyG5tUNO518sMl8PYJbCOrs8Y8GRYRDUBlMY884XjnO319+bpz3q 4UQOCoGFndM7tOJ5uFwOkkVo9qftFUdfXj6rXdFk3YBSweJyhQ2naohgJJpBUpAgEBxLmR feYvc7xhBhdOMtKQTCEVrX7T8b9FB9Bt6hzdgROn/PZQkObuzqRflHqey4WrvYQ7yFZyj0 ncfMbr25Rg4EIRwrRhDXegQtcCr6hIwHMbP2xQFJXCOhpahV1ee6Q3jM8iKSFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062682; a=rsa-sha256; cv=none; b=RPWWySky6mgxYJwfVrBKf1SXKn1UKZsGXUpjDIFa7YbHT/LgCpQaak7EFmJ3NarWLR0u0/ fP0IQkF+N+QPG5MTF1txWsx9tQLlvLoKn85WanpuOShQ+fnPKehEhJk5JF6EkC655lxhxm DfZ3CsqbMWA3PHaMMQH20im1kk81vTI8e9Z0QQ6xYWw38ICvPx86a44PRHqCLKlK/A5co7 zeRwRG8NO7XzfjyWQLwgoU1eeWFLHJeT9hYqM/tYnWhbI4v8HRXuh0mmAQDghCv4Cb6Czh pIhGECi8bQNJoEFiXE/RCw8nW8MGG/K8kHfqjvdGEMcC44uiWMftfUs4/Gq7qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvCt2r71zB53; Mon, 27 Nov 2023 05:24: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 3AR5OggH065800; Mon, 27 Nov 2023 05:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5OgtC065794; Mon, 27 Nov 2023 05:24:42 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:42 GMT Message-Id: <202311270524.3AR5OgtC065794@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: dc36d6f9bb17 - main - lib: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: dc36d6f9bb1753f3808552f3afd30eda9a7b206a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dc36d6f9bb1753f3808552f3afd30eda9a7b206a commit dc36d6f9bb1753f3808552f3afd30eda9a7b206a Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:28 +0000 lib: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- lib/Makefile | 1 - lib/libc/Makefile | 1 - lib/libc/amd64/SYS.h | 2 -- lib/libc/amd64/gen/Makefile.inc | 1 - lib/libc/amd64/gen/_setjmp.S | 3 --- lib/libc/amd64/gen/setjmp.S | 3 --- lib/libc/amd64/gen/sigsetjmp.S | 2 -- lib/libc/amd64/stdlib/Makefile.inc | 1 - lib/libc/amd64/sys/cerror.S | 3 --- lib/libc/amd64/sys/vfork.S | 3 --- lib/libc/arm/SYS.h | 2 -- lib/libc/arm/gen/Makefile.inc | 1 - lib/libc/arm/sys/Ovfork.S | 2 -- lib/libc/arm/sys/cerror.S | 2 -- lib/libc/arm/sys/syscall.S | 2 -- lib/libc/compat-43/Makefile.inc | 1 - lib/libc/compat-43/creat.2 | 2 -- lib/libc/compat-43/creat.c | 3 --- lib/libc/compat-43/gethostid.3 | 2 -- lib/libc/compat-43/gethostid.c | 3 --- lib/libc/compat-43/getwd.c | 3 --- lib/libc/compat-43/killpg.2 | 2 -- lib/libc/compat-43/killpg.c | 3 --- lib/libc/compat-43/sethostid.c | 3 --- lib/libc/compat-43/setpgrp.c | 3 --- lib/libc/compat-43/setrgid.c | 3 --- lib/libc/compat-43/setruid.3 | 2 -- lib/libc/compat-43/setruid.c | 3 --- lib/libc/compat-43/sigcompat.c | 3 --- lib/libc/compat-43/sigpause.2 | 2 -- lib/libc/compat-43/sigsetmask.2 | 2 -- lib/libc/compat-43/sigvec.2 | 2 -- lib/libc/db/Makefile.inc | 2 -- lib/libc/db/README | 1 - lib/libc/db/btree/Makefile.inc | 1 - lib/libc/db/btree/bt_close.c | 3 --- lib/libc/db/btree/bt_conv.c | 3 --- lib/libc/db/btree/bt_debug.c | 3 --- lib/libc/db/btree/bt_delete.c | 3 --- lib/libc/db/btree/bt_get.c | 3 --- lib/libc/db/btree/bt_open.c | 3 --- lib/libc/db/btree/bt_overflow.c | 3 --- lib/libc/db/btree/bt_page.c | 3 --- lib/libc/db/btree/bt_put.c | 3 --- lib/libc/db/btree/bt_search.c | 3 --- lib/libc/db/btree/bt_seq.c | 3 --- lib/libc/db/btree/bt_split.c | 3 --- lib/libc/db/btree/bt_utils.c | 3 --- lib/libc/db/btree/btree.h | 2 -- lib/libc/db/btree/extern.h | 2 -- lib/libc/db/db/Makefile.inc | 1 - lib/libc/db/db/db.c | 3 --- lib/libc/db/hash/Makefile.inc | 1 - lib/libc/db/hash/README | 1 - lib/libc/db/hash/extern.h | 2 -- lib/libc/db/hash/hash.c | 3 --- lib/libc/db/hash/hash.h | 2 -- lib/libc/db/hash/hash_bigkey.c | 3 --- lib/libc/db/hash/hash_buf.c | 3 --- lib/libc/db/hash/hash_func.c | 3 --- lib/libc/db/hash/hash_log2.c | 3 --- lib/libc/db/hash/hash_page.c | 3 --- lib/libc/db/hash/ndbm.c | 3 --- lib/libc/db/hash/page.h | 2 -- lib/libc/db/man/Makefile.inc | 1 - lib/libc/db/man/btree.3 | 2 -- lib/libc/db/man/dbopen.3 | 2 -- lib/libc/db/man/hash.3 | 2 -- lib/libc/db/man/mpool.3 | 2 -- lib/libc/db/man/recno.3 | 2 -- lib/libc/db/mpool/Makefile.inc | 1 - lib/libc/db/mpool/README | 1 - lib/libc/db/mpool/mpool.c | 3 --- lib/libc/db/recno/Makefile.inc | 1 - lib/libc/db/recno/extern.h | 2 -- lib/libc/db/recno/rec_close.c | 3 --- lib/libc/db/recno/rec_delete.c | 3 --- lib/libc/db/recno/rec_get.c | 3 --- lib/libc/db/recno/rec_open.c | 3 --- lib/libc/db/recno/rec_put.c | 3 --- lib/libc/db/recno/rec_search.c | 3 --- lib/libc/db/recno/rec_seq.c | 4 ---- lib/libc/db/recno/rec_utils.c | 3 --- lib/libc/db/recno/recno.h | 2 -- lib/libc/db/test/Makefile | 1 - lib/libc/db/test/README | 1 - lib/libc/db/test/btree.tests/main.c | 3 --- lib/libc/db/test/dbtest.c | 3 --- lib/libc/db/test/hash.tests/driver2.c | 3 --- lib/libc/db/test/hash.tests/makedb.sh | 2 -- lib/libc/db/test/hash.tests/tcreat3.c | 3 --- lib/libc/db/test/hash.tests/tdel.c | 3 --- lib/libc/db/test/hash.tests/testit | 3 --- lib/libc/db/test/hash.tests/thash4.c | 3 --- lib/libc/db/test/hash.tests/tread2.c | 3 --- lib/libc/db/test/hash.tests/tseq.c | 3 --- lib/libc/db/test/hash.tests/tverify.c | 3 --- lib/libc/db/test/run.test | 3 --- lib/libc/gen/Makefile.inc | 1 - lib/libc/gen/__xuname.c | 2 -- lib/libc/gen/alarm.3 | 2 -- lib/libc/gen/alarm.c | 2 -- lib/libc/gen/assert.c | 2 -- lib/libc/gen/clock.3 | 2 -- lib/libc/gen/clock.c | 2 -- lib/libc/gen/closedir.c | 2 -- lib/libc/gen/confstr.3 | 2 -- lib/libc/gen/confstr.c | 2 -- lib/libc/gen/crypt.c | 2 -- lib/libc/gen/ctermid.3 | 2 -- lib/libc/gen/daemon.3 | 2 -- lib/libc/gen/daemon.c | 2 -- lib/libc/gen/devname.3 | 2 -- lib/libc/gen/devname.c | 2 -- lib/libc/gen/directory.3 | 2 -- lib/libc/gen/disklabel.c | 2 -- lib/libc/gen/dlopen.3 | 2 -- lib/libc/gen/err.3 | 2 -- lib/libc/gen/err.c | 2 -- lib/libc/gen/errlst.c | 2 -- lib/libc/gen/exec.3 | 2 -- lib/libc/gen/exec.c | 2 -- lib/libc/gen/fnmatch.3 | 2 -- lib/libc/gen/fnmatch.c | 2 -- lib/libc/gen/frexp.3 | 2 -- lib/libc/gen/fstab.c | 2 -- lib/libc/gen/fts-compat.c | 2 -- lib/libc/gen/fts-compat.h | 2 -- lib/libc/gen/fts-compat11.c | 2 -- lib/libc/gen/fts-compat11.h | 2 -- lib/libc/gen/fts.3 | 2 -- lib/libc/gen/fts.c | 2 -- lib/libc/gen/getbootfile.3 | 2 -- lib/libc/gen/getbootfile.c | 2 -- lib/libc/gen/getbsize.3 | 2 -- lib/libc/gen/getbsize.c | 2 -- lib/libc/gen/getcap.3 | 2 -- lib/libc/gen/getcap.c | 2 -- lib/libc/gen/getcwd.3 | 2 -- lib/libc/gen/getcwd.c | 2 -- lib/libc/gen/getdiskbyname.3 | 2 -- lib/libc/gen/getdomainname.3 | 2 -- lib/libc/gen/getdomainname.c | 2 -- lib/libc/gen/getfsent.3 | 2 -- lib/libc/gen/getgrent.3 | 2 -- lib/libc/gen/getgrouplist.3 | 2 -- lib/libc/gen/getgrouplist.c | 2 -- lib/libc/gen/gethostname.3 | 2 -- lib/libc/gen/gethostname.c | 2 -- lib/libc/gen/getloadavg.3 | 2 -- lib/libc/gen/getloadavg.c | 2 -- lib/libc/gen/getlogin.c | 2 -- lib/libc/gen/getmntinfo-compat11.c | 2 -- lib/libc/gen/getmntinfo.3 | 2 -- lib/libc/gen/getmntinfo.c | 2 -- lib/libc/gen/getnetgrent.3 | 2 -- lib/libc/gen/getnetgrent.c | 2 -- lib/libc/gen/getosreldate.c | 2 -- lib/libc/gen/getpagesize.3 | 2 -- lib/libc/gen/getpagesize.c | 2 -- lib/libc/gen/getpass.3 | 2 -- lib/libc/gen/getpwent.3 | 2 -- lib/libc/gen/getttyent.3 | 2 -- lib/libc/gen/getttyent.c | 2 -- lib/libc/gen/getusershell.3 | 2 -- lib/libc/gen/getusershell.c | 2 +- lib/libc/gen/getvfsbyname.3 | 2 -- lib/libc/gen/getvfsbyname.c | 2 -- lib/libc/gen/glob-compat11.c | 2 -- lib/libc/gen/glob-compat11.h | 2 -- lib/libc/gen/glob.3 | 2 -- lib/libc/gen/glob.c | 2 -- lib/libc/gen/initgroups.3 | 2 -- lib/libc/gen/initgroups.c | 2 -- lib/libc/gen/isatty.c | 2 -- lib/libc/gen/ldexp.3 | 2 -- lib/libc/gen/modf.3 | 2 -- lib/libc/gen/modf.c | 1 - lib/libc/gen/nice.3 | 2 -- lib/libc/gen/nice.c | 2 -- lib/libc/gen/nlist.3 | 2 -- lib/libc/gen/nlist.c | 2 -- lib/libc/gen/opendir.c | 2 -- lib/libc/gen/pause.3 | 2 -- lib/libc/gen/pause.c | 2 -- lib/libc/gen/popen.3 | 2 -- lib/libc/gen/popen.c | 2 -- lib/libc/gen/psignal.3 | 2 -- lib/libc/gen/psignal.c | 2 -- lib/libc/gen/pw_scan.c | 2 -- lib/libc/gen/pw_scan.h | 2 -- lib/libc/gen/raise.3 | 2 -- lib/libc/gen/raise.c | 2 -- lib/libc/gen/rand48.3 | 2 -- lib/libc/gen/readdir-compat11.c | 2 -- lib/libc/gen/readdir.c | 2 -- lib/libc/gen/rewinddir.c | 2 -- lib/libc/gen/scandir-compat11.c | 2 -- lib/libc/gen/scandir.3 | 2 -- lib/libc/gen/scandir.c | 2 -- lib/libc/gen/seekdir.c | 2 -- lib/libc/gen/setdomainname.c | 2 -- lib/libc/gen/sethostname.c | 2 -- lib/libc/gen/setjmp.3 | 2 -- lib/libc/gen/setjmperr.c | 2 -- lib/libc/gen/setmode.3 | 2 -- lib/libc/gen/setmode.c | 2 -- lib/libc/gen/siginterrupt.3 | 2 -- lib/libc/gen/siginterrupt.c | 2 -- lib/libc/gen/siglist.c | 2 -- lib/libc/gen/signal.3 | 2 -- lib/libc/gen/signal.c | 2 -- lib/libc/gen/sigsetops.3 | 2 -- lib/libc/gen/sigsetops.c | 2 -- lib/libc/gen/sleep.3 | 2 -- lib/libc/gen/sleep.c | 2 -- lib/libc/gen/strtofflags.3 | 2 -- lib/libc/gen/strtofflags.c | 2 -- lib/libc/gen/sysconf.3 | 2 -- lib/libc/gen/sysconf.c | 2 -- lib/libc/gen/sysctl.3 | 2 -- lib/libc/gen/sysctl.c | 2 -- lib/libc/gen/syslog.3 | 2 -- lib/libc/gen/syslog.c | 2 -- lib/libc/gen/tcgetpgrp.3 | 2 -- lib/libc/gen/tcsendbreak.3 | 2 -- lib/libc/gen/tcsetattr.3 | 2 -- lib/libc/gen/tcsetpgrp.3 | 2 -- lib/libc/gen/telldir.c | 2 -- lib/libc/gen/termios.c | 2 -- lib/libc/gen/time.3 | 2 -- lib/libc/gen/time.c | 2 -- lib/libc/gen/times.3 | 2 -- lib/libc/gen/times.c | 2 -- lib/libc/gen/timezone.3 | 2 -- lib/libc/gen/timezone.c | 2 -- lib/libc/gen/ttyname.3 | 2 -- lib/libc/gen/ttyname.c | 2 -- lib/libc/gen/ttyslot.c | 2 +- lib/libc/gen/tzset.3 | 2 -- lib/libc/gen/ualarm.3 | 2 -- lib/libc/gen/ualarm.c | 2 -- lib/libc/gen/uname.3 | 2 -- lib/libc/gen/uname.c | 2 -- lib/libc/gen/usleep.3 | 2 -- lib/libc/gen/usleep.c | 2 -- lib/libc/gen/utime.3 | 2 -- lib/libc/gen/utime.c | 2 -- lib/libc/gen/valloc.3 | 2 -- lib/libc/gen/valloc.c | 2 -- lib/libc/gen/wait.c | 2 -- lib/libc/gen/wait3.c | 2 -- lib/libc/gen/waitpid.c | 2 -- lib/libc/gmon/Makefile.inc | 1 - lib/libc/gmon/gmon.c | 3 --- lib/libc/gmon/mcount.c | 3 --- lib/libc/gmon/moncontrol.3 | 2 -- lib/libc/i386/SYS.h | 2 -- lib/libc/i386/gen/Makefile.inc | 1 - lib/libc/i386/gen/_setjmp.S | 3 --- lib/libc/i386/gen/fabs.S | 3 --- lib/libc/i386/gen/setjmp.S | 3 --- lib/libc/i386/gen/sigsetjmp.S | 2 -- lib/libc/i386/stdlib/Makefile.inc | 1 - lib/libc/i386/sys/Ovfork.S | 3 --- lib/libc/i386/sys/cerror.S | 3 --- lib/libc/i386/sys/i386_get_ldt.2 | 2 -- lib/libc/i386/sys/syscall.S | 3 --- lib/libc/inet/inet_addr.c | 4 ---- lib/libc/inet/inet_cidr_ntop.c | 3 --- lib/libc/inet/inet_cidr_pton.c | 3 --- lib/libc/inet/inet_lnaof.c | 3 --- lib/libc/inet/inet_makeaddr.c | 3 --- lib/libc/inet/inet_net_ntop.c | 3 --- lib/libc/inet/inet_net_pton.c | 3 --- lib/libc/inet/inet_neta.c | 3 --- lib/libc/inet/inet_netof.c | 3 --- lib/libc/inet/inet_network.c | 3 --- lib/libc/inet/inet_ntoa.c | 4 ---- lib/libc/inet/inet_ntop.c | 3 --- lib/libc/inet/inet_pton.c | 3 --- lib/libc/inet/nsap_addr.c | 3 --- lib/libc/isc/ev_streams.c | 3 --- lib/libc/isc/ev_timers.c | 3 --- lib/libc/locale/Makefile.inc | 1 - lib/libc/locale/big5.c | 3 --- lib/libc/locale/ctype.3 | 2 -- lib/libc/locale/digittoint.3 | 2 -- lib/libc/locale/euc.5 | 2 -- lib/libc/locale/euc.c | 3 --- lib/libc/locale/isalnum.3 | 2 -- lib/libc/locale/isalpha.3 | 2 -- lib/libc/locale/isascii.3 | 2 -- lib/libc/locale/isblank.3 | 2 -- lib/libc/locale/iscntrl.3 | 2 -- lib/libc/locale/isctype.c | 3 --- lib/libc/locale/isdigit.3 | 2 -- lib/libc/locale/isgraph.3 | 2 -- lib/libc/locale/islower.3 | 2 -- lib/libc/locale/isprint.3 | 2 -- lib/libc/locale/ispunct.3 | 2 -- lib/libc/locale/isspace.3 | 2 -- lib/libc/locale/isupper.3 | 2 -- lib/libc/locale/iswalnum.3 | 2 -- lib/libc/locale/isxdigit.3 | 2 -- lib/libc/locale/localeconv.3 | 2 -- lib/libc/locale/localeconv.c | 3 --- lib/libc/locale/mblen.3 | 2 -- lib/libc/locale/mbstowcs.3 | 2 -- lib/libc/locale/mbtowc.3 | 2 -- lib/libc/locale/mskanji.c | 3 --- lib/libc/locale/multibyte.3 | 2 -- lib/libc/locale/none.c | 3 --- lib/libc/locale/rune.c | 3 --- lib/libc/locale/setlocale.3 | 2 -- lib/libc/locale/setlocale.c | 3 --- lib/libc/locale/table.c | 3 --- lib/libc/locale/toascii.3 | 2 -- lib/libc/locale/tolower.3 | 2 -- lib/libc/locale/toupper.3 | 2 -- lib/libc/locale/towlower.3 | 2 -- lib/libc/locale/towupper.3 | 2 -- lib/libc/locale/utf8.5 | 2 -- lib/libc/locale/wcstombs.3 | 2 -- lib/libc/locale/wctomb.3 | 2 -- lib/libc/nameser/ns_name.c | 3 --- lib/libc/nameser/ns_netint.c | 3 --- lib/libc/nameser/ns_parse.c | 3 --- lib/libc/nameser/ns_print.c | 3 --- lib/libc/nameser/ns_samedomain.c | 3 --- lib/libc/nameser/ns_ttl.c | 3 --- lib/libc/net/Makefile.inc | 1 - lib/libc/net/byteorder.3 | 2 -- lib/libc/net/gethostbydns.c | 4 ---- lib/libc/net/gethostbyht.c | 3 --- lib/libc/net/gethostbyname.3 | 2 -- lib/libc/net/getipnodebyname.3 | 2 -- lib/libc/net/getnetbydns.c | 3 --- lib/libc/net/getnetbyht.c | 4 ---- lib/libc/net/getnetent.3 | 2 -- lib/libc/net/getproto.c | 3 --- lib/libc/net/getprotoent.3 | 2 -- lib/libc/net/getprotoent.c | 3 --- lib/libc/net/getprotoname.c | 3 --- lib/libc/net/getservent.3 | 2 -- lib/libc/net/getservent.c | 3 --- lib/libc/net/hesiod.c | 3 --- lib/libc/net/inet.3 | 2 -- lib/libc/net/linkaddr.3 | 2 -- lib/libc/net/linkaddr.c | 3 --- lib/libc/net/map_v4v6.c | 3 --- lib/libc/net/networks | 2 -- lib/libc/net/protocols | 3 --- lib/libc/net/rcmd.3 | 2 -- lib/libc/net/rcmd.c | 3 --- lib/libc/net/recv.c | 3 --- lib/libc/net/resolver.3 | 2 -- lib/libc/net/sctp_bindx.3 | 2 -- lib/libc/net/sctp_freepaddrs.3 | 2 -- lib/libc/net/sctp_getaddrlen.3 | 2 -- lib/libc/net/sctp_getpaddrs.3 | 2 -- lib/libc/net/sctp_opt_info.3 | 2 -- lib/libc/net/sctp_sendmsg.3 | 2 -- lib/libc/net/send.c | 3 --- lib/libc/quad/Makefile.inc | 1 - lib/libc/quad/TESTS/Makefile | 1 - lib/libc/quad/TESTS/divrem.c | 3 --- lib/libc/quad/TESTS/mul.c | 3 --- lib/libc/quad/adddi3.c | 3 --- lib/libc/quad/anddi3.c | 3 --- lib/libc/quad/ashldi3.c | 3 --- lib/libc/quad/ashrdi3.c | 3 --- lib/libc/quad/cmpdi2.c | 3 --- lib/libc/quad/divdi3.c | 3 --- lib/libc/quad/fixdfdi.c | 3 --- lib/libc/quad/fixsfdi.c | 3 --- lib/libc/quad/fixunsdfdi.c | 3 --- lib/libc/quad/fixunssfdi.c | 3 --- lib/libc/quad/floatdidf.c | 3 --- lib/libc/quad/floatdisf.c | 3 --- lib/libc/quad/floatunsdidf.c | 3 --- lib/libc/quad/iordi3.c | 3 --- lib/libc/quad/lshldi3.c | 3 --- lib/libc/quad/lshrdi3.c | 3 --- lib/libc/quad/moddi3.c | 3 --- lib/libc/quad/muldi3.c | 3 --- lib/libc/quad/negdi2.c | 3 --- lib/libc/quad/notdi2.c | 3 --- lib/libc/quad/qdivrem.c | 3 --- lib/libc/quad/quad.h | 2 -- lib/libc/quad/subdi3.c | 3 --- lib/libc/quad/ucmpdi2.c | 3 --- lib/libc/quad/udivdi3.c | 3 --- lib/libc/quad/umoddi3.c | 3 --- lib/libc/quad/xordi3.c | 3 --- lib/libc/regex/COPYRIGHT | 2 -- lib/libc/regex/Makefile.inc | 1 - lib/libc/regex/WHATSNEW | 1 - lib/libc/regex/cname.h | 2 -- lib/libc/regex/engine.c | 2 -- lib/libc/regex/re_format.7 | 2 -- lib/libc/regex/regcomp.c | 5 ----- lib/libc/regex/regerror.c | 5 ----- lib/libc/regex/regex.3 | 2 -- lib/libc/regex/regex2.h | 2 -- lib/libc/regex/regexec.c | 5 ----- lib/libc/regex/regfree.c | 5 ----- lib/libc/regex/utils.h | 2 -- lib/libc/resolv/herror.c | 4 ---- lib/libc/resolv/res_comp.c | 4 ---- lib/libc/resolv/res_data.c | 3 --- lib/libc/resolv/res_debug.c | 4 ---- lib/libc/resolv/res_findzonecut.c | 3 --- lib/libc/resolv/res_init.c | 4 ---- lib/libc/resolv/res_mkquery.c | 4 ---- lib/libc/resolv/res_mkupdate.c | 3 --- lib/libc/resolv/res_query.c | 4 ---- lib/libc/resolv/res_send.c | 4 ---- lib/libc/resolv/res_update.c | 3 --- lib/libc/rpc/Makefile.inc | 1 - lib/libc/rpc/auth_des.c | 3 --- lib/libc/rpc/auth_none.c | 4 ---- lib/libc/rpc/auth_time.c | 2 -- lib/libc/rpc/auth_unix.c | 4 ---- lib/libc/rpc/authdes_prot.c | 3 --- lib/libc/rpc/authunix_prot.c | 4 ---- lib/libc/rpc/bindresvport.3 | 1 - lib/libc/rpc/bindresvport.c | 4 ---- lib/libc/rpc/clnt_bcast.c | 1 - lib/libc/rpc/clnt_dg.c | 1 - lib/libc/rpc/clnt_generic.c | 6 ------ lib/libc/rpc/clnt_perror.c | 4 ---- lib/libc/rpc/clnt_raw.c | 4 ---- lib/libc/rpc/clnt_simple.c | 4 ---- lib/libc/rpc/clnt_vc.c | 5 ----- lib/libc/rpc/des_crypt.3 | 1 - lib/libc/rpc/des_crypt.c | 3 --- lib/libc/rpc/des_soft.c | 3 --- lib/libc/rpc/getnetconfig.3 | 1 - lib/libc/rpc/getnetconfig.c | 3 --- lib/libc/rpc/getnetpath.3 | 1 - lib/libc/rpc/getnetpath.c | 3 --- lib/libc/rpc/getpublickey.c | 3 --- lib/libc/rpc/getrpcent.3 | 1 - lib/libc/rpc/getrpcent.c | 3 --- lib/libc/rpc/getrpcport.3 | 1 - lib/libc/rpc/getrpcport.c | 4 ---- lib/libc/rpc/key_call.c | 1 - lib/libc/rpc/key_prot_xdr.c | 1 - lib/libc/rpc/mt_misc.c | 1 - lib/libc/rpc/netname.c | 3 --- lib/libc/rpc/netnamer.c | 3 --- lib/libc/rpc/pmap_clnt.c | 4 ---- lib/libc/rpc/pmap_getmaps.c | 4 ---- lib/libc/rpc/pmap_getport.c | 4 ---- lib/libc/rpc/pmap_prot.c | 4 ---- lib/libc/rpc/pmap_prot2.c | 4 ---- lib/libc/rpc/pmap_rmt.c | 4 ---- lib/libc/rpc/publickey.3 | 1 - lib/libc/rpc/publickey.5 | 1 - lib/libc/rpc/rpc.3 | 1 - lib/libc/rpc/rpc.5 | 1 - lib/libc/rpc/rpc_callmsg.c | 4 ---- lib/libc/rpc/rpc_clnt_auth.3 | 2 -- lib/libc/rpc/rpc_clnt_calls.3 | 2 -- lib/libc/rpc/rpc_clnt_create.3 | 2 -- lib/libc/rpc/rpc_com.h | 2 -- lib/libc/rpc/rpc_commondata.c | 3 --- lib/libc/rpc/rpc_dtablesize.c | 4 ---- lib/libc/rpc/rpc_generic.c | 1 - lib/libc/rpc/rpc_prot.c | 4 ---- lib/libc/rpc/rpc_secure.3 | 1 - lib/libc/rpc/rpc_soc.3 | 1 - lib/libc/rpc/rpc_soc.c | 5 ----- lib/libc/rpc/rpc_svc_calls.3 | 2 -- lib/libc/rpc/rpc_svc_create.3 | 2 -- lib/libc/rpc/rpc_svc_err.3 | 2 -- lib/libc/rpc/rpc_svc_reg.3 | 2 -- lib/libc/rpc/rpc_xdr.3 | 2 -- lib/libc/rpc/rpcb_clnt.c | 6 ------ lib/libc/rpc/rpcb_prot.c | 5 ----- lib/libc/rpc/rpcbind.3 | 1 - lib/libc/rpc/rpcdname.c | 3 --- lib/libc/rpc/rtime.3 | 1 - lib/libc/rpc/rtime.c | 3 --- lib/libc/rpc/svc.c | 4 ---- lib/libc/rpc/svc_auth.c | 1 - lib/libc/rpc/svc_auth_des.c | 3 --- lib/libc/rpc/svc_auth_unix.c | 4 ---- lib/libc/rpc/svc_dg.c | 1 - lib/libc/rpc/svc_generic.c | 1 - lib/libc/rpc/svc_raw.c | 5 ----- lib/libc/rpc/svc_run.c | 4 ---- lib/libc/rpc/svc_simple.c | 1 - lib/libc/rpc/svc_vc.c | 4 ---- lib/libc/stdio/Makefile.inc | 1 - lib/libc/stdio/clrerr.c | 3 --- lib/libc/stdio/fclose.3 | 2 -- lib/libc/stdio/fclose.c | 3 --- lib/libc/stdio/fdopen.c | 3 --- lib/libc/stdio/feof.c | 3 --- lib/libc/stdio/ferror.3 | 2 -- lib/libc/stdio/ferror.c | 3 --- lib/libc/stdio/fflush.3 | 2 -- lib/libc/stdio/fflush.c | 3 --- lib/libc/stdio/fgetc.c | 3 --- lib/libc/stdio/fgetln.3 | 2 -- lib/libc/stdio/fgetln.c | 3 --- lib/libc/stdio/fgetpos.c | 3 --- lib/libc/stdio/fgets.3 | 2 -- lib/libc/stdio/fgets.c | 3 --- lib/libc/stdio/fgetwln.3 | 2 -- lib/libc/stdio/fgetws.3 | 2 -- lib/libc/stdio/fileno.c | 3 --- lib/libc/stdio/findfp.c | 3 --- lib/libc/stdio/flags.c | 3 --- lib/libc/stdio/floatio.h | 2 -- lib/libc/stdio/fopen.3 | 2 -- lib/libc/stdio/fopen.c | 3 --- lib/libc/stdio/fprintf.c | 3 --- lib/libc/stdio/fpurge.c | 3 --- lib/libc/stdio/fputc.c | 3 --- lib/libc/stdio/fputs.3 | 2 -- lib/libc/stdio/fputs.c | 3 --- lib/libc/stdio/fputws.3 | 2 -- lib/libc/stdio/fread.3 | 2 -- lib/libc/stdio/fread.c | 3 --- lib/libc/stdio/freopen.c | 3 --- lib/libc/stdio/fscanf.c | 3 --- lib/libc/stdio/fseek.3 | 2 -- lib/libc/stdio/fseek.c | 3 --- lib/libc/stdio/fsetpos.c | 3 --- lib/libc/stdio/ftell.c | 3 --- lib/libc/stdio/funopen.3 | 2 -- lib/libc/stdio/funopen.c | 3 --- lib/libc/stdio/fvwrite.c | 3 --- lib/libc/stdio/fvwrite.h | 2 -- lib/libc/stdio/fwalk.c | 3 --- lib/libc/stdio/fwrite.c | 3 --- lib/libc/stdio/getc.3 | 2 -- lib/libc/stdio/getc.c | 3 --- lib/libc/stdio/getchar.c | 3 --- lib/libc/stdio/gets.c | 3 --- lib/libc/stdio/getw.c | 3 --- lib/libc/stdio/getwc.3 | 2 -- lib/libc/stdio/glue.h | 2 -- lib/libc/stdio/local.h | 2 -- lib/libc/stdio/makebuf.c | 3 --- lib/libc/stdio/mktemp.3 | 2 -- lib/libc/stdio/mktemp.c | 3 --- lib/libc/stdio/perror.c | 3 --- lib/libc/stdio/printf-pos.c | 3 --- lib/libc/stdio/printf.3 | 2 -- lib/libc/stdio/printf.c | 3 --- lib/libc/stdio/putc.3 | 2 -- lib/libc/stdio/putc.c | 3 --- lib/libc/stdio/putchar.c | 3 --- lib/libc/stdio/puts.c | 3 --- lib/libc/stdio/putw.c | 3 --- lib/libc/stdio/putwc.3 | 2 -- lib/libc/stdio/refill.c | 3 --- lib/libc/stdio/remove.3 | 2 -- lib/libc/stdio/remove.c | 3 --- lib/libc/stdio/rewind.c | 3 --- lib/libc/stdio/rget.c | 3 --- lib/libc/stdio/scanf.3 | 2 -- lib/libc/stdio/scanf.c | 3 --- lib/libc/stdio/setbuf.3 | 2 -- lib/libc/stdio/setbuf.c | 3 --- lib/libc/stdio/setbuffer.c | 3 --- lib/libc/stdio/setvbuf.c | 3 --- lib/libc/stdio/snprintf.c | 3 --- lib/libc/stdio/sprintf.c | 3 --- lib/libc/stdio/sscanf.c | 3 --- lib/libc/stdio/stdio.3 | 2 -- lib/libc/stdio/stdio.c | 3 --- lib/libc/stdio/tempnam.c | 3 --- lib/libc/stdio/tmpfile.c | 3 --- lib/libc/stdio/tmpnam.3 | 2 -- lib/libc/stdio/tmpnam.c | 3 --- lib/libc/stdio/ungetc.3 | 2 -- lib/libc/stdio/ungetc.c | 3 --- lib/libc/stdio/ungetwc.3 | 2 -- lib/libc/stdio/vfprintf.c | 3 --- lib/libc/stdio/vfscanf.c | 3 --- lib/libc/stdio/vfwprintf.c | 3 --- lib/libc/stdio/vfwscanf.c | 3 --- lib/libc/stdio/vprintf.c | 3 --- lib/libc/stdio/vscanf.c | 3 --- lib/libc/stdio/vsnprintf.c | 3 --- lib/libc/stdio/vsprintf.c | 3 --- lib/libc/stdio/vsscanf.c | 3 --- lib/libc/stdio/wbuf.c | 3 --- lib/libc/stdio/wprintf.3 | 2 -- lib/libc/stdio/wscanf.3 | 2 -- lib/libc/stdio/wsetup.c | 3 --- lib/libc/stdlib/Makefile.inc | 1 - lib/libc/stdlib/abort.3 | 2 -- lib/libc/stdlib/abort.c | 3 --- lib/libc/stdlib/abs.3 | 2 -- lib/libc/stdlib/abs.c | 3 --- lib/libc/stdlib/alloca.3 | 2 -- lib/libc/stdlib/atexit.3 | 2 -- lib/libc/stdlib/atexit.c | 3 --- lib/libc/stdlib/atexit.h | 2 -- lib/libc/stdlib/atof.3 | 2 -- lib/libc/stdlib/atof.c | 3 --- lib/libc/stdlib/atoi.3 | 2 -- lib/libc/stdlib/atoi.c | 3 --- lib/libc/stdlib/atol.3 | 2 -- lib/libc/stdlib/atol.c | 3 --- lib/libc/stdlib/bsearch.3 | 2 -- lib/libc/stdlib/bsearch.c | 3 --- lib/libc/stdlib/div.3 | 2 -- lib/libc/stdlib/div.c | 3 --- lib/libc/stdlib/exit.3 | 2 -- lib/libc/stdlib/exit.c | 3 --- lib/libc/stdlib/getenv.3 | 2 -- lib/libc/stdlib/getopt.3 | 2 -- lib/libc/stdlib/getopt.c | 3 --- lib/libc/stdlib/getopt_long.3 | 2 -- lib/libc/stdlib/getopt_long.c | 3 --- lib/libc/stdlib/getsubopt.3 | 2 -- lib/libc/stdlib/getsubopt.c | 3 --- lib/libc/stdlib/heapsort.c | 3 --- lib/libc/stdlib/labs.3 | 2 -- lib/libc/stdlib/labs.c | 3 --- lib/libc/stdlib/ldiv.3 | 2 -- lib/libc/stdlib/ldiv.c | 3 --- lib/libc/stdlib/memory.3 | 2 -- lib/libc/stdlib/merge.c | 3 --- lib/libc/stdlib/qsort.3 | 2 -- lib/libc/stdlib/qsort.c | 3 --- lib/libc/stdlib/radixsort.3 | 2 -- lib/libc/stdlib/radixsort.c | 3 --- lib/libc/stdlib/rand.3 | 2 -- lib/libc/stdlib/rand.c | 3 --- lib/libc/stdlib/random.3 | 2 -- lib/libc/stdlib/random.c | 3 --- lib/libc/stdlib/reallocf.3 | 2 -- lib/libc/stdlib/realpath.3 | 2 -- lib/libc/stdlib/realpath.c | 3 --- lib/libc/stdlib/strtod.3 | 2 -- lib/libc/stdlib/strtoimax.c | 3 --- lib/libc/stdlib/strtol.3 | 2 -- lib/libc/stdlib/strtol.c | 3 --- lib/libc/stdlib/strtoll.c | 3 --- lib/libc/stdlib/strtoq.c | 3 --- lib/libc/stdlib/strtoul.3 | 2 -- lib/libc/stdlib/strtoul.c | 3 --- lib/libc/stdlib/strtoull.c | 3 --- lib/libc/stdlib/strtoumax.c | 3 --- lib/libc/stdlib/strtouq.c | 3 --- lib/libc/stdlib/system.3 | 2 -- lib/libc/stdlib/system.c | 3 --- lib/libc/stdtime/ctime.3 | 2 -- lib/libc/stdtime/strftime.3 | 2 -- lib/libc/stdtime/strftime.c | 3 --- lib/libc/string/Makefile.inc | 1 - lib/libc/string/bcmp.3 | 2 -- lib/libc/string/bcmp.c | 3 --- lib/libc/string/bcopy.3 | 2 -- lib/libc/string/bcopy.c | 3 --- lib/libc/string/bstring.3 | 2 -- lib/libc/string/bzero.3 | 2 -- lib/libc/string/ffs.3 | 2 -- lib/libc/string/ffs.c | 3 --- lib/libc/string/index.3 | 2 -- lib/libc/string/memccpy.3 | 2 -- lib/libc/string/memccpy.c | 3 --- lib/libc/string/memchr.3 | 2 -- lib/libc/string/memcmp.3 | 2 -- lib/libc/string/memcmp.c | 3 --- lib/libc/string/memcpy.3 | 2 -- lib/libc/string/memmove.3 | 2 -- lib/libc/string/memset.3 | 2 -- lib/libc/string/memset.c | 3 --- lib/libc/string/stpcpy.c | 3 --- lib/libc/string/strcasecmp.3 | 2 -- lib/libc/string/strcasecmp.c | 3 --- lib/libc/string/strcat.3 | 2 -- lib/libc/string/strcat.c | 3 --- lib/libc/string/strchr.3 | 2 -- lib/libc/string/strcmp.3 | 2 -- lib/libc/string/strcmp.c | 3 --- lib/libc/string/strcoll.3 | 2 -- lib/libc/string/strcpy.3 | 2 -- lib/libc/string/strcpy.c | 3 --- lib/libc/string/strdup.3 | 2 -- lib/libc/string/strdup.c | 3 --- lib/libc/string/strerror.3 | 2 -- lib/libc/string/strerror.c | 3 --- lib/libc/string/string.3 | 2 -- lib/libc/string/strlen.3 | 2 -- lib/libc/string/strmode.3 | 2 -- lib/libc/string/strmode.c | 3 --- lib/libc/string/strncat.c | 3 --- lib/libc/string/strncmp.c | 3 --- lib/libc/string/strncpy.c | 3 --- lib/libc/string/strnstr.c | 3 --- lib/libc/string/strpbrk.3 | 2 -- lib/libc/string/strpbrk.c | 3 --- lib/libc/string/strrchr.c | 3 --- lib/libc/string/strsep.3 | 2 -- lib/libc/string/strsep.c | 3 --- lib/libc/string/strsignal.c | 3 --- lib/libc/string/strspn.3 | 2 -- lib/libc/string/strstr.3 | 2 -- lib/libc/string/strtok.3 | 2 -- lib/libc/string/strtok.c | 3 --- lib/libc/string/strxfrm.3 | 2 -- lib/libc/string/swab.3 | 2 -- lib/libc/string/swab.c | 3 --- lib/libc/string/wcpcpy.c | 3 --- lib/libc/string/wcscoll.3 | 2 -- lib/libc/string/wcsncpy.c | 3 --- lib/libc/string/wcsstr.c | 3 --- lib/libc/string/wcsxfrm.3 | 2 -- lib/libc/string/wmemchr.3 | 2 -- lib/libc/sys/Makefile.inc | 1 - lib/libc/sys/_exit.2 | 2 -- lib/libc/sys/accept.2 | 2 -- lib/libc/sys/access.2 | 2 -- lib/libc/sys/acct.2 | 2 -- lib/libc/sys/adjtime.2 | 2 -- lib/libc/sys/bind.2 | 2 -- lib/libc/sys/brk.2 | 2 -- lib/libc/sys/chdir.2 | 2 -- lib/libc/sys/chflags.2 | 2 -- lib/libc/sys/chmod.2 | 2 -- lib/libc/sys/chown.2 | 2 -- lib/libc/sys/chroot.2 | 2 -- lib/libc/sys/close.2 | 2 -- lib/libc/sys/connect.2 | 2 -- lib/libc/sys/dup.2 | 2 -- lib/libc/sys/execve.2 | 2 -- lib/libc/sys/fcntl.2 | 2 -- lib/libc/sys/flock.2 | 2 -- lib/libc/sys/fork.2 | 2 -- lib/libc/sys/fsync.2 | 2 -- lib/libc/sys/getdirentries.2 | 2 -- lib/libc/sys/getdtablesize.2 | 2 -- lib/libc/sys/getfh.2 | 2 -- lib/libc/sys/getfsstat.2 | 2 -- lib/libc/sys/getgid.2 | 2 -- lib/libc/sys/getgroups.2 | 2 -- lib/libc/sys/getitimer.2 | 2 -- lib/libc/sys/getlogin.2 | 2 -- lib/libc/sys/getpeername.2 | 2 -- lib/libc/sys/getpgrp.2 | 2 -- lib/libc/sys/getpid.2 | 2 -- lib/libc/sys/getpriority.2 | 2 -- lib/libc/sys/getrlimit.2 | 2 -- lib/libc/sys/getrusage.2 | 2 -- lib/libc/sys/getsockname.2 | 2 -- lib/libc/sys/getsockopt.2 | 2 -- lib/libc/sys/gettimeofday.2 | 2 -- lib/libc/sys/getuid.2 | 2 -- lib/libc/sys/intro.2 | 2 -- lib/libc/sys/ioctl.2 | 2 -- lib/libc/sys/kill.2 | 2 -- lib/libc/sys/ktrace.2 | 2 -- lib/libc/sys/link.2 | 2 -- lib/libc/sys/listen.2 | 2 -- lib/libc/sys/lseek.2 | 2 -- lib/libc/sys/madvise.2 | 2 -- lib/libc/sys/mincore.2 | 2 -- lib/libc/sys/minherit.2 | 2 -- lib/libc/sys/mkdir.2 | 2 -- lib/libc/sys/mkfifo.2 | 2 -- lib/libc/sys/mknod.2 | 2 -- lib/libc/sys/mlock.2 | 2 -- lib/libc/sys/mmap.2 | 2 -- lib/libc/sys/mount.2 | 2 -- lib/libc/sys/mprotect.2 | 2 -- lib/libc/sys/msync.2 | 2 -- lib/libc/sys/munmap.2 | 2 -- lib/libc/sys/nanosleep.2 | 2 -- lib/libc/sys/nfssvc.2 | 2 -- lib/libc/sys/open.2 | 2 -- lib/libc/sys/pathconf.2 | 2 -- lib/libc/sys/pipe.2 | 2 -- lib/libc/sys/posix_fadvise.2 | 2 -- lib/libc/sys/posix_fallocate.2 | 2 -- lib/libc/sys/profil.2 | 2 -- lib/libc/sys/quotactl.2 | 2 -- lib/libc/sys/read.2 | 2 -- lib/libc/sys/readlink.2 | 2 -- lib/libc/sys/reboot.2 | 2 -- lib/libc/sys/recv.2 | 2 -- lib/libc/sys/rename.2 | 2 -- lib/libc/sys/revoke.2 | 2 -- lib/libc/sys/rmdir.2 | 2 -- lib/libc/sys/select.2 | 2 -- lib/libc/sys/send.2 | 2 -- lib/libc/sys/setgroups.2 | 2 -- lib/libc/sys/setpgid.2 | 2 -- lib/libc/sys/setregid.2 | 2 -- lib/libc/sys/setreuid.2 | 2 -- lib/libc/sys/setsid.2 | 2 -- lib/libc/sys/setuid.2 | 2 -- lib/libc/sys/shutdown.2 | 2 -- lib/libc/sys/sigaction.2 | 2 -- lib/libc/sys/sigaltstack.2 | 2 -- lib/libc/sys/sigpending.2 | 2 -- lib/libc/sys/sigprocmask.2 | 2 -- lib/libc/sys/sigreturn.2 | 2 -- lib/libc/sys/sigstack.2 | 2 -- lib/libc/sys/sigsuspend.2 | 2 -- lib/libc/sys/socket.2 | 2 -- lib/libc/sys/socketpair.2 | 2 -- lib/libc/sys/stat.2 | 2 -- lib/libc/sys/statfs.2 | 2 -- lib/libc/sys/swapon.2 | 2 -- lib/libc/sys/symlink.2 | 2 -- lib/libc/sys/sync.2 | 2 -- lib/libc/sys/sysarch.2 | 2 -- lib/libc/sys/syscall.2 | 2 -- lib/libc/sys/truncate.2 | 2 -- lib/libc/sys/umask.2 | 2 -- lib/libc/sys/undelete.2 | 2 -- lib/libc/sys/unlink.2 | 2 -- lib/libc/sys/utimensat.2 | 2 -- lib/libc/sys/utimes.2 | 2 -- lib/libc/sys/vfork.2 | 2 -- lib/libc/sys/wait.2 | 2 -- lib/libc/sys/write.2 | 2 -- lib/libc/xdr/Makefile.inc | 1 - lib/libc/xdr/xdr.3 | 1 - lib/libc/xdr/xdr.c | 4 ---- lib/libc/xdr/xdr_array.c | 4 ---- lib/libc/xdr/xdr_float.c | 4 ---- lib/libc/xdr/xdr_mem.c | 4 ---- lib/libc/xdr/xdr_rec.c | 4 ---- lib/libc/xdr/xdr_reference.c | 4 ---- lib/libc/xdr/xdr_stdio.c | 4 ---- lib/libc/yp/Makefile.inc | 1 - lib/libcompat/4.1/ftime.3 | 2 -- lib/libcompat/4.3/re_comp.3 | 2 -- lib/libcompat/4.3/re_comp.c | 2 -- lib/libcompat/4.3/rexec.3 | 2 -- lib/libcompat/4.3/rexec.c | 2 -- lib/libcompat/4.4/cuserid.c | 2 -- lib/libcompat/Makefile | 1 - lib/libedit/Makefile | 1 - lib/libkvm/Makefile | 1 - lib/libkvm/kvm.3 | 2 -- lib/libkvm/kvm.c | 2 -- lib/libkvm/kvm.h | 2 -- lib/libkvm/kvm_amd64.c | 2 -- lib/libkvm/kvm_geterr.3 | 2 -- lib/libkvm/kvm_getloadavg.3 | 2 -- lib/libkvm/kvm_getloadavg.c | 2 -- lib/libkvm/kvm_getprocs.3 | 2 -- lib/libkvm/kvm_i386.c | 2 -- lib/libkvm/kvm_nlist.3 | 2 -- lib/libkvm/kvm_open.3 | 2 -- lib/libkvm/kvm_private.h | 2 -- lib/libkvm/kvm_proc.c | 2 -- lib/libkvm/kvm_read.3 | 2 -- lib/libnetbsd/netinet/in.h | 2 -- lib/librpcsvc/Makefile | 1 - lib/librpcsvc/rnusers.c | 3 --- lib/librpcsvc/rstat.c | 3 --- lib/librpcsvc/rwall.c | 3 --- lib/librpcsvc/secretkey.c | 3 --- lib/libsecureboot/openpgp/opgp_sig.c | 2 -- lib/libtelnet/Makefile | 1 - lib/libutil/Makefile | 1 - lib/libutil/hexdump.c | 2 -- lib/libutil/login_tty.c | 2 -- lib/libutil/pty.c | 2 -- lib/libutil/pw_util.c | 2 -- lib/libutil/uucplock.c | 2 -- lib/liby/main.c | 3 --- lib/liby/yyerror.c | 3 --- lib/msun/Makefile | 2 -- lib/msun/bsdsrc/b_exp.c | 1 - lib/msun/bsdsrc/b_log.c | 1 - lib/msun/bsdsrc/b_tgamma.c | 1 - lib/msun/bsdsrc/mathimpl.h | 2 -- lib/msun/ld128/e_lgammal_r.c | 1 - lib/msun/ld128/e_rem_pio2l.h | 1 - lib/msun/ld128/k_cosl.c | 1 - lib/msun/ld128/k_sinl.c | 1 - lib/msun/ld128/k_tanl.c | 2 -- lib/msun/ld128/s_erfl.c | 1 - lib/msun/ld80/e_lgammal_r.c | 1 - lib/msun/ld80/e_rem_pio2l.h | 1 - lib/msun/ld80/k_cosl.c | 1 - lib/msun/ld80/k_sinl.c | 1 - lib/msun/ld80/k_tanl.c | 2 -- lib/msun/ld80/s_erfl.c | 1 - lib/msun/man/acos.3 | 2 -- lib/msun/man/acosh.3 | 2 -- lib/msun/man/asin.3 | 2 -- lib/msun/man/asinh.3 | 2 -- lib/msun/man/atan.3 | 2 -- lib/msun/man/atan2.3 | 2 -- lib/msun/man/atanh.3 | 2 -- lib/msun/man/ceil.3 | 2 -- lib/msun/man/copysign.3 | 2 -- lib/msun/man/cos.3 | 2 -- lib/msun/man/cosh.3 | 2 -- lib/msun/man/erf.3 | 2 -- lib/msun/man/exp.3 | 2 -- lib/msun/man/fabs.3 | 4 ---- lib/msun/man/floor.3 | 2 -- lib/msun/man/fmod.3 | 2 -- lib/msun/man/hypot.3 | 2 -- lib/msun/man/ieee.3 | 2 -- lib/msun/man/ieee_test.3 | 2 -- lib/msun/man/ilogb.3 | 2 -- lib/msun/man/j0.3 | 2 -- lib/msun/man/lgamma.3 | 2 -- lib/msun/man/math.3 | 2 -- lib/msun/man/nextafter.3 | 2 -- lib/msun/man/remainder.3 | 2 -- lib/msun/man/rint.3 | 2 -- lib/msun/man/scalbn.3 | 2 -- lib/msun/man/sin.3 | 4 ---- lib/msun/man/sinh.3 | 2 -- lib/msun/man/sqrt.3 | 2 -- lib/msun/man/tan.3 | 2 -- lib/msun/man/tanh.3 | 2 -- lib/msun/src/e_acos.c | 1 - lib/msun/src/e_acosh.c | 1 - lib/msun/src/e_acoshl.c | 1 - lib/msun/src/e_acosl.c | 1 - lib/msun/src/e_asin.c | 1 - lib/msun/src/e_asinl.c | 1 - lib/msun/src/e_atan2.c | 1 - lib/msun/src/e_atan2l.c | 1 - lib/msun/src/e_atanh.c | 1 - lib/msun/src/e_atanhl.c | 1 - lib/msun/src/e_cosh.c | 1 - lib/msun/src/e_exp.c | 1 - lib/msun/src/e_fmod.c | 1 - lib/msun/src/e_fmodl.c | 1 - lib/msun/src/e_gamma.c | 1 - lib/msun/src/e_gamma_r.c | 1 - lib/msun/src/e_hypot.c | 1 - lib/msun/src/e_hypotl.c | 1 - lib/msun/src/e_j0.c | 1 - lib/msun/src/e_j1.c | 1 - lib/msun/src/e_jn.c | 1 - lib/msun/src/e_lgamma.c | 1 - lib/msun/src/e_lgamma_r.c | 1 - lib/msun/src/e_lgammal.c | 1 - lib/msun/src/e_log.c | 1 - lib/msun/src/e_log10.c | 1 - lib/msun/src/e_log2.c | 1 - lib/msun/src/e_pow.c | 1 - lib/msun/src/e_rem_pio2.c | 1 - lib/msun/src/e_remainder.c | 1 - lib/msun/src/e_scalb.c | 1 - lib/msun/src/e_sinh.c | 1 - lib/msun/src/e_sqrt.c | 1 - lib/msun/src/k_cos.c | 1 - lib/msun/src/k_log.h | 1 - lib/msun/src/k_rem_pio2.c | 1 - lib/msun/src/k_sin.c | 1 - lib/msun/src/k_tan.c | 2 -- lib/msun/src/math.h | 1 - lib/msun/src/math_private.h | 1 - lib/msun/src/s_asinh.c | 1 - lib/msun/src/s_asinhl.c | 1 - lib/msun/src/s_atan.c | 1 - lib/msun/src/s_atanl.c | 1 - *** 12932 LINES SKIPPED *** From nobody Mon Nov 27 05:24:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvCw0Srvz51h55; Mon, 27 Nov 2023 05:24: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 4SdvCv4Rttz4WSw; Mon, 27 Nov 2023 05:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcVctOjtOmL/cigmlbsBlisAfdTkb9apUVhA0e0bTfg=; b=v2/bT0HCOQtMIIgv2Dl/zOFq3MivhcyTOrg1Toe6pPJrsdyFnSC0bxxEiQL/pJ04uvKpRK tYVeK1PbRH7pPoj3EU7OGIKMuml2kvKRmrP6/7K3dCF3wvqRnDO4Oawz9qdfQTxs2vyoD2 8VEpV79PwBh1Hgupj3WPwF9JJN/oEAdg8g6WpWpuwNlcNJkCzm8+uCVkDrnW7QNy/ZQ8Gy TeK6Ce9mAdastdiEHtxApyxXDQcqo6UEFXn2FONfer3pEMEDVBdk33wqaj9MfOCkdFmSa3 rNQnfuDMunVTwGnzEjdcnirq/zC59WReh3cE9KrEFDneBfhHCEHNfjZbsCNl1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcVctOjtOmL/cigmlbsBlisAfdTkb9apUVhA0e0bTfg=; b=Ks2U/fsI2N8QJLF6FiVlRvcUg5MNAm6PpkQ6qyAeVfxlMXPIu56yks+zKaWmtGL7khjg4y PPjSxbvxbs4uNyb2P0hkANerjkk/CZj2OhBqTTmjvEtHWPm/OsLP9wVJhIB9/uxYqsb/SJ C8t7WGk3VbnHU0EKf7/PNZV4jT/DKRputt8pkNRSxoYdt272XSW7obCJmRHEDx4ObvO7Cm GS4iSMEW9ClKt2zijjHIFFBeP7fX8WGadJJjQ3VXH/mXlTcFhQiBtmQ+fo2Swm6mGVbcuT IGfirr2AW2vnHNQ6jFsogB2meFyvithclViG2QRdjxPdIbc1DAntQZNyJPogiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062683; a=rsa-sha256; cv=none; b=WNQKP6buLJDsEMgp7xX+650x9aKsONNvdx2M3nHMGekLb58Ey/HfgPIKo0ztuownGKA9tm SO/jlnxAYdnQdkKTG7W0mCKFPJ7X+F8wrKjEipIbPWAxQaAOrxhHeYFXBXcAELsqlibJSw OxLHvkK7EiyRUAa6j3Im2nKkiRllsbrAEvaGzRLvw3vPTB464sz0XdXu1XaSoGpBosY6mH fJ9LRrS5zoLdBjn/0T8gwMgtMt8ionQ1lROSsLprBRb5uceMj6HYRA4+GuGWJbnM1nlsqR JYKer8WQ5qZRwsm/O0g8fiT0QTPaPaCmrPd2gjNNk3qsp2ZSl/BLbDoS9vcmdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvCv3FTQz9HK; Mon, 27 Nov 2023 05:24: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 3AR5OhBS065846; Mon, 27 Nov 2023 05:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5OhlI065843; Mon, 27 Nov 2023 05:24:43 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:43 GMT Message-Id: <202311270524.3AR5OhlI065843@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: 43581d7b6617 - main - libexec: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 43581d7b6617959e4452094d9330ef020034a6c9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=43581d7b6617959e4452094d9330ef020034a6c9 commit 43581d7b6617959e4452094d9330ef020034a6c9 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:28 +0000 libexec: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- libexec/Makefile | 1 - libexec/Makefile.inc | 1 - libexec/comsat/Makefile | 1 - libexec/comsat/comsat.8 | 2 -- libexec/comsat/comsat.c | 3 --- libexec/fingerd/Makefile | 1 - libexec/fingerd/fingerd.8 | 2 -- libexec/fingerd/fingerd.c | 3 --- libexec/fingerd/pathnames.h | 2 -- libexec/ftpd/Makefile | 1 - libexec/ftpd/extern.h | 2 -- libexec/ftpd/ftpcmd.y | 5 ----- libexec/ftpd/ftpd.8 | 2 -- libexec/ftpd/ftpd.c | 3 --- libexec/ftpd/logwtmp.c | 3 --- libexec/ftpd/pathnames.h | 2 -- libexec/ftpd/popen.c | 3 --- libexec/getty/Makefile | 1 - libexec/getty/extern.h | 2 -- libexec/getty/getty.8 | 2 -- libexec/getty/gettytab | 2 -- libexec/getty/gettytab.5 | 2 -- libexec/getty/gettytab.h | 2 -- libexec/getty/init.c | 3 --- libexec/getty/main.c | 3 --- libexec/getty/pathnames.h | 2 -- libexec/getty/subr.c | 3 --- libexec/getty/ttys.5 | 2 -- libexec/mail.local/Makefile | 1 - libexec/mknetid/parse_group.c | 3 --- libexec/rbootd/Makefile | 1 - libexec/rbootd/bpf.c | 5 ----- libexec/rbootd/conf.c | 5 ----- libexec/rbootd/defs.h | 2 -- libexec/rbootd/parseconf.c | 5 ----- libexec/rbootd/pathnames.h | 2 -- libexec/rbootd/rbootd.8 | 2 -- libexec/rbootd/rbootd.c | 5 ----- libexec/rbootd/rmp.h | 2 -- libexec/rbootd/rmp_var.h | 2 -- libexec/rbootd/rmpproto.c | 5 ----- libexec/rbootd/utils.c | 5 ----- libexec/rc/netstart | 3 --- libexec/rc/rc | 3 --- libexec/rpc.rstatd/rstat_proc.c | 4 ---- libexec/rtld-elf/rtld_malloc.c | 3 --- libexec/smrsh/Makefile | 1 - libexec/talkd/Makefile | 1 - libexec/talkd/announce.c | 3 --- libexec/talkd/print.c | 3 --- libexec/talkd/process.c | 3 --- libexec/talkd/table.c | 3 --- libexec/talkd/talkd.8 | 2 -- libexec/talkd/talkd.c | 3 --- libexec/tftpd/Makefile | 1 - libexec/tftpd/tftpd.8 | 2 -- libexec/tftpd/tftpd.c | 3 --- 57 files changed, 144 deletions(-) diff --git a/libexec/Makefile b/libexec/Makefile index 795250dddfdb..5f7f652df6ed 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 .include diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc index 54ecdc22b1ae..ee76f0719dfa 100644 --- a/libexec/Makefile.inc +++ b/libexec/Makefile.inc @@ -1,4 +1,3 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 BINDIR?= /usr/libexec diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile index 23634b2fd679..848577f178be 100644 --- a/libexec/comsat/Makefile +++ b/libexec/comsat/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 PROG= comsat MAN= comsat.8 diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8 index c35b52b5ef3b..a0fde4c53b0b 100644 --- a/libexec/comsat/comsat.8 +++ b/libexec/comsat/comsat.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)comsat.8 8.1 (Berkeley) 6/4/93 -.\" .Dd January 21, 2010 .Dt COMSAT 8 .Os diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 138881db9e4a..6d3c47d2761f 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)comsat.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile index c5b780c4e225..5a170379e326 100644 --- a/libexec/fingerd/Makefile +++ b/libexec/fingerd/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 .include diff --git a/libexec/fingerd/fingerd.8 b/libexec/fingerd/fingerd.8 index 1080b491b531..29dab8636f22 100644 --- a/libexec/fingerd/fingerd.8 +++ b/libexec/fingerd/fingerd.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)fingerd.8 8.1 (Berkeley) 6/4/93 -.\" .Dd November 19, 2014 .Dt FINGERD 8 .Os diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index dd51064a00a6..79a006ec99a3 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)fingerd.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include diff --git a/libexec/fingerd/pathnames.h b/libexec/fingerd/pathnames.h index eb95161edadb..02eb4eb0ea69 100644 --- a/libexec/fingerd/pathnames.h +++ b/libexec/fingerd/pathnames.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/4/93 */ #define _PATH_FINGER "/usr/bin/finger" diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index f58b675cf8e7..2cbd14912009 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.2 (Berkeley) 4/4/94 .include diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h index 2e314ba5c117..047e8573dd09 100644 --- a/libexec/ftpd/extern.h +++ b/libexec/ftpd/extern.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)extern.h 8.2 (Berkeley) 4/4/94 */ #include diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 9d57017e2f19..620acad07395 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -27,8 +27,6 @@ * 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. - * - * @(#)ftpcmd.y 8.3 (Berkeley) 4/6/94 */ /* @@ -39,9 +37,6 @@ %{ #ifndef lint -#if 0 -static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; -#endif #endif /* not lint */ #include diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index ec4ce0c65100..fcc5da0b6db1 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" .Dd September 9, 2023 .Dt FTPD 8 .Os diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index a41a23ab1184..d71ba541578e 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -38,9 +38,6 @@ static char copyright[] = #endif #ifndef lint -#if 0 -static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; -#endif #endif /* not lint */ #include diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c index 933fca37a417..376af74b2d7c 100644 --- a/libexec/ftpd/logwtmp.c +++ b/libexec/ftpd/logwtmp.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h index 75bec0d18a68..1ff753123b1c 100644 --- a/libexec/ftpd/pathnames.h +++ b/libexec/ftpd/pathnames.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/4/93 */ #include diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c index 887883af3480..e950e78dcc30 100644 --- a/libexec/ftpd/popen.c +++ b/libexec/ftpd/popen.c @@ -33,9 +33,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; -#endif #endif /* not lint */ #include diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile index 68875c57eacc..1661a3a1512f 100644 --- a/libexec/getty/Makefile +++ b/libexec/getty/Makefile @@ -1,4 +1,3 @@ -# from: @(#)Makefile 8.1 (Berkeley) 6/4/93 PACKAGE= runtime diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h index d20c2b119cfb..386eef5d16a3 100644 --- a/libexec/getty/extern.h +++ b/libexec/getty/extern.h @@ -27,8 +27,6 @@ * 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. - * - * from: @(#)extern.h 8.1 (Berkeley) 6/4/93 */ struct delayval; diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8 index f37f2d9f60ed..baed4b861a8d 100644 --- a/libexec/getty/getty.8 +++ b/libexec/getty/getty.8 @@ -24,8 +24,6 @@ .\" 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. -.\" -.\" from: @(#)getty.8 8.1 (Berkeley) 6/4/93 .\" " .Dd July 21, 2020 .Dt GETTY 8 diff --git a/libexec/getty/gettytab b/libexec/getty/gettytab index 51ffb01f3401..c2a8d9dc5fad 100644 --- a/libexec/getty/gettytab +++ b/libexec/getty/gettytab @@ -1,5 +1,3 @@ -# from: @(#)gettytab 5.14 (Berkeley) 3/27/91 -# # Most of the table entries here are just copies of the old getty table, # it is by no means certain, or even likely, that any of them are optimal # for any purpose whatever. Nor is it likely that more than a couple are diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5 index d074900c877e..1fb769efebc1 100644 --- a/libexec/getty/gettytab.5 +++ b/libexec/getty/gettytab.5 @@ -24,8 +24,6 @@ .\" 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. -.\" -.\" from: @(#)gettytab.5 8.4 (Berkeley) 4/19/94 .\" " .Dd September 29, 2022 .Dt GETTYTAB 5 diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h index 1ef0f8acc202..d6b7384b7a44 100644 --- a/libexec/getty/gettytab.h +++ b/libexec/getty/gettytab.h @@ -27,8 +27,6 @@ * 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. - * - * from: @(#)gettytab.h 8.2 (Berkeley) 3/30/94 */ /* diff --git a/libexec/getty/init.c b/libexec/getty/init.c index e09cbf2c3e94..a3fb952e93bf 100644 --- a/libexec/getty/init.c +++ b/libexec/getty/init.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)from: init.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ /* diff --git a/libexec/getty/main.c b/libexec/getty/main.c index 2cdcfaeb3e02..29bd7532a913 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)from: main.c 8.1 (Berkeley) 6/20/93"; -#endif #endif /* not lint */ #include #include diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h index 4e01ec7954d4..1de5551a196a 100644 --- a/libexec/getty/pathnames.h +++ b/libexec/getty/pathnames.h @@ -27,8 +27,6 @@ * 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. - * - * from: @(#)pathnames.h 8.1 (Berkeley) 6/4/93 */ #include diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index 2c262e0968ca..68035c22a333 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)from: subr.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ /* diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5 index 5138172c48a7..cd94e6a1c91a 100644 --- a/libexec/getty/ttys.5 +++ b/libexec/getty/ttys.5 @@ -24,8 +24,6 @@ .\" 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. -.\" -.\" from: @(#)ttys.5 8.1 (Berkeley) 6/4/93 .\" " .Dd October 26, 2023 .Dt TTYS 5 diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index d0ae0aafd954..8a2b211cf7c9 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 7/19/93 PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c index 59ebf44eab37..4fcb5bbc2d9c 100644 --- a/libexec/mknetid/parse_group.c +++ b/libexec/mknetid/parse_group.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static const char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94"; -#endif #endif /* not lint */ /* diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile index 98709740140a..f204de7397d6 100644 --- a/libexec/rbootd/Makefile +++ b/libexec/rbootd/Makefile @@ -1,4 +1,3 @@ -# from: @(#)Makefile 8.1 (Berkeley) 6/4/93 PROG= rbootd SRCS= bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c index 6fbe34111a67..39914264c8da 100644 --- a/libexec/rbootd/bpf.c +++ b/libexec/rbootd/bpf.c @@ -36,16 +36,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)bpf.c 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: bpf.c 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ #ifndef lint -#if 0 -static const char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c index a48d3efdb9c1..d11c367a1695 100644 --- a/libexec/rbootd/conf.c +++ b/libexec/rbootd/conf.c @@ -36,16 +36,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)conf.c 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: conf.c 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ #ifndef lint -#if 0 -static const char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include diff --git a/libexec/rbootd/defs.h b/libexec/rbootd/defs.h index 5fd23ac41c4e..87bbb5716b83 100644 --- a/libexec/rbootd/defs.h +++ b/libexec/rbootd/defs.h @@ -36,8 +36,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)defs.h 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: defs.h 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c index 262f81fb68d7..18a73c592da2 100644 --- a/libexec/rbootd/parseconf.c +++ b/libexec/rbootd/parseconf.c @@ -36,16 +36,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)parseconf.c 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: parseconf.c 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ #ifndef lint -#if 0 -static const char sccsid[] = "@(#)parseconf.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include diff --git a/libexec/rbootd/pathnames.h b/libexec/rbootd/pathnames.h index 4eab4bb6ff22..eed4e6db535c 100644 --- a/libexec/rbootd/pathnames.h +++ b/libexec/rbootd/pathnames.h @@ -36,8 +36,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)pathnames.h 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: pathnames.h 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8 index 15ebb956d234..592c5fcb2f99 100644 --- a/libexec/rbootd/rbootd.8 +++ b/libexec/rbootd/rbootd.8 @@ -33,8 +33,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)rbootd.8 8.2 (Berkeley) 12/11/93 -.\" .\" Utah Hdr: rbootd.man 3.1 92/07/06 .\" Author: Jeff Forys, University of Utah CSS .\" diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c index 6b0fb75184c4..5b2a37365ce5 100644 --- a/libexec/rbootd/rbootd.c +++ b/libexec/rbootd/rbootd.c @@ -36,8 +36,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)rbootd.c 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: rbootd.c 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ @@ -49,9 +47,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static const char sccsid[] = "@(#)rbootd.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include #include diff --git a/libexec/rbootd/rmp.h b/libexec/rbootd/rmp.h index 3866a41617fe..bc739b751afc 100644 --- a/libexec/rbootd/rmp.h +++ b/libexec/rbootd/rmp.h @@ -36,8 +36,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)rmp.h 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: rmp.h 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ diff --git a/libexec/rbootd/rmp_var.h b/libexec/rbootd/rmp_var.h index 73cd40f399e6..0d3003edd565 100644 --- a/libexec/rbootd/rmp_var.h +++ b/libexec/rbootd/rmp_var.h @@ -36,8 +36,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)rmp_var.h 8.1 (Berkeley) 6/4/93 - * * from: Utah Hdr: rmp_var.h 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c index 2603e697d8b8..b1459c998588 100644 --- a/libexec/rbootd/rmpproto.c +++ b/libexec/rbootd/rmpproto.c @@ -36,16 +36,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)rmpproto.c 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: rmpproto.c 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ #ifndef lint -#if 0 -static const char sccsid[] = "@(#)rmpproto.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c index 36a7116a05c4..4cf333bbbea0 100644 --- a/libexec/rbootd/utils.c +++ b/libexec/rbootd/utils.c @@ -36,16 +36,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)utils.c 8.1 (Berkeley) 6/4/93 - * * From: Utah Hdr: utils.c 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ #ifndef lint -#if 0 -static const char sccsid[] = "@(#)utils.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include diff --git a/libexec/rc/netstart b/libexec/rc/netstart index c854de09417b..430a578a73ea 100755 --- a/libexec/rc/netstart +++ b/libexec/rc/netstart @@ -23,9 +23,6 @@ # 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. -# -# From: @(#)netstart 5.9 (Berkeley) 3/30/91 -# # This file is NOT called by any of the other scripts - it has been # obsoleted by /etc/rc.d/* and is provided here only for user diff --git a/libexec/rc/rc b/libexec/rc/rc index 462967703d60..0ea61a4b2c0a 100644 --- a/libexec/rc/rc +++ b/libexec/rc/rc @@ -23,9 +23,6 @@ # 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. -# -# @(#)rc 5.27 (Berkeley) 6/5/91 -# # System startup script run by init on autoboot # or after single-user. diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index cc488657c077..74ac15071a95 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -28,10 +28,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro"; -static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC"; -#endif #endif /* diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index dafbc222322e..647718738ada 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)malloc.c 5.11 (Berkeley) 2/23/91";*/ -#endif /* LIBC_SCCS and not lint */ /* * malloc.c (Caltech) 2/21/82 diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index 5cef87a9fe29..2f4f62131d7d 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 7/2/95 PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile index 69fdd6a5493a..f39a0b2ca579 100644 --- a/libexec/talkd/Makefile +++ b/libexec/talkd/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 PROG= ntalkd SRCS= talkd.c announce.c process.c table.c print.c ttymsg.c diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c index b1b1acc09553..a12a1ed18e55 100644 --- a/libexec/talkd/announce.c +++ b/libexec/talkd/announce.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)announce.c 8.3 (Berkeley) 4/28/95"; -#endif #endif /* not lint */ #include diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c index 47ccb89f20d6..9d48fe347906 100644 --- a/libexec/talkd/print.c +++ b/libexec/talkd/print.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ /* debug print routines */ diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c index 886fc038ab97..4ea01a45169f 100644 --- a/libexec/talkd/process.c +++ b/libexec/talkd/process.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)process.c 8.2 (Berkeley) 11/16/93"; -#endif #endif /* not lint */ /* diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c index 495d63b02b06..ff4aed54b014 100644 --- a/libexec/talkd/table.c +++ b/libexec/talkd/table.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ /* diff --git a/libexec/talkd/talkd.8 b/libexec/talkd/talkd.8 index f7a59dab180a..dac7fa5ef0c0 100644 --- a/libexec/talkd/talkd.8 +++ b/libexec/talkd/talkd.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)talkd.8 8.2 (Berkeley) 12/11/93 -.\" .Dd December 11, 1993 .Dt TALKD 8 .Os diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c index 76d0ec5a09ad..10232ba34522 100644 --- a/libexec/talkd/talkd.c +++ b/libexec/talkd/talkd.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)talkd.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ /* diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile index cafde449c695..e804ff4d0f35 100644 --- a/libexec/tftpd/Makefile +++ b/libexec/tftpd/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 .include diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index 3de042197618..d71da9f1f9ea 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 -.\" .Dd July 20, 2023 .Dt TFTPD 8 .Os diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index ffe31927780e..92dd6c44370d 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)tftpd.c 8.1 (Berkeley) 6/4/93"; -#endif #endif /* not lint */ #include /* From nobody Mon Nov 27 05:24:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvCx0mLKz51hGK; Mon, 27 Nov 2023 05:24: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 4SdvCw5CMfz4WmR; Mon, 27 Nov 2023 05:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NkoZmMiwyctphWKW2O8jjdi9lKnQo+4QBfktNq2PJ7c=; b=hpjOEvIGciZ32vMG7qc49Ci/bFRFE2cjyNKW90l9AuhF41gyvepXaoH5SmkcBWXYTMvBA5 9trEMAJ1PiUptWEEQH90+WYuc9u3Ys6PdtOf3NowIRcPaOkfth7h3dybJg8Wpd7eZAA7vY JWoIqdirr4iATp2lQyDbKUQMOBB7Q3xSBFHVjn9sH8HLm5J6eSrbnNXSLcDSYtPl5TQbSn DNc2VwHv4aCpVne0ObIO1Umwhq/UXjvPDuUDTvS1TpA1HbRlwGSWgL4+Y7X4JlV+IgW7C0 AYvzOu3WtnK567QsOmUrm8mzEp3FaECEHyhmK73YvFdXp+dzof2ahjfoKYSViQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NkoZmMiwyctphWKW2O8jjdi9lKnQo+4QBfktNq2PJ7c=; b=TvbXxBl7KBGCw/ON4Wh9cDAcrFmSXv8qkqkXrpiTgCKzrBvDCHuCWwzq8MIPz3X3+nhmqQ DoDA/y6ETd78tHmfRH2Q6urLf7xAEJiF7mm3XaKuL53AJ+mGdppRe6HgjMWIvLNMYTw+O9 ZjFxFyyXa4vEBCILv2TwQb4PmDNbeEExh2F33pyS87LObJCI5hlxzfLVdr4GO5ThXnBsaM 2gjE4ahjRUa+u6OCyapBae7Vk3kUFygBYli+3HkebvMNXwCAMma6vZBlGXglS+HPr2KS/a 0d7yRDWv8duN2QM9FQtNJHBna+ZC+sUUBj82fVr038pgDwN9qVmSMGBAu6I42A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062684; a=rsa-sha256; cv=none; b=Uf8Q5Rp9ncvcjhO884xFyBvYlTk6BsLu0D+qHbNOJU4ynb+Ekka9M9i2cKbnCq1IPBBoCL jRl6EqpaXUgmZUFf5d3fZSVjDSBxV0jWD5IoHzJIFYCeu8OiFAixp32a0AwqDfOoBr3iD/ YYbuXHXxgQHJTnFxkaxQ5VVi+erCSudKcwojInEH+/h1hSePgS4NitYsk76TB+unk8GpTg Wx8nzFhhbu44Y4iBSdzKVRRwJM9+7MIVkKlpdYkns7ffr9VFWTWCgNy64NOmH4WsUfYYln X4bd0wRvS4YzgVNk+18LjnbT6t4nz80P90tunsNUub6+SZVNynt+0HvYlPjYrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvCw4K4XzB18; Mon, 27 Nov 2023 05:24: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 3AR5Oitq065895; Mon, 27 Nov 2023 05:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Oi3b065892; Mon, 27 Nov 2023 05:24:44 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:44 GMT Message-Id: <202311270524.3AR5Oi3b065892@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: 51e16cb8fc53 - main - sbin: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 51e16cb8fc536913f490ac6bc9c17e92ebd0411b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=51e16cb8fc536913f490ac6bc9c17e92ebd0411b commit 51e16cb8fc536913f490ac6bc9c17e92ebd0411b Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:29 +0000 sbin: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- sbin/Makefile | 1 - sbin/Makefile.inc | 1 - sbin/bectl/bectl.8 | 2 -- sbin/bsdlabel/Makefile | 1 - sbin/bsdlabel/bsdlabel.8 | 2 -- sbin/bsdlabel/bsdlabel.c | 4 ---- sbin/bsdlabel/pathnames.h | 2 -- sbin/clri/Makefile | 1 - sbin/clri/clri.8 | 2 -- sbin/clri/clri.c | 3 --- sbin/comcontrol/Makefile | 1 - sbin/dmesg/Makefile | 1 - sbin/dmesg/dmesg.8 | 2 -- sbin/dmesg/dmesg.c | 3 --- sbin/dump/Makefile | 1 - sbin/dump/dump.8 | 2 -- sbin/dump/dump.h | 2 -- sbin/dump/dumprmt.c | 3 --- sbin/dump/itime.c | 3 --- sbin/dump/main.c | 3 --- sbin/dump/optr.c | 3 --- sbin/dump/pathnames.h | 2 -- sbin/dump/tape.c | 3 --- sbin/dump/traverse.c | 3 --- sbin/dump/unctime.c | 3 --- sbin/dumpfs/Makefile | 1 - sbin/dumpfs/dumpfs.8 | 2 -- sbin/dumpfs/dumpfs.c | 3 --- sbin/dumpon/dumpon.8 | 2 -- sbin/dumpon/dumpon.c | 3 --- sbin/etherswitchcfg/Makefile | 1 - sbin/ffsinfo/Makefile | 2 -- sbin/fsck/fsck.c | 2 -- sbin/fsck_ffs/Makefile | 1 - sbin/fsck_ffs/dir.c | 3 --- sbin/fsck_ffs/fsck.h | 2 -- sbin/fsck_ffs/fsck_ffs.8 | 2 -- sbin/fsck_ffs/fsutil.c | 3 --- sbin/fsck_ffs/globs.c | 3 --- sbin/fsck_ffs/inode.c | 3 --- sbin/fsck_ffs/main.c | 3 --- sbin/fsck_ffs/pass1.c | 3 --- sbin/fsck_ffs/pass1b.c | 3 --- sbin/fsck_ffs/pass2.c | 3 --- sbin/fsck_ffs/pass3.c | 3 --- sbin/fsck_ffs/pass4.c | 3 --- sbin/fsck_ffs/pass5.c | 3 --- sbin/fsck_ffs/setup.c | 3 --- sbin/fsck_ffs/utilities.c | 3 --- sbin/fsdb/Makefile | 1 - sbin/growfs/Makefile | 2 -- sbin/ifconfig/Makefile | 1 - sbin/ifconfig/ifconfig.8 | 2 -- sbin/ifconfig/ifconfig.c | 3 --- sbin/init/Makefile | 1 - sbin/init/init.8 | 2 -- sbin/init/init.c | 3 --- sbin/init/pathnames.h | 2 -- sbin/init/ttys | 3 --- sbin/ipf/common/ipf.h | 2 -- sbin/ipf/common/ipmon.h | 2 -- sbin/ipf/ipf/bpf-ipf.h | 4 ---- sbin/ipf/ipf/bpf_filter.c | 2 -- sbin/ipf/ipf/ipf.c | 4 ---- sbin/ipf/ipf/ipfcomp.c | 4 ---- sbin/ipf/ipfs/ipfs.c | 3 --- sbin/ipf/ipfstat/ipfstat.c | 4 ---- sbin/ipf/ipfsync/ipfsyncd.c | 4 ---- sbin/ipf/ipfsync/ipsyncm.c | 4 ---- sbin/ipf/ipfsync/ipsyncs.c | 4 ---- sbin/ipf/ipftest/ip_fil.c | 4 ---- sbin/ipf/ipftest/ipftest.c | 4 ---- sbin/ipf/ipmon/ipmon.c | 4 ---- sbin/ipf/ipnat/ipnat.c | 4 ---- sbin/ipf/ipsend/arp.c | 4 ---- sbin/ipf/ipsend/ipsend.c | 4 ---- sbin/ipf/ipsend/ipsopt.c | 4 ---- sbin/ipf/ipsend/resend.c | 4 ---- sbin/ipf/ipsend/sbpf.c | 4 ---- sbin/ipf/ipsend/sdlpi.c | 4 ---- sbin/ipf/ipsend/snit.c | 4 ---- sbin/ipf/ipsend/sock.c | 4 ---- sbin/ipf/ipsend/sockraw.c | 3 --- sbin/ipf/libipf/facpri.c | 3 --- sbin/ipf/libipf/getnattype.c | 3 --- sbin/ipf/libipf/inet_addr.c | 4 ---- sbin/ipf/libipf/ipft_hx.c | 4 ---- sbin/ipf/libipf/ipft_pc.c | 3 --- sbin/ipf/libipf/ipft_tx.c | 4 ---- sbin/ipf/libipf/kmem.c | 4 ---- sbin/ipf/libipf/nat_setgroupmap.c | 3 --- sbin/ipf/libipf/printactiveaddr.c | 3 --- sbin/ipf/libipf/printactivenat.c | 3 --- sbin/ipf/libipf/printaps.c | 3 --- sbin/ipf/libipf/printnat.c | 3 --- sbin/ipf/libipf/printnataddr.c | 3 --- sbin/ipf/libipf/printproto.c | 3 --- sbin/md5/Makefile | 1 - sbin/mdconfig/mdconfig.8 | 2 -- sbin/mknod/Makefile | 1 - sbin/mknod/mknod.8 | 2 -- sbin/mknod/mknod.c | 3 --- sbin/mount/Makefile | 1 - sbin/mount/getmntopts.c | 3 --- sbin/mount/mntopts.3 | 2 -- sbin/mount/mntopts.h | 2 -- sbin/mount/mount.8 | 2 -- sbin/mount/mount.c | 3 --- sbin/mount/mount_fs.c | 3 --- sbin/mount/pathnames.h | 2 -- sbin/mount/vfslist.c | 3 --- sbin/mount_cd9660/Makefile | 1 - sbin/mount_cd9660/mount_cd9660.8 | 2 -- sbin/mount_cd9660/mount_cd9660.c | 2 -- sbin/mount_nfs/Makefile | 2 -- sbin/mount_nfs/mount_nfs.8 | 2 -- sbin/mount_nfs/mount_nfs.c | 3 --- sbin/mount_nullfs/Makefile | 1 - sbin/mount_nullfs/mount_nullfs.8 | 2 -- sbin/mount_nullfs/mount_nullfs.c | 3 --- sbin/mount_unionfs/Makefile | 1 - sbin/mount_unionfs/mount_unionfs.8 | 2 -- sbin/mount_unionfs/mount_unionfs.c | 3 --- sbin/newfs/Makefile | 1 - sbin/newfs/mkfs.c | 3 --- sbin/newfs/newfs.8 | 2 -- sbin/newfs/newfs.c | 3 --- sbin/nfsiod/Makefile | 1 - sbin/nfsiod/nfsiod.8 | 2 -- sbin/nfsiod/nfsiod.c | 3 --- sbin/ping/Makefile | 1 - sbin/ping/ping.8 | 2 -- sbin/ping/ping.c | 3 --- sbin/ping/ping6.c | 3 --- sbin/ping/utils.c | 3 --- sbin/quotacheck/Makefile | 1 - sbin/quotacheck/quotacheck.8 | 2 -- sbin/quotacheck/quotacheck.c | 3 --- sbin/rcorder/hash.h | 2 -- sbin/rcorder/sprite.h | 2 -- sbin/reboot/Makefile | 1 - sbin/reboot/boot_i386.8 | 2 -- sbin/reboot/reboot.8 | 2 -- sbin/reboot/reboot.c | 3 --- sbin/restore/Makefile | 1 - sbin/restore/dirs.c | 3 --- sbin/restore/extern.h | 2 -- sbin/restore/interactive.c | 3 --- sbin/restore/main.c | 3 --- sbin/restore/restore.8 | 2 -- sbin/restore/restore.c | 3 --- sbin/restore/restore.h | 2 -- sbin/restore/symtab.c | 3 --- sbin/restore/tape.c | 3 --- sbin/restore/utilities.c | 3 --- sbin/route/Makefile | 1 - sbin/route/keywords | 1 - sbin/route/route.8 | 2 -- sbin/route/route.c | 3 --- sbin/routed/defs.h | 5 ----- sbin/routed/pathnames.h | 2 -- sbin/routed/radix.c | 2 -- sbin/routed/radix.h | 2 -- sbin/routed/routed.8 | 2 -- sbin/routed/rtquery/rtquery.c | 3 --- sbin/savecore/savecore.8 | 2 -- sbin/shutdown/Makefile | 1 - sbin/shutdown/shutdown.8 | 2 -- sbin/shutdown/shutdown.c | 3 --- sbin/swapon/Makefile | 1 - sbin/swapon/swapon.8 | 2 -- sbin/swapon/swapon.c | 3 --- sbin/sysctl/Makefile | 1 - sbin/sysctl/sysctl.8 | 2 -- sbin/tunefs/Makefile | 1 - sbin/tunefs/tunefs.8 | 2 -- sbin/tunefs/tunefs.c | 3 --- sbin/umount/Makefile | 2 -- sbin/umount/umount.8 | 2 -- sbin/umount/umount.c | 3 --- sbin/zfsbootcfg/Makefile | 1 - 181 files changed, 449 deletions(-) diff --git a/sbin/Makefile b/sbin/Makefile index c125075c6696..0c648f29badb 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.5 (Berkeley) 3/31/94 .include diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc index d59f70fe1ef6..a9e857c046de 100644 --- a/sbin/Makefile.inc +++ b/sbin/Makefile.inc @@ -1,4 +1,3 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/8/93 .include diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 19cd867df56b..93244c52ce4d 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -13,8 +13,6 @@ .\" documentation and/or other materials provided with the distribution. .\" .\" -.\" @(#)be.1 -.\" .Dd October 5, 2023 .Dt BECTL 8 .Os diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile index f1d6461beaef..9bfa0fad6573 100644 --- a/sbin/bsdlabel/Makefile +++ b/sbin/bsdlabel/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.2 (Berkeley) 3/17/94 .PATH: ${SRCTOP}/sys/geom diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8 index 9228bba78d4b..0e5b35a0588c 100644 --- a/sbin/bsdlabel/bsdlabel.8 +++ b/sbin/bsdlabel/bsdlabel.8 @@ -28,8 +28,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94 -.\" .Dd October 5, 2016 .Dt BSDLABEL 8 .Os diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 766def59ffe9..bc0dec3bc399 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -49,10 +49,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94"; -/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ -#endif /* not lint */ #endif #include #include diff --git a/sbin/bsdlabel/pathnames.h b/sbin/bsdlabel/pathnames.h index f28593e71e55..4d215eb72e33 100644 --- a/sbin/bsdlabel/pathnames.h +++ b/sbin/bsdlabel/pathnames.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/5/93 */ #include diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile index 726adbf8871c..ac3eda4cd597 100644 --- a/sbin/clri/Makefile +++ b/sbin/clri/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 PACKAGE=ufs PROG= clri diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8 index f9a86fe659ec..9d1fb92e22ba 100644 --- a/sbin/clri/clri.8 +++ b/sbin/clri/clri.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)clri.8 8.2 (Berkeley) 4/19/94 -.\" .Dd October 5, 2016 .Dt CLRI 8 .Os diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c index 7144490869cd..8eeafbda70af 100644 --- a/sbin/clri/clri.c +++ b/sbin/clri/clri.c @@ -39,9 +39,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)clri.c 8.2 (Berkeley) 9/23/93"; -#endif /* not lint */ #endif #include diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile index 2ddb60218039..809f1060d183 100644 --- a/sbin/comcontrol/Makefile +++ b/sbin/comcontrol/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 5.4 (Berkeley) 6/5/91 PACKAGE=runtime PROG= comcontrol diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile index 4214988b7c71..d1863f2b448c 100644 --- a/sbin/dmesg/Makefile +++ b/sbin/dmesg/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 PACKAGE=runtime PROG= dmesg diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index cbd7d66f9e98..2ef3be8b6610 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)dmesg.8 8.1 (Berkeley) 6/5/93 -.\" .Dd May 7, 2022 .Dt DMESG 8 .Os diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 9b744aee7d2e..4e243d2f51cd 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static const char sccsid[] = "@(#)dmesg.c 8.1 (Berkeley) 6/5/93"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile index 5cb5b9f27a47..d982e5bc033e 100644 --- a/sbin/dump/Makefile +++ b/sbin/dump/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 # dump.h header file # itime.c reads /etc/dumpdates diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8 index 00cfef444c9b..08b3c2e574d7 100644 --- a/sbin/dump/dump.8 +++ b/sbin/dump/dump.8 @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)dump.8 8.3 (Berkeley) 5/1/95 -.\" .Dd December 28, 2020 .Dt DUMP 8 .Os diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index bd133fc4c68e..9429704a1800 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)dump.h 8.2 (Berkeley) 4/28/95 */ /* diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index a8b2d9c221da..ef75be6f2a1f 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95"; -#endif #endif /* not lint */ #include diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index d9121e4df05a..adeaa044ff4f 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; -#endif #endif /* not lint */ #include diff --git a/sbin/dump/main.c b/sbin/dump/main.c index a5b4eaa6f8ac..945c38e519ac 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; -#endif #endif /* not lint */ #include diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index d3ca5b2a926e..15d34020b24c 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; -#endif #endif /* not lint */ #include diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h index 3ee966a55ff7..e309643473a7 100644 --- a/sbin/dump/pathnames.h +++ b/sbin/dump/pathnames.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/5/93 */ #include diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 3a3574f6d44d..dd3a7672586d 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95"; -#endif #endif /* not lint */ #include diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 281cffcdf6f2..c166b6a1af24 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; -#endif #endif /* not lint */ #include diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c index 5f44c80f9358..86ce682642b5 100644 --- a/sbin/dump/unctime.c +++ b/sbin/dump/unctime.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)unctime.c 8.2 (Berkeley) 6/14/94"; -#endif #endif /* not lint */ #include diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile index d7f768ad4c3d..b416eb1cd588 100644 --- a/sbin/dumpfs/Makefile +++ b/sbin/dumpfs/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 PACKAGE=ufs PROG= dumpfs diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8 index 63da8e59aa46..768329315bc3 100644 --- a/sbin/dumpfs/dumpfs.8 +++ b/sbin/dumpfs/dumpfs.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)dumpfs.8 8.1 (Berkeley) 6/5/93 -.\" .Dd July 2, 2021 .Dt DUMPFS 8 .Os diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 7d2598c190e8..9eb1cba26824 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -51,9 +51,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; -#endif #endif /* not lint */ #include diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8 index 59d199a2de17..a57dfef7096d 100644 --- a/sbin/dumpon/dumpon.8 +++ b/sbin/dumpon/dumpon.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" From: @(#)swapon.8 8.1 (Berkeley) 6/5/93 -.\" .Dd April 23, 2020 .Dt DUMPON 8 .Os diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index 81144e33bc71..20a9246496ae 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "From: @(#)swapon.c 8.1 (Berkeley) 6/5/93"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/etherswitchcfg/Makefile b/sbin/etherswitchcfg/Makefile index 12a5c01e9ed7..6312f07b09d3 100644 --- a/sbin/etherswitchcfg/Makefile +++ b/sbin/etherswitchcfg/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 5.4 (Berkeley) 6/5/91 PACKAGE=runtime PROG= etherswitchcfg diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile index 043be5743ab1..cc03ac9d08ca 100644 --- a/sbin/ffsinfo/Makefile +++ b/sbin/ffsinfo/Makefile @@ -1,5 +1,3 @@ -# @(#)Makefile 8.8 (Berkeley) 6/21/2000 -# # $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $ # diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c index 3757ed062ba5..6bef9a31b8f5 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c @@ -30,8 +30,6 @@ * 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. - * - * From: @(#)mount.c 8.19 (Berkeley) 4/19/94 * From: $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp * $NetBSD: fsck.c,v 1.30 2003/08/07 10:04:15 agc Exp $ */ diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile index de8913c1ecb3..59805dbbf3d6 100644 --- a/sbin/fsck_ffs/Makefile +++ b/sbin/fsck_ffs/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.2 (Berkeley) 4/27/95 PACKAGE=ufs PROG= fsck_ffs diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 0551ba4521c3..597cb1996401 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 827336a77d67..312142eab9a7 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -57,8 +57,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * @(#)fsck.h 8.4 (Berkeley) 5/9/95 */ #ifndef _FSCK_H_ diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8 index 8288216c0681..1eb9ebeb3b9b 100644 --- a/sbin/fsck_ffs/fsck_ffs.8 +++ b/sbin/fsck_ffs/fsck_ffs.8 @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)fsck.8 8.4 (Berkeley) 5/9/95 -.\" .Dd November 17, 2023 .Dt FSCK_FFS 8 .Os diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 05f83789236e..7e9a2c4661ef 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c index b004dd7d48b7..8c69b8db44ea 100644 --- a/sbin/fsck_ffs/globs.c +++ b/sbin/fsck_ffs/globs.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index e4349ff97088..8b154d972dd3 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 4189af1ba517..63446f63a110 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95"; -#endif /* not lint */ #endif #include #define _WANT_P_OSREL diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index bed9d547f637..99da2db3bc6b 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index c1af6158f92c..fe6acd4c27db 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)pass1b.c 8.4 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index 977ee1b1c61e..d92bf22c4394 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c index 9a01bb02ccc8..ac0b61437ccb 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)pass3.c 8.2 (Berkeley) 4/27/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c index b4cf59bc97dc..bddd7ca9a94f 100644 --- a/sbin/fsck_ffs/pass4.c +++ b/sbin/fsck_ffs/pass4.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)pass4.c 8.4 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 8980ba60e03a..efe36ca42cb4 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index b3d58749015e..71088ee13849 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c index 45bbcc9d6612..e5ec06cb101e 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; -#endif /* not lint */ #endif #include #include diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index 5a71210dc365..28016b4ccdfc 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -1,5 +1,4 @@ # $NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 PACKAGE=ufs PROG= fsdb diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile index 3f72e6ac625f..6fb1ba51db00 100644 --- a/sbin/growfs/Makefile +++ b/sbin/growfs/Makefile @@ -1,5 +1,3 @@ -# @(#)Makefile 8.8 (Berkeley) 6/21/2000 -# # $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $ # diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index b95d7a6ea178..e5701fbcdbba 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 8.1 (Berkeley) 6/5/93 .include diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 3b1774606b21..789b98fd7447 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" .Dd November 08, 2023 .Dt IFCONFIG 8 .Os diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 4e2f8e782de9..cd91cf7991bc 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -33,9 +33,6 @@ static const char copyright[] = "@(#) Copyright (c) 1983, 1993\n\ The Regents of the University of California. All rights reserved.\n"; -#if 0 -static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; -#endif #endif /* not lint */ #include diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 79ccaf149ace..965608065291 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 7/19/93 CONFGROUPS= CONFTTYS PACKAGE=runtime diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 88d663a1afe8..4f988438cd35 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -28,8 +28,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)init.8 8.3 (Berkeley) 4/18/94 -.\" .Dd July 22, 2021 .Dt INIT 8 .Os diff --git a/sbin/init/init.c b/sbin/init/init.c index d5200e4cfe35..a78bfac073da 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -39,9 +39,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93"; -#endif #endif /* not lint */ #include diff --git a/sbin/init/pathnames.h b/sbin/init/pathnames.h index e385aed648b4..c04155a901ae 100644 --- a/sbin/init/pathnames.h +++ b/sbin/init/pathnames.h @@ -30,8 +30,6 @@ * 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/5/93 */ #include diff --git a/sbin/init/ttys b/sbin/init/ttys index f5cfe4118da6..d3ac4546d9be 100644 --- a/sbin/init/ttys +++ b/sbin/init/ttys @@ -1,6 +1,3 @@ -# -# @(#)ttys 5.1 (Berkeley) 4/17/89 -# # This file specifies various information about terminals on the system. # It is used by several different programs. Common entries for the # various columns include: diff --git a/sbin/ipf/common/ipf.h b/sbin/ipf/common/ipf.h index c672c53cb56d..20a0087ed5a1 100644 --- a/sbin/ipf/common/ipf.h +++ b/sbin/ipf/common/ipf.h @@ -3,8 +3,6 @@ * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. - * - * @(#)ipf.h 1.12 6/5/96 * $Id$ */ diff --git a/sbin/ipf/common/ipmon.h b/sbin/ipf/common/ipmon.h index 8caf20fdf725..4d377027eb3d 100644 --- a/sbin/ipf/common/ipmon.h +++ b/sbin/ipf/common/ipmon.h @@ -3,8 +3,6 @@ * Copyright (C) 2012 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. - * - * @(#)ip_fil.h 1.35 6/5/96 * $Id$ */ diff --git a/sbin/ipf/ipf/bpf-ipf.h b/sbin/ipf/ipf/bpf-ipf.h index 1c3032150377..7bc299d57256 100644 --- a/sbin/ipf/ipf/bpf-ipf.h +++ b/sbin/ipf/ipf/bpf-ipf.h @@ -35,10 +35,6 @@ * 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. - * - * @(#)bpf.h 7.1 (Berkeley) 5/7/91 - * - * @(#) $Header: /devel/CVS/IP-Filter/bpf-ipf.h,v 2.1 2002/10/26 12:14:26 darrenr Exp $ (LBL) */ #ifndef BPF_MAJOR_VERSION diff --git a/sbin/ipf/ipf/bpf_filter.c b/sbin/ipf/ipf/bpf_filter.c index ff7c93576d1e..b380eb8e20ee 100644 --- a/sbin/ipf/ipf/bpf_filter.c +++ b/sbin/ipf/ipf/bpf_filter.c @@ -35,8 +35,6 @@ * 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. - * *** 1551 LINES SKIPPED *** From nobody Mon Nov 27 05:24:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvCy276xz51h28; Mon, 27 Nov 2023 05:24: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 4SdvCy0wZ0z4Wq9; Mon, 27 Nov 2023 05:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K2UqJjG6M2RJPaw5HKRMgJtEZDk4KDYKJt8MAyYuVuI=; b=fqHm+hgncj1XMOFRZGczi6PEa641+u4xdnwAXm7RHmo39zy/tM1s0IR+TZ50uliaMk4CgH /xgjhisX8gHa4mUDsCcqLAgZbPqOlav8zRN0//5shRwifWmbL/v5X6ryBpnqwatRT90ACw N+9zD1T9cozfmRXZAG5vJjSzMh74a1cda4wu3uTlzXApAxJi/LeeJLej00egIJ9Knl7P5i 19whYVohjX+xCBGbYa1Egt3gT2/x+OnxG1eyRCUAXJSrss69ArtPVE2msZ+OKwvkv9OpzO P77pAFTGhh8Imwd9KCAiE3gbo4+q8wTxtGmrLp+bY6LnV+sMoXTMUXG0FPzG/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K2UqJjG6M2RJPaw5HKRMgJtEZDk4KDYKJt8MAyYuVuI=; b=kMBVxzEyEepeFoQ3nZxHq1jBLw0u1yLfNJrLvZmoNy2BYioN6wWH8LE7cKKRy8l9Qy7vqd CtqjuHPRToksikfYD1Qio1jnvbBM5ew0HceEqanNpEeJy40o1WnbI44Qh8jfLRjFHqjjC2 xw6k4Mld5XnjiE7z907ZvSASH0BHf/CIPWAoIVPk5vKfwt0/4Hxn5trmYYMqDJho/Hz3tA oTX9XY2adqVpo4QU9AlDsAqJqYh4vPYP3QFQUTz7EJnDuZsEf113XJr/Li/d4oghZB8xZQ g56GkaQpkXGBZHBMqXGsSbmwlp6ApE84JWARaEMfuE+XKLaNOwuIPqPSKS+VKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062686; a=rsa-sha256; cv=none; b=lRsOOqTcPsmHSwtvOJZ6e5nr585XaDKVskjX1p0evqCCXMS/Ep/lJckZqOu4gF7Uzh5qSU 7VDwwGILfcigecTlLjyVoKUgFqVvZBnGKe0zqr8zvka9xV+CdDxga+MmlpQPakYD4rKrJH rNetj5EJS/LrceTAV7STin9bNRvqlXBLE2unqH8tCVuJsp+Xmx5rfIwYT3SPaHR9IMixcR bHGQLCMbz/K3Yy4iUr8vjv+KTJnsTP+PXCH77z1Uigr3ic9SaZclISEUQdYSIpbLpdO34L AOTCoDBjz1zqkyVWWAb4gVs2S/IamD8bl4BQ/uTdtna9qvK75swK5iZusVFP2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvCx6h9kzBK3; Mon, 27 Nov 2023 05:24: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 3AR5Oj1w065937; Mon, 27 Nov 2023 05:24:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5OjZ1065934; Mon, 27 Nov 2023 05:24:45 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:45 GMT Message-Id: <202311270524.3AR5OjZ1065934@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: 174c0ac687ec - main - secure: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 174c0ac687ec4ccb0b56ee30d48c0a7b8b9c4e15 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=174c0ac687ec4ccb0b56ee30d48c0a7b8b9c4e15 commit 174c0ac687ec4ccb0b56ee30d48c0a7b8b9c4e15 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:29 +0000 secure: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_item_new.3 | 2 -- secure/lib/libcrypto/man/man3/ASN1_item_sign.3 | 2 -- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 -- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_f_prefix.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_core.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_datagram.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 -- secure/lib/libcrypto/man/man3/BIO_socket_wait.3 | 2 -- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 -- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 -- secure/lib/libcrypto/man/man3/BN_add.3 | 2 -- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 -- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 -- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 -- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 -- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 -- secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 | 2 -- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 -- secure/lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 -- secure/lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 -- secure/lib/libcrypto/man/man3/BN_new.3 | 2 -- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 -- secure/lib/libcrypto/man/man3/BN_rand.3 | 2 -- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 -- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 -- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 -- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 -- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_EncryptedData_decrypt.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_EncryptedData_encrypt.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_EnvelopedData_create.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_data_create.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_digest_create.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 -- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 -- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 -- secure/lib/libcrypto/man/man3/CONF_modules_load_file.3 | 2 -- secure/lib/libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 -- secure/lib/libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 -- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 -- secure/lib/libcrypto/man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 -- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 -- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 -- secure/lib/libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 2 -- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 -- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 -- secure/lib/libcrypto/man/man3/DH_generate_parameters.3 | 2 -- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 2 -- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 -- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 -- secure/lib/libcrypto/man/man3/DH_new.3 | 2 -- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 -- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 -- secure/lib/libcrypto/man/man3/DH_size.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_generate_parameters.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 -- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 -- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 -- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 -- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 -- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 -- secure/lib/libcrypto/man/man3/ECDSA_sign.3 | 2 -- secure/lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 -- secure/lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 -- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 -- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 -- secure/lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 -- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 -- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 -- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 -- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_new.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 -- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_CIPHER_CTX_get_original_iv.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_KDF.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_KEM_free.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_MAC.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_copy_parameters.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_digestsign_supports_digest.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_get_default_digest_nid.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_get_field_type.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_get_group_name.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_gettable_params.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_encoded_public_key.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_settable_params.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_RAND.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_des_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_set_default_properties.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 -- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 -- secure/lib/libcrypto/man/man3/HMAC.3 | 2 -- secure/lib/libcrypto/man/man3/MD5.3 | 2 -- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 -- secure/lib/libcrypto/man/man3/NCONF_new_ex.3 | 2 -- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 -- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 -- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 -- secure/lib/libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 -- secure/lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 2 -- secure/lib/libcrypto/man/man3/OCSP_response_status.3 | 2 -- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_load_builtin_modules.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 -- secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_HDR_get0_transactionID.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set0_validity.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_DECODER.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX_new_for_pkey.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_ESS_check_signing_certs.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_ITEM.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_PARAM.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_PARAM_allocate_from_text.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_set_callback.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_trace_get_category_num.3 | 2 -- secure/lib/libcrypto/man/man3/OSSL_trace_set_channel.3 | 2 -- secure/lib/libcrypto/man/man3/OpenSSL_add_all_algorithms.3 | 2 -- secure/lib/libcrypto/man/man3/OpenSSL_version.3 | 2 -- secure/lib/libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 | 2 -- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 -- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 -- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 -- secure/lib/libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 -- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 -- secure/lib/libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 -- secure/lib/libcrypto/man/man3/PEM_write_bio_PKCS7_stream.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_create_cert.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_add_CSPName_asc.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_add_friendlyname_asc.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_get_friendlyname.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_init.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS7_get_octet_string.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS7_type_is_other.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 | 2 -- secure/lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 | 2 -- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 -- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 2 -- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 -- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 -- secure/lib/libcrypto/man/man3/RAND_get0_primary.3 | 2 -- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 -- secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 | 2 -- secure/lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 -- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 -- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 -- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 -- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 -- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 -- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 -- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 -- secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 | 2 -- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 -- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 -- secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 | 2 -- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 -- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 -- secure/lib/libcrypto/man/man3/SRP_Calc_B.3 | 2 -- secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 | 2 -- secure/lib/libcrypto/man/man3/SRP_create_verifier.3 | 2 -- secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_COMP_add_compression_method.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_has_client_custom_ext.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_load_verify_locations.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_cache_size.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_cert_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_client_hello_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_generate_session_id.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_keylog_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_min_proto_version.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_psk_client_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_record_padding_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_security_level.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_cache_mode.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_id_context.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_split_send_fragment.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_srp_password.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 -- .../lib/libcrypto/man/man3/SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_dh_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_id_context.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_get_compress_id.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_get_protocol_version.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_export_keying_material.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_extension_supported.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_certificate.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_current_cipher.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_default_timeout.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_peer_signature_nid.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_verify_result.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_group_to_name.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set_async_callback.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set_retry_verify.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 -- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 -- secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/TS_VERIFY_CTX_set_certs.3 | 2 -- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 -- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 -- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 -- secure/lib/libcrypto/man/man3/UI_new.3 | 2 -- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 -- secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 | 2 -- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 -- secure/lib/libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 -- secure/lib/libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 -- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 -- secure/lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 -- secure/lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 -- secure/lib/libcrypto/man/man3/X509_NAME_ENTRY_get_object.3 | 2 -- secure/lib/libcrypto/man/man3/X509_NAME_add_entry_by_txt.3 | 2 -- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 -- secure/lib/libcrypto/man/man3/X509_NAME_get_index_by_NID.3 | 2 -- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 -- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 -- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 -- secure/lib/libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 -- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 2 -- secure/lib/libcrypto/man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 -- secure/lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 -- secure/lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 -- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 -- secure/lib/libcrypto/man/man3/X509_STORE_set_verify_cb_func.3 | 2 -- secure/lib/libcrypto/man/man3/X509_VERIFY_PARAM_set_flags.3 | 2 -- secure/lib/libcrypto/man/man3/X509_add_cert.3 | 2 -- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 -- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 -- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 -- secure/lib/libcrypto/man/man3/X509_check_private_key.3 | 2 -- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 -- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 -- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 -- secure/lib/libcrypto/man/man3/X509_digest.3 | 2 -- secure/lib/libcrypto/man/man3/X509_dup.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get0_distinguishing_id.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get0_signature.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get_extension_flags.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 -- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 -- secure/lib/libcrypto/man/man3/X509_load_http.3 | 2 -- secure/lib/libcrypto/man/man3/X509_new.3 | 2 -- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 -- secure/lib/libcrypto/man/man3/X509_verify.3 | 2 -- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 -- secure/lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 -- secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 | 2 -- secure/lib/libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 -- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 -- secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 | 2 -- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 -- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 -- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 -- secure/lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 -- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 -- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 -- secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 | 2 -- secure/lib/libcrypto/man/man5/config.5 | 2 -- secure/lib/libcrypto/man/man5/fips_config.5 | 2 -- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 -- secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_MD-common.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_RAND.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 2 -- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 2 -- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 | 2 -- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 | 2 -- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 | 2 -- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 | 2 -- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 | 2 -- secure/lib/libcrypto/man/man7/RAND.7 | 2 -- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 -- secure/lib/libcrypto/man/man7/X25519.7 | 2 -- secure/lib/libcrypto/man/man7/bio.7 | 2 -- secure/lib/libcrypto/man/man7/crypto.7 | 2 -- secure/lib/libcrypto/man/man7/ct.7 | 2 -- secure/lib/libcrypto/man/man7/des_modes.7 | 2 -- secure/lib/libcrypto/man/man7/evp.7 | 2 -- secure/lib/libcrypto/man/man7/fips_module.7 | 2 -- secure/lib/libcrypto/man/man7/life_cycle-cipher.7 | 2 -- secure/lib/libcrypto/man/man7/life_cycle-digest.7 | 2 -- secure/lib/libcrypto/man/man7/life_cycle-kdf.7 | 2 -- secure/lib/libcrypto/man/man7/life_cycle-mac.7 | 2 -- secure/lib/libcrypto/man/man7/life_cycle-pkey.7 | 2 -- secure/lib/libcrypto/man/man7/life_cycle-rand.7 | 2 -- secure/lib/libcrypto/man/man7/migration_guide.7 | 2 -- secure/lib/libcrypto/man/man7/openssl-core.h.7 | 2 -- secure/lib/libcrypto/man/man7/openssl-core_dispatch.h.7 | 2 -- secure/lib/libcrypto/man/man7/openssl-core_names.h.7 | 2 -- secure/lib/libcrypto/man/man7/openssl-env.7 | 2 -- secure/lib/libcrypto/man/man7/openssl-glossary.7 | 2 -- secure/lib/libcrypto/man/man7/openssl-threads.7 | 2 -- secure/lib/libcrypto/man/man7/openssl_user_macros.7 | 2 -- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 -- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 -- secure/lib/libcrypto/man/man7/passphrase-encoding.7 | 2 -- secure/lib/libcrypto/man/man7/property.7 | 2 -- secure/lib/libcrypto/man/man7/provider-asym_cipher.7 | 2 -- secure/lib/libcrypto/man/man7/provider-base.7 | 2 -- secure/lib/libcrypto/man/man7/provider-cipher.7 | 2 -- secure/lib/libcrypto/man/man7/provider-decoder.7 | 2 -- secure/lib/libcrypto/man/man7/provider-digest.7 | 2 -- secure/lib/libcrypto/man/man7/provider-encoder.7 | 2 -- secure/lib/libcrypto/man/man7/provider-kdf.7 | 2 -- secure/lib/libcrypto/man/man7/provider-kem.7 | 2 -- secure/lib/libcrypto/man/man7/provider-keyexch.7 | 2 -- secure/lib/libcrypto/man/man7/provider-keymgmt.7 | 2 -- secure/lib/libcrypto/man/man7/provider-mac.7 | 2 -- secure/lib/libcrypto/man/man7/provider-object.7 | 2 -- secure/lib/libcrypto/man/man7/provider-rand.7 | 2 -- secure/lib/libcrypto/man/man7/provider-signature.7 | 2 -- secure/lib/libcrypto/man/man7/provider-storemgmt.7 | 2 -- secure/lib/libcrypto/man/man7/provider.7 | 2 -- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 -- secure/lib/libcrypto/man/man7/ssl.7 | 2 -- secure/lib/libcrypto/man/man7/x509.7 | 2 -- secure/usr.bin/openssl/man/CA.pl.1 | 2 -- secure/usr.bin/openssl/man/openssl-asn1parse.1 | 2 -- secure/usr.bin/openssl/man/openssl-ca.1 | 2 -- secure/usr.bin/openssl/man/openssl-ciphers.1 | 2 -- secure/usr.bin/openssl/man/openssl-cmds.1 | 2 -- secure/usr.bin/openssl/man/openssl-cmp.1 | 2 -- secure/usr.bin/openssl/man/openssl-cms.1 | 2 -- secure/usr.bin/openssl/man/openssl-crl.1 | 2 -- secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 | 2 -- secure/usr.bin/openssl/man/openssl-dgst.1 | 2 -- secure/usr.bin/openssl/man/openssl-dhparam.1 | 2 -- secure/usr.bin/openssl/man/openssl-dsa.1 | 2 -- secure/usr.bin/openssl/man/openssl-dsaparam.1 | 2 -- secure/usr.bin/openssl/man/openssl-ec.1 | 2 -- secure/usr.bin/openssl/man/openssl-ecparam.1 | 2 -- secure/usr.bin/openssl/man/openssl-enc.1 | 2 -- secure/usr.bin/openssl/man/openssl-engine.1 | 2 -- secure/usr.bin/openssl/man/openssl-errstr.1 | 2 -- secure/usr.bin/openssl/man/openssl-fipsinstall.1 | 2 -- secure/usr.bin/openssl/man/openssl-format-options.1 | 2 -- secure/usr.bin/openssl/man/openssl-gendsa.1 | 2 -- secure/usr.bin/openssl/man/openssl-genpkey.1 | 2 -- secure/usr.bin/openssl/man/openssl-genrsa.1 | 2 -- secure/usr.bin/openssl/man/openssl-info.1 | 2 -- secure/usr.bin/openssl/man/openssl-kdf.1 | 2 -- secure/usr.bin/openssl/man/openssl-list.1 | 2 -- secure/usr.bin/openssl/man/openssl-mac.1 | 2 -- secure/usr.bin/openssl/man/openssl-namedisplay-options.1 | 2 -- secure/usr.bin/openssl/man/openssl-nseq.1 | 2 -- secure/usr.bin/openssl/man/openssl-ocsp.1 | 2 -- secure/usr.bin/openssl/man/openssl-passphrase-options.1 | 2 -- secure/usr.bin/openssl/man/openssl-passwd.1 | 2 -- secure/usr.bin/openssl/man/openssl-pkcs12.1 | 2 -- secure/usr.bin/openssl/man/openssl-pkcs7.1 | 2 -- secure/usr.bin/openssl/man/openssl-pkcs8.1 | 2 -- secure/usr.bin/openssl/man/openssl-pkey.1 | 2 -- secure/usr.bin/openssl/man/openssl-pkeyparam.1 | 2 -- secure/usr.bin/openssl/man/openssl-pkeyutl.1 | 2 -- secure/usr.bin/openssl/man/openssl-prime.1 | 2 -- secure/usr.bin/openssl/man/openssl-rand.1 | 2 -- secure/usr.bin/openssl/man/openssl-rehash.1 | 2 -- secure/usr.bin/openssl/man/openssl-req.1 | 2 -- secure/usr.bin/openssl/man/openssl-rsa.1 | 2 -- secure/usr.bin/openssl/man/openssl-rsautl.1 | 2 -- secure/usr.bin/openssl/man/openssl-s_client.1 | 2 -- secure/usr.bin/openssl/man/openssl-s_server.1 | 2 -- secure/usr.bin/openssl/man/openssl-s_time.1 | 2 -- secure/usr.bin/openssl/man/openssl-sess_id.1 | 2 -- secure/usr.bin/openssl/man/openssl-smime.1 | 2 -- secure/usr.bin/openssl/man/openssl-speed.1 | 2 -- secure/usr.bin/openssl/man/openssl-spkac.1 | 2 -- secure/usr.bin/openssl/man/openssl-srp.1 | 2 -- secure/usr.bin/openssl/man/openssl-storeutl.1 | 2 -- secure/usr.bin/openssl/man/openssl-ts.1 | 2 -- secure/usr.bin/openssl/man/openssl-verification-options.1 | 2 -- secure/usr.bin/openssl/man/openssl-verify.1 | 2 -- secure/usr.bin/openssl/man/openssl-version.1 | 2 -- secure/usr.bin/openssl/man/openssl-x509.1 | 2 -- secure/usr.bin/openssl/man/openssl.1 | 2 -- secure/usr.bin/openssl/man/tsget.1 | 2 -- 792 files changed, 1584 deletions(-) diff --git a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 index d63c9fd5b66f..1c20e00e6b67 100644 --- a/secure/lib/libcrypto/man/man3/ADMISSIONS.3 +++ b/secure/lib/libcrypto/man/man3/ADMISSIONS.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 b/secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 index 6c933f0ec9f7..b78e25eafad1 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 index 23fe03660ec2..8f57a9bd7b53 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_get_int64.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 index 310b7aeb57b4..ecc1b8e221b2 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 index 217e2d84b131..bad8a53f3b4d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 index 5d74589c8e15..aa8514b09699 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 index 92c13d542d81..a9a8808c0d2f 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 index 4076f8c3d904..e8a6e1feee84 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 index d950d2ad5c3e..a10c04d6026d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 index e643351d875c..844daeb5662d 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 index 406a02003712..8529522d18c3 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 index fccf591a8181..c85eb62faf53 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 b/secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 index ad81a08d06ba..347d5ebcc502 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 @@ -68,8 +68,6 @@ . \} .\} .rr rF -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ diff --git a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 index abb03bd95638..0cbbcef69a96 100644 --- a/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 +++ b/secure/lib/libcrypto/man/man3/ASN1_generate_nconf.3 @@ -68,8 +68,6 @@ *** 10122 LINES SKIPPED *** From nobody Mon Nov 27 05:24:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvCz2vFHz51hJY; Mon, 27 Nov 2023 05:24: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 4SdvCz25nJz4WsW; Mon, 27 Nov 2023 05:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ijBOufIXIoobg1EYVcbMDQAkrRhpQrOTtd7b4o4dqLk=; b=mRcRb7Wsjns8llD8fjjp3d4S5l0Wkf5+HJ21QJx+vI8yhrbYsXkDcXass55SeTgQYSfTv2 bJg8JfCOsVNf7qqlWOSFZqOdlOcWpYf4ftx7X59bC2VRyINOZDFkCKVTFljZi9H0x19mnQ Ek6ajm/TpimynlhfbnnbMxShz4MbzA7k3AGc/PKMoOGQCCEQFop4q++ks4TcvvJqOzLJ3I Snov85BL84M+CVsEFbeDj4OUMcwaF1aU02kqsZ+YA3U5c4EPUixpwrdG/RfcBaQBMuGjFB B6z6tJfzKzLldqpxnhQCzqakWkoL6IQEjI0raP34yMGyUpQenQLKotJGSk41mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ijBOufIXIoobg1EYVcbMDQAkrRhpQrOTtd7b4o4dqLk=; b=CoRTI5NUOv/qgK1cD+LDwtRp4qQmQbCVNhPOYVJVPlUHq+yRGtW8JXoR1NcPeAq7iaFhle Kp7Ir4VSn2WG5aE8xF11OenA7HTEsbsDBCSf27r9/z+qfV9CcP2dZ2HHfWaDsOqcEfrS/v lbhC31b9oTIbFKme8bCT4Y1uOGAYSQgxqXJPH51auSPCbszcVuiRZTfmTVGffp+RUDou96 8pgSFfJI7pb+qb0PR/U+3kKkbYPm+ZRKHxyYTYCTZbu4AZU/1k88QZ9d8oRMd532smblB1 Ij5XRSajORhGXLdF4rWCNWPQonWd13kqCh0pdpzRSW6Jc5Ur4DYp2kBMo9fniQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062687; a=rsa-sha256; cv=none; b=GnEq6qgIspNryFvIAK6jJQVprQHl2N3+as2yzL/3wERzaJtMP62t2i3g0KJn9rz27yP3yC PiJerqpVOpBPz8/+QOZYnsoW+StEwCXAH7v2dZ+mBJppVOPMRH1RTA5Yft9B5qXB56yTni hgPuIRDMqqLA75OtnkEj3r5+jmFkreDNKH2RYPbbZWitqg81+VoA95VjAcC4Y6GeRNlu7C wFHIge8nGLSZFQDROc3iCuco5EoSPhd+W8nVEZ3lRHSbPszj7xbxE2LHM3w6M0h4tAsjwW jqoJuWhFSX5QpMKrUbxia4E9h7QPtlpDld/pejmm2KF1GSt7RxLiakppO6touA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvCz1C98z9nL; Mon, 27 Nov 2023 05:24: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 3AR5OlxV065979; Mon, 27 Nov 2023 05:24:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Oku1065976; Mon, 27 Nov 2023 05:24:46 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:46 GMT Message-Id: <202311270524.3AR5Oku1065976@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: 97759ccc715c - main - share: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 97759ccc715c4b365432c16d763c50eecfcb1100 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=97759ccc715c4b365432c16d763c50eecfcb1100 commit 97759ccc715c4b365432c16d763c50eecfcb1100 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:29 +0000 share: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- share/Makefile | 1 - share/Makefile.inc | 1 - share/dict/Makefile | 1 - share/dict/README | 1 - share/doc/Makefile | 1 - share/doc/papers/beyond4.3/Makefile | 1 - share/doc/papers/beyond4.3/beyond43.ms | 2 -- share/doc/papers/diskperf/Makefile | 1 - share/doc/papers/diskperf/abs.ms | 2 -- share/doc/papers/diskperf/appendix.ms | 2 -- share/doc/papers/diskperf/conclusions.ms | 2 -- share/doc/papers/diskperf/equip.ms | 2 -- share/doc/papers/diskperf/methodology.ms | 2 -- share/doc/papers/diskperf/motivation.ms | 2 -- share/doc/papers/diskperf/results.ms | 2 -- share/doc/papers/diskperf/tests.ms | 2 -- share/doc/papers/fsinterface/Makefile | 1 - share/doc/papers/fsinterface/abstract.ms | 2 -- share/doc/papers/fsinterface/fsinterface.ms | 2 -- share/doc/papers/fsinterface/slides.t | 2 -- share/doc/papers/kernmalloc/Makefile | 1 - share/doc/papers/kernmalloc/alloc.fig | 2 -- share/doc/papers/kernmalloc/appendix.ms | 2 -- share/doc/papers/kernmalloc/appendix.t | 2 -- share/doc/papers/kernmalloc/kernmalloc.t | 2 -- share/doc/papers/kernmalloc/usage.tbl | 2 -- share/doc/papers/kerntune/0.t | 2 -- share/doc/papers/kerntune/1.t | 2 -- share/doc/papers/kerntune/2.t | 2 -- share/doc/papers/kerntune/3.t | 2 -- share/doc/papers/kerntune/4.t | 2 -- share/doc/papers/kerntune/Makefile | 1 - share/doc/papers/kerntune/fig2.pic | 2 -- share/doc/papers/malloc/Makefile | 1 - share/doc/papers/newvm/0.t | 2 -- share/doc/papers/newvm/1.t | 2 -- share/doc/papers/newvm/Makefile | 1 - share/doc/papers/newvm/a.t | 2 -- share/doc/papers/relengr/0.t | 2 -- share/doc/papers/relengr/1.t | 2 -- share/doc/papers/relengr/2.t | 2 -- share/doc/papers/relengr/3.t | 2 -- share/doc/papers/relengr/Makefile | 1 - share/doc/papers/sysperf/0.t | 2 -- share/doc/papers/sysperf/1.t | 2 -- share/doc/papers/sysperf/2.t | 2 -- share/doc/papers/sysperf/3.t | 2 -- share/doc/papers/sysperf/4.t | 2 -- share/doc/papers/sysperf/5.t | 2 -- share/doc/papers/sysperf/6.t | 2 -- share/doc/papers/sysperf/7.t | 2 -- share/doc/papers/sysperf/Makefile | 1 - share/doc/papers/sysperf/a1.t | 2 -- share/doc/papers/sysperf/a2.t | 2 -- share/doc/papers/sysperf/appendix.ms | 4 ---- share/doc/psd/01.cacm/Makefile | 1 - share/doc/psd/01.cacm/p.mac | 2 -- share/doc/psd/01.cacm/p1 | 2 -- share/doc/psd/01.cacm/p2 | 2 -- share/doc/psd/01.cacm/p3 | 2 -- share/doc/psd/01.cacm/p4 | 2 -- share/doc/psd/01.cacm/p5 | 2 -- share/doc/psd/01.cacm/p6 | 2 -- share/doc/psd/02.implement/Makefile | 1 - share/doc/psd/02.implement/fig1.pic | 1 - share/doc/psd/02.implement/fig2.pic | 1 - share/doc/psd/02.implement/implement | 1 - share/doc/psd/03.iosys/Makefile | 1 - share/doc/psd/03.iosys/iosys | 1 - share/doc/psd/04.uprog/Makefile | 1 - share/doc/psd/04.uprog/p.mac | 2 -- share/doc/psd/04.uprog/p0 | 2 -- share/doc/psd/04.uprog/p1 | 2 -- share/doc/psd/04.uprog/p2 | 2 -- share/doc/psd/04.uprog/p3 | 2 -- share/doc/psd/04.uprog/p4 | 2 -- share/doc/psd/04.uprog/p5 | 2 -- share/doc/psd/04.uprog/p6 | 2 -- share/doc/psd/04.uprog/p8 | 2 -- share/doc/psd/04.uprog/p9 | 2 -- share/doc/psd/05.sysman/0.t | 2 -- share/doc/psd/05.sysman/1.0.t | 2 -- share/doc/psd/05.sysman/1.1.t | 2 -- share/doc/psd/05.sysman/1.2.t | 2 -- share/doc/psd/05.sysman/1.3.t | 2 -- share/doc/psd/05.sysman/1.4.t | 2 -- share/doc/psd/05.sysman/1.5.t | 2 -- share/doc/psd/05.sysman/1.6.t | 2 -- share/doc/psd/05.sysman/1.7.t | 2 -- share/doc/psd/05.sysman/2.0.t | 2 -- share/doc/psd/05.sysman/2.1.t | 2 -- share/doc/psd/05.sysman/2.2.t | 2 -- share/doc/psd/05.sysman/2.3.t | 2 -- share/doc/psd/05.sysman/2.4.t | 2 -- share/doc/psd/05.sysman/2.5.t | 2 -- share/doc/psd/05.sysman/Makefile | 1 - share/doc/psd/05.sysman/a.t | 2 -- share/doc/psd/06.Clang/Clang.ms | 2 -- share/doc/psd/06.Clang/Makefile | 1 - share/doc/psd/12.make/Makefile | 1 - share/doc/psd/12.make/tutorial.ms | 2 -- share/doc/psd/15.yacc/Makefile | 1 - share/doc/psd/15.yacc/ss0 | 2 -- share/doc/psd/15.yacc/ss1 | 2 -- share/doc/psd/15.yacc/ss10 | 2 -- share/doc/psd/15.yacc/ss11 | 2 -- share/doc/psd/15.yacc/ss2 | 2 -- share/doc/psd/15.yacc/ss3 | 2 -- share/doc/psd/15.yacc/ss4 | 2 -- share/doc/psd/15.yacc/ss5 | 2 -- share/doc/psd/15.yacc/ss6 | 2 -- share/doc/psd/15.yacc/ss7 | 2 -- share/doc/psd/15.yacc/ss8 | 2 -- share/doc/psd/15.yacc/ss9 | 2 -- share/doc/psd/15.yacc/ss_ | 2 -- share/doc/psd/15.yacc/ssa | 2 -- share/doc/psd/15.yacc/ssb | 2 -- share/doc/psd/15.yacc/ssc | 1 - share/doc/psd/15.yacc/ssd | 1 - share/doc/psd/16.lex/Makefile | 1 - share/doc/psd/16.lex/lex.ms | 1 - share/doc/psd/17.m4/Makefile | 1 - share/doc/psd/17.m4/m4.ms | 1 - share/doc/psd/18.gprof/Makefile | 1 - share/doc/psd/18.gprof/abstract.me | 2 -- share/doc/psd/18.gprof/gathering.me | 2 -- share/doc/psd/18.gprof/header.me | 2 -- share/doc/psd/18.gprof/intro.me | 2 -- share/doc/psd/18.gprof/postp.me | 2 -- share/doc/psd/18.gprof/postp1.pic | 2 -- share/doc/psd/18.gprof/postp2.pic | 2 -- share/doc/psd/18.gprof/postp3.pic | 2 -- share/doc/psd/18.gprof/pres1.pic | 2 -- share/doc/psd/18.gprof/pres2.pic | 2 -- share/doc/psd/18.gprof/present.me | 2 -- share/doc/psd/18.gprof/profiling.me | 2 -- share/doc/psd/18.gprof/refs.me | 2 -- share/doc/psd/20.ipctut/Makefile | 1 - share/doc/psd/20.ipctut/dgramread.c | 2 -- share/doc/psd/20.ipctut/dgramsend.c | 2 -- share/doc/psd/20.ipctut/fig2.pic | 2 -- share/doc/psd/20.ipctut/fig3.pic | 2 -- share/doc/psd/20.ipctut/fig8.pic | 2 -- share/doc/psd/20.ipctut/pipe.c | 2 -- share/doc/psd/20.ipctut/socketpair.c | 2 -- share/doc/psd/20.ipctut/strchkread.c | 2 -- share/doc/psd/20.ipctut/streamread.c | 2 -- share/doc/psd/20.ipctut/streamwrite.c | 2 -- share/doc/psd/20.ipctut/tutor.me | 2 -- share/doc/psd/20.ipctut/udgramread.c | 2 -- share/doc/psd/20.ipctut/udgramsend.c | 2 -- share/doc/psd/20.ipctut/ustreamread.c | 2 -- share/doc/psd/20.ipctut/ustreamwrite.c | 2 -- share/doc/psd/21.ipc/0.t | 2 -- share/doc/psd/21.ipc/1.t | 2 -- share/doc/psd/21.ipc/2.t | 2 -- share/doc/psd/21.ipc/3.t | 2 -- share/doc/psd/21.ipc/4.t | 2 -- share/doc/psd/21.ipc/5.t | 2 -- share/doc/psd/21.ipc/Makefile | 1 - share/doc/psd/22.rpcgen/rpcgen.ms | 2 -- share/doc/psd/23.rpc/rpc.prog.ms | 2 -- share/doc/psd/24.xdr/xdr.nts.ms | 2 -- share/doc/psd/25.xdrrfc/xdr.rfc.ms | 2 -- share/doc/psd/26.rpcrfc/rpc.rfc.ms | 2 -- share/doc/psd/27.nfsrpc/nfs.rfc.ms | 2 -- share/doc/psd/Makefile | 1 - share/doc/psd/contents/contents.ms | 2 -- share/doc/psd/title/Title | 2 -- share/doc/smm/01.setup/0.t | 2 -- share/doc/smm/01.setup/1.t | 2 -- share/doc/smm/01.setup/2.t | 2 -- share/doc/smm/01.setup/3.t | 1 - share/doc/smm/01.setup/4.t | 2 -- share/doc/smm/01.setup/5.t | 2 -- share/doc/smm/01.setup/6.t | 2 -- share/doc/smm/01.setup/Makefile | 1 - share/doc/smm/02.config/0.t | 2 -- share/doc/smm/02.config/1.t | 2 -- share/doc/smm/02.config/2.t | 2 -- share/doc/smm/02.config/3.t | 2 -- share/doc/smm/02.config/4.t | 2 -- share/doc/smm/02.config/5.t | 2 -- share/doc/smm/02.config/6.t | 2 -- share/doc/smm/02.config/Makefile | 1 - share/doc/smm/02.config/a.t | 2 -- share/doc/smm/02.config/b.t | 2 -- share/doc/smm/02.config/c.t | 2 -- share/doc/smm/02.config/d.t | 2 -- share/doc/smm/02.config/e.t | 2 -- share/doc/smm/03.fsck/0.t | 1 - share/doc/smm/03.fsck/1.t | 1 - share/doc/smm/03.fsck/2.t | 1 - share/doc/smm/03.fsck/3.t | 1 - share/doc/smm/03.fsck/4.t | 1 - share/doc/smm/03.fsck/Makefile | 1 - share/doc/smm/04.quotas/Makefile | 1 - share/doc/smm/04.quotas/quotas.ms | 2 -- share/doc/smm/05.fastfs/0.t | 2 -- share/doc/smm/05.fastfs/1.t | 2 -- share/doc/smm/05.fastfs/2.t | 2 -- share/doc/smm/05.fastfs/3.t | 2 -- share/doc/smm/05.fastfs/4.t | 2 -- share/doc/smm/05.fastfs/5.t | 2 -- share/doc/smm/05.fastfs/6.t | 2 -- share/doc/smm/05.fastfs/Makefile | 1 - share/doc/smm/06.nfs/0.t | 2 -- share/doc/smm/06.nfs/1.t | 2 -- share/doc/smm/06.nfs/2.t | 2 -- share/doc/smm/06.nfs/Makefile | 1 - share/doc/smm/06.nfs/ref.t | 2 -- share/doc/smm/07.lpd/0.t | 2 -- share/doc/smm/07.lpd/1.t | 2 -- share/doc/smm/07.lpd/2.t | 2 -- share/doc/smm/07.lpd/3.t | 2 -- share/doc/smm/07.lpd/4.t | 2 -- share/doc/smm/07.lpd/5.t | 2 -- share/doc/smm/07.lpd/6.t | 2 -- share/doc/smm/07.lpd/7.t | 2 -- share/doc/smm/07.lpd/Makefile | 1 - share/doc/smm/08.sendmailop/Makefile | 1 - share/doc/smm/11.timedop/Makefile | 1 - share/doc/smm/11.timedop/timed.ms | 2 -- share/doc/smm/12.timed/Makefile | 1 - share/doc/smm/12.timed/date | 2 -- share/doc/smm/12.timed/loop | 2 -- share/doc/smm/12.timed/time | 2 -- share/doc/smm/12.timed/timed.ms | 2 -- share/doc/smm/12.timed/unused | 2 -- share/doc/smm/18.net/0.t | 2 -- share/doc/smm/18.net/1.t | 2 -- share/doc/smm/18.net/2.t | 2 -- share/doc/smm/18.net/3.t | 2 -- share/doc/smm/18.net/4.t | 2 -- share/doc/smm/18.net/5.t | 2 -- share/doc/smm/18.net/6.t | 2 -- share/doc/smm/18.net/7.t | 2 -- share/doc/smm/18.net/8.t | 2 -- share/doc/smm/18.net/9.t | 2 -- share/doc/smm/18.net/Makefile | 1 - share/doc/smm/18.net/a.t | 2 -- share/doc/smm/18.net/b.t | 2 -- share/doc/smm/18.net/c.t | 2 -- share/doc/smm/18.net/d.t | 2 -- share/doc/smm/18.net/e.t | 2 -- share/doc/smm/18.net/f.t | 2 -- share/doc/smm/Makefile | 1 - share/doc/smm/contents/contents.ms | 2 -- share/doc/smm/title/Title | 2 -- share/doc/usd/04.csh/Makefile | 1 - share/doc/usd/04.csh/csh.1 | 2 -- share/doc/usd/04.csh/csh.2 | 2 -- share/doc/usd/04.csh/csh.3 | 2 -- share/doc/usd/04.csh/csh.4 | 2 -- share/doc/usd/04.csh/csh.a | 2 -- share/doc/usd/04.csh/csh.g | 2 -- share/doc/usd/04.csh/tabs | 2 -- share/doc/usd/05.dc/Makefile | 1 - share/doc/usd/05.dc/dc | 2 -- share/doc/usd/06.bc/Makefile | 1 - share/doc/usd/06.bc/bc | 2 -- share/doc/usd/07.mail/Makefile | 1 - share/doc/usd/07.mail/mail0.nr | 2 -- share/doc/usd/07.mail/mail1.nr | 2 -- share/doc/usd/07.mail/mail2.nr | 2 -- share/doc/usd/07.mail/mail3.nr | 2 -- share/doc/usd/07.mail/mail4.nr | 2 -- share/doc/usd/07.mail/mail5.nr | 2 -- share/doc/usd/07.mail/mail6.nr | 2 -- share/doc/usd/07.mail/mail7.nr | 2 -- share/doc/usd/07.mail/mail8.nr | 2 -- share/doc/usd/07.mail/mail9.nr | 2 -- share/doc/usd/07.mail/maila.nr | 2 -- share/doc/usd/10.exref/exref/ex.rm | 2 -- share/doc/usd/10.exref/summary/ex.summary | 2 -- share/doc/usd/11.vitut/Makefile | 1 - share/doc/usd/11.vitut/edittut.ms | 2 -- share/doc/usd/12.vi/summary/vi.summary | 2 -- share/doc/usd/12.vi/vi/vi.chars | 2 -- share/doc/usd/12.vi/vi/vi.in | 2 -- share/doc/usd/12.vi/viapwh/vi.apwh.ms | 2 -- share/doc/usd/13.viref/Makefile | 1 - share/doc/usd/13.viref/ex.cmd.roff | 2 -- share/doc/usd/13.viref/merge.awk | 2 -- share/doc/usd/13.viref/ref.so | 2 -- share/doc/usd/13.viref/set.opt.roff | 2 -- share/doc/usd/13.viref/vi.cmd.roff | 2 -- share/doc/usd/13.viref/vi.ref | 2 -- share/doc/usd/18.msdiffs/Makefile | 1 - share/doc/usd/18.msdiffs/ms.diffs | 2 -- share/doc/usd/19.memacros/Makefile | 1 - share/doc/usd/20.meref/Makefile | 1 - share/doc/usd/21.troff/Makefile | 1 - share/doc/usd/21.troff/m.mac | 2 -- share/doc/usd/21.troff/m0 | 2 -- share/doc/usd/21.troff/m0a | 1 - share/doc/usd/21.troff/m1 | 2 -- share/doc/usd/21.troff/m2 | 2 -- share/doc/usd/21.troff/m3 | 1 - share/doc/usd/21.troff/m4 | 2 -- share/doc/usd/21.troff/m5 | 2 -- share/doc/usd/21.troff/table1 | 2 -- share/doc/usd/21.troff/table2 | 1 - share/doc/usd/22.trofftut/Makefile | 1 - share/doc/usd/22.trofftut/tt.mac | 2 -- share/doc/usd/22.trofftut/tt00 | 2 -- share/doc/usd/22.trofftut/tt01 | 2 -- share/doc/usd/22.trofftut/tt02 | 2 -- share/doc/usd/22.trofftut/tt03 | 2 -- share/doc/usd/22.trofftut/tt04 | 2 -- share/doc/usd/22.trofftut/tt05 | 2 -- share/doc/usd/22.trofftut/tt06 | 2 -- share/doc/usd/22.trofftut/tt07 | 2 -- share/doc/usd/22.trofftut/tt08 | 2 -- share/doc/usd/22.trofftut/tt09 | 2 -- share/doc/usd/22.trofftut/tt10 | 2 -- share/doc/usd/22.trofftut/tt11 | 2 -- share/doc/usd/22.trofftut/tt12 | 2 -- share/doc/usd/22.trofftut/tt13 | 2 -- share/doc/usd/22.trofftut/tt14 | 2 -- share/doc/usd/22.trofftut/ttack | 2 -- share/doc/usd/22.trofftut/ttcharset | 2 -- share/doc/usd/22.trofftut/ttindex | 2 -- share/doc/usd/Makefile | 1 - share/doc/usd/contents/contents.ms | 2 -- share/doc/usd/title/Title | 2 -- share/examples/sunrpc/Makefile | 4 ---- share/examples/sunrpc/dir/Makefile | 4 ---- share/examples/sunrpc/dir/dir.x | 1 - share/examples/sunrpc/dir/dir_proc.c | 1 - share/examples/sunrpc/dir/rls.c | 1 - share/examples/sunrpc/msg/Makefile | 4 ---- share/examples/sunrpc/msg/msg.x | 1 - share/examples/sunrpc/msg/msg_proc.c | 1 - share/examples/sunrpc/msg/printmsg.c | 1 - share/examples/sunrpc/msg/rprintmsg.c | 1 - share/examples/sunrpc/sort/Makefile | 4 ---- share/examples/sunrpc/sort/rsort.c | 1 - share/examples/sunrpc/sort/sort.x | 1 - share/examples/sunrpc/sort/sort_proc.c | 1 - share/man/Makefile | 1 - share/man/man1/Makefile | 1 - share/man/man1/intro.1 | 2 -- share/man/man3/Makefile | 1 - share/man/man3/assert.3 | 2 -- share/man/man3/bitstring.3 | 2 -- share/man/man3/end.3 | 2 -- share/man/man3/fpgetround.3 | 2 -- share/man/man3/intro.3 | 2 -- share/man/man3/queue.3 | 2 -- share/man/man3/stdarg.3 | 2 -- share/man/man4/Makefile | 1 - share/man/man4/disc.4 | 2 -- share/man/man4/edsc.4 | 2 -- share/man/man4/fd.4 | 2 -- share/man/man4/icmp.4 | 2 -- share/man/man4/inet.4 | 2 -- share/man/man4/ip.4 | 2 -- share/man/man4/le.4 | 1 - share/man/man4/lo.4 | 2 -- share/man/man4/mem.4 | 2 -- share/man/man4/mtio.4 | 2 -- share/man/man4/netintro.4 | 2 -- share/man/man4/null.4 | 2 -- share/man/man4/openfirm.4 | 2 -- share/man/man4/pts.4 | 2 -- share/man/man4/route.4 | 2 -- share/man/man4/tcp.4 | 2 -- share/man/man4/termios.4 | 2 -- share/man/man4/tty.4 | 2 -- share/man/man4/udp.4 | 2 -- share/man/man4/unix.4 | 2 -- share/man/man5/Makefile | 1 - share/man/man5/a.out.5 | 2 -- share/man/man5/acct.5 | 2 -- share/man/man5/core.5 | 2 -- share/man/man5/dir.5 | 2 -- share/man/man5/disktab.5 | 2 -- share/man/man5/fs.5 | 2 -- share/man/man5/fstab.5 | 2 -- share/man/man5/group.5 | 2 -- share/man/man5/hosts.5 | 2 -- share/man/man5/networks.5 | 2 -- share/man/man5/passwd.5 | 2 -- share/man/man5/phones.5 | 2 -- share/man/man5/protocols.5 | 2 -- share/man/man5/remote.5 | 2 -- share/man/man5/resolver.5 | 2 -- share/man/man5/services.5 | 2 -- share/man/man5/shells.5 | 2 -- share/man/man5/stab.5 | 2 -- share/man/man7/Makefile | 1 - share/man/man7/ascii.7 | 2 -- share/man/man7/environ.7 | 2 -- share/man/man7/hier.7 | 2 -- share/man/man7/hostname.7 | 2 -- share/man/man7/intro.7 | 2 -- share/man/man7/operator.7 | 2 -- share/man/man7/sticky.7 | 2 -- share/man/man8/Makefile | 1 - share/man/man8/intro.8 | 2 -- share/man/man8/rc.8 | 2 -- share/man/man8/yp.8 | 2 -- share/man/man9/style.9 | 5 ----- share/misc/Makefile | 1 - share/misc/birthtoken | 1 - share/misc/flowers | 2 -- share/mk/Makefile | 1 - share/mk/bsd.README | 1 - share/mk/bsd.doc.mk | 2 -- share/mk/bsd.lib.mk | 2 -- share/mk/bsd.subdir.mk | 2 -- share/mk/sys.mk | 1 - share/skel/Makefile | 1 - share/tabset/Makefile | 1 - share/termcap/Makefile | 1 - share/termcap/README | 2 -- share/termcap/tck | 3 --- share/termcap/termcap | 2 -- share/termcap/termcap.5 | 2 -- 420 files changed, 759 deletions(-) diff --git a/share/Makefile b/share/Makefile index 4f5a3a9863ef..5546f3e90c1b 100644 --- a/share/Makefile +++ b/share/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 .include diff --git a/share/Makefile.inc b/share/Makefile.inc index 82f1010034e8..121787f4b10b 100644 --- a/share/Makefile.inc +++ b/share/Makefile.inc @@ -1,4 +1,3 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/5/93 BINDIR?= ${SHAREDIR} BINOWN= ${SHAREOWN} diff --git a/share/dict/Makefile b/share/dict/Makefile index b3dd6a9b4515..7e8c830d1944 100644 --- a/share/dict/Makefile +++ b/share/dict/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 # XXX MISSING: connectives words FILES= README propernames web2 web2a freebsd diff --git a/share/dict/README b/share/dict/README index 85aa67a65f87..56e181dc01dc 100644 --- a/share/dict/README +++ b/share/dict/README @@ -1,4 +1,3 @@ -# @(#)README 8.1 (Berkeley) 6/5/93 WEB ---- (introduction provided by jaw@riacs) ------------------------- diff --git a/share/doc/Makefile b/share/doc/Makefile index 3cd129a7b39c..75c12e2ba0e7 100644 --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 8.1 (Berkeley) 6/5/93 .include diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile index 9abd3b11ec68..9f25cb6db894 100644 --- a/share/doc/papers/beyond4.3/Makefile +++ b/share/doc/papers/beyond4.3/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 5.2 (Berkeley) 6/8/93 VOLUME= papers DOC= beyond43 diff --git a/share/doc/papers/beyond4.3/beyond43.ms b/share/doc/papers/beyond4.3/beyond43.ms index c0d0e8c4d455..36c9115bb4e9 100644 --- a/share/doc/papers/beyond4.3/beyond43.ms +++ b/share/doc/papers/beyond4.3/beyond43.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)beyond43.ms 5.1 (Berkeley) 6/5/90 -.\" .\" *troff -ms .rm CM .sp 2 diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile index b160dfdba76d..dd6c009d47ea 100644 --- a/share/doc/papers/diskperf/Makefile +++ b/share/doc/papers/diskperf/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 6.3 (Berkeley) 6/8/93 VOLUME= papers DOC= diskperf diff --git a/share/doc/papers/diskperf/abs.ms b/share/doc/papers/diskperf/abs.ms index 4076b5c7aede..4c970acd7f7b 100644 --- a/share/doc/papers/diskperf/abs.ms +++ b/share/doc/papers/diskperf/abs.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)abs.ms 6.2 (Berkeley) 4/16/91 -.\" .if n .ND .TL Performance Effects of Disk Subsystem Choices diff --git a/share/doc/papers/diskperf/appendix.ms b/share/doc/papers/diskperf/appendix.ms index 09474de53d93..831621486f06 100644 --- a/share/doc/papers/diskperf/appendix.ms +++ b/share/doc/papers/diskperf/appendix.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)appendix.ms 6.2 (Berkeley) 4/16/91 -.\" .\" .nr H2 1 .ds RH Appendix A .NH diff --git a/share/doc/papers/diskperf/conclusions.ms b/share/doc/papers/diskperf/conclusions.ms index 2ae4508a3b4c..9a55d3f595cf 100644 --- a/share/doc/papers/diskperf/conclusions.ms +++ b/share/doc/papers/diskperf/conclusions.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)conclusions.ms 6.2 (Berkeley) 4/16/91 -.\" .ds RH Conclusions .NH Conclusions diff --git a/share/doc/papers/diskperf/equip.ms b/share/doc/papers/diskperf/equip.ms index 651cbb51b8f4..351b4fe35514 100644 --- a/share/doc/papers/diskperf/equip.ms +++ b/share/doc/papers/diskperf/equip.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)equip.ms 6.2 (Berkeley) 4/16/91 -.\" .ds RH Equipment .NH Equipment diff --git a/share/doc/papers/diskperf/methodology.ms b/share/doc/papers/diskperf/methodology.ms index e357217f24e8..ce6f491ee3a5 100644 --- a/share/doc/papers/diskperf/methodology.ms +++ b/share/doc/papers/diskperf/methodology.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)methodology.ms 6.2 (Berkeley) 4/16/91 -.\" .ds RH Methodology .NH Methodology diff --git a/share/doc/papers/diskperf/motivation.ms b/share/doc/papers/diskperf/motivation.ms index 0217f7174604..0bbc11d66e8d 100644 --- a/share/doc/papers/diskperf/motivation.ms +++ b/share/doc/papers/diskperf/motivation.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)motivation.ms 6.2 (Berkeley) 4/16/91 -.\" .ds RH Motivation .NH Motivation diff --git a/share/doc/papers/diskperf/results.ms b/share/doc/papers/diskperf/results.ms index 6bee1327c609..3bf68b6f8daf 100644 --- a/share/doc/papers/diskperf/results.ms +++ b/share/doc/papers/diskperf/results.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)results.ms 6.2 (Berkeley) 4/16/91 -.\" .ds RH Results .NH Results diff --git a/share/doc/papers/diskperf/tests.ms b/share/doc/papers/diskperf/tests.ms index 593698c10ded..d9f736c3bf41 100644 --- a/share/doc/papers/diskperf/tests.ms +++ b/share/doc/papers/diskperf/tests.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)tests.ms 6.2 (Berkeley) 4/16/91 -.\" .ds RH Tests .NH Tests diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile index 109e1a33e2d8..4226f134917a 100644 --- a/share/doc/papers/fsinterface/Makefile +++ b/share/doc/papers/fsinterface/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 5.3 (Berkeley) 6/8/93 VOLUME= papers DOC= fsinterface diff --git a/share/doc/papers/fsinterface/abstract.ms b/share/doc/papers/fsinterface/abstract.ms index 9b6667fa0030..b85bd6cbc45b 100644 --- a/share/doc/papers/fsinterface/abstract.ms +++ b/share/doc/papers/fsinterface/abstract.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)abstract.ms 5.2 (Berkeley) 4/16/91 -.\" .TL Toward a Compatible Filesystem Interface .AU diff --git a/share/doc/papers/fsinterface/fsinterface.ms b/share/doc/papers/fsinterface/fsinterface.ms index 461fdbb803ec..cb567416334f 100644 --- a/share/doc/papers/fsinterface/fsinterface.ms +++ b/share/doc/papers/fsinterface/fsinterface.ms @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)fsinterface.ms 1.4 (Berkeley) 4/16/91 -.\" .nr UX 0 .de UX .ie \\n(UX \s-1UNIX\s0\\$1 diff --git a/share/doc/papers/fsinterface/slides.t b/share/doc/papers/fsinterface/slides.t index c494a3b43726..4c32930cc122 100644 --- a/share/doc/papers/fsinterface/slides.t +++ b/share/doc/papers/fsinterface/slides.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)slides.t 5.2 (Berkeley) 4/16/91 -.\" .so macros .nf .LL diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile index f7a74596b9e4..d91fd40baaa5 100644 --- a/share/doc/papers/kernmalloc/Makefile +++ b/share/doc/papers/kernmalloc/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 1.8 (Berkeley) 6/8/93 VOLUME= papers DOC= kernmalloc diff --git a/share/doc/papers/kernmalloc/alloc.fig b/share/doc/papers/kernmalloc/alloc.fig index 576e3fd0b01f..be313de4e673 100644 --- a/share/doc/papers/kernmalloc/alloc.fig +++ b/share/doc/papers/kernmalloc/alloc.fig @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)alloc.fig 5.1 (Berkeley) 4/16/91 -.\" .PS scale=100 define m0 | diff --git a/share/doc/papers/kernmalloc/appendix.ms b/share/doc/papers/kernmalloc/appendix.ms index 6895cee3e0d3..1c1f3dc092b0 100644 --- a/share/doc/papers/kernmalloc/appendix.ms +++ b/share/doc/papers/kernmalloc/appendix.ms @@ -97,8 +97,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)appendix.t 5.1 (Berkeley) 4/16/91 -.\" .bp .H 1 "Appendix A - Implementation Details" .LP diff --git a/share/doc/papers/kernmalloc/appendix.t b/share/doc/papers/kernmalloc/appendix.t index dee3fd4838d0..b0248856938b 100644 --- a/share/doc/papers/kernmalloc/appendix.t +++ b/share/doc/papers/kernmalloc/appendix.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)appendix.t 5.1 (Berkeley) 4/16/91 -.\" .bp .H 1 "Appendix A - Implementation Details" .LP diff --git a/share/doc/papers/kernmalloc/kernmalloc.t b/share/doc/papers/kernmalloc/kernmalloc.t index 4130e66a7c57..26cb605b6958 100644 --- a/share/doc/papers/kernmalloc/kernmalloc.t +++ b/share/doc/papers/kernmalloc/kernmalloc.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)kernmalloc.t 5.1 (Berkeley) 4/16/91 -.\" .\" reference a system routine name .de RN \fI\\$1\fP\^(\h'1m/24u')\\$2 diff --git a/share/doc/papers/kernmalloc/usage.tbl b/share/doc/papers/kernmalloc/usage.tbl index 3c56d1e84ac4..ccbc5d2afa6b 100644 --- a/share/doc/papers/kernmalloc/usage.tbl +++ b/share/doc/papers/kernmalloc/usage.tbl @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)usage.tbl 5.1 (Berkeley) 4/16/91 -.\" .TS box; c s s s diff --git a/share/doc/papers/kerntune/0.t b/share/doc/papers/kerntune/0.t index ea4f09a161f5..6e8af80fcfd2 100644 --- a/share/doc/papers/kerntune/0.t +++ b/share/doc/papers/kerntune/0.t @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)0.t 1.2 (Berkeley) 11/8/90 -.\" .EQ delim $$ .EN diff --git a/share/doc/papers/kerntune/1.t b/share/doc/papers/kerntune/1.t index c80849dc67e3..ad0e25d7b029 100644 --- a/share/doc/papers/kerntune/1.t +++ b/share/doc/papers/kerntune/1.t @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)1.t 1.2 (Berkeley) 11/8/90 -.\" .ds RH Introduction .NH 1 Introduction diff --git a/share/doc/papers/kerntune/2.t b/share/doc/papers/kerntune/2.t index 370eac65a238..1a90ceb2a7ee 100644 --- a/share/doc/papers/kerntune/2.t +++ b/share/doc/papers/kerntune/2.t @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)2.t 1.3 (Berkeley) 11/8/90 -.\" .ds RH The \fIgprof\fP Profiler .NH 1 The \fIgprof\fP Profiler diff --git a/share/doc/papers/kerntune/3.t b/share/doc/papers/kerntune/3.t index 0e4fc25ef318..59487e29b604 100644 --- a/share/doc/papers/kerntune/3.t +++ b/share/doc/papers/kerntune/3.t @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)3.t 1.2 (Berkeley) 11/8/90 -.\" .ds RH Techniques for Improving Performance .NH 1 Techniques for Improving Performance diff --git a/share/doc/papers/kerntune/4.t b/share/doc/papers/kerntune/4.t index a521d42c35d3..fd813bc0870c 100644 --- a/share/doc/papers/kerntune/4.t +++ b/share/doc/papers/kerntune/4.t @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)4.t 1.2 (Berkeley) 11/8/90 -.\" .ds RH Conclusions .NH 1 Conclusions diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile index b1d494477daa..a4f9954d6aba 100644 --- a/share/doc/papers/kerntune/Makefile +++ b/share/doc/papers/kerntune/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 1.5 (Berkeley) 6/8/93 VOLUME= papers DOC= kerntune diff --git a/share/doc/papers/kerntune/fig2.pic b/share/doc/papers/kerntune/fig2.pic index 4c2e2cf7e380..5fe73fdebe5d 100644 --- a/share/doc/papers/kerntune/fig2.pic +++ b/share/doc/papers/kerntune/fig2.pic @@ -26,8 +26,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)fig2.pic 1.2 (Berkeley) 11/8/90 -.\" .PS ellipse ht .3i wid .75i "\s-1CALLER1\s+1" ellipse ht .3i wid .75i "\s-1CALLER2\s+1" at 1st ellipse + (2i,0i) diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile index 98ee6f1f8864..8925f01cb450 100644 --- a/share/doc/papers/malloc/Makefile +++ b/share/doc/papers/malloc/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 6.3 (Berkeley) 6/8/93 VOLUME= papers DOC= malloc diff --git a/share/doc/papers/newvm/0.t b/share/doc/papers/newvm/0.t index 29de74e59cd5..e53b6714f535 100644 --- a/share/doc/papers/newvm/0.t +++ b/share/doc/papers/newvm/0.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)0.t 5.1 (Berkeley) 4/16/91 -.\" .rm CM .TL A New Virtual Memory Implementation for Berkeley diff --git a/share/doc/papers/newvm/1.t b/share/doc/papers/newvm/1.t index f1eeb33c3a16..f363f58fe4ae 100644 --- a/share/doc/papers/newvm/1.t +++ b/share/doc/papers/newvm/1.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)1.t 5.1 (Berkeley) 4/16/91 -.\" .NH Motivations for a New Virtual Memory System .PP diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile index 7ca254b3042d..531de11faf3d 100644 --- a/share/doc/papers/newvm/Makefile +++ b/share/doc/papers/newvm/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 1.4 (Berkeley) 6/8/93 VOLUME= papers DOC= newvm diff --git a/share/doc/papers/newvm/a.t b/share/doc/papers/newvm/a.t index 680ee48b525d..4dcbc4f7283e 100644 --- a/share/doc/papers/newvm/a.t +++ b/share/doc/papers/newvm/a.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)a.t 5.1 (Berkeley) 4/16/91 -.\" .sp 2 .ne 2i .NH diff --git a/share/doc/papers/relengr/0.t b/share/doc/papers/relengr/0.t index 7a90683e8ed7..3731dba787cf 100644 --- a/share/doc/papers/relengr/0.t +++ b/share/doc/papers/relengr/0.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)0.t 5.1 (Berkeley) 4/17/91 -.\" .rm CM .nr PO 1.25i .ds CH " diff --git a/share/doc/papers/relengr/1.t b/share/doc/papers/relengr/1.t index a48231e7302d..cd15d8034137 100644 --- a/share/doc/papers/relengr/1.t +++ b/share/doc/papers/relengr/1.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)1.t 5.1 (Berkeley) 4/17/91 -.\" .NH Introduction .PP diff --git a/share/doc/papers/relengr/2.t b/share/doc/papers/relengr/2.t index 61cda2596ff2..f786a55498dc 100644 --- a/share/doc/papers/relengr/2.t +++ b/share/doc/papers/relengr/2.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)2.t 5.1 (Berkeley) 4/17/91 -.\" .NH System Development .PP diff --git a/share/doc/papers/relengr/3.t b/share/doc/papers/relengr/3.t index bef83e80fb6c..22cc33cf075e 100644 --- a/share/doc/papers/relengr/3.t +++ b/share/doc/papers/relengr/3.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)3.t 5.1 (Berkeley) 4/17/91 -.\" .NH System Release .PP diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile index 6061e52875a2..902c3d1855e4 100644 --- a/share/doc/papers/relengr/Makefile +++ b/share/doc/papers/relengr/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 1.6 (Berkeley) 6/8/93 VOLUME= papers DOC= releng diff --git a/share/doc/papers/sysperf/0.t b/share/doc/papers/sysperf/0.t index 57cc0333f244..e2ebaf6be22b 100644 --- a/share/doc/papers/sysperf/0.t +++ b/share/doc/papers/sysperf/0.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)0.t 5.1 (Berkeley) 4/17/91 -.\" .if n .ND .TL Measuring and Improving the Performance of Berkeley UNIX* diff --git a/share/doc/papers/sysperf/1.t b/share/doc/papers/sysperf/1.t index 8f4124e53425..38a56f0500b5 100644 --- a/share/doc/papers/sysperf/1.t +++ b/share/doc/papers/sysperf/1.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)1.t 5.1 (Berkeley) 4/17/91 -.\" .ds RH Introduction .af PN 1 .bp 1 diff --git a/share/doc/papers/sysperf/2.t b/share/doc/papers/sysperf/2.t index 50a248a9ec46..7aa97335adae 100644 --- a/share/doc/papers/sysperf/2.t +++ b/share/doc/papers/sysperf/2.t @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)2.t 5.1 (Berkeley) 4/17/91 -.\" .ds RH Observation techniques .NH Observation techniques diff --git a/share/doc/papers/sysperf/3.t b/share/doc/papers/sysperf/3.t *** 4586 LINES SKIPPED *** From nobody Mon Nov 27 05:24:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD05HPcz51h5Z; Mon, 27 Nov 2023 05:24: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 4SdvD03P44z4X4F; Mon, 27 Nov 2023 05:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mowbav2OVQlzELjw0v+5Sze0MO00MN+f+LoQm8yf1ec=; b=vf9PAdBUVRJSpHSUMU3CrfzxLrCvL+8T6tM0H4mspvxOl0raVy+RejKxuUdaaFkpH6uBlR vUIrEmn1OGxBFOK69XVYLVbD7VBU+PRvP+dXbsaRVKmF3CPxwMRJM8XkbhzFpq/8PH7TJX cXYA/JPfRujY0QGH2suqJNRv+5MX4//SIG6QpS93fDvQ0Fmv7n/D0v4CvXJDhswH10huMk D10Vy7Iyw7cu4IZJoFrojXsfpumzjW0lGI/QZHlAi1vEDw5QL6zqWE9dI/RfGRi5DLCeQf sSi+tNcCJeecOyHl7wKDtnYEh6yCVpQ0qchkvOpv4Fh+ITZN87wU4tBgAjXp+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mowbav2OVQlzELjw0v+5Sze0MO00MN+f+LoQm8yf1ec=; b=AH5gXGDhzIIOSOTlwSTQ4j5yJjoQskqKZQY9CR+loYO4gH8Ui76PeV/WRJRylKw3yWuNty N8r3ePFLGAWGfFsn8LS3S83v0z3AbjwnqZdYy1KVgbpLjTwalGnnTTEp7B7IIA1HGEYLId 9dq42qQqsMftcmyk0OjoHo7c/ZL2nQlYeNPlJ5rnFu2cwmidet3Egc6YBXq43nKI+3Z4J9 xdd71J1mtaU8tUy1JyGnUhO3mC3BaNRiylZgdrtmExUTCrVsr3RuPbo/rJGNCI+Grcrlp7 S1S9e3atOjFlInbEAR8YEbL2kz29xSl1pMuhGHtk8LOfknb4VfoosfBCsbCr9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062688; a=rsa-sha256; cv=none; b=FmSDFKJ4RJFKsdehKEDlU+ifDFu1OZEyX5v5W8WbKfQFj4WmmO1KEXZA2/xPB/ik0N5nGL N1z+UInIs72YuA2Qva1O1AVLv6LS7q2YWU0L2OO1/sk+s9VHQpjcXcGYpn+tVatOv0F9ML 1i13CWHjjpG3cti1Jtk8OZPpWTzxsFiGgakLQijfWmJ8Ord1LJrGQ1m6j7TfOYW80SRSFF 0CHkrrvx2wQOh1wm68n1h7UVBNiFZH+zVl4Q+pdjqUyD9wYKn28w2lAj+flUMHhEnuTFpl rvButfXM1D0wLU18gWIlojRhpv6+x8NI489iDSxLWsLslDn6x9sao7OIUmIM7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD01xMKz9ls; Mon, 27 Nov 2023 05:24: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 3AR5OmKX066027; Mon, 27 Nov 2023 05:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5OmLb066024; Mon, 27 Nov 2023 05:24:48 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:48 GMT Message-Id: <202311270524.3AR5OmLb066024@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: 6e28a6bc2e83 - main - stand: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 6e28a6bc2e83d56a5d2d5ee4f5da72d798de2d07 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6e28a6bc2e83d56a5d2d5ee4f5da72d798de2d07 commit 6e28a6bc2e83d56a5d2d5ee4f5da72d798de2d07 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:29 +0000 stand: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- stand/common/newvers.sh | 2 -- stand/libsa/amd64/_setjmp.S | 3 --- stand/libsa/arp.c | 2 -- stand/libsa/bootp.c | 2 -- stand/libsa/close.c | 2 -- stand/libsa/dev.c | 2 -- stand/libsa/ether.c | 2 -- stand/libsa/fstat.c | 2 -- stand/libsa/geli/pwgets.c | 2 -- stand/libsa/getopt.c | 3 --- stand/libsa/gets.c | 2 -- stand/libsa/in_cksum.c | 2 -- stand/libsa/inet_ntoa.c | 3 --- stand/libsa/ioctl.c | 2 -- stand/libsa/lseek.c | 2 -- stand/libsa/net.c | 2 -- stand/libsa/nfsv2.h | 2 -- stand/libsa/nullfs.c | 2 -- stand/libsa/open.c | 2 -- stand/libsa/printf.c | 2 -- stand/libsa/random.c | 2 -- stand/libsa/rarp.c | 2 -- stand/libsa/read.c | 2 -- stand/libsa/rpc.c | 2 -- stand/libsa/rpcv2.h | 2 -- stand/libsa/saioctl.h | 2 -- stand/libsa/stand.h | 2 -- stand/libsa/stat.c | 2 -- stand/libsa/strcasecmp.c | 3 --- stand/libsa/strdup.c | 3 --- stand/libsa/twiddle.c | 2 -- stand/libsa/udp.c | 2 -- stand/libsa/write.c | 2 -- 33 files changed, 71 deletions(-) diff --git a/stand/common/newvers.sh b/stand/common/newvers.sh index 610999bf7ace..916fecb98334 100755 --- a/stand/common/newvers.sh +++ b/stand/common/newvers.sh @@ -28,8 +28,6 @@ # 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. -# -# @(#)newvers.sh 8.1 (Berkeley) 4/20/94 tempfile=$(mktemp tmp.XXXXXX) || exit trap "rm -f $tempfile" EXIT INT TERM diff --git a/stand/libsa/amd64/_setjmp.S b/stand/libsa/amd64/_setjmp.S index 077f080faa7e..62683be11946 100644 --- a/stand/libsa/amd64/_setjmp.S +++ b/stand/libsa/amd64/_setjmp.S @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) - .asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90" -#endif /* LIBC_SCCS and not lint */ #include /* * C library -- _setjmp, _longjmp diff --git a/stand/libsa/arp.c b/stand/libsa/arp.c index caca08d4cc89..e461d9322e7e 100644 --- a/stand/libsa/arp.c +++ b/stand/libsa/arp.c @@ -31,8 +31,6 @@ * 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. - * - * @(#) Header: arp.c,v 1.5 93/07/15 05:52:26 leres Exp (LBL) */ #include diff --git a/stand/libsa/bootp.c b/stand/libsa/bootp.c index 2dc823027234..fea516d4b97d 100644 --- a/stand/libsa/bootp.c +++ b/stand/libsa/bootp.c @@ -31,8 +31,6 @@ * 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. - * - * @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL) */ #include diff --git a/stand/libsa/close.c b/stand/libsa/close.c index 523578996483..0fb1c136664d 100644 --- a/stand/libsa/close.c +++ b/stand/libsa/close.c @@ -31,8 +31,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)close.c 8.1 (Berkeley) 6/11/93 - * * * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University * All Rights Reserved. diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c index e83af5d2e6a0..ea81e0f92115 100644 --- a/stand/libsa/dev.c +++ b/stand/libsa/dev.c @@ -27,8 +27,6 @@ * 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. - * - * @(#)dev.c 8.1 (Berkeley) 6/11/93 */ #include diff --git a/stand/libsa/ether.c b/stand/libsa/ether.c index 304983295eb2..e9dae723e99d 100644 --- a/stand/libsa/ether.c +++ b/stand/libsa/ether.c @@ -31,8 +31,6 @@ * 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. - * - * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp (LBL) */ #include diff --git a/stand/libsa/fstat.c b/stand/libsa/fstat.c index a0bdd8fe8605..b1e99a075880 100644 --- a/stand/libsa/fstat.c +++ b/stand/libsa/fstat.c @@ -27,8 +27,6 @@ * 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. - * - * @(#)stat.c 8.1 (Berkeley) 6/11/93 */ #include diff --git a/stand/libsa/geli/pwgets.c b/stand/libsa/geli/pwgets.c index 5b3c85861786..f7eece5d0d5c 100644 --- a/stand/libsa/geli/pwgets.c +++ b/stand/libsa/geli/pwgets.c @@ -27,8 +27,6 @@ * 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. - * - * @(#)gets.c 8.1 (Berkeley) 6/11/93 */ #include diff --git a/stand/libsa/getopt.c b/stand/libsa/getopt.c index 22c8b2b7fe0a..0e49664f8721 100644 --- a/stand/libsa/getopt.c +++ b/stand/libsa/getopt.c @@ -28,9 +28,6 @@ */ #include -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; -#endif /* LIBC_SCCS and not lint */ #include "stand.h" #include diff --git a/stand/libsa/gets.c b/stand/libsa/gets.c index 04775f6f5280..6d5968f1d6c2 100644 --- a/stand/libsa/gets.c +++ b/stand/libsa/gets.c @@ -27,8 +27,6 @@ * 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. - * - * @(#)gets.c 8.1 (Berkeley) 6/11/93 */ #include diff --git a/stand/libsa/in_cksum.c b/stand/libsa/in_cksum.c index cdc1110fa4a1..f4d5a91b1b5a 100644 --- a/stand/libsa/in_cksum.c +++ b/stand/libsa/in_cksum.c @@ -31,8 +31,6 @@ * 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. - * - * @(#) Header: in_cksum.c,v 1.1 92/09/11 01:15:55 leres Exp (LBL) */ #include diff --git a/stand/libsa/inet_ntoa.c b/stand/libsa/inet_ntoa.c index 6c32c020557c..e696d4c67ffe 100644 --- a/stand/libsa/inet_ntoa.c +++ b/stand/libsa/inet_ntoa.c @@ -28,9 +28,6 @@ */ #include -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)inet_ntoa.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ #include #include diff --git a/stand/libsa/ioctl.c b/stand/libsa/ioctl.c index 26d817dbaefd..366c97309c1b 100644 --- a/stand/libsa/ioctl.c +++ b/stand/libsa/ioctl.c @@ -31,8 +31,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)ioctl.c 8.1 (Berkeley) 6/11/93 - * * * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University * All Rights Reserved. diff --git a/stand/libsa/lseek.c b/stand/libsa/lseek.c index eb063394a144..73448d4a4c03 100644 --- a/stand/libsa/lseek.c +++ b/stand/libsa/lseek.c @@ -31,8 +31,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)lseek.c 8.1 (Berkeley) 6/11/93 - * * * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University * All Rights Reserved. diff --git a/stand/libsa/net.c b/stand/libsa/net.c index 5125f89aaa9f..20731d90b6aa 100644 --- a/stand/libsa/net.c +++ b/stand/libsa/net.c @@ -31,8 +31,6 @@ * 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. - * - * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp (LBL) */ #include diff --git a/stand/libsa/nfsv2.h b/stand/libsa/nfsv2.h index 165517760eca..bcae55b06b1d 100644 --- a/stand/libsa/nfsv2.h +++ b/stand/libsa/nfsv2.h @@ -30,8 +30,6 @@ * 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. - * - * @(#)nfsv2.h 8.1 (Berkeley) 6/10/93 */ /* diff --git a/stand/libsa/nullfs.c b/stand/libsa/nullfs.c index 157c8a3178ec..bb11286a4579 100644 --- a/stand/libsa/nullfs.c +++ b/stand/libsa/nullfs.c @@ -30,8 +30,6 @@ * 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. - * - * @(#)open.c 8.1 (Berkeley) 6/11/93 * * * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University diff --git a/stand/libsa/open.c b/stand/libsa/open.c index fc70e2c3904a..66866dd5c0f2 100644 --- a/stand/libsa/open.c +++ b/stand/libsa/open.c @@ -31,8 +31,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)open.c 8.1 (Berkeley) 6/11/93 - * * * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University * All Rights Reserved. diff --git a/stand/libsa/printf.c b/stand/libsa/printf.c index 4d4696828988..313cf79fdffa 100644 --- a/stand/libsa/printf.c +++ b/stand/libsa/printf.c @@ -30,8 +30,6 @@ * 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. - * - * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 */ #include diff --git a/stand/libsa/random.c b/stand/libsa/random.c index 8570c9d514c1..a6d903ed2e02 100644 --- a/stand/libsa/random.c +++ b/stand/libsa/random.c @@ -25,8 +25,6 @@ * 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. - * - * @(#)random.c 8.1 (Berkeley) 6/10/93 */ #include diff --git a/stand/libsa/rarp.c b/stand/libsa/rarp.c index 38a936a8833e..9c5daad5cd42 100644 --- a/stand/libsa/rarp.c +++ b/stand/libsa/rarp.c @@ -31,8 +31,6 @@ * 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. - * - * @(#) Header: arp.c,v 1.5 93/07/15 05:52:26 leres Exp (LBL) */ #include diff --git a/stand/libsa/read.c b/stand/libsa/read.c index 3f928f8e6916..df150f8f0fbe 100644 --- a/stand/libsa/read.c +++ b/stand/libsa/read.c @@ -31,8 +31,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)read.c 8.1 (Berkeley) 6/11/93 - * * * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University * All Rights Reserved. diff --git a/stand/libsa/rpc.c b/stand/libsa/rpc.c index c1fecd422610..108601f6629e 100644 --- a/stand/libsa/rpc.c +++ b/stand/libsa/rpc.c @@ -31,8 +31,6 @@ * 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. - * - * @(#) Header: rpc.c,v 1.12 93/09/28 08:31:56 leres Exp (LBL) */ #include diff --git a/stand/libsa/rpcv2.h b/stand/libsa/rpcv2.h index fb6df3595bb7..4973b3918110 100644 --- a/stand/libsa/rpcv2.h +++ b/stand/libsa/rpcv2.h @@ -30,8 +30,6 @@ * 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. - * - * @(#)rpcv2.h 8.1 (Berkeley) 6/10/93 */ /* diff --git a/stand/libsa/saioctl.h b/stand/libsa/saioctl.h index 281527aa4fcf..2ad35443e367 100644 --- a/stand/libsa/saioctl.h +++ b/stand/libsa/saioctl.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)saioctl.h 8.1 (Berkeley) 6/11/93 */ /* ioctl's -- for disks just now */ diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index d19d42d37f10..b6ddebb82fd7 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -52,8 +52,6 @@ * 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. - * - * @(#)stand.h 8.1 (Berkeley) 6/11/93 */ #ifndef STAND_H diff --git a/stand/libsa/stat.c b/stand/libsa/stat.c index fb79723ad03f..50065db6858b 100644 --- a/stand/libsa/stat.c +++ b/stand/libsa/stat.c @@ -27,8 +27,6 @@ * 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. - * - * @(#)stat.c 8.1 (Berkeley) 6/11/93 */ #include diff --git a/stand/libsa/strcasecmp.c b/stand/libsa/strcasecmp.c index 6c149e1fa5da..9a4ddbcf9cb3 100644 --- a/stand/libsa/strcasecmp.c +++ b/stand/libsa/strcasecmp.c @@ -32,9 +32,6 @@ #include #include "stand.h" -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ int strcasecmp(const char *s1, const char *s2) diff --git a/stand/libsa/strdup.c b/stand/libsa/strdup.c index f256bb95afff..f4506f424c2f 100644 --- a/stand/libsa/strdup.c +++ b/stand/libsa/strdup.c @@ -28,9 +28,6 @@ */ #include -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ #include "stand.h" #include diff --git a/stand/libsa/twiddle.c b/stand/libsa/twiddle.c index 682e66424cf6..43cdca25a367 100644 --- a/stand/libsa/twiddle.c +++ b/stand/libsa/twiddle.c @@ -30,8 +30,6 @@ * 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. - * - * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 */ #include diff --git a/stand/libsa/udp.c b/stand/libsa/udp.c index ae7989c17451..7a5942bbef95 100644 --- a/stand/libsa/udp.c +++ b/stand/libsa/udp.c @@ -31,8 +31,6 @@ * 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. - * - * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp (LBL) */ #include diff --git a/stand/libsa/write.c b/stand/libsa/write.c index 2827f986974f..16a6fc7eaa60 100644 --- a/stand/libsa/write.c +++ b/stand/libsa/write.c @@ -31,8 +31,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)write.c 8.1 (Berkeley) 6/11/93 - * * * Copyright (c) 1989, 1990, 1991 Carnegie Mellon University * All Rights Reserved. From nobody Mon Nov 27 05:24:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD171l1z51h83; Mon, 27 Nov 2023 05:24: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 4SdvD15j4Vz4WnZ; Mon, 27 Nov 2023 05:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWVciC3lOIGD8j0naPqsS75P66oR2rdjO//vaiDm8KA=; b=u9jfNbbLjTawtZcdOQMtdXQdijjMo7/NovYtvHEPDCY2DOVpKp8EdFLahr/BdXb0HhAqIl q14Gm4r9ddsMLngCsfqAWxX/l8K+I+RAi4dtSkjDUY7u2PbXpUSSJv87iodov8/nkmtU8U 02rn4rFrtToXYiexdPTGrtNjiVXNvGoNbMo+2BAMM1xjCFcTAlt7aVl1XauTVs1t5HeQD+ Ml0DdphkcjbAA+J8NODaL61H9roiwAIDLcC2aLlHfN8E8mPMXbmY3qL55YEXOWW/MkGA1K Qt1vU92NQNdS8Nb+pQRZGwqrYkrC6t56vJ5M8+FGK8JjjzJAnn/2sc1LLGzAxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWVciC3lOIGD8j0naPqsS75P66oR2rdjO//vaiDm8KA=; b=Dq72oS7G0XccRIKnlcaC2kGOyaoNGBN4I1mVaBpOqQwAvpFCHyuGKmspIE6NPgPSjSx7eC LJss/P4Ndt7R4Il32PMrqR7baN3GUcAI0kr4XsKBWjecysL46dqKT4my6TbAJX8ZGZE02y 7wzho55xomTe5YYtCdamR1oZGKDtp4Xnc2DZsqpOy0UWMJSe2ygjmr/4Wh2XUqMyApRZv2 BRUK7LgTmH1ehp1RJ5jlJ6/sfe6iMcRn57pWEZEaa3/9X3+Q0+lTAsi6sp+UKw8aKW2DFf pkaBycDahZsE2yYnTGBbcRaXiUuzcmrtHTx6xrGAK7sCKx70NZgVHNTwy68gVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062689; a=rsa-sha256; cv=none; b=ZFerWGtP2nP3CAR7b839qOBA6hmVhz/TBRkby5BhYJ+7DQhkHDL6xYVW3zDkW49NwHgVrH g8kdhVuXjJbXtz2QuscKcmpO+8Xze07zKt57EFhvDrptyb6+/0ZobvrBVFKcFPlBK8ynNm wWVPyCQ3zidq2BXvDhbZZr1keIRBL5pdDCWxq48qm8XNJQMxrSd3S0vZLtN/j9DErktGOP zO8EdyRQSYTzc/gV7+g4BYisx2gFxawTE+Z287oy6gBvrDA2oCktKK6KRC2/hOt85cOYm/ pyTjw28VbUDALhpJW9PwPq6auq8ehsWg8CtkQkbFXQewQXLhSFizbJMfO16geA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD14pkFzB9t; Mon, 27 Nov 2023 05:24: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 3AR5On9K066069; Mon, 27 Nov 2023 05:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Onom066066; Mon, 27 Nov 2023 05:24:49 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:49 GMT Message-Id: <202311270524.3AR5Onom066066@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: 29363fb44637 - main - sys: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 29363fb446372cb3f10bc98664e9767c53fbb457 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=29363fb446372cb3f10bc98664e9767c53fbb457 commit 29363fb446372cb3f10bc98664e9767c53fbb457 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:30 +0000 sys: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- sys/amd64/Makefile | 1 - sys/amd64/amd64/exec_machdep.c | 2 -- sys/amd64/amd64/fpu.c | 2 -- sys/amd64/amd64/genassym.c | 2 -- sys/amd64/amd64/machdep.c | 2 -- sys/amd64/amd64/mem.c | 1 - sys/amd64/amd64/pmap.c | 2 -- sys/amd64/amd64/sys_machdep.c | 2 -- sys/amd64/amd64/trap.c | 2 -- sys/amd64/amd64/uio_machdep.c | 2 -- sys/amd64/amd64/vm_machdep.c | 2 -- sys/amd64/include/asm.h | 2 -- sys/amd64/include/cpu.h | 2 -- sys/amd64/include/exec.h | 2 -- sys/amd64/include/floatingpoint.h | 2 -- sys/amd64/include/fpu.h | 2 -- sys/amd64/include/ieeefp.h | 2 -- sys/amd64/include/in_cksum.h | 1 - sys/amd64/include/limits.h | 2 -- sys/amd64/include/param.h | 2 -- sys/amd64/include/pcb.h | 2 -- sys/amd64/include/pmap.h | 3 --- sys/amd64/include/proc.h | 2 -- sys/amd64/include/profile.h | 2 -- sys/amd64/include/reloc.h | 2 -- sys/amd64/include/segments.h | 2 -- sys/amd64/include/tss.h | 2 -- sys/amd64/include/vmparam.h | 2 -- sys/arm/arm/autoconf.c | 2 -- sys/arm/arm/in_cksum_machdep.c | 2 -- sys/arm/arm/mem.c | 1 - sys/arm/arm/pmap-v6.c | 2 -- sys/arm/arm/sys_machdep.c | 2 -- sys/arm/arm/uio_machdep.c | 2 -- sys/arm/arm/vm_machdep.c | 2 -- sys/arm/include/_align.h | 2 -- sys/arm/include/_limits.h | 2 -- sys/arm/include/_types.h | 3 --- sys/arm/include/asm.h | 2 -- sys/arm/include/endian.h | 2 -- sys/arm/include/float.h | 2 -- sys/arm/include/floatingpoint.h | 2 -- sys/arm/include/ieee.h | 2 -- sys/arm/include/in_cksum.h | 1 - sys/arm/include/limits.h | 2 -- sys/arm/include/param.h | 2 -- sys/arm/include/pmap.h | 3 --- sys/arm/include/proc.h | 2 -- sys/arm/include/profile.h | 2 -- sys/arm/include/reloc.h | 2 -- sys/arm/include/signal.h | 2 -- sys/arm64/arm64/pmap.c | 2 -- sys/arm64/arm64/uio_machdep.c | 2 -- sys/arm64/include/_align.h | 2 -- sys/arm64/include/_limits.h | 2 -- sys/arm64/include/_types.h | 3 --- sys/arm64/include/cpu.h | 2 -- sys/arm64/include/endian.h | 2 -- sys/arm64/include/float.h | 2 -- sys/arm64/include/in_cksum.h | 1 - sys/arm64/include/param.h | 2 -- sys/arm64/include/proc.h | 2 -- sys/arm64/include/signal.h | 2 -- sys/arm64/include/vmparam.h | 2 -- sys/cddl/dev/dtrace/aarch64/regset.h | 1 - sys/cddl/dev/dtrace/arm/regset.h | 1 - sys/cddl/dev/dtrace/powerpc/regset.h | 1 - sys/cddl/dev/dtrace/riscv/regset.h | 1 - sys/cddl/dev/dtrace/x86/instr_size.c | 1 - sys/cddl/dev/dtrace/x86/regset.h | 1 - sys/compat/linprocfs/linprocfs.c | 2 -- sys/conf/Makefile.amd64 | 1 - sys/conf/Makefile.arm | 2 -- sys/conf/Makefile.arm64 | 1 - sys/conf/Makefile.i386 | 2 -- sys/conf/Makefile.powerpc | 2 -- sys/conf/Makefile.riscv | 1 - sys/conf/kmod.mk | 2 -- sys/conf/newvers.sh | 2 -- sys/conf/systags.sh | 3 --- sys/dev/fdc/fdc.c | 2 -- sys/dev/ic/nec765.h | 2 -- sys/dev/ic/ns16550.h | 2 -- sys/dev/iscsi/icl_soft_proxy.c | 2 -- sys/dev/le/am7990.c | 2 -- sys/dev/le/am79900.c | 4 ---- sys/dev/le/am79900reg.h | 2 -- sys/dev/le/am7990reg.h | 2 -- sys/dev/le/if_le_isa.c | 2 -- sys/dev/le/if_le_pci.c | 2 -- sys/dev/le/lance.c | 2 -- sys/dev/le/lancereg.h | 2 -- sys/dev/md/md.c | 2 -- sys/dev/ofw/openfirmio.c | 2 -- sys/dev/ofw/openfirmio.h | 2 -- sys/dev/ppbus/lpt.h | 1 - sys/fs/cd9660/cd9660_bmap.c | 2 -- sys/fs/cd9660/cd9660_lookup.c | 3 --- sys/fs/cd9660/cd9660_mount.h | 2 -- sys/fs/cd9660/cd9660_node.c | 2 -- sys/fs/cd9660/cd9660_node.h | 2 -- sys/fs/cd9660/cd9660_rrip.c | 2 -- sys/fs/cd9660/cd9660_rrip.h | 2 -- sys/fs/cd9660/cd9660_util.c | 2 -- sys/fs/cd9660/cd9660_vfsops.c | 2 -- sys/fs/cd9660/cd9660_vnops.c | 2 -- sys/fs/cd9660/iso.h | 2 -- sys/fs/cd9660/iso_rrip.h | 2 -- sys/fs/deadfs/dead_vnops.c | 2 -- sys/fs/devfs/devfs.h | 2 -- sys/fs/devfs/devfs_vfsops.c | 2 -- sys/fs/devfs/devfs_vnops.c | 2 -- sys/fs/ext2fs/ext2_alloc.c | 2 -- sys/fs/ext2fs/ext2_balloc.c | 2 -- sys/fs/ext2fs/ext2_bmap.c | 2 -- sys/fs/ext2fs/ext2_extern.h | 2 -- sys/fs/ext2fs/ext2_inode.c | 2 -- sys/fs/ext2fs/ext2_lookup.c | 2 -- sys/fs/ext2fs/ext2_mount.h | 2 -- sys/fs/ext2fs/ext2_subr.c | 2 -- sys/fs/ext2fs/ext2_vfsops.c | 2 -- sys/fs/ext2fs/ext2_vnops.c | 3 --- sys/fs/ext2fs/fs.h | 2 -- sys/fs/ext2fs/inode.h | 2 -- sys/fs/fdescfs/fdesc.h | 2 -- sys/fs/fdescfs/fdesc_vfsops.c | 2 -- sys/fs/fdescfs/fdesc_vnops.c | 2 -- sys/fs/fifofs/fifo_vnops.c | 2 -- sys/fs/nfsclient/nfs_clbio.c | 2 -- sys/fs/nullfs/null.h | 2 -- sys/fs/nullfs/null_subr.c | 2 -- sys/fs/nullfs/null_vfsops.c | 4 ---- sys/fs/nullfs/null_vnops.c | 4 ---- sys/fs/procfs/procfs.c | 2 -- sys/fs/procfs/procfs.h | 2 -- sys/fs/procfs/procfs_dbregs.c | 2 -- sys/fs/procfs/procfs_fpregs.c | 2 -- sys/fs/procfs/procfs_map.c | 2 -- sys/fs/procfs/procfs_mem.c | 2 -- sys/fs/procfs/procfs_note.c | 2 -- sys/fs/procfs/procfs_regs.c | 2 -- sys/fs/procfs/procfs_rlimit.c | 2 -- sys/fs/procfs/procfs_status.c | 2 -- sys/fs/unionfs/union.h | 2 -- sys/fs/unionfs/union_subr.c | 2 -- sys/fs/unionfs/union_vfsops.c | 2 -- sys/fs/unionfs/union_vnops.c | 2 -- sys/geom/geom_ccd.c | 2 -- sys/i386/Makefile | 1 - sys/i386/i386/exec_machdep.c | 2 -- sys/i386/i386/genassym.c | 2 -- sys/i386/i386/in_cksum_machdep.c | 1 - sys/i386/i386/locore.S | 2 -- sys/i386/i386/machdep.c | 2 -- sys/i386/i386/mem.c | 1 - sys/i386/i386/npx.c | 2 -- sys/i386/i386/pmap.c | 2 -- sys/i386/i386/pmap_base.c | 2 -- sys/i386/i386/sigtramp.S | 2 -- sys/i386/i386/sys_machdep.c | 2 -- sys/i386/i386/trap.c | 2 -- sys/i386/i386/uio_machdep.c | 2 -- sys/i386/i386/vm_machdep.c | 2 -- sys/i386/include/asm.h | 2 -- sys/i386/include/cpu.h | 2 -- sys/i386/include/exec.h | 2 -- sys/i386/include/floatingpoint.h | 2 -- sys/i386/include/ieeefp.h | 2 -- sys/i386/include/in_cksum.h | 1 - sys/i386/include/limits.h | 2 -- sys/i386/include/npx.h | 2 -- sys/i386/include/param.h | 2 -- sys/i386/include/pcb.h | 2 -- sys/i386/include/pmap.h | 3 --- sys/i386/include/pmap_nopae.h | 3 --- sys/i386/include/pmap_pae.h | 3 --- sys/i386/include/proc.h | 2 -- sys/i386/include/profile.h | 2 -- sys/i386/include/reloc.h | 2 -- sys/i386/include/segments.h | 2 -- sys/i386/include/signal.h | 2 -- sys/i386/include/tss.h | 2 -- sys/i386/include/vmparam.h | 2 -- sys/isa/isareg.h | 2 -- sys/isa/rtc.h | 2 -- sys/kern/Make.tags.inc | 1 - sys/kern/Makefile | 2 -- sys/kern/init_main.c | 2 -- sys/kern/kern_acct.c | 2 -- sys/kern/kern_clock.c | 2 -- sys/kern/kern_cons.c | 2 -- sys/kern/kern_descrip.c | 2 -- sys/kern/kern_exit.c | 2 -- sys/kern/kern_fork.c | 2 -- sys/kern/kern_ktrace.c | 2 -- sys/kern/kern_lockf.c | 2 -- sys/kern/kern_malloc.c | 2 -- sys/kern/kern_mib.c | 2 -- sys/kern/kern_proc.c | 2 -- sys/kern/kern_prot.c | 2 -- sys/kern/kern_resource.c | 2 -- sys/kern/kern_shutdown.c | 2 -- sys/kern/kern_sig.c | 2 -- sys/kern/kern_synch.c | 2 -- sys/kern/kern_sysctl.c | 2 -- sys/kern/kern_time.c | 2 -- sys/kern/kern_timeout.c | 2 -- sys/kern/kern_xxx.c | 2 -- sys/kern/subr_autoconf.c | 2 -- sys/kern/subr_clock.c | 1 - sys/kern/subr_hash.c | 2 -- sys/kern/subr_log.c | 2 -- sys/kern/subr_param.c | 2 -- sys/kern/subr_prf.c | 2 -- sys/kern/subr_prof.c | 2 -- sys/kern/subr_rtc.c | 1 - sys/kern/subr_scanf.c | 2 -- sys/kern/subr_syscall.c | 2 -- sys/kern/subr_trap.c | 2 -- sys/kern/subr_uio.c | 2 -- sys/kern/sys_generic.c | 2 -- sys/kern/sys_socket.c | 2 -- sys/kern/tty_compat.c | 2 -- sys/kern/uipc_domain.c | 2 -- sys/kern/uipc_mbuf.c | 2 -- sys/kern/uipc_mbuf2.c | 2 -- sys/kern/uipc_sockbuf.c | 2 -- sys/kern/uipc_socket.c | 2 -- sys/kern/uipc_syscalls.c | 2 -- sys/kern/uipc_usrreq.c | 2 -- sys/kern/vfs_cache.c | 2 -- sys/kern/vfs_cluster.c | 2 -- sys/kern/vfs_default.c | 2 -- sys/kern/vfs_export.c | 2 -- sys/kern/vfs_init.c | 4 ---- sys/kern/vfs_lookup.c | 2 -- sys/kern/vfs_subr.c | 2 -- sys/kern/vfs_syscalls.c | 2 -- sys/kern/vfs_vnops.c | 2 -- sys/kern/vnode_if.src | 3 --- sys/libkern/bcopy.c | 6 ------ sys/libkern/bsearch.c | 3 --- sys/libkern/inet_ntop.c | 3 --- sys/libkern/inet_pton.c | 3 --- sys/libkern/quad.h | 2 -- sys/libkern/random.c | 2 -- sys/libkern/scanc.c | 2 -- sys/libkern/strlcat.c | 3 --- sys/libkern/strncat.c | 3 --- sys/libkern/strsep.c | 3 --- sys/libkern/strtol.c | 2 -- sys/libkern/strtoul.c | 2 -- sys/net/altq/altq_rmclass.c | 2 -- sys/net/altq/altq_rmclass.h | 2 -- sys/net/altq/altq_rmclass_debug.h | 2 -- sys/net/bpf.c | 2 -- sys/net/bpf.h | 3 --- sys/net/bpf_buffer.c | 2 -- sys/net/bpf_filter.c | 2 -- sys/net/bpfdesc.h | 2 -- sys/net/dlt.h | 2 -- sys/net/if.c | 2 -- sys/net/if.h | 2 -- sys/net/if_arp.h | 2 -- sys/net/if_clone.c | 2 -- sys/net/if_clone.h | 2 -- sys/net/if_disc.c | 2 -- sys/net/if_dl.h | 2 -- sys/net/if_edsc.c | 2 -- sys/net/if_ethersubr.c | 2 -- sys/net/if_llc.h | 2 -- sys/net/if_loop.c | 2 -- sys/net/if_private.h | 2 -- sys/net/if_types.h | 2 -- sys/net/if_var.h | 2 -- sys/net/ifq.c | 2 -- sys/net/ifq.h | 2 -- sys/net/radix.c | 2 -- sys/net/radix.h | 2 -- sys/net/route.c | 2 -- sys/net/route.h | 2 -- sys/net/route/route_ifaddrs.c | 2 -- sys/net/rtsock.c | 2 -- sys/net/slcompress.c | 2 -- sys/netinet/icmp6.h | 2 -- sys/netinet/icmp_var.h | 2 -- sys/netinet/if_ether.c | 2 -- sys/netinet/if_ether.h | 2 -- sys/netinet/igmp.c | 2 -- sys/netinet/igmp.h | 2 -- sys/netinet/igmp_var.h | 2 -- sys/netinet/in.c | 2 -- sys/netinet/in.h | 2 -- sys/netinet/in_cksum.c | 2 -- sys/netinet/in_pcb.c | 2 -- sys/netinet/in_pcb.h | 2 -- sys/netinet/in_pcb_var.h | 2 -- sys/netinet/in_proto.c | 2 -- sys/netinet/in_systm.h | 2 -- sys/netinet/in_var.h | 2 -- sys/netinet/ip.h | 2 -- sys/netinet/ip6.h | 2 -- sys/netinet/ip_icmp.c | 2 -- sys/netinet/ip_icmp.h | 2 -- sys/netinet/ip_input.c | 2 -- sys/netinet/ip_mroute.c | 2 -- sys/netinet/ip_mroute.h | 2 -- sys/netinet/ip_output.c | 2 -- sys/netinet/ip_reass.c | 2 -- sys/netinet/ip_var.h | 2 -- sys/netinet/raw_ip.c | 2 -- sys/netinet/tcp.h | 2 -- sys/netinet/tcp_ecn.c | 2 -- sys/netinet/tcp_ecn.h | 2 -- sys/netinet/tcp_fsm.h | 2 -- sys/netinet/tcp_input.c | 2 -- sys/netinet/tcp_output.c | 2 -- sys/netinet/tcp_reass.c | 2 -- sys/netinet/tcp_sack.c | 3 --- sys/netinet/tcp_seq.h | 2 -- sys/netinet/tcp_subr.c | 2 -- sys/netinet/tcp_syncache.h | 2 -- sys/netinet/tcp_timer.c | 2 -- sys/netinet/tcp_timer.h | 2 -- sys/netinet/tcp_timewait.c | 2 -- sys/netinet/tcp_usrreq.c | 2 -- sys/netinet/tcp_var.h | 2 -- sys/netinet/tcpip.h | 2 -- sys/netinet/udp.h | 2 -- sys/netinet/udp_usrreq.c | 2 -- sys/netinet/udp_var.h | 2 -- sys/netinet6/icmp6.c | 2 -- sys/netinet6/in6.c | 2 -- sys/netinet6/in6.h | 2 -- sys/netinet6/in6_cksum.c | 2 -- sys/netinet6/in6_pcb.c | 2 -- sys/netinet6/in6_pcb.h | 2 -- sys/netinet6/in6_proto.c | 2 -- sys/netinet6/in6_src.c | 2 -- sys/netinet6/in6_var.h | 2 -- sys/netinet6/ip6_input.c | 2 -- sys/netinet6/ip6_mroute.c | 2 -- sys/netinet6/ip6_output.c | 2 -- sys/netinet6/ip6_var.h | 2 -- sys/netinet6/mld6.c | 2 -- sys/netinet6/raw_ip6.c | 2 -- sys/netinet6/tcp6_var.h | 2 -- sys/netinet6/udp6_usrreq.c | 2 -- sys/netinet6/udp6_var.h | 2 -- sys/netpfil/ipfilter/netinet/fil.c | 4 ---- sys/netpfil/ipfilter/netinet/ip_auth.c | 3 --- sys/netpfil/ipfilter/netinet/ip_compat.h | 2 -- sys/netpfil/ipfilter/netinet/ip_dstlist.c | 3 --- sys/netpfil/ipfilter/netinet/ip_fil.h | 2 -- sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 4 ---- sys/netpfil/ipfilter/netinet/ip_frag.c | 4 ---- sys/netpfil/ipfilter/netinet/ip_frag.h | 2 -- sys/netpfil/ipfilter/netinet/ip_htable.c | 3 --- sys/netpfil/ipfilter/netinet/ip_lookup.c | 3 --- sys/netpfil/ipfilter/netinet/ip_nat.c | 4 ---- sys/netpfil/ipfilter/netinet/ip_nat.h | 2 -- sys/netpfil/ipfilter/netinet/ip_nat6.c | 3 --- sys/netpfil/ipfilter/netinet/ip_pool.c | 4 ---- sys/netpfil/ipfilter/netinet/ip_proxy.c | 3 --- sys/netpfil/ipfilter/netinet/ip_scan.c | 4 ---- sys/netpfil/ipfilter/netinet/ip_scan.h | 2 -- sys/netpfil/ipfilter/netinet/ip_state.c | 4 ---- sys/netpfil/ipfilter/netinet/ip_state.h | 2 -- sys/netpfil/ipfilter/netinet/ip_sync.c | 3 --- sys/netpfil/ipfilter/netinet/ip_sync.h | 2 -- sys/netpfil/ipfilter/netinet/ipl.h | 2 -- sys/netpfil/pf/in4_cksum.c | 2 -- sys/nfs/krpc_subr.c | 1 - sys/nfs/nfs_diskless.c | 2 -- sys/nfs/nfsdiskless.h | 2 -- sys/nfs/nfsproto.h | 2 -- sys/nfs/xdr_subs.h | 2 -- sys/nfsclient/nfs.h | 2 -- sys/nfsclient/nfsargs.h | 2 -- sys/nfsclient/nfsmount.h | 2 -- sys/nfsclient/nfsnode.h | 2 -- sys/nfsclient/nfsstats.h | 2 -- sys/nfsserver/nfs.h | 2 -- sys/nfsserver/nfsrvstats.h | 2 -- sys/nlm/nlm_prot_clnt.c | 2 -- sys/nlm/nlm_prot_server.c | 2 -- sys/nlm/nlm_prot_svc.c | 2 -- sys/nlm/nlm_prot_xdr.c | 2 -- sys/powerpc/fpu/fpu_add.c | 2 -- sys/powerpc/fpu/fpu_arith.h | 2 -- sys/powerpc/fpu/fpu_compare.c | 2 -- sys/powerpc/fpu/fpu_div.c | 2 -- sys/powerpc/fpu/fpu_emu.c | 2 -- sys/powerpc/fpu/fpu_emu.h | 2 -- sys/powerpc/fpu/fpu_explode.c | 2 -- sys/powerpc/fpu/fpu_implode.c | 2 -- sys/powerpc/fpu/fpu_instr.h | 2 -- sys/powerpc/fpu/fpu_mul.c | 2 -- sys/powerpc/fpu/fpu_sqrt.c | 2 -- sys/powerpc/fpu/fpu_subr.c | 2 -- sys/powerpc/include/_align.h | 2 -- sys/powerpc/include/_limits.h | 2 -- sys/powerpc/include/_types.h | 3 --- sys/powerpc/include/endian.h | 2 -- sys/powerpc/include/float.h | 2 -- sys/powerpc/include/ieee.h | 2 -- sys/powerpc/include/in_cksum.h | 1 - sys/powerpc/include/limits.h | 2 -- sys/powerpc/include/param.h | 2 -- sys/powerpc/include/ptrace.h | 2 -- sys/powerpc/powerpc/genassym.c | 2 -- sys/powerpc/powerpc/intr_machdep.c | 2 -- sys/powerpc/powerpc/mem.c | 1 - sys/powerpc/powerpc/uio_machdep.c | 2 -- sys/powerpc/powerpc/vm_machdep.c | 2 -- sys/riscv/include/_align.h | 2 -- sys/riscv/include/_limits.h | 2 -- sys/riscv/include/_types.h | 3 --- sys/riscv/include/endian.h | 2 -- sys/riscv/include/float.h | 2 -- sys/riscv/include/in_cksum.h | 1 - sys/riscv/include/param.h | 2 -- sys/riscv/include/proc.h | 2 -- sys/riscv/include/signal.h | 2 -- sys/riscv/include/vmparam.h | 2 -- sys/riscv/riscv/pmap.c | 2 -- sys/riscv/riscv/uio_machdep.c | 2 -- sys/rpc/auth.h | 4 ---- sys/rpc/auth_none.c | 4 ---- sys/rpc/auth_unix.c | 4 ---- sys/rpc/authunix_prot.c | 4 ---- sys/rpc/clnt.h | 3 --- sys/rpc/clnt_bck.c | 5 ----- sys/rpc/clnt_dg.c | 1 - sys/rpc/clnt_stat.h | 2 -- sys/rpc/clnt_vc.c | 5 ----- sys/rpc/pmap_prot.h | 3 --- sys/rpc/rpc.h | 3 --- sys/rpc/rpc_callmsg.c | 4 ---- sys/rpc/rpc_com.h | 2 -- sys/rpc/rpc_generic.c | 1 - sys/rpc/rpc_msg.h | 3 --- sys/rpc/rpc_prot.c | 4 ---- sys/rpc/rpcb_clnt.c | 6 ------ sys/rpc/rpcb_clnt.h | 1 - sys/rpc/rpcb_prot.c | 5 ----- sys/rpc/rpcb_prot.h | 2 -- sys/rpc/rpcm_subs.h | 2 -- sys/rpc/svc.c | 4 ---- sys/rpc/svc.h | 3 --- sys/rpc/svc_auth.c | 1 - sys/rpc/svc_auth.h | 3 --- sys/rpc/svc_auth_unix.c | 4 ---- sys/rpc/svc_dg.c | 1 - sys/rpc/svc_generic.c | 1 - sys/rpc/svc_vc.c | 4 ---- sys/rpc/types.h | 3 --- sys/rpc/xdr.h | 3 --- sys/sys/_callout.h | 2 -- sys/sys/_iovec.h | 2 -- sys/sys/_sigset.h | 2 -- sys/sys/_sockaddr_storage.h | 2 -- sys/sys/_termios.h | 2 -- sys/sys/_timespec.h | 2 -- sys/sys/_uio.h | 2 -- sys/sys/_winsize.h | 2 -- sys/sys/acct.h | 2 -- sys/sys/bio.h | 2 -- sys/sys/bitcount.h | 2 -- sys/sys/buf.h | 2 -- sys/sys/callout.h | 2 -- sys/sys/cdefs.h | 2 -- sys/sys/conf.h | 2 -- sys/sys/cons.h | 2 -- sys/sys/dirent.h | 2 -- sys/sys/disk/bsd.h | 2 -- sys/sys/disk/mbr.h | 2 -- sys/sys/disklabel.h | 2 -- sys/sys/diskmbr.h | 2 -- sys/sys/dkstat.h | 2 -- sys/sys/domain.h | 2 -- sys/sys/errno.h | 2 -- sys/sys/exec.h | 2 -- sys/sys/fbio.h | 2 -- sys/sys/fcntl.h | 2 -- sys/sys/file.h | 2 -- sys/sys/filedesc.h | 2 -- sys/sys/filio.h | 2 -- sys/sys/gmon.h | 2 -- sys/sys/imgact_aout.h | 2 -- sys/sys/ioccom.h | 2 -- sys/sys/ioctl.h | 2 -- sys/sys/ioctl_compat.h | 2 -- sys/sys/ipc.h | 2 -- sys/sys/kernel.h | 2 -- sys/sys/ktrace.h | 2 -- sys/sys/libkern.h | 2 -- sys/sys/lockf.h | 2 -- sys/sys/malloc.h | 2 -- sys/sys/mbuf.h | 2 -- sys/sys/mdioctl.h | 2 -- sys/sys/mman.h | 2 -- sys/sys/mount.h | 2 -- sys/sys/msgbuf.h | 2 -- sys/sys/mtio.h | 2 -- sys/sys/namei.h | 2 -- sys/sys/nlist_aout.h | 2 -- sys/sys/param.h | 2 -- sys/sys/proc.h | 2 -- sys/sys/protosw.h | 2 -- sys/sys/ptrace.h | 2 -- sys/sys/queue.h | 2 -- sys/sys/reboot.h | 2 -- sys/sys/resource.h | 2 -- sys/sys/resourcevar.h | 2 -- sys/sys/selinfo.h | 2 -- sys/sys/sigio.h | 2 -- sys/sys/signal.h | 2 -- sys/sys/signalvar.h | 2 -- sys/sys/sockbuf.h | 2 -- sys/sys/socket.h | 2 -- sys/sys/socketvar.h | 2 -- sys/sys/sockio.h | 2 -- sys/sys/sockopt.h | 2 -- sys/sys/stat.h | 2 -- sys/sys/sysctl.h | 2 -- sys/sys/syslimits.h | 2 -- sys/sys/syslog.h | 2 -- sys/sys/systm.h | 2 -- sys/sys/time.h | 2 -- sys/sys/timeb.h | 2 -- sys/sys/times.h | 2 -- sys/sys/timespec.h | 2 -- sys/sys/ttycom.h | 2 -- sys/sys/ttydefaults.h | 2 -- sys/sys/types.h | 2 -- sys/sys/ucred.h | 2 -- sys/sys/uio.h | 2 -- sys/sys/un.h | 2 -- sys/sys/unistd.h | 2 -- sys/sys/unpcb.h | 2 -- sys/sys/user.h | 2 -- sys/sys/utsname.h | 2 -- sys/sys/vmmeter.h | 2 -- sys/sys/vnode.h | 2 -- sys/sys/wait.h | 2 -- sys/tools/makeobjops.awk | 4 ---- sys/tools/vnode_if.awk | 3 --- sys/ufs/ffs/ffs_alloc.c | 2 -- sys/ufs/ffs/ffs_balloc.c | 2 -- sys/ufs/ffs/ffs_extern.h | 2 -- sys/ufs/ffs/ffs_inode.c | 2 -- sys/ufs/ffs/ffs_snapshot.c | 2 -- sys/ufs/ffs/ffs_softdep.c | 2 -- sys/ufs/ffs/ffs_subr.c | 2 -- sys/ufs/ffs/ffs_tables.c | 2 -- sys/ufs/ffs/ffs_vfsops.c | 2 -- sys/ufs/ffs/ffs_vnops.c | 3 --- sys/ufs/ffs/fs.h | 2 -- sys/ufs/ffs/softdep.h | 2 -- sys/ufs/ufs/dinode.h | 2 -- sys/ufs/ufs/dir.h | 2 -- sys/ufs/ufs/inode.h | 2 -- sys/ufs/ufs/quota.h | 2 -- sys/ufs/ufs/ufs_bmap.c | 2 -- sys/ufs/ufs/ufs_extern.h | 2 -- sys/ufs/ufs/ufs_inode.c | 2 -- sys/ufs/ufs/ufs_lookup.c | 2 -- sys/ufs/ufs/ufs_quota.c | 2 -- sys/ufs/ufs/ufs_vfsops.c | 2 -- sys/ufs/ufs/ufs_vnops.c | 2 -- sys/ufs/ufs/ufsmount.h | 2 -- sys/vm/device_pager.c | 2 -- sys/vm/pmap.h | 2 -- sys/vm/swap_pager.c | 3 --- sys/vm/swap_pager.h | 2 -- sys/vm/vm.h | 4 ---- sys/vm/vm_extern.h | 2 -- sys/vm/vm_fault.c | 2 -- sys/vm/vm_glue.c | 2 -- sys/vm/vm_init.c | 2 -- sys/vm/vm_kern.c | 2 -- sys/vm/vm_kern.h | 2 -- sys/vm/vm_map.c | 2 -- sys/vm/vm_map.h | 2 -- sys/vm/vm_meter.c | 2 -- sys/vm/vm_mmap.c | 2 -- sys/vm/vm_object.c | 2 -- sys/vm/vm_object.h | 2 -- sys/vm/vm_page.c | 2 -- sys/vm/vm_page.h | 2 -- sys/vm/vm_pageout.c | 2 -- sys/vm/vm_pageout.h | 2 -- sys/vm/vm_pagequeue.h | 2 -- sys/vm/vm_pager.c | 2 -- sys/vm/vm_pager.h | 2 -- sys/vm/vm_param.h | 2 -- sys/vm/vm_swapout.c | 2 -- sys/vm/vm_swapout_dummy.c | 2 -- sys/vm/vm_unix.c | 2 -- sys/vm/vnode_pager.c | 2 -- sys/vm/vnode_pager.h | 2 -- sys/x86/include/_align.h | 2 -- sys/x86/include/_limits.h | 2 -- sys/x86/include/_types.h | 3 --- sys/x86/include/endian.h | 2 -- sys/x86/include/float.h | 2 -- sys/x86/include/fpu.h | 2 -- sys/x86/include/frame.h | 2 -- sys/x86/include/psl.h | 2 -- sys/x86/include/ptrace.h | 2 -- sys/x86/include/reg.h | 2 -- sys/x86/include/segments.h | 2 -- sys/x86/include/signal.h | 2 -- sys/x86/include/specialreg.h | 2 -- sys/x86/include/trap.h | 2 -- sys/x86/include/x86_ieeefp.h | 2 -- sys/x86/isa/clock.c | 2 -- sys/x86/isa/icu.h | 2 -- sys/x86/isa/isa_dma.c | 2 -- sys/x86/isa/nmi.c | 2 -- sys/x86/x86/autoconf.c | 2 -- sys/x86/x86/cpu_machdep.c | 2 -- sys/x86/x86/delay.c | 2 -- sys/xdr/xdr.c | 4 ---- sys/xdr/xdr_array.c | 4 ---- sys/xdr/xdr_mem.c | 4 ---- sys/xdr/xdr_reference.c | 4 ---- 628 files changed, 1332 deletions(-) diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile index 878d21c51edb..759b12977d1a 100644 --- a/sys/amd64/Makefile +++ b/sys/amd64/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/11/93 # Makefile for amd64 links, tags file diff --git a/sys/amd64/amd64/exec_machdep.c b/sys/amd64/amd64/exec_machdep.c index cf635d822300..8361f9fcfcab 100644 --- a/sys/amd64/amd64/exec_machdep.c +++ b/sys/amd64/amd64/exec_machdep.c @@ -36,8 +36,6 @@ * 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. - * - * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ #include diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 3432e62bf7f8..4fd7f0933154 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -28,8 +28,6 @@ * 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. - * - * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 */ #include diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 214ad494639c..ca266d181c7a 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -30,8 +30,6 @@ * 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. - * - * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 */ #include diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f235d72519ae..e237363f304b 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -36,8 +36,6 @@ * 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. - * - * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ #include diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index 378cf2f011f6..e5285586b928 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -35,7 +35,6 @@ * SUCH DAMAGE. * * from: Utah $Hdr: mem.c 1.13 89/10/08$ - * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 */ #include diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 3b009385aaab..ebc065e0d040 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -43,8 +43,6 @@ * 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. - * - * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 6f8d6feaf60b..dd4eef610147 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -28,8 +28,6 @@ * 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. - * - * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 */ #include diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 8114105655f8..8616f3d27e9d 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,8 +35,6 @@ * 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. - * - * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 */ #include diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c index 67e14d8e0d12..2640d4f9bbaf 100644 --- a/sys/amd64/amd64/uio_machdep.c +++ b/sys/amd64/amd64/uio_machdep.c @@ -33,8 +33,6 @@ * 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. - * - * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 */ #include diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 27bf3f67ca25..6173aabd97f5 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -37,8 +37,6 @@ * 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. - * - * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ */ diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h index 29bac1212228..6a2e326d42aa 100644 --- a/sys/amd64/include/asm.h +++ b/sys/amd64/include/asm.h @@ -30,8 +30,6 @@ * 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. - * - * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 */ #ifdef __i386__ diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h index 530ba746e0b2..99b8806ba0ba 100644 --- a/sys/amd64/include/cpu.h +++ b/sys/amd64/include/cpu.h @@ -30,8 +30,6 @@ * 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. - * - * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 */ #ifndef _MACHINE_CPU_H_ diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h index f3a8caa5b88d..f48188fcefd3 100644 --- a/sys/amd64/include/exec.h +++ b/sys/amd64/include/exec.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)exec.h 8.1 (Berkeley) 6/11/93 */ #ifndef _MACHINE_EXEC_H_ diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h index 392fb1957fa1..f077ff1037a8 100644 --- a/sys/amd64/include/floatingpoint.h +++ b/sys/amd64/include/floatingpoint.h @@ -31,8 +31,6 @@ * 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. - * - * from: @(#) floatingpoint.h 1.0 (Berkeley) 9/23/93 */ #ifndef _FLOATINGPOINT_H_ diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h index cb46325d70bc..cb09f5d05e85 100644 --- a/sys/amd64/include/fpu.h +++ b/sys/amd64/include/fpu.h @@ -30,8 +30,6 @@ * 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. - * - * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 */ /* diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h index 4de2dd8db614..f9ec5bf83fd0 100644 --- a/sys/amd64/include/ieeefp.h +++ b/sys/amd64/include/ieeefp.h @@ -32,8 +32,6 @@ * 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. - * - * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 */ #ifndef _MACHINE_IEEEFP_H_ diff --git a/sys/amd64/include/in_cksum.h b/sys/amd64/include/in_cksum.h index 356c7c564f3a..7b649011f7d9 100644 --- a/sys/amd64/include/in_cksum.h +++ b/sys/amd64/include/in_cksum.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * from tahoe: in_cksum.c 1.2 86/01/05 - * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp */ diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h index c6da8ec92fdb..72dc3a64c23d 100644 --- a/sys/amd64/include/limits.h +++ b/sys/amd64/include/limits.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)limits.h 8.3 (Berkeley) 1/4/94 */ #ifndef _MACHINE_LIMITS_H_ diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index 2478ef8d037c..660f69593709 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -36,8 +36,6 @@ * 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. - * - * @(#)param.h 8.1 (Berkeley) 6/10/93 */ #ifndef _AMD64_INCLUDE_PARAM_H_ diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index f98e5f68dd96..3b28e97db40c 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -31,8 +31,6 @@ * 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. - * - * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 */ #ifndef _AMD64_PCB_H_ diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 09bfc7aa5685..17df8d0b8fde 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -38,9 +38,6 @@ * map the page tables using the pagetables themselves. This is done to * reduce the impact on kernel virtual memory for lots of sparse address * space, and to reduce the cost of memory to each process. - * - * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 - * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 */ #ifdef __i386__ diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h index e9ed7f5182bc..ff547981d599 100644 --- a/sys/amd64/include/proc.h +++ b/sys/amd64/include/proc.h @@ -27,8 +27,6 @@ * 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. - * - * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 */ #ifdef __i386__ diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h index 80130911e5d7..ec8e90c106e9 100644 --- a/sys/amd64/include/profile.h +++ b/sys/amd64/include/profile.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)profile.h 8.1 (Berkeley) 6/11/93 */ #ifdef __i386__ diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h index 777cafe1d6b8..851019096f72 100644 --- a/sys/amd64/include/reloc.h +++ b/sys/amd64/include/reloc.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)reloc.h 8.1 (Berkeley) 6/10/93 */ #ifndef _I386_MACHINE_RELOC_H_ diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h index 6cb8b385c22f..7706e4cdb032 100644 --- a/sys/amd64/include/segments.h +++ b/sys/amd64/include/segments.h @@ -31,8 +31,6 @@ * 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. - * - * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 */ #ifdef __i386__ diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h index 585a49704397..8ce6bbc0ada7 100644 --- a/sys/amd64/include/tss.h +++ b/sys/amd64/include/tss.h @@ -30,8 +30,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY *** 7900 LINES SKIPPED *** From nobody Mon Nov 27 05:24:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD32YxQz51hM0; Mon, 27 Nov 2023 05:24: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 4SdvD31mMTz4X4q; Mon, 27 Nov 2023 05:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YVbl7CLibg4R7GpT/cTkOpwo0DabA43srSDdC5oWLrA=; b=jOibuLwATK+OO6mPspe0lUnrr6al4tE5t3iVeuuiAx6yTgdw2qj3uc5pAmFMEXZLuYq39q xNCfvsMsb9t69sEVC12HuPNfzMNIz3cTfG/YP7MzRptANKPD1Gk1mLnrMrLaXLgzw2YKyL PmzZKsXHXn6XwdGTBe3yiAVADPr0VFilrsy9qs6rRWPS3oXhMxWmnwqK8J6g/mUPjM/WZ6 2+CEi2cYbUCxgNDX9vv63EqGMaH56ByajFr+5hi5SeDvLz/6BVyC6l/aq9rZCUm5OZVh9C zhQFGcPzMA2crknv26jMYwbF2OAw+n5DoQfci2o/leWeSsJvIZsFv1MVhjAZsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YVbl7CLibg4R7GpT/cTkOpwo0DabA43srSDdC5oWLrA=; b=mI039fOh0Kfe1pW5vljnwISouCQeLXrrP+bpbiEjrQFzUBllVdfiSLvZu8Nyv5zUa5Xlf1 QVDecuttAIRiEFlFVhDdO+uYT/DFMFEhr9DZYzQFjKRizuMBEnC/abp3cUNlmBXbdqngQS s3T8TZEN5jR0h3xgaFsF612vk9JYEN1m8T0c54W9W1hG3rBDLmXNE73JZz/T7j2TemjbAR fR5FmKHQ/uMyNiATe2YCHBWZ6rM4TxdkyOTpsbZ8SuTfKKmKJF6NRePC5WP7ZSxqJ7OcFq yiZ/bloJeKfAbxCJ9uBvM60YQ2JKpHEvh18CVm/pR/gvKhVbdhSJn5UE6S5E9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062691; a=rsa-sha256; cv=none; b=kGzFTOlXrZiZ08LbiWqOZEWHyPz+rhopk9vmd3harWIifDymNLujB0JqlPPm6lyuZ048GP /h+lHzOdx5cOdDh09pagcP8RqhOyF8rz6b5xoYlZTdruL04WhOoKpEEXYR7/W9gri8pJdK E5s7LJ8Twwg9o+yCjKXcfZzlGs62Ldm1G8RZF4c6fYC14gpFhm410//vbdwMlrF+9wX4Y5 QSk8MIIZMctOy548ENRM8iY82hY1tUQrxBoI1tMfLUwUVuYpm4xLh/G2+9WNbxm8KPETPh U+FYdxdMyapLExjQWc7bYFNfvaUvuiN3De6VUOlnCL3LwzkPNjMDdaEEjTjumg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD302Dhz9nM; Mon, 27 Nov 2023 05: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 3AR5OoTf066111; Mon, 27 Nov 2023 05:24:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Ooon066108; Mon, 27 Nov 2023 05:24:50 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:50 GMT Message-Id: <202311270524.3AR5Ooon066108@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: ac00d4d59b18 - main - tests: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: ac00d4d59b18a76c6148ca5d7439bb446d38da5c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac00d4d59b18a76c6148ca5d7439bb446d38da5c commit ac00d4d59b18a76c6148ca5d7439bb446d38da5c Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:30 +0000 tests: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- tests/sys/cddl/zfs/bin/chg_usr_exec.c | 1 - tests/sys/cddl/zfs/bin/devname2devid.c | 1 - tests/sys/cddl/zfs/bin/dir_rd_update.c | 1 - tests/sys/cddl/zfs/bin/file_check.c | 1 - tests/sys/cddl/zfs/bin/file_common.h | 1 - tests/sys/cddl/zfs/bin/file_trunc.c | 1 - tests/sys/cddl/zfs/bin/file_write.c | 1 - tests/sys/cddl/zfs/bin/largest_file.c | 1 - tests/sys/cddl/zfs/bin/mkfile.c | 3 --- tests/sys/cddl/zfs/bin/mktree.c | 1 - tests/sys/cddl/zfs/bin/mmapwrite.c | 1 - tests/sys/cddl/zfs/bin/randfree_file.c | 1 - tests/sys/cddl/zfs/bin/readmmap.c | 1 - tests/sys/cddl/zfs/bin/rename_dir.c | 1 - tests/sys/cddl/zfs/bin/rm_lnkcnt_zero_file.c | 1 - tests/sys/cddl/zfs/bin/zfs.ksh | 3 --- tests/sys/cddl/zfs/bin/zfs_crypto.ksh | 3 --- tests/sys/cddl/zfs/bin/zfs_version.ksh | 3 --- tests/sys/cddl/zfs/bin/zpool.ksh | 3 --- tests/sys/cddl/zfs/bin/zpool_smi.ksh | 3 --- tests/sys/cddl/zfs/bin/zpool_version.ksh | 3 --- tests/sys/cddl/zfs/include/commands.txt | 3 --- tests/sys/cddl/zfs/include/default.cfg.in | 3 --- tests/sys/cddl/zfs/include/libremote.kshlib | 3 --- tests/sys/cddl/zfs/include/libtest.kshlib | 3 --- tests/sys/cddl/zfs/include/logapi.kshlib | 3 --- tests/sys/cddl/zfs/include/stf.shlib | 3 --- tests/sys/cddl/zfs/tests/acl/acl.cfg | 3 --- tests/sys/cddl/zfs/tests/acl/acl_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/acl/cifs/cifs.kshlib | 3 --- tests/sys/cddl/zfs/tests/acl/cifs/cifs_attr_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/cifs/cifs_attr_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/cifs/cifs_attr_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_002_pos.ksh | 3 --- .../cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh | 3 --- .../cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_compact_001_pos.ksh | 3 --- .../cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_delete_001_pos.ksh | 3 --- .../cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_inherit_001_pos.ksh | 3 --- .../cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_inherit_002_pos.ksh | 3 --- .../cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_inherit_003_pos.ksh | 3 --- .../cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_inherit_004_pos.ksh | 3 --- .../sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_owner_001_pos.ksh | 3 --- .../sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_rwacl_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_rwx_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_rwx_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_rwx_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_rwx_004_pos.ksh | 3 --- .../sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_xattr_001_pos.ksh | 3 --- .../sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_chmod_xattr_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_cp_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_cp_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_cpio_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_cpio_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_find_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_ls_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_mv_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_tar_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/nontrivial/zfs_acl_tar_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_chmod_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_compress_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_cp_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_cp_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_cp_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_find_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_find_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_ls_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_ls_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_mv_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_pack_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_pax_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_pax_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_pax_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_pax_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_pax_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_pax_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_tar_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/acl/trivial/zfs_acl_tar_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/atime/atime.cfg | 3 --- tests/sys/cddl/zfs/tests/atime/atime_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/atime/atime_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/atime/atime_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/atime/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/atime/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs.cfg | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/bootfs/bootfs_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache.cfg | 3 --- tests/sys/cddl/zfs/tests/cache/cache.kshlib | 3 --- tests/sys/cddl/zfs/tests/cache/cache_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cache/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cachefile/cachefile.cfg | 3 --- tests/sys/cddl/zfs/tests/cachefile/cachefile.kshlib | 3 --- tests/sys/cddl/zfs/tests/cachefile/cachefile_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cachefile/cachefile_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cachefile/cachefile_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cachefile/cachefile_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/clean_mirror/clean_mirror_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/clean_mirror/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/clean_mirror/default.cfg | 3 --- tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/cli.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/cli_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zdb/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zdb/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zdb/zdb.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_malformed.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/properties.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_010_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_011_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_012_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_013_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_006_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_006_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_009_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_010_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_list_d.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_010_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_011_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_006_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_008_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_property/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_property/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property.cfg | 3 --- .../cddl/zfs/tests/cli_root/zfs_property/zfs_set_property_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_010_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_011_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_012_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_013_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation.cfg | 3 --- .../zfs/tests/cli_root/zfs_reservation/zfs_reservation_001_pos.ksh | 3 --- .../zfs/tests/cli_root/zfs_reservation/zfs_reservation_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_001_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_002_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_004_neg.ksh | 3 --- .../cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_send/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_send/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/cache_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/cache_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/canmount_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/canmount_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/canmount_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/canmount_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/checksum_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/compression_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/mountpoint_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/mountpoint_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/mountpoint_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/onoffs_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/property_alias_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/readonly_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/reservation_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/ro_props_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/share_mount_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/snapdir_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/user_property_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/user_property_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/user_property_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/user_property_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/version_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_009_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_010_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_001_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_003_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_004_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_005_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_006_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh | 3 --- .../cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/cleanup.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/setup.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_002_pos.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_003_pos.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_004_pos.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_006_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool/zpool.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_attach/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_clear/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_005_pos.ksh | 2 -- tests/sys/cddl/zfs/tests/cli_root/zpool_create/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_create/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create.kshlib | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_001_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_002_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_003_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_004_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_005_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_006_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_007_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_008_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_009_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_010_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_011_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_012_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_015_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_017_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_018_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_019_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_020_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_021_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_022_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_023_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy.cfg | 3 --- .../cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh | 3 --- .../cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_002_pos.ksh | 3 --- .../cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_detach/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_expand/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_expand/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_001_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_002_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_export/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_001_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_002_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_003_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_get/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_history/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh | 3 --- .../cddl/zfs/tests/cli_root/zpool_history/zpool_history_001_neg.ksh | 3 --- .../cddl/zfs/tests/cli_root/zpool_history/zpool_history_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_import/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_002_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_003_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_004_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_005_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_006_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_007_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_008_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_009_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_010_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_011_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_012_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_013_neg.ksh | 3 --- .../cddl/zfs/tests/cli_root/zpool_import/zpool_import_all_001_pos.ksh | 3 --- .../zfs/tests/cli_root/zpool_import/zpool_import_missing_001_pos.ksh | 3 --- .../zfs/tests/cli_root/zpool_import/zpool_import_missing_002_pos.ksh | 3 --- .../zfs/tests/cli_root/zpool_import/zpool_import_missing_003_pos.ksh | 3 --- .../zfs/tests/cli_root/zpool_import/zpool_import_rename_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_offline/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline.cfg | 3 --- .../cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_001_pos.ksh | 3 --- .../cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_online/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_001_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_remove/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_remove/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_001_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_002_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_replace/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace.cfg | 3 --- .../cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_status/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_status/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status.cfg | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_001_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/README | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/cleanup.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/setup.ksh | 4 ---- tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade.kshlib | 3 --- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_001_pos.ksh | 4 ---- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_002_pos.ksh | 4 ---- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_003_pos.ksh | 4 ---- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh | 4 ---- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_005_neg.ksh | 4 ---- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_006_neg.ksh | 3 --- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh | 4 ---- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_008_pos.ksh | 3 --- .../cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/cli.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zdb_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_allow_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_clone_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_create_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_destroy_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_get_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_inherit_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_mount_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_promote_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_receive_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_rename_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_rollback_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_send_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_set_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_share_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_snapshot_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_unallow_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_unmount_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_unshare_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zfs_upgrade_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_attach_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_clear_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_create_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_destroy_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_detach_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_export_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_get_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_history_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_import_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_import_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_offline_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_online_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_remove_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_replace_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_scrub_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_set_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_status_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/misc/zpool_upgrade_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list.kshlib | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat.cfg | 3 --- .../sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_001_neg.ksh | 3 --- .../sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_002_pos.ksh | 3 --- .../sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zpool_list/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zpool_list/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list.cfg | 3 --- tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/compression/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/compression/compress.cfg | 3 --- tests/sys/cddl/zfs/tests/compression/compress_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/compression/compress_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/compression/compress_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/compression/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/ctime/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/ctime/ctime.cfg | 3 --- tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c | 1 - tests/sys/cddl/zfs/tests/ctime/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/delegate.cfg | 3 --- tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/delegate/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_010_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_011_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_allow_012_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_unallow_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_unallow_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_unallow_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_unallow_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_unallow_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_unallow_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_unallow_007_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/delegate/zfs_unallow_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/devices/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/devices/devices.cfg | 3 --- tests/sys/cddl/zfs/tests/devices/devices_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/devices/devices_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/devices/devices_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/devices/devices_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/devices/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/exec/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/exec/exec_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/exec/exec_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/exec/mmap_exec.c | 1 - tests/sys/cddl/zfs/tests/exec/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/grow_pool/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/grow_pool/grow_pool.cfg | 3 --- tests/sys/cddl/zfs/tests/grow_pool/grow_pool_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/grow_pool/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/grow_replicas/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas.cfg | 3 --- tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/history/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history.cfg | 3 --- tests/sys/cddl/zfs/tests/history/history_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_006_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_009_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_010_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/history/history_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/history/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/hotplug/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/hotplug/hotplug.cfg | 3 --- tests/sys/cddl/zfs/tests/hotplug/hotplug.kshlib | 3 --- tests/sys/cddl/zfs/tests/hotplug/hotplug_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotplug/hotplug_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotplug/hotplug_011_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotplug/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare.cfg | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_add_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_add_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_clone_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_clone_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_detach_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_detach_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_detach_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_detach_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_detach_005_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_export_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_onoffline_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_001_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_scrub_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_snapshot_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/hotspare_snapshot_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/hotspare/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/inheritance/README.config | 3 --- tests/sys/cddl/zfs/tests/inheritance/README.state | 4 ---- tests/sys/cddl/zfs/tests/inheritance/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/inheritance/config001.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config002.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config003.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config004.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config005.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config006.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config007.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config008.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config009.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config010.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config011.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config012.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config013.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config014.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config015.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config016.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config017.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config018.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config019.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config020.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config021.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config022.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config023.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/config024.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/inherit.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/inherit.kshlib | 3 --- tests/sys/cddl/zfs/tests/inheritance/inherit_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/inheritance/state001.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state002.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state003.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state004.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state005.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state006.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state007.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state008.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state009.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state010.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state011.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state012.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state013.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state014.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state015.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state016.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state017.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state018.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state019.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state020.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state021.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state022.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state023.cfg | 3 --- tests/sys/cddl/zfs/tests/inheritance/state024.cfg | 3 --- tests/sys/cddl/zfs/tests/interop/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/interop/interop.cfg | 3 --- tests/sys/cddl/zfs/tests/interop/interop_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/interop/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/inuse/inuse.cfg | 3 --- tests/sys/cddl/zfs/tests/inuse/inuse_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/inuse/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/iscsi/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/iscsi/iscsi.cfg | 3 --- tests/sys/cddl/zfs/tests/iscsi/iscsi_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/iscsi/iscsi_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/iscsi/iscsi_003_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/iscsi/iscsi_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/iscsi/iscsi_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/iscsi/iscsi_006_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/iscsi/iscsi_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/iscsi/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/large_files/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/large_files/large_files.cfg | 3 --- tests/sys/cddl/zfs/tests/large_files/large_files_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/large_files/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/largest_pool/largest_pool.cfg | 3 --- tests/sys/cddl/zfs/tests/largest_pool/largest_pool_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/link_count/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/link_count/link_count.cfg | 3 --- tests/sys/cddl/zfs/tests/link_count/link_count_001.ksh | 3 --- tests/sys/cddl/zfs/tests/link_count/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration.cfg | 3 --- tests/sys/cddl/zfs/tests/migration/migration.kshlib | 3 --- tests/sys/cddl/zfs/tests/migration/migration_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_009_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_010_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_011_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/migration_012_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/migration/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/mmap/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/mmap/mmap.cfg | 3 --- tests/sys/cddl/zfs/tests/mmap/mmap_read_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/mmap/mmap_write_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/mmap/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/mount/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/mount/mounttest.ksh | 3 --- tests/sys/cddl/zfs/tests/mount/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/mount/vars.cfg | 3 --- tests/sys/cddl/zfs/tests/mv_files/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/mv_files/mv_files.cfg | 3 --- tests/sys/cddl/zfs/tests/mv_files/mv_files_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/mv_files/mv_files_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/mv_files/mv_files_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/mv_files/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/nestedfs/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/nestedfs/nestedfs.cfg | 3 --- tests/sys/cddl/zfs/tests/nestedfs/nestedfs_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/nestedfs/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/no_space/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/no_space/enospc.cfg | 3 --- tests/sys/cddl/zfs/tests/no_space/enospc_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/no_space/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/online_offline/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/pool_names/pool_names.cfg | 3 --- tests/sys/cddl/zfs/tests/pool_names/pool_names_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/poolversion/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/poolversion/poolversion_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/poolversion/poolversion_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/poolversion/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/quota/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/quota/quota.cfg | 3 --- tests/sys/cddl/zfs/tests/quota/quota.kshlib | 3 --- tests/sys/cddl/zfs/tests/quota/quota_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/quota/quota_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/quota/quota_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/quota/quota_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/quota/quota_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/quota/quota_006_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/quota/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/redundancy/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/redundancy/redundancy.cfg | 3 --- tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib | 3 --- tests/sys/cddl/zfs/tests/redundancy/redundancy_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/redundancy/redundancy_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/redundancy/redundancy_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/redundancy/redundancy_004_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/redundancy/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/refquota/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/refquota/refquota.cfg | 3 --- tests/sys/cddl/zfs/tests/refquota/refquota_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refquota/refquota_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refquota/refquota_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refquota/refquota_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refquota/refquota_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refquota/refquota_006_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/refquota/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/refreserv/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/refreserv/refreserv.cfg | 3 --- tests/sys/cddl/zfs/tests/refreserv/refreserv_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refreserv/refreserv_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refreserv/refreserv_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refreserv/refreserv_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refreserv/refreserv_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/refreserv/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/rename_dirs/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/rename_dirs/rename_dirs.cfg | 3 --- tests/sys/cddl/zfs/tests/rename_dirs/rename_dirs_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rename_dirs/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/replacement/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation.cfg | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation.kshlib | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_009_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_010_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_011_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_012_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_013_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_014_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_015_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_016_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/reservation_018_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/reservation/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/rootpool/cleanup.ksh | 4 ---- tests/sys/cddl/zfs/tests/rootpool/rootpool_001_pos.ksh | 4 ---- tests/sys/cddl/zfs/tests/rootpool/rootpool_002_neg.ksh | 4 ---- tests/sys/cddl/zfs/tests/rootpool/rootpool_007_neg.ksh | 4 ---- tests/sys/cddl/zfs/tests/rootpool/setup.ksh | 4 ---- tests/sys/cddl/zfs/tests/rsend/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend.cfg | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend.kshlib | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_009_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_010_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_011_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_012_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/rsend_013_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/rsend/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/scrub_mirror/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/scrub_mirror/default.cfg | 3 --- tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_common.kshlib | 3 --- tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog.cfg | 3 --- tests/sys/cddl/zfs/tests/slog/slog.kshlib | 3 --- tests/sys/cddl/zfs/tests/slog/slog_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_008_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_009_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_010_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_011_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_012_neg.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/slog/slog_014_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/cleanup.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/rollback_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/rollback_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/rollback_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/setup.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot.cfg | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_001_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_002_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_003_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_004_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_005_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_006_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_007_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_008_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_009_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_010_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_011_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_012_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_013_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_014_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_015_pos.ksh | 3 --- tests/sys/cddl/zfs/tests/snapshot/snapshot_016_pos.ksh | 3 --- *** 15717 LINES SKIPPED *** From nobody Mon Nov 27 05:24:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD43SqKz51h60; Mon, 27 Nov 2023 05: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 4SdvD42jB2z4Wrl; Mon, 27 Nov 2023 05: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=1701062692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R0dvdiHZu4K40hdfgF+DYmN1Wu2bZq5XJhYVfqUIjyg=; b=DbvylSSwyJM23+A4241XxZ01FtA+nG4GYri4cMbKXcs6i0RPZll3Hys4Rg9MwFm+qI4efr WA3KkIO4UmMmve5LQcdtGD0XHQ+jycyeXJulyj7vtJkK1s0w8uWN7QkX5rlJ+TwTo/GMxr lPXK3Vsb/j2I+AJZqyGnlKgjO9m6jyNp03Lgtnmp3FOq0cZ2cVJzvURKXvYZ3Oc5IzaKJ2 Mi9Lw15W/6Q9wSCOgu4mdAbcwK6SVHh96hLOVzDBJ9vE2E/8EplMQsnLqQIttuZ3thCpSN 62o6nWXec+s56cQoMytt3A/iwwgAwdNUuVmnLvrEjc6ONFOzjsnrSu0c+Kv57g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R0dvdiHZu4K40hdfgF+DYmN1Wu2bZq5XJhYVfqUIjyg=; b=pus079T/fh0Y6dvDZ3dbIYk1PvMQzseU1wxYVUEBPoeEJt+3ZfZzYP3SW0skBI9bdcSGFG Z77QhAjrXlR0OhMIhVir9uaVCr4Tmd73sSzdbfa/CAHVJsrnmbBjuCxBFqpv6qdSJJeMB6 KKN41LPd6Auv+sQ7bh9m0XEI3/+4vPoc0ROIwgFkVgQMxA21hWWVdgqjbhXFusxTAnpag5 XgaDYko2UJgiaAAB4Ss2cqhs6GL/4amCwkej5Xg1Q4TtAragPSxfrDF1fZKSklE4TTlkfh SMzIm2SktlZuWwm1NPxHfHqa/qc78wqd2mERj4E6q+6U8yFYrQ9pqpKo6hGO7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062692; a=rsa-sha256; cv=none; b=LrQbEPXBDUmnPca9DNVQDz0aGBcVlMuxCMuckx0xpQK9rNEyITSfWRWsEpEQMUGl9uSJs5 fmaioI98w2XTd/E0rLAa1UOT2Y4V991yiPlg/VaothGmCuwk05azeBTtF9ULNhuH5e9PZz gLyQFXwumNJnpSH2VGl189rVvEVMkZJOG7ZtV2baysq++4B5gT4+qOQSvDTsStzzwkwcAG rWRTQFjEnAZpCe1y2swvBlROT/tgDzFaZHXavDmiPiR4t41PzjqPRqMOIDL9ceCPQhZh8W fLwkorOBCeJ9+FW2VEQSKdjRGeCvJpBctbsgSdCWt/3GghmOnQ/CUu3hdo7T/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 4SdvD41pXbzB9v; Mon, 27 Nov 2023 05:24: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 3AR5OqVf066153; Mon, 27 Nov 2023 05:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Oq6U066150; Mon, 27 Nov 2023 05:24:52 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:52 GMT Message-Id: <202311270524.3AR5Oq6U066150@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: bdcbfde31e8e - main - usr.bin: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: bdcbfde31e8e9b343f113a1956384bdf30d1ed62 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bdcbfde31e8e9b343f113a1956384bdf30d1ed62 commit bdcbfde31e8e9b343f113a1956384bdf30d1ed62 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:30 +0000 usr.bin: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- usr.bin/Makefile | 1 - usr.bin/Makefile.inc | 1 - usr.bin/apply/Makefile | 1 - usr.bin/apply/apply.1 | 2 -- usr.bin/apply/apply.c | 3 --- usr.bin/banner/Makefile | 1 - usr.bin/banner/banner.6 | 2 -- usr.bin/banner/banner.c | 3 --- usr.bin/basename/Makefile | 1 - usr.bin/basename/basename.1 | 2 -- usr.bin/basename/basename.c | 3 --- usr.bin/bc/bc.1 | 2 -- usr.bin/bc/bc.library | 1 - usr.bin/biff/Makefile | 1 - usr.bin/biff/biff.1 | 2 -- usr.bin/biff/biff.c | 3 --- usr.bin/bintrans/Makefile | 1 - usr.bin/bintrans/bintrans.1 | 2 -- usr.bin/bintrans/uudecode.c | 3 --- usr.bin/bintrans/uuencode.c | 3 --- usr.bin/bintrans/uuencode.format.5 | 2 -- usr.bin/caesar/Makefile | 1 - usr.bin/caesar/caesar.6 | 2 -- usr.bin/caesar/caesar.c | 3 --- usr.bin/caesar/rot13.sh | 2 -- usr.bin/calendar/Makefile | 1 - usr.bin/calendar/calendar.1 | 2 -- usr.bin/calendar/calendar.c | 3 --- usr.bin/calendar/io.c | 3 --- usr.bin/calendar/pathnames.h | 2 -- usr.bin/calendar/pom.c | 3 --- usr.bin/cap_mkdb/Makefile | 1 - usr.bin/cap_mkdb/cap_mkdb.1 | 2 -- usr.bin/cap_mkdb/cap_mkdb.c | 3 --- usr.bin/chkey/chkey.1 | 1 - usr.bin/chkey/chkey.c | 3 --- usr.bin/chpass/Makefile | 1 - usr.bin/chpass/chpass.1 | 2 -- usr.bin/chpass/chpass.c | 3 --- usr.bin/chpass/chpass.h | 2 -- usr.bin/chpass/edit.c | 3 --- usr.bin/chpass/field.c | 3 --- usr.bin/chpass/table.c | 3 --- usr.bin/chpass/util.c | 3 --- usr.bin/cksum/Makefile | 1 - usr.bin/cksum/cksum.1 | 2 -- usr.bin/cksum/cksum.c | 3 --- usr.bin/cksum/crc.c | 3 --- usr.bin/cksum/extern.h | 2 -- usr.bin/cksum/print.c | 3 --- usr.bin/cksum/sum1.c | 3 --- usr.bin/cksum/sum2.c | 3 --- usr.bin/cmp/Makefile | 1 - usr.bin/cmp/cmp.1 | 2 -- usr.bin/cmp/cmp.c | 3 --- usr.bin/cmp/extern.h | 2 -- usr.bin/cmp/misc.c | 3 --- usr.bin/cmp/regular.c | 3 --- usr.bin/cmp/special.c | 3 --- usr.bin/col/Makefile | 1 - usr.bin/col/README | 2 -- usr.bin/col/col.1 | 2 -- usr.bin/col/col.c | 3 --- usr.bin/colrm/Makefile | 1 - usr.bin/colrm/colrm.1 | 2 -- usr.bin/colrm/colrm.c | 3 --- usr.bin/column/Makefile | 1 - usr.bin/column/column.1 | 2 -- usr.bin/column/column.c | 3 --- usr.bin/comm/Makefile | 1 - usr.bin/comm/comm.1 | 2 -- usr.bin/comm/comm.c | 3 --- usr.bin/compress/Makefile | 1 - usr.bin/compress/compress.1 | 2 -- usr.bin/compress/compress.c | 3 --- usr.bin/compress/zopen.3 | 2 -- usr.bin/compress/zopen.c | 3 --- usr.bin/ctags/C.c | 3 --- usr.bin/ctags/Makefile | 1 - usr.bin/ctags/ctags.1 | 2 -- usr.bin/ctags/ctags.c | 3 --- usr.bin/ctags/ctags.h | 2 -- usr.bin/ctags/fortran.c | 3 --- usr.bin/ctags/lisp.c | 3 --- usr.bin/ctags/print.c | 3 --- usr.bin/ctags/tree.c | 3 --- usr.bin/ctags/yacc.c | 3 --- usr.bin/cut/Makefile | 1 - usr.bin/cut/cut.1 | 2 -- usr.bin/dc/dc.1 | 2 -- usr.bin/diff/diff.1 | 2 -- usr.bin/diff/diff.h | 2 -- usr.bin/diff/diffreg.c | 2 -- usr.bin/diff3/diff3.1 | 2 -- usr.bin/diff3/diff3.c | 5 ----- usr.bin/dirname/Makefile | 1 - usr.bin/dirname/dirname.c | 3 --- usr.bin/du/Makefile | 1 - usr.bin/du/du.1 | 2 -- usr.bin/du/du.c | 3 --- usr.bin/env/Makefile | 1 - usr.bin/env/env.1 | 2 -- usr.bin/env/env.c | 3 --- usr.bin/expand/Makefile | 1 - usr.bin/expand/expand.1 | 2 -- usr.bin/expand/expand.c | 3 --- usr.bin/factor/Makefile | 1 - usr.bin/factor/factor.6 | 2 -- usr.bin/false/Makefile | 1 - usr.bin/false/false.1 | 2 -- usr.bin/false/false.c | 3 --- usr.bin/find/Makefile | 1 - usr.bin/find/extern.h | 2 -- usr.bin/find/find.1 | 2 -- usr.bin/find/find.c | 3 --- usr.bin/find/find.h | 2 -- usr.bin/find/function.c | 3 --- usr.bin/find/ls.c | 3 --- usr.bin/find/main.c | 3 --- usr.bin/find/misc.c | 3 --- usr.bin/find/operator.c | 3 --- usr.bin/finger/Makefile | 1 - usr.bin/finger/extern.h | 2 -- usr.bin/finger/finger.1 | 2 -- usr.bin/finger/finger.c | 3 --- usr.bin/finger/finger.h | 2 -- usr.bin/finger/lprint.c | 3 --- usr.bin/finger/net.c | 3 --- usr.bin/finger/sprint.c | 3 --- usr.bin/finger/util.c | 3 --- usr.bin/fmt/Makefile | 1 - usr.bin/fmt/fmt.1 | 2 -- usr.bin/fold/Makefile | 1 - usr.bin/fold/fold.1 | 2 -- usr.bin/fold/fold.c | 3 --- usr.bin/fortune/Makefile | 2 -- usr.bin/fortune/Notes | 1 - usr.bin/fortune/README | 1 - usr.bin/fortune/datfiles/Makefile | 1 - usr.bin/fortune/fortune/Makefile | 1 - usr.bin/fortune/fortune/fortune.6 | 2 -- usr.bin/fortune/fortune/fortune.c | 3 --- usr.bin/fortune/fortune/pathnames.h | 2 -- usr.bin/fortune/strfile/Makefile | 1 - usr.bin/fortune/strfile/strfile.8 | 2 -- usr.bin/fortune/strfile/strfile.c | 3 --- usr.bin/fortune/strfile/strfile.h | 2 -- usr.bin/fortune/tools/Do_spell | 3 --- usr.bin/fortune/tools/Do_troff | 3 --- usr.bin/fortune/tools/do_sort | 3 --- usr.bin/fortune/unstr/Makefile | 1 - usr.bin/fortune/unstr/unstr.c | 3 --- usr.bin/from/Makefile | 1 - usr.bin/from/from.1 | 2 -- usr.bin/from/from.c | 3 --- usr.bin/fstat/Makefile | 1 - usr.bin/fstat/fstat.1 | 2 -- usr.bin/ftp/Makefile | 1 - usr.bin/gcore/Makefile | 1 - usr.bin/gcore/extern.h | 2 -- usr.bin/gcore/gcore.1 | 2 -- usr.bin/gcore/gcore.c | 3 --- usr.bin/gprof/Makefile | 1 - usr.bin/gprof/arcs.c | 3 --- usr.bin/gprof/dfn.c | 3 --- usr.bin/gprof/elf.c | 3 --- usr.bin/gprof/gprof.1 | 2 -- usr.bin/gprof/gprof.c | 3 --- usr.bin/gprof/gprof.h | 2 -- usr.bin/gprof/hertz.c | 3 --- usr.bin/gprof/lookup.c | 3 --- usr.bin/gprof/pathnames.h | 2 -- usr.bin/gprof/printgprof.c | 3 --- usr.bin/gprof/printlist.c | 3 --- usr.bin/grep/grep.1 | 2 -- usr.bin/head/Makefile | 1 - usr.bin/head/head.1 | 2 -- usr.bin/head/head.c | 3 --- usr.bin/hexdump/Makefile | 1 - usr.bin/hexdump/conv.c | 3 --- usr.bin/hexdump/display.c | 3 --- usr.bin/hexdump/hexdump.1 | 2 -- usr.bin/hexdump/hexdump.c | 3 --- usr.bin/hexdump/hexdump.h | 2 -- usr.bin/hexdump/hexsyntax.c | 3 --- usr.bin/hexdump/od.1 | 2 -- usr.bin/hexdump/odsyntax.c | 3 --- usr.bin/hexdump/parse.c | 3 --- usr.bin/id/Makefile | 1 - usr.bin/id/groups.1 | 2 -- usr.bin/id/id.1 | 2 -- usr.bin/id/id.c | 3 --- usr.bin/id/whoami.1 | 2 -- usr.bin/indent/Makefile | 1 - usr.bin/indent/args.c | 3 --- usr.bin/indent/indent.1 | 2 -- usr.bin/indent/indent.c | 3 --- usr.bin/indent/indent_codes.h | 2 -- usr.bin/indent/indent_globs.h | 2 -- usr.bin/indent/io.c | 3 --- usr.bin/indent/lexi.c | 3 --- usr.bin/indent/parse.c | 3 --- usr.bin/indent/pr_comment.c | 3 --- usr.bin/join/Makefile | 1 - usr.bin/join/join.1 | 2 -- usr.bin/join/join.c | 3 --- usr.bin/jot/Makefile | 1 - usr.bin/jot/jot.1 | 2 -- usr.bin/jot/jot.c | 3 --- usr.bin/kdump/Makefile | 1 - usr.bin/kdump/kdump.1 | 2 -- usr.bin/kdump/kdump.c | 3 --- usr.bin/keylogin/keylogin.1 | 1 - usr.bin/keylogin/keylogin.c | 3 --- usr.bin/keylogout/keylogout.1 | 1 - usr.bin/ktrace/Makefile | 1 - usr.bin/ktrace/ktrace.1 | 2 -- usr.bin/ktrace/ktrace.c | 3 --- usr.bin/ktrace/ktrace.h | 2 -- usr.bin/ktrace/subr.c | 3 --- usr.bin/lam/Makefile | 1 - usr.bin/lam/lam.1 | 2 -- usr.bin/lam/lam.c | 3 --- usr.bin/last/Makefile | 1 - usr.bin/last/last.1 | 2 -- usr.bin/last/last.c | 3 --- usr.bin/lastcomm/Makefile | 1 - usr.bin/lastcomm/lastcomm.1 | 2 -- usr.bin/lastcomm/lastcomm.c | 3 --- usr.bin/lastcomm/pathnames.h | 2 -- usr.bin/leave/Makefile | 1 - usr.bin/leave/leave.1 | 2 -- usr.bin/leave/leave.c | 3 --- usr.bin/lex/initparse.c | 1 - usr.bin/locate/Makefile | 1 - usr.bin/locate/bigram/Makefile | 1 - usr.bin/locate/bigram/locate.bigram.c | 3 --- usr.bin/locate/code/Makefile | 1 - usr.bin/locate/code/locate.code.c | 3 --- usr.bin/locate/locate/Makefile | 1 - usr.bin/locate/locate/locate.1 | 2 -- usr.bin/locate/locate/locate.c | 3 --- usr.bin/locate/locate/locate.h | 2 -- usr.bin/locate/locate/pathnames.h | 2 -- usr.bin/lock/Makefile | 1 - usr.bin/lock/lock.1 | 2 -- usr.bin/lock/lock.c | 3 --- usr.bin/logger/Makefile | 1 - usr.bin/logger/logger.1 | 2 -- usr.bin/logger/logger.c | 3 --- usr.bin/login/Makefile | 1 - usr.bin/login/login.1 | 2 -- usr.bin/login/login.c | 3 --- usr.bin/login/pathnames.h | 2 -- usr.bin/logname/Makefile | 1 - usr.bin/logname/logname.1 | 2 -- usr.bin/logname/logname.c | 3 --- usr.bin/look/Makefile | 1 - usr.bin/look/look.1 | 2 -- usr.bin/look/look.c | 3 --- usr.bin/look/pathnames.h | 2 -- usr.bin/lorder/Makefile | 1 - usr.bin/lorder/lorder.1 | 2 -- usr.bin/lorder/lorder.sh | 4 ---- usr.bin/m4/TEST/ack.m4 | 3 --- usr.bin/m4/TEST/hanoi.m4 | 3 --- usr.bin/m4/TEST/hash.m4 | 3 --- usr.bin/m4/TEST/sqroot.m4 | 3 --- usr.bin/m4/TEST/string.m4 | 3 --- usr.bin/m4/TEST/test.m4 | 3 --- usr.bin/m4/extern.h | 2 -- usr.bin/m4/m4.1 | 1 - usr.bin/m4/mdef.h | 2 -- usr.bin/m4/pathnames.h | 2 -- usr.bin/m4/stdd.h | 2 -- usr.bin/mail/Makefile | 1 - usr.bin/mail/cmd1.c | 3 --- usr.bin/mail/cmd2.c | 3 --- usr.bin/mail/cmd3.c | 3 --- usr.bin/mail/cmdtab.c | 3 --- usr.bin/mail/collect.c | 3 --- usr.bin/mail/def.h | 2 -- usr.bin/mail/edit.c | 3 --- usr.bin/mail/extern.h | 2 -- usr.bin/mail/fio.c | 3 --- usr.bin/mail/getname.c | 3 --- usr.bin/mail/glob.h | 2 -- usr.bin/mail/head.c | 3 --- usr.bin/mail/lex.c | 3 --- usr.bin/mail/list.c | 3 --- usr.bin/mail/mail.1 | 2 -- usr.bin/mail/main.c | 3 --- usr.bin/mail/names.c | 3 --- usr.bin/mail/pathnames.h | 2 -- usr.bin/mail/popen.c | 3 --- usr.bin/mail/quit.c | 3 --- usr.bin/mail/rcv.h | 2 -- usr.bin/mail/send.c | 3 --- usr.bin/mail/strings.c | 3 --- usr.bin/mail/temp.c | 3 --- usr.bin/mail/tty.c | 3 --- usr.bin/mail/util.c | 3 --- usr.bin/mail/v7.local.c | 3 --- usr.bin/mail/vars.c | 3 --- usr.bin/mail/version.c | 3 --- usr.bin/mesg/Makefile | 1 - usr.bin/mesg/mesg.1 | 2 -- usr.bin/mesg/mesg.c | 3 --- usr.bin/mkdep/Makefile | 1 - usr.bin/mkdep/mkdep.1 | 2 -- usr.bin/mkdep/mkdep.gcc.sh | 2 -- usr.bin/mkdep/mkdep.sh | 3 --- usr.bin/mkfifo/Makefile | 1 - usr.bin/mkfifo/mkfifo.1 | 2 -- usr.bin/mkfifo/mkfifo.c | 3 --- usr.bin/mkstr/Makefile | 1 - usr.bin/mkstr/mkstr.1 | 2 -- usr.bin/mkstr/mkstr.c | 3 --- usr.bin/morse/Makefile | 1 - usr.bin/morse/morse.6 | 2 -- usr.bin/morse/morse.c | 3 --- usr.bin/msgs/Makefile | 1 - usr.bin/msgs/msgs.1 | 2 -- usr.bin/msgs/msgs.c | 3 --- usr.bin/msgs/pathnames.h | 2 -- usr.bin/mt/Makefile | 1 - usr.bin/mt/mt.1 | 2 -- usr.bin/mt/mt.c | 3 --- usr.bin/netstat/Makefile | 1 - usr.bin/netstat/common.h | 2 -- usr.bin/netstat/if.c | 3 --- usr.bin/netstat/inet.c | 3 --- usr.bin/netstat/inet6.c | 3 --- usr.bin/netstat/ipsec.c | 3 --- usr.bin/netstat/main.c | 3 --- usr.bin/netstat/mbuf.c | 3 --- usr.bin/netstat/mroute.c | 2 -- usr.bin/netstat/mroute6.c | 2 -- usr.bin/netstat/netstat.1 | 2 -- usr.bin/netstat/netstat.h | 2 -- usr.bin/netstat/pfkey.c | 3 --- usr.bin/netstat/route.c | 3 --- usr.bin/netstat/sctp.c | 3 --- usr.bin/netstat/unix.c | 3 --- usr.bin/newkey/generic.c | 3 --- usr.bin/newkey/newkey.8 | 1 - usr.bin/newkey/newkey.c | 3 --- usr.bin/newkey/update.c | 3 --- usr.bin/nfsstat/Makefile | 1 - usr.bin/nfsstat/nfsstat.1 | 2 -- usr.bin/nfsstat/nfsstat.c | 3 --- usr.bin/nice/Makefile | 1 - usr.bin/nice/nice.1 | 2 -- usr.bin/nice/nice.c | 3 --- usr.bin/nohup/Makefile | 1 - usr.bin/nohup/nohup.1 | 2 -- usr.bin/nohup/nohup.c | 3 --- usr.bin/number/Makefile | 1 - usr.bin/number/number.6 | 2 -- usr.bin/number/number.c | 3 --- usr.bin/pagesize/Makefile | 1 - usr.bin/pagesize/pagesize.1 | 2 -- usr.bin/pagesize/pagesize.sh | 3 --- usr.bin/passwd/Makefile | 1 - usr.bin/passwd/passwd.1 | 2 -- usr.bin/paste/Makefile | 1 - usr.bin/paste/paste.1 | 2 -- usr.bin/paste/paste.c | 3 --- usr.bin/pom/Makefile | 1 - usr.bin/pom/pom.6 | 2 -- usr.bin/pom/pom.c | 3 --- usr.bin/pr/Makefile | 1 - usr.bin/pr/egetopt.c | 3 --- usr.bin/pr/extern.h | 2 -- usr.bin/pr/pr.1 | 2 -- usr.bin/pr/pr.c | 3 --- usr.bin/pr/pr.h | 2 -- usr.bin/primes/Makefile | 1 - usr.bin/primes/pattern.c | 3 --- usr.bin/primes/pr_tbl.c | 3 --- usr.bin/primes/primes.c | 3 --- usr.bin/primes/primes.h | 2 -- usr.bin/printenv/Makefile | 1 - usr.bin/printenv/printenv.1 | 2 -- usr.bin/printenv/printenv.c | 3 --- usr.bin/printf/Makefile | 1 - usr.bin/printf/printf.1 | 2 -- usr.bin/printf/printf.c | 3 --- usr.bin/quota/Makefile | 1 - usr.bin/quota/quota.1 | 2 -- usr.bin/quota/quota.c | 3 --- usr.bin/random/Makefile | 1 - usr.bin/random/random.6 | 2 -- usr.bin/random/random.c | 3 --- usr.bin/renice/Makefile | 1 - usr.bin/renice/renice.8 | 2 -- usr.bin/renice/renice.c | 3 --- usr.bin/rev/Makefile | 1 - usr.bin/rev/rev.1 | 2 -- usr.bin/rev/rev.c | 3 --- usr.bin/rpcgen/rpc_clntout.c | 1 - usr.bin/rpcgen/rpc_cout.c | 1 - usr.bin/rpcgen/rpc_hout.c | 1 - usr.bin/rpcgen/rpc_main.c | 1 - usr.bin/rpcgen/rpc_parse.c | 1 - usr.bin/rpcgen/rpc_parse.h | 4 ---- usr.bin/rpcgen/rpc_sample.c | 2 -- usr.bin/rpcgen/rpc_scan.c | 1 - usr.bin/rpcgen/rpc_scan.h | 4 ---- usr.bin/rpcgen/rpc_svcout.c | 1 - usr.bin/rpcgen/rpc_tblout.c | 1 - usr.bin/rpcgen/rpc_util.c | 1 - usr.bin/rpcgen/rpc_util.h | 4 ---- usr.bin/rpcgen/rpcgen.1 | 1 - usr.bin/rpcinfo/Makefile | 1 - usr.bin/rpcinfo/rpcinfo.8 | 1 - usr.bin/rpcinfo/rpcinfo.c | 5 ----- usr.bin/rs/Makefile | 1 - usr.bin/rs/rs.1 | 2 -- usr.bin/ruptime/Makefile | 1 - usr.bin/ruptime/ruptime.1 | 2 -- usr.bin/ruptime/ruptime.c | 3 --- usr.bin/rusers/rusers.1 | 2 -- usr.bin/rwall/rwall.1 | 2 -- usr.bin/rwall/rwall.c | 3 --- usr.bin/rwho/Makefile | 1 - usr.bin/rwho/rwho.1 | 2 -- usr.bin/rwho/rwho.c | 3 --- usr.bin/script/Makefile | 1 - usr.bin/script/script.1 | 2 -- usr.bin/script/script.c | 3 --- usr.bin/sed/Makefile | 1 - usr.bin/sed/POSIX | 1 - usr.bin/sed/compile.c | 3 --- usr.bin/sed/defs.h | 2 -- usr.bin/sed/extern.h | 2 -- usr.bin/sed/main.c | 3 --- usr.bin/sed/misc.c | 3 --- usr.bin/sed/process.c | 3 --- usr.bin/sed/sed.1 | 2 -- usr.bin/sed/tests/hanoi.sed | 4 ---- usr.bin/sed/tests/multi_test.sh | 4 ---- usr.bin/shar/Makefile | 1 - usr.bin/shar/shar.1 | 2 -- usr.bin/shar/shar.sh | 3 --- usr.bin/showmount/Makefile | 1 - usr.bin/showmount/showmount.8 | 2 -- usr.bin/showmount/showmount.c | 3 --- usr.bin/sort/sort.1.in | 2 -- usr.bin/split/Makefile | 1 - usr.bin/split/split.1 | 2 -- usr.bin/split/split.c | 3 --- usr.bin/su/Makefile | 1 - usr.bin/su/su.1 | 2 -- usr.bin/su/su.c | 3 --- usr.bin/systat/Makefile | 1 - usr.bin/systat/cmds.c | 3 --- usr.bin/systat/cmdtab.c | 3 --- usr.bin/systat/devs.c | 3 --- usr.bin/systat/extern.h | 2 -- usr.bin/systat/fetch.c | 3 --- usr.bin/systat/icmp.c | 3 --- usr.bin/systat/icmp6.c | 3 --- usr.bin/systat/iostat.c | 3 --- usr.bin/systat/ip.c | 3 --- usr.bin/systat/ip6.c | 3 --- usr.bin/systat/keyboard.c | 3 --- usr.bin/systat/main.c | 3 --- usr.bin/systat/netcmds.c | 3 --- usr.bin/systat/netstat.c | 3 --- usr.bin/systat/pigs.c | 3 --- usr.bin/systat/swap.c | 3 --- usr.bin/systat/systat.1 | 2 -- usr.bin/systat/systat.h | 2 -- usr.bin/systat/vmstat.c | 3 --- usr.bin/tail/Makefile | 1 - usr.bin/tail/extern.h | 2 -- usr.bin/tail/forward.c | 3 --- usr.bin/tail/misc.c | 3 --- usr.bin/tail/read.c | 3 --- usr.bin/tail/reverse.c | 3 --- usr.bin/tail/tail.1 | 2 -- usr.bin/tail/tail.c | 3 --- usr.bin/talk/Makefile | 1 - usr.bin/talk/ctl.c | 3 --- usr.bin/talk/ctl_transact.c | 3 --- usr.bin/talk/display.c | 3 --- usr.bin/talk/get_addrs.c | 3 --- usr.bin/talk/get_names.c | 3 --- usr.bin/talk/init_disp.c | 3 --- usr.bin/talk/invite.c | 3 --- usr.bin/talk/io.c | 3 --- usr.bin/talk/look_up.c | 3 --- usr.bin/talk/msgs.c | 3 --- usr.bin/talk/talk.1 | 2 -- usr.bin/talk/talk.c | 3 --- usr.bin/talk/talk.h | 2 -- usr.bin/talk/talk_ctl.h | 2 -- usr.bin/tcopy/Makefile | 1 - usr.bin/tcopy/tcopy.1 | 2 -- usr.bin/tcopy/tcopy.c | 3 --- usr.bin/tee/Makefile | 1 - usr.bin/tee/tee.1 | 2 -- usr.bin/tee/tee.c | 3 --- usr.bin/tftp/Makefile | 1 - usr.bin/tftp/main.c | 3 --- usr.bin/tftp/tftp.1 | 2 -- usr.bin/tftp/tftp.c | 3 --- usr.bin/tftp/tftp.h | 2 -- usr.bin/time/Makefile | 1 - usr.bin/time/time.1 | 2 -- usr.bin/time/time.c | 3 --- usr.bin/tip/libacu/biz22.c | 4 ---- usr.bin/tip/libacu/biz31.c | 4 ---- usr.bin/tip/libacu/courier.c | 4 ---- usr.bin/tip/libacu/df.c | 4 ---- usr.bin/tip/libacu/dn11.c | 4 ---- usr.bin/tip/libacu/hayes.c | 4 ---- usr.bin/tip/libacu/t3000.c | 4 ---- usr.bin/tip/libacu/v3451.c | 4 ---- usr.bin/tip/libacu/v831.c | 4 ---- usr.bin/tip/libacu/ventel.c | 4 ---- usr.bin/tip/tip/acu.c | 4 ---- usr.bin/tip/tip/acutab.c | 4 ---- usr.bin/tip/tip/cmds.c | 4 ---- usr.bin/tip/tip/cmdtab.c | 4 ---- usr.bin/tip/tip/cu.1 | 2 -- usr.bin/tip/tip/cu.c | 4 ---- usr.bin/tip/tip/hunt.c | 4 ---- usr.bin/tip/tip/log.c | 4 ---- usr.bin/tip/tip/partab.c | 4 ---- usr.bin/tip/tip/pathnames.h | 2 -- usr.bin/tip/tip/phones | 2 -- usr.bin/tip/tip/remote | 3 --- usr.bin/tip/tip/remote.c | 4 ---- usr.bin/tip/tip/tip.1 | 2 -- usr.bin/tip/tip/tip.c | 4 ---- usr.bin/tip/tip/tip.h | 2 -- usr.bin/tip/tip/tipout.c | 4 ---- usr.bin/tip/tip/uucplock.c | 4 ---- usr.bin/tip/tip/value.c | 4 ---- usr.bin/tip/tip/vars.c | 4 ---- usr.bin/touch/Makefile | 1 - usr.bin/touch/touch.1 | 2 -- usr.bin/touch/touch.c | 3 --- usr.bin/tr/Makefile | 1 - usr.bin/tr/extern.h | 2 -- usr.bin/tr/str.c | 3 --- usr.bin/tr/tr.1 | 2 -- usr.bin/tr/tr.c | 3 --- usr.bin/true/Makefile | 1 - usr.bin/true/true.1 | 2 -- usr.bin/true/true.c | 3 --- usr.bin/tsort/Makefile | 1 - usr.bin/tsort/tsort.1 | 2 -- usr.bin/tsort/tsort.c | 3 --- usr.bin/tty/Makefile | 1 - usr.bin/tty/tty.1 | 2 -- usr.bin/tty/tty.c | 3 --- usr.bin/ul/Makefile | 1 - usr.bin/ul/ul.1 | 2 -- usr.bin/ul/ul.c | 3 --- usr.bin/uname/Makefile | 1 - usr.bin/uname/uname.1 | 2 -- usr.bin/uname/uname.c | 3 --- usr.bin/unexpand/Makefile | 1 - usr.bin/unexpand/unexpand.c | 3 --- usr.bin/uniq/Makefile | 1 - usr.bin/uniq/uniq.1 | 2 -- usr.bin/uniq/uniq.c | 3 --- usr.bin/unvis/Makefile | 1 - usr.bin/users/Makefile | 1 - usr.bin/users/users.1 | 2 -- usr.bin/vgrind/Makefile | 1 - usr.bin/vgrind/extern.h | 2 -- usr.bin/vgrind/pathnames.h | 2 -- usr.bin/vgrind/regexp.c | 3 --- usr.bin/vgrind/vfontedpr.c | 3 --- usr.bin/vgrind/vgrind.1 | 2 -- usr.bin/vgrind/vgrind.sh | 4 ---- usr.bin/vgrind/vgrindefs.5 | 2 -- usr.bin/vgrind/vgrindefs.src | 3 --- usr.bin/vis/Makefile | 1 - usr.bin/vmstat/Makefile | 1 - usr.bin/vmstat/vmstat.8 | 2 -- usr.bin/vmstat/vmstat.c | 3 --- usr.bin/w/Makefile | 1 - usr.bin/w/extern.h | 2 -- usr.bin/w/pr_time.c | 3 --- usr.bin/w/proc_compare.c | 3 --- usr.bin/w/uptime.1 | 2 -- usr.bin/w/w.1 | 2 -- usr.bin/w/w.c | 3 --- usr.bin/wall/Makefile | 1 - usr.bin/wall/ttymsg.c | 3 --- usr.bin/wall/wall.1 | 2 -- usr.bin/wall/wall.c | 3 --- usr.bin/wc/Makefile | 1 - usr.bin/wc/wc.1 | 2 -- usr.bin/wc/wc.c | 3 --- usr.bin/what/Makefile | 1 - usr.bin/what/what.1 | 2 -- usr.bin/what/what.c | 3 --- usr.bin/whereis/whereis.1 | 2 -- usr.bin/which/Makefile | 1 - usr.bin/who/Makefile | 1 - usr.bin/who/who.1 | 2 -- usr.bin/whois/Makefile | 1 - usr.bin/whois/whois.1 | 2 -- usr.bin/whois/whois.c | 3 --- usr.bin/write/Makefile | 1 - usr.bin/write/write.1 | 2 -- usr.bin/write/write.c | 3 --- usr.bin/xargs/Makefile | 1 - usr.bin/xargs/pathnames.h | 2 -- usr.bin/xargs/xargs.1 | 2 -- usr.bin/xargs/xargs.c | 3 --- usr.bin/xinstall/Makefile | 1 - usr.bin/xinstall/install.1 | 2 -- usr.bin/xinstall/xinstall.c | 3 --- usr.bin/xstr/Makefile | 1 - usr.bin/xstr/pathnames.h | 2 -- usr.bin/xstr/xstr.1 | 2 -- usr.bin/xstr/xstr.c | 3 --- usr.bin/yacc/Makefile | 1 - usr.bin/yes/Makefile | 1 - usr.bin/yes/yes.1 | 2 -- usr.bin/yes/yes.c | 3 --- usr.bin/ypcat/Makefile | 1 - usr.bin/ypmatch/Makefile | 1 - usr.bin/ypwhich/Makefile | 1 - 631 files changed, 1424 deletions(-) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 8e82e773e6b0..5cccf1903471 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc index 84bfd7f9af91..ff74a2dff9c3 100644 --- a/usr.bin/Makefile.inc +++ b/usr.bin/Makefile.inc @@ -1,3 +1,2 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 BINDIR?= /usr/bin diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile index a8bcef1c863e..50c224496ef7 100644 --- a/usr.bin/apply/Makefile +++ b/usr.bin/apply/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 .include diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1 index 5b910b108d4b..f1c114d40814 100644 --- a/usr.bin/apply/apply.1 +++ b/usr.bin/apply/apply.1 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)apply.1 8.2 (Berkeley) 4/4/94 -.\" .Dd January 28, 2022 .Dt APPLY 1 .Os diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index 88f14c479dfb..edeb9c60679a 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -33,9 +33,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94"; -#endif #endif #include diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile index 896470535e90..cd51944e825b 100644 --- a/usr.bin/banner/Makefile +++ b/usr.bin/banner/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= banner MAN= banner.6 diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6 index 8c3ad5e29bc3..614bfc51a286 100644 --- a/usr.bin/banner/banner.6 +++ b/usr.bin/banner/banner.6 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" From: @(#)banner.6 8.2 (Berkeley) 4/29/95 -.\" .Dd June 21, 2021 .Dt BANNER 6 .Os diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c index c7bfa6e27b19..9cf21905487f 100644 --- a/usr.bin/banner/banner.c +++ b/usr.bin/banner/banner.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif #if 0 -#ifndef lint -static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95"; -#endif #endif #include diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile index 644b0e751945..f1a729df2ddc 100644 --- a/usr.bin/basename/Makefile +++ b/usr.bin/basename/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 8.1 (Berkeley) 6/6/93 .include diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1 index 2bbb31e16094..41bbcc1ba60b 100644 --- a/usr.bin/basename/basename.1 +++ b/usr.bin/basename/basename.1 @@ -28,8 +28,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)basename.1 8.2 (Berkeley) 4/18/94 -.\" .Dd June 21, 2021 .Dt BASENAME 1 .Os diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c index c2a734688a1a..354f9f4542fe 100644 --- a/usr.bin/basename/basename.c +++ b/usr.bin/basename/basename.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif #if 0 -#ifndef lint -static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95"; -#endif /* not lint */ #endif #include diff --git a/usr.bin/bc/bc.1 b/usr.bin/bc/bc.1 index 101626908585..97bb3bf62c56 100644 --- a/usr.bin/bc/bc.1 +++ b/usr.bin/bc/bc.1 @@ -32,8 +32,6 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" @(#)bc.1 6.8 (Berkeley) 8/8/91 -.\" .Dd November 21, 2015 .Dt BC 1 .Os diff --git a/usr.bin/bc/bc.library b/usr.bin/bc/bc.library index 9cd67e4e6f60..539de20a7e0c 100644 --- a/usr.bin/bc/bc.library +++ b/usr.bin/bc/bc.library @@ -35,7 +35,6 @@ */ /* - * @(#)bc.library 5.1 (Berkeley) 4/17/91 */ scale = 20 diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile index ccd195f8fc37..9e20c4580fc6 100644 --- a/usr.bin/biff/Makefile +++ b/usr.bin/biff/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= biff diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1 index 206c8fd5bdd3..70370d41f843 100644 --- a/usr.bin/biff/biff.1 +++ b/usr.bin/biff/biff.1 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)biff.1 8.1 (Berkeley) 6/6/93 -.\" .Dd April 28, 2013 .Dt BIFF 1 .Os diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c index 1de902800cad..601e10a8fa55 100644 --- a/usr.bin/biff/biff.c +++ b/usr.bin/biff/biff.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif #if 0 -#ifndef lint -static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93"; -#endif #endif #include diff --git a/usr.bin/bintrans/Makefile b/usr.bin/bintrans/Makefile index 8283e374c138..751e66dab55d 100644 --- a/usr.bin/bintrans/Makefile +++ b/usr.bin/bintrans/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 .include diff --git a/usr.bin/bintrans/bintrans.1 b/usr.bin/bintrans/bintrans.1 index e7e7f4c56cdf..b2b4d039a407 100644 --- a/usr.bin/bintrans/bintrans.1 +++ b/usr.bin/bintrans/bintrans.1 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" From: @(#)uuencode.1 8.1 (Berkeley) 6/6/93 -.\" .Dd April 18, 2022 .Dt BINTRANS 1 .Os diff --git a/usr.bin/bintrans/uudecode.c b/usr.bin/bintrans/uudecode.c index b0ab415486c8..e58d20631f94 100644 --- a/usr.bin/bintrans/uudecode.c +++ b/usr.bin/bintrans/uudecode.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94"; -#endif /* not lint */ #endif #include /* diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c index 267ab7deb8d1..d8d5dd4228d0 100644 --- a/usr.bin/bintrans/uuencode.c +++ b/usr.bin/bintrans/uuencode.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94"; -#endif /* not lint */ #endif #include /* diff --git a/usr.bin/bintrans/uuencode.format.5 b/usr.bin/bintrans/uuencode.format.5 index 3a154e1e26f2..4daafda7a337 100644 --- a/usr.bin/bintrans/uuencode.format.5 +++ b/usr.bin/bintrans/uuencode.format.5 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)uuencode.format.5 8.2 (Berkeley) 1/12/94 -.\" .Dd January 12, 1994 .Dt UUENCODE 5 .Os diff --git a/usr.bin/caesar/Makefile b/usr.bin/caesar/Makefile index f6ea9bc75344..e9b1d371a6f0 100644 --- a/usr.bin/caesar/Makefile +++ b/usr.bin/caesar/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 PACKAGE= games diff --git a/usr.bin/caesar/caesar.6 b/usr.bin/caesar/caesar.6 index ba478528e4ec..403370d57e36 100644 --- a/usr.bin/caesar/caesar.6 +++ b/usr.bin/caesar/caesar.6 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)caesar.6 8.2 (Berkeley) 11/16/93 -.\" .Dd November 16, 1993 .Dt CAESAR 6 .Os diff --git a/usr.bin/caesar/caesar.c b/usr.bin/caesar/caesar.c index 296fa77120cb..fdd531034092 100644 --- a/usr.bin/caesar/caesar.c +++ b/usr.bin/caesar/caesar.c @@ -42,9 +42,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static const char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93"; -#endif /* not lint */ #endif #include #include diff --git a/usr.bin/caesar/rot13.sh b/usr.bin/caesar/rot13.sh index 477907cf8242..1916fa78ad65 100644 --- a/usr.bin/caesar/rot13.sh +++ b/usr.bin/caesar/rot13.sh @@ -26,7 +26,5 @@ # 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. -# -# @(#)rot13.sh 8.1 (Berkeley) 5/31/93 exec /usr/bin/caesar 13 "$@" diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index 539fa3a746a6..8d5851cc089e 100644 --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 .include diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1 index 898ef8fb4a3d..af368475e4d5 100644 --- a/usr.bin/calendar/calendar.1 +++ b/usr.bin/calendar/calendar.1 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 -.\" .Dd July 31, 2022 .Dt CALENDAR 1 .Os diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index 476c0495d218..2c9b90051abf 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif #if 0 -#ifndef lint -static char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; -#endif #endif #include diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c index 5390882305a0..e11527e4bc86 100644 *** 7604 LINES SKIPPED *** From nobody Mon Nov 27 05:24:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD55Mwrz51h66; Mon, 27 Nov 2023 05:24: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 4SdvD53pb7z4WxX; Mon, 27 Nov 2023 05:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BgQaxVPzAcHBbtBTlHS7Chn/oT0/rPVi/32vRfKr+Qk=; b=I8qvoS9rvpPH6pcpVt3ibPAciug3Q69SQlRiurp/j0csGRoPeT9koEXA33ZgMyl8HNNt+G DxOXEBuEVcE1SU94qS8CBgUEEWvZZi2t8pRQ98J7vvtTeyrodxwgOri29Wx4oCVKR2spLK GgCvqlGdxA3CCK4zZOrAwr1dYYJrMi9RWZ4GZFdWxMAF6gAA5FqX/G9WMzIgPBdUkWi6Jc Dhb94bx8aeD/zm0YHahheSr/fFMV5joW8srFsrVfmERfI5EbcVdt3DWvYxyeCsG19AK/IC F6Dq7jHM1fnuD34yhYy56HlKkClkd7wDF8hqawzAW1tvJsESIEc5GJPEjFBzEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BgQaxVPzAcHBbtBTlHS7Chn/oT0/rPVi/32vRfKr+Qk=; b=mPDWve4h2YV5Qs3BDNSxediNRMjtatsiM0uIlhjX4t0gDnXCBsrUgqf9zY30Zymxpm3zT4 cAMZPv4bbBFLMYCA67XXPmFJMIimCIX4r4sWXt1/gnI5OcFlYOs7uBsGtX6x77g7WvcRnM IZ+4FxkyznwNYGymXLfRAyNzEGozTcbpGsgdd0EG87aoY8h8OVGoKyHUuyBWfPwvCTcIMw RxvVwly5egLHB2eldTmmHt3DyLzmBEaG1RWJ7JtiRnRi/3pIEwLQKPtYwDbDdTZcOh5nWR TQtvqxy9a+sTuKVqEIAou+i38vEFK8kAfjQW5zQ5tC37+fiVvb8xY4QAYdjaOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062693; a=rsa-sha256; cv=none; b=L2E/MdQWMU3myy/5wu9xBlUX7N7Fr84pToiiJqVf9ZpHxndZNXHVhk5FtU/uqPvZMCapqp x1rh3DgwxPL/n79k5+kgQ1XY4HR9LLs2qLyAVuZbH3sMmb5dLywciTV3Zw+hiF7isFS+Wo BMKm/dAED4uSn3PkIKZEhtDjTC92pdzXoXpTbGp7GoC9pgBlhjb8VGHNxqvJo4RDmF0Pen ifbw0spnTbvQ6SSh6EqNFM79vt0FZZMLEg4r1/82vK+1nd7gWLFaGcEm7ou+wLUUE31Ipm 6osux2N4Wqi2QoELp+dqoThF5iE6JI2ZBU22pQBf9h9hY13JruMVwSqGoUTKUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD52sHTzB19; Mon, 27 Nov 2023 05:24: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 3AR5OrwU066201; Mon, 27 Nov 2023 05:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5OrGA066198; Mon, 27 Nov 2023 05:24:53 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:53 GMT Message-Id: <202311270524.3AR5OrGA066198@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: 8a7b61203704 - main - usr.sbin: Remove ancient SCCS tags. List-Id: Commit messages for the main 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: 8a7b61203704d362cfbc66c00619f51b24106b55 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8a7b61203704d362cfbc66c00619f51b24106b55 commit 8a7b61203704d362cfbc66c00619f51b24106b55 Author: Warner Losh AuthorDate: 2023-11-23 17:21:37 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:56 +0000 usr.sbin: Remove ancient SCCS tags. Remove ancient SCCS tags from the tree, automated scripting, with two minor fixup to keep things compiling. All the common forms in the tree were removed with a perl script. Sponsored by: Netflix --- usr.sbin/Makefile | 1 - usr.sbin/Makefile.inc | 1 - usr.sbin/accton/Makefile | 1 - usr.sbin/accton/accton.c | 3 --- usr.sbin/apmd/apmd.8 | 2 -- usr.sbin/arp/Makefile | 1 - usr.sbin/arp/arp.4 | 2 -- usr.sbin/arp/arp.8 | 2 -- usr.sbin/arp/arp.c | 3 --- usr.sbin/bootparamd/Makefile.inc | 1 - usr.sbin/bootparamd/bootparamd/Makefile | 1 - usr.sbin/bootparamd/bootparamd/bootparamd.8 | 1 - usr.sbin/bootparamd/callbootd/Makefile | 1 - usr.sbin/chown/Makefile | 1 - usr.sbin/chown/chgrp.1 | 2 -- usr.sbin/chown/chown.8 | 2 -- usr.sbin/chown/chown.c | 3 --- usr.sbin/chroot/Makefile | 1 - usr.sbin/chroot/chroot.8 | 2 -- usr.sbin/chroot/chroot.c | 3 --- usr.sbin/config/Makefile | 1 - usr.sbin/config/config.8 | 2 -- usr.sbin/config/config.h | 2 -- usr.sbin/config/config.y | 2 -- usr.sbin/config/lang.l | 2 -- usr.sbin/config/main.cc | 3 --- usr.sbin/config/mkheaders.c | 3 --- usr.sbin/config/mkmakefile.cc | 3 --- usr.sbin/config/mkoptions.cc | 3 --- usr.sbin/cron/cron/job.c | 3 --- usr.sbin/cron/cron/popen.c | 3 --- usr.sbin/cron/cron/user.c | 3 --- usr.sbin/cron/lib/env.c | 3 --- usr.sbin/cron/lib/misc.c | 3 --- usr.sbin/edquota/Makefile | 1 - usr.sbin/edquota/edquota.8 | 2 -- usr.sbin/edquota/edquota.c | 3 --- usr.sbin/edquota/pathnames.h | 2 -- usr.sbin/ifmcstat/Makefile | 1 - usr.sbin/inetd/Makefile | 1 - usr.sbin/inetd/inetd.8 | 2 -- usr.sbin/inetd/inetd.c | 3 --- usr.sbin/inetd/pathnames.h | 2 -- usr.sbin/iostat/Makefile | 1 - usr.sbin/iostat/iostat.8 | 2 -- usr.sbin/kbdcontrol/kbdcontrol.1 | 2 -- usr.sbin/keyserv/keyserv.8 | 2 -- usr.sbin/keyserv/keyserv.c | 3 --- usr.sbin/keyserv/setkey.c | 3 --- usr.sbin/lpr/common_source/common.c | 3 --- usr.sbin/lpr/common_source/displayq.c | 3 --- usr.sbin/lpr/common_source/lp.h | 2 -- usr.sbin/lpr/common_source/lp.local.h | 2 -- usr.sbin/lpr/common_source/net.c | 2 -- usr.sbin/lpr/common_source/pathnames.h | 2 -- usr.sbin/lpr/common_source/printcap.c | 3 --- usr.sbin/lpr/common_source/rmjob.c | 3 --- usr.sbin/lpr/common_source/startdaemon.c | 3 --- usr.sbin/lpr/filters/Makefile | 1 - usr.sbin/lpr/filters/lpf.c | 3 --- usr.sbin/lpr/lpc/Makefile | 1 - usr.sbin/lpr/lpc/cmds.c | 3 --- usr.sbin/lpr/lpc/cmdtab.c | 3 --- usr.sbin/lpr/lpc/extern.h | 2 -- usr.sbin/lpr/lpc/lpc.8 | 2 -- usr.sbin/lpr/lpc/lpc.c | 3 --- usr.sbin/lpr/lpc/lpc.h | 2 -- usr.sbin/lpr/lpd/Makefile | 1 - usr.sbin/lpr/lpd/extern.h | 2 -- usr.sbin/lpr/lpd/lpd.8 | 2 -- usr.sbin/lpr/lpd/lpd.c | 3 --- usr.sbin/lpr/lpd/lpdchar.c | 3 --- usr.sbin/lpr/lpd/modes.c | 3 --- usr.sbin/lpr/lpd/printcap | 1 - usr.sbin/lpr/lpd/printjob.c | 3 --- usr.sbin/lpr/lpd/recvjob.c | 3 --- usr.sbin/lpr/lpq/Makefile | 1 - usr.sbin/lpr/lpq/lpq.1 | 2 -- usr.sbin/lpr/lpq/lpq.c | 3 --- usr.sbin/lpr/lpr/Makefile | 1 - usr.sbin/lpr/lpr/lpr.1 | 2 -- usr.sbin/lpr/lpr/lpr.c | 3 --- usr.sbin/lpr/lpr/printcap.5 | 2 -- usr.sbin/lpr/lprm/Makefile | 1 - usr.sbin/lpr/lprm/lprm.1 | 2 -- usr.sbin/lpr/lprm/lprm.c | 3 --- usr.sbin/lpr/lptest/Makefile | 1 - usr.sbin/lpr/lptest/lptest.1 | 2 -- usr.sbin/lpr/lptest/lptest.c | 3 --- usr.sbin/lpr/pac/Makefile | 1 - usr.sbin/lpr/pac/pac.8 | 2 -- usr.sbin/lpr/pac/pac.c | 3 --- usr.sbin/mailstats/Makefile | 1 - usr.sbin/makefs/ffs.c | 2 -- usr.sbin/makefs/ffs/ffs_alloc.c | 2 -- usr.sbin/makefs/ffs/ffs_balloc.c | 2 -- usr.sbin/makefs/ffs/ffs_extern.h | 2 -- usr.sbin/makefs/ffs/ffs_subr.c | 2 -- usr.sbin/makefs/ffs/ufs_bmap.c | 2 -- usr.sbin/makefs/ffs/ufs_inode.h | 2 -- usr.sbin/makemap/Makefile | 1 - usr.sbin/mountd/Makefile | 1 - usr.sbin/mountd/exports.5 | 2 -- usr.sbin/mountd/mountd.8 | 2 -- usr.sbin/mountd/mountd.c | 3 --- usr.sbin/mountd/netgroup.5 | 2 -- usr.sbin/mountd/pathnames.h | 2 -- usr.sbin/ndp/ndp.c | 3 --- usr.sbin/newsyslog/newsyslog.8 | 2 -- usr.sbin/newsyslog/newsyslog.conf.5 | 2 -- usr.sbin/nfsd/Makefile | 1 - usr.sbin/nfsd/nfsd.8 | 2 -- usr.sbin/nfsd/nfsd.c | 3 --- usr.sbin/nmtree/mtree.5 | 2 -- usr.sbin/nologin/Makefile | 1 - usr.sbin/nologin/nologin.5 | 2 -- usr.sbin/nologin/nologin.8 | 2 -- usr.sbin/pmcstudy/Makefile | 1 - usr.sbin/ppp/slcompress.c | 2 -- usr.sbin/praliases/Makefile | 1 - usr.sbin/pstat/Makefile | 1 - usr.sbin/pstat/pstat.8 | 2 -- usr.sbin/pstat/pstat.c | 3 --- usr.sbin/pwd_mkdb/Makefile | 1 - usr.sbin/pwd_mkdb/pwd_mkdb.8 | 2 -- usr.sbin/pwd_mkdb/pwd_mkdb.c | 3 --- usr.sbin/quotaon/Makefile | 1 - usr.sbin/quotaon/quotaon.8 | 2 -- usr.sbin/quotaon/quotaon.c | 3 --- usr.sbin/rarpd/Makefile | 1 - usr.sbin/repquota/Makefile | 1 - usr.sbin/repquota/repquota.8 | 2 -- usr.sbin/repquota/repquota.c | 3 --- usr.sbin/rip6query/Makefile | 1 - usr.sbin/rmt/Makefile | 1 - usr.sbin/rmt/rmt.8 | 2 -- usr.sbin/rmt/rmt.c | 3 --- usr.sbin/route6d/Makefile | 1 - usr.sbin/route6d/route6d.c | 3 --- usr.sbin/rpc.umntall/Makefile | 1 - usr.sbin/rpc.ypupdated/update.c | 3 --- usr.sbin/rpcbind/check_bound.c | 5 ----- usr.sbin/rpcbind/pmap_svc.c | 5 ----- usr.sbin/rpcbind/rpcb_stat.c | 2 -- usr.sbin/rpcbind/rpcb_svc.c | 2 -- usr.sbin/rpcbind/rpcb_svc_4.c | 2 -- usr.sbin/rpcbind/rpcb_svc_com.c | 2 -- usr.sbin/rpcbind/rpcbind.8 | 1 - usr.sbin/rpcbind/rpcbind.c | 5 ----- usr.sbin/rpcbind/rpcbind.h | 2 -- usr.sbin/rpcbind/warmstart.c | 1 - usr.sbin/rtprio/Makefile | 1 - usr.sbin/rwhod/Makefile | 1 - usr.sbin/rwhod/rwhod.8 | 2 -- usr.sbin/rwhod/rwhod.c | 3 --- usr.sbin/sendmail/Makefile | 1 - usr.sbin/services_mkdb/services | 3 --- usr.sbin/setfib/Makefile | 1 - usr.sbin/syslogd/Makefile | 1 - usr.sbin/syslogd/pathnames.h | 2 -- usr.sbin/syslogd/syslog.conf.5 | 2 -- usr.sbin/syslogd/syslogd.8 | 2 -- usr.sbin/syslogd/syslogd.c | 3 --- usr.sbin/tcpdump/Makefile | 1 - usr.sbin/tcpdump/Makefile.inc | 1 - usr.sbin/traceroute6/traceroute6.c | 3 --- usr.sbin/vidcontrol/vidcontrol.1 | 2 -- usr.sbin/vipw/Makefile | 1 - usr.sbin/vipw/vipw.8 | 2 -- usr.sbin/vipw/vipw.c | 3 --- usr.sbin/ypbind/Makefile | 1 - usr.sbin/ypbind/yp_ping.c | 4 ---- usr.sbin/yppoll/Makefile | 1 - usr.sbin/ypset/Makefile | 1 - 174 files changed, 357 deletions(-) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index bdc45c87e3bc..c3a4cc42f721 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 5.20 (Berkeley) 6/12/93 .include diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc index fd9286474425..523a0dd44643 100644 --- a/usr.sbin/Makefile.inc +++ b/usr.sbin/Makefile.inc @@ -1,3 +1,2 @@ -# @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 BINDIR?= /usr/sbin diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile index b03b32b3b67e..01abcda32e02 100644 --- a/usr.sbin/accton/Makefile +++ b/usr.sbin/accton/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= accton MAN= accton.8 diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c index 367307311b9d..545a7543c1a3 100644 --- a/usr.sbin/accton/accton.c +++ b/usr.sbin/accton/accton.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)accton.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ #endif #include #include diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8 index d88d1bb295e6..94640046bb74 100644 --- a/usr.sbin/apmd/apmd.8 +++ b/usr.sbin/apmd/apmd.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)apmd.8 1.1 (FreeBSD) 6/28/99 -.\" .Dd June 28, 1999 .Dt APMD 8 i386 .Os diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile index f45319b50810..0730be75b894 100644 --- a/usr.sbin/arp/Makefile +++ b/usr.sbin/arp/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.2 (Berkeley) 4/18/94 .include diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4 index b14686f96737..244f784dd028 100644 --- a/usr.sbin/arp/arp.4 +++ b/usr.sbin/arp/arp.4 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)arp4.4 6.5 (Berkeley) 4/18/94 -.\" .Dd October 7, 2016 .Dt ARP 4 .Os diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8 index 3f61c0cd9ecc..e2b81c6a1bb9 100644 --- a/usr.sbin/arp/arp.8 +++ b/usr.sbin/arp/arp.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)arp.8 8.1 (Berkeley) 6/6/93 -.\" .Dd July 13, 2020 .Dt ARP 8 .Os diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 9a19d792f788..62f4ebf156d7 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -39,9 +39,6 @@ static char const copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char const sccsid[] = "@(#)from: arp.c 8.2 (Berkeley) 1/2/94"; -#endif /* not lint */ #endif #include /* diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc index 9440974e627b..e5b8262ffd7d 100644 --- a/usr.sbin/bootparamd/Makefile.inc +++ b/usr.sbin/bootparamd/Makefile.inc @@ -1,4 +1,3 @@ -# @(#)Makefile.inc 5.1 (Berkeley) 5/11/90 BINDIR?= /usr/sbin diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile index 9ef42ec493d2..ca1b26b62bc6 100644 --- a/usr.sbin/bootparamd/bootparamd/Makefile +++ b/usr.sbin/bootparamd/bootparamd/Makefile @@ -1,4 +1,3 @@ -# from: @(#)Makefile 5.8 (Berkeley) 7/28/90 .include diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8 index 781e07adb3cd..45fa7d2aa918 100644 --- a/usr.sbin/bootparamd/bootparamd/bootparamd.8 +++ b/usr.sbin/bootparamd/bootparamd/bootparamd.8 @@ -1,4 +1,3 @@ -.\" @(#)bootparamd.8 .Dd December 14, 2000 .Dt BOOTPARAMD 8 .Os diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile index 426ee15da516..f5e102a5a60b 100644 --- a/usr.sbin/bootparamd/callbootd/Makefile +++ b/usr.sbin/bootparamd/callbootd/Makefile @@ -1,4 +1,3 @@ -# from: @(#)Makefile 5.8 (Berkeley) 7/28/90 PROG= callbootd MAN= diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile index 014f6506fbc0..705e20fa6552 100644 --- a/usr.sbin/chown/Makefile +++ b/usr.sbin/chown/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 .include diff --git a/usr.sbin/chown/chgrp.1 b/usr.sbin/chown/chgrp.1 index d52a6c00e01e..f05c81e4bae7 100644 --- a/usr.sbin/chown/chgrp.1 +++ b/usr.sbin/chown/chgrp.1 @@ -28,8 +28,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)chgrp.1 8.3 (Berkeley) 3/31/94 -.\" .Dd January 7, 2017 .Dt CHGRP 1 .Os diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8 index 8c243a47188e..9f4cfafb6852 100644 --- a/usr.sbin/chown/chown.8 +++ b/usr.sbin/chown/chown.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)chown.8 8.3 (Berkeley) 3/31/94 -.\" .Dd August 24, 2022 .Dt CHOWN 8 .Os diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c index caf801287ca5..dfcb6bd230ff 100644 --- a/usr.sbin/chown/chown.c +++ b/usr.sbin/chown/chown.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)chown.c 8.8 (Berkeley) 4/4/94"; -#endif /* not lint */ #endif #include diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile index 9d15688403b7..7935fa4b568a 100644 --- a/usr.sbin/chroot/Makefile +++ b/usr.sbin/chroot/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= chroot MAN= chroot.8 diff --git a/usr.sbin/chroot/chroot.8 b/usr.sbin/chroot/chroot.8 index dfc915aa1298..f26b7e937da9 100644 --- a/usr.sbin/chroot/chroot.8 +++ b/usr.sbin/chroot/chroot.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)chroot.8 8.1 (Berkeley) 6/9/93 -.\" .Dd July 20, 2021 .Dt CHROOT 8 .Os diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index 9fc918e38eac..57a7f2acaa74 100644 --- a/usr.sbin/chroot/chroot.c +++ b/usr.sbin/chroot/chroot.c @@ -36,9 +36,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)chroot.c 8.1 (Berkeley) 6/9/93"; -#endif /* not lint */ #endif #include #include diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile index 6762d1ec2f2f..5b10ac40df74 100644 --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 SRCDIR:=${.PARSEDIR:tA} diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8 index ac8020e6b76e..ccb61cdf2786 100644 --- a/usr.sbin/config/config.8 +++ b/usr.sbin/config/config.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)config.8 8.2 (Berkeley) 4/19/94 -.\" .Dd April 9, 2021 .Dt CONFIG 8 .Os diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index df0428b59073..16562a7f8210 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)config.h 8.1 (Berkeley) 6/6/93 */ /* diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index c475f15f56e4..a5a9e1546c36 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -66,8 +66,6 @@ * 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. - * - * @(#)config.y 8.1 (Berkeley) 6/6/93 */ #include diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l index e3315b028df2..a6558237db5a 100644 --- a/usr.sbin/config/lang.l +++ b/usr.sbin/config/lang.l @@ -28,8 +28,6 @@ * 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. - * - * @(#)lang.l 8.1 (Berkeley) 6/6/93 */ #include diff --git a/usr.sbin/config/main.cc b/usr.sbin/config/main.cc index 59af07b76c8d..1e61a44c1d71 100644 --- a/usr.sbin/config/main.cc +++ b/usr.sbin/config/main.cc @@ -36,9 +36,6 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; -#endif #endif /* not lint */ #include diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c index f1fc967bf1be..41a48d108d08 100644 --- a/usr.sbin/config/mkheaders.c +++ b/usr.sbin/config/mkheaders.c @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)mkheaders.c 8.1 (Berkeley) 6/6/93"; -#endif #endif /* not lint */ /* diff --git a/usr.sbin/config/mkmakefile.cc b/usr.sbin/config/mkmakefile.cc index 49990c4a250c..9452ab8cdfbb 100644 --- a/usr.sbin/config/mkmakefile.cc +++ b/usr.sbin/config/mkmakefile.cc @@ -30,9 +30,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)mkmakefile.c 8.1 (Berkeley) 6/6/93"; -#endif #endif /* not lint */ /* diff --git a/usr.sbin/config/mkoptions.cc b/usr.sbin/config/mkoptions.cc index 53c8fa796a26..83f45a4d5c90 100644 --- a/usr.sbin/config/mkoptions.cc +++ b/usr.sbin/config/mkoptions.cc @@ -31,9 +31,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)mkheaders.c 8.1 (Berkeley) 6/6/93"; -#endif #endif /* not lint */ /* diff --git a/usr.sbin/cron/cron/job.c b/usr.sbin/cron/cron/job.c index c2f6e993225c..9579cd9d755d 100644 --- a/usr.sbin/cron/cron/job.c +++ b/usr.sbin/cron/cron/job.c @@ -19,9 +19,6 @@ * SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static const char rcsid[] = "$Id: job.c,v 1.2 1998/08/14 00:32:40 vixie Exp $"; -#endif #include "cron.h" diff --git a/usr.sbin/cron/cron/popen.c b/usr.sbin/cron/cron/popen.c index dfa90252fe22..72d4afc4d1f3 100644 --- a/usr.sbin/cron/cron/popen.c +++ b/usr.sbin/cron/cron/popen.c @@ -26,9 +26,6 @@ #ifndef lint static const char rcsid[] = "$Id: popen.c,v 1.3 1998/08/14 00:32:41 vixie Exp $"; -#if 0 -static const char sccsid[] = "@(#)popen.c 5.7 (Berkeley) 2/14/89"; -#endif #endif /* not lint */ #include "cron.h" diff --git a/usr.sbin/cron/cron/user.c b/usr.sbin/cron/cron/user.c index 01fc6a01529a..35c4f684f013 100644 --- a/usr.sbin/cron/cron/user.c +++ b/usr.sbin/cron/cron/user.c @@ -19,9 +19,6 @@ * SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static const char rcsid[] = "$Id: user.c,v 1.2 1998/08/14 00:32:41 vixie Exp $"; -#endif /* vix 26jan87 [log is in RCS file] */ diff --git a/usr.sbin/cron/lib/env.c b/usr.sbin/cron/lib/env.c index 36c5fca12117..287dd8636293 100644 --- a/usr.sbin/cron/lib/env.c +++ b/usr.sbin/cron/lib/env.c @@ -19,9 +19,6 @@ * SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static const char rcsid[] = "$Id: env.c,v 1.3 1998/08/14 00:32:39 vixie Exp $"; -#endif #include "cron.h" diff --git a/usr.sbin/cron/lib/misc.c b/usr.sbin/cron/lib/misc.c index 7f0257d7b469..a67753cc1ff8 100644 --- a/usr.sbin/cron/lib/misc.c +++ b/usr.sbin/cron/lib/misc.c @@ -19,9 +19,6 @@ * SOFTWARE. */ -#if !defined(lint) && !defined(LINT) -static const char rcsid[] = "$Id: misc.c,v 1.5 1998/08/14 00:32:40 vixie Exp $"; -#endif /* vix 26jan87 [RCS has the rest of the log] * vix 30dec86 [written] diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile index 40622578ec1c..3e9d0ede6721 100644 --- a/usr.sbin/edquota/Makefile +++ b/usr.sbin/edquota/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= edquota MAN= edquota.8 diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8 index 13a4af18f50c..926576abf0d9 100644 --- a/usr.sbin/edquota/edquota.8 +++ b/usr.sbin/edquota/edquota.8 @@ -28,8 +28,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)edquota.8 8.1 (Berkeley) 6/6/93 -.\" .Dd June 6, 1993 .Dt EDQUOTA 8 .Os diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 464694a5090d..b71508955b8b 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -39,9 +39,6 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)edquota.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ #endif #include diff --git a/usr.sbin/edquota/pathnames.h b/usr.sbin/edquota/pathnames.h index 19b9df68d565..3a9758a2abd3 100644 --- a/usr.sbin/edquota/pathnames.h +++ b/usr.sbin/edquota/pathnames.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 */ #include diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile index 0d5de3f6598f..faf6908e9204 100644 --- a/usr.sbin/ifmcstat/Makefile +++ b/usr.sbin/ifmcstat/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 .include diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile index aca7f2a2ca48..c62efc8dabb0 100644 --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 .include diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8 index 27d424e08b99..86feb0ba466e 100644 --- a/usr.sbin/inetd/inetd.8 +++ b/usr.sbin/inetd/inetd.8 @@ -25,8 +25,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)inetd.8 8.3 (Berkeley) 4/13/94 -.\" .Dd September 29, 2022 .Dt INETD 8 .Os diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 700821588423..13ee4b91d650 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -36,9 +36,6 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1991, 1993, 1994\n\ #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)from: inetd.c 8.4 (Berkeley) 4/13/94"; -#endif #endif /* not lint */ /* diff --git a/usr.sbin/inetd/pathnames.h b/usr.sbin/inetd/pathnames.h index e9cc994bd08e..0c103c24fa6e 100644 --- a/usr.sbin/inetd/pathnames.h +++ b/usr.sbin/inetd/pathnames.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 */ #include diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile index 27efbad1cb2a..fa9640267d3d 100644 --- a/usr.sbin/iostat/Makefile +++ b/usr.sbin/iostat/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= iostat MAN= iostat.8 diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index a749b410d071..11f0ef6fbeb6 100644 --- a/usr.sbin/iostat/iostat.8 +++ b/usr.sbin/iostat/iostat.8 @@ -52,8 +52,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)iostat.8 8.1 (Berkeley) 6/6/93 -.\" .Dd November 26, 2023 .Dt IOSTAT 8 .Os diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1 index 0b984547a122..dcadf1b7414d 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.1 +++ b/usr.sbin/kbdcontrol/kbdcontrol.1 @@ -10,8 +10,6 @@ .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" -.\" @(#)kbdcontrol.1 -.\" .Dd March 16, 2016 .Dt KBDCONTROL 1 .Os diff --git a/usr.sbin/keyserv/keyserv.8 b/usr.sbin/keyserv/keyserv.8 index 17007c7d8f40..f067c421a333 100644 --- a/usr.sbin/keyserv/keyserv.8 +++ b/usr.sbin/keyserv/keyserv.8 @@ -1,7 +1,5 @@ -.\" @(#)keyserv.1m 1.21 93/07/14 SMI; from SVr4 .\"macro stdmacro .\" Copyright 1989 AT&T -.\" @(#)keyserv.8c 1.8 89/03/29 SMI; .\".TH KEYSERV 8C "9 September 1987" .Dd September 14, 1992 .Dt KEYSERV 8 diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c index cd27c66965b1..2c7251483749 100644 --- a/usr.sbin/keyserv/keyserv.c +++ b/usr.sbin/keyserv/keyserv.c @@ -28,9 +28,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)keyserv.c 1.15 94/04/25 SMI"; -#endif #endif /* not lint */ /* diff --git a/usr.sbin/keyserv/setkey.c b/usr.sbin/keyserv/setkey.c index d1496190b559..f4c9fe62b0c5 100644 --- a/usr.sbin/keyserv/setkey.c +++ b/usr.sbin/keyserv/setkey.c @@ -28,9 +28,6 @@ */ #ifndef lint -#if 0 -static char sccsid[] = "@(#)setkey.c 1.11 94/04/25 SMI"; -#endif #endif /* not lint */ /* diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index 51d4c7a1cd00..0cba026acf04 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -39,9 +39,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c index 22fc41ca6d34..58936b5f51c2 100644 --- a/usr.sbin/lpr/common_source/displayq.c +++ b/usr.sbin/lpr/common_source/displayq.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)displayq.c 8.4 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h index 6b328427800c..b8c02e26b710 100644 --- a/usr.sbin/lpr/common_source/lp.h +++ b/usr.sbin/lpr/common_source/lp.h @@ -27,8 +27,6 @@ * 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. - * - * From: @(#)lp.h 8.2 (Berkeley) 4/28/95 */ #include diff --git a/usr.sbin/lpr/common_source/lp.local.h b/usr.sbin/lpr/common_source/lp.local.h index 56439d9274ce..c4ccef0c2597 100644 --- a/usr.sbin/lpr/common_source/lp.local.h +++ b/usr.sbin/lpr/common_source/lp.local.h @@ -25,8 +25,6 @@ * 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. - * - * @(#)lp.local.h 8.1 (Berkeley) 6/6/93 */ /* diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c index 93fe1f232433..86af21601f7f 100644 --- a/usr.sbin/lpr/common_source/net.c +++ b/usr.sbin/lpr/common_source/net.c @@ -36,8 +36,6 @@ * 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. - * - * From: @(#)common.c 8.5 (Berkeley) 4/28/95 */ #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/common_source/pathnames.h b/usr.sbin/lpr/common_source/pathnames.h index 89deed5874a1..2704c2245b53 100644 --- a/usr.sbin/lpr/common_source/pathnames.h +++ b/usr.sbin/lpr/common_source/pathnames.h @@ -27,8 +27,6 @@ * 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. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 */ #include diff --git a/usr.sbin/lpr/common_source/printcap.c b/usr.sbin/lpr/common_source/printcap.c index 070c08d04263..5a646bd8f27f 100644 --- a/usr.sbin/lpr/common_source/printcap.c +++ b/usr.sbin/lpr/common_source/printcap.c @@ -39,9 +39,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)printcap.c 8.2 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c index 3b4d37f01c41..12e57b02d472 100644 --- a/usr.sbin/lpr/common_source/rmjob.c +++ b/usr.sbin/lpr/common_source/rmjob.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c index d1c08806a420..ad124af1fb2e 100644 --- a/usr.sbin/lpr/common_source/startdaemon.c +++ b/usr.sbin/lpr/common_source/startdaemon.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)startdaemon.c 8.2 (Berkeley) 4/17/94"; -#endif /* not lint */ #endif #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index 26200c52bb11..024fb738f0fb 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -1,4 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 BINDIR= ${LIBEXECDIR}/lpr diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c index a7c8c3748ce4..361f86e69831 100644 --- a/usr.sbin/lpr/filters/lpf.c +++ b/usr.sbin/lpr/filters/lpf.c @@ -36,9 +36,6 @@ static const char copyright[] = #endif /* not lint */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)lpf.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ #endif #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index 0b96e15e2e6f..545f0f7ed121 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -1,4 +1,3 @@ -# From: @(#)Makefile 8.1 (Berkeley) 6/6/93 .PATH: ${.CURDIR:H}/common_source diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c index 5243e69154f2..820fda1b44e5 100644 --- a/usr.sbin/lpr/lpc/cmds.c +++ b/usr.sbin/lpr/lpc/cmds.c @@ -37,9 +37,6 @@ static const char copyright[] = #endif /* not lint */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95"; -#endif /* not lint */ #endif #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c index e4d9a5e6787f..ebc062abf0a8 100644 --- a/usr.sbin/lpr/lpc/cmdtab.c +++ b/usr.sbin/lpr/lpc/cmdtab.c @@ -30,9 +30,6 @@ */ #if 0 -#ifndef lint -static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ #endif #include "lp.cdefs.h" /* A cross-platform version of */ diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h index f75afa863cc8..c1cca9978d06 100644 --- a/usr.sbin/lpr/lpc/extern.h +++ b/usr.sbin/lpr/lpc/extern.h @@ -28,8 +28,6 @@ * 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. - * - * @(#)extern.h 8.1 (Berkeley) 6/6/93 */ diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8 index 4fad123a0642..089be4ab3bfc 100644 --- a/usr.sbin/lpr/lpc/lpc.8 +++ b/usr.sbin/lpr/lpc/lpc.8 @@ -25,8 +25,6 @@ *** 1324 LINES SKIPPED *** From nobody Mon Nov 27 05:24:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD70qfMz51hH0; Mon, 27 Nov 2023 05:24: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 4SdvD64jKtz4WvG; Mon, 27 Nov 2023 05:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5/NM+Ixd2NFeYuKrJDLxCcARM/EfCHddwBNdG+9l4co=; b=kRetUqAxjVdpWIzBRHx0gk8CFIi5ZPl4hvkj2rSXf+gkCBBvjOurj9G0D3vGURyg4a3nzr IKjPI7B9MF5IJDSFA1A+8VJ43pvAenLM4KEJKVDm8hEyYy2XCYPkd0wi4qsb2m3n5iqQ4p GWvg+gDLFsug4DxzkhlNBI/5vjkuzUyw1lUxjdSmx12jH0VUHv7FZJPaRuOioAr4MJe/2U FkSahD+8mYttTwMA31jFaktgGiqhYoo4PmuXxGwIb5Cww52jATe/ZxbZ6H/+0KAP8XUd+N mP65hn/PsXREqAEGNWbBbTykMRiRHO7Z3nioSSZmWv7H/lrt6sCmqUvImhU/BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5/NM+Ixd2NFeYuKrJDLxCcARM/EfCHddwBNdG+9l4co=; b=yFmpGanqeV1+AriIhWvBBlndAsXhYCBiwBMKuyyjmQ+6TyVj167It8TxpoYCQ9dmaFaYjT H4DUsp9UKiZZL68gZiXJA24UR5LZAcY1o5NWvhIJ3gyabFL23ebUGYKubiY5QT2rgK1ubX 7aJNLQsc15qAmTUZQZXKAkx56Y0GW0SzE3S0UJVU1AthqdpEC/vM230AN1vee5MByvFwhV MJvLlOe7JvW6CdMjQwFDX9cJG6DbDMaR6dwyRS0RPaZsh7qJ/x9FbmAw9DgTek46j9CtL4 MFd6nu+EIGiR7b2n6VYStWoM7wOQ1U6uZ405UE62Fj9QT40DJ8LCrApwb2z4ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062694; a=rsa-sha256; cv=none; b=h/jH7BMEeoEUJKnhndzyH4qPBEL9IWzp1S8AAz6n9kp2BBW3w8+oVH6/isR0Lv/P15M0kk V98SzYnrtzqUyssfT57E8p1oCdubRcC3jwQQm5MTm/gfjq1jIndJXsK5p0Uni2FO7azAjo pSJYEx9T2aAYpgSOzUODw9yoK+CKyL3gaYa3lthiPuR2MddnfqIAIv5a8d1C3mH7wHi6+9 cOPHuOxa+jAajqoRthRrTWGsZN8AwDgQm06QZNS3CKRgYfMG0sFVSKxctWuNjl9XCUc5f9 POrVBDPBCfvF4lHycNxSRRnCckHombwWDPWWesSR4wGklIQg87uM5blk1c0awA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD63nY2zB7R; Mon, 27 Nov 2023 05:24: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 3AR5Osdv066237; Mon, 27 Nov 2023 05:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Osad066234; Mon, 27 Nov 2023 05:24:54 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:54 GMT Message-Id: <202311270524.3AR5Osad066234@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: 5b31cc94b10d - main - sccs: Manual changes List-Id: Commit messages for the main 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: 5b31cc94b10d4bb7109c6b27940a0fc76a44a331 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b31cc94b10d4bb7109c6b27940a0fc76a44a331 commit 5b31cc94b10d4bb7109c6b27940a0fc76a44a331 Author: Warner Losh AuthorDate: 2023-11-23 17:59:13 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:58 +0000 sccs: Manual changes For the uncommon items: Go through the tree and remove sccs tags that didn't fit any nice pattern. If in the neighborhood, other SCM tags were removed when they were detritis of long-ago CVS somehow in the early mists of the project. Some adjacent copyrights stringswere removed (they duplicated the copyright notices in the file). This also removed non-standard formations of omission of SCCS tags (usually by adding an extra #if 0 somewhere. After this commit, a number of strings tagged with the 'what' @(#) prefix remain, but they are primarily copyright notices. Sponsored by: Netflix --- include/rpc/rpcb_prot.x | 2 -- include/rpcsvc/bootparam_prot.x | 6 ------ include/rpcsvc/crypt.x | 4 ---- include/rpcsvc/key_prot.x | 4 ---- include/rpcsvc/klm_prot.x | 8 -------- include/rpcsvc/mount.x | 8 -------- include/rpcsvc/nfs_prot.x | 8 -------- include/rpcsvc/nis.x | 4 ---- include/rpcsvc/nis_cache.x | 4 ---- include/rpcsvc/nis_callback.x | 4 ---- include/rpcsvc/nlm_prot.x | 8 +------- include/rpcsvc/pmap_prot.x | 3 --- include/rpcsvc/rex.x | 8 -------- include/rpcsvc/rnusers.x | 8 -------- include/rpcsvc/rquota.x | 4 ---- include/rpcsvc/rstat.x | 7 ------- include/rpcsvc/rwall.x | 2 -- include/rpcsvc/sm_inter.x | 4 ---- include/rpcsvc/spray.x | 8 -------- include/rpcsvc/yp.x | 4 ---- include/rpcsvc/yppasswd.x | 8 -------- include/rpcsvc/ypupdate_prot.x | 1 - kerberos5/include/config.h | 3 +-- lib/libc/db/docs/hash.usenix.ps | 1 - lib/libc/db/docs/libtp.usenix.ps | 1 - lib/libc/rpc/clnt_bcast.c | 3 --- lib/libc/rpc/clnt_dg.c | 3 --- lib/libc/rpc/svc_auth.c | 3 --- lib/libc/rpc/svc_generic.c | 3 --- lib/libc/string/wcscmp.c | 10 +++------- lib/libc/string/wcsncmp.c | 9 ++------- sbin/fsck/preen.c | 9 +-------- sbin/ipf/ipf/bpf_filter.c | 5 ----- sbin/ipf/ipsend/ip.c | 4 ---- sbin/ipf/ipsend/ipresend.c | 4 ---- sbin/ipf/ipsend/iptest.c | 4 ---- sbin/ipf/ipsend/iptests.c | 4 ---- sbin/mount_cd9660/mount_cd9660.c | 12 ------------ sbin/quotacheck/preen.c | 9 +-------- sbin/rcorder/hash.c | 13 ------------- sys/amd64/linux/syscalls.master | 1 - sys/amd64/linux32/syscalls.master | 1 - sys/i386/linux/syscalls.master | 1 - sys/kern/syscalls.master | 2 -- sys/libkern/arm/muldi3.c | 8 -------- sys/rpc/clnt_dg.c | 4 ---- sys/rpc/svc_auth.c | 4 ---- sys/rpc/svc_generic.c | 4 ---- usr.bin/compress/doc/README | 3 --- usr.bin/cut/cut.c | 7 ------- usr.bin/factor/factor.c | 14 -------------- usr.bin/find/option.c | 4 ---- usr.bin/rpcgen/rpc_clntout.c | 7 ------- usr.bin/rpcgen/rpc_cout.c | 7 ------- usr.bin/rpcgen/rpc_hout.c | 7 ------- usr.bin/rpcgen/rpc_main.c | 7 ------- usr.bin/rpcgen/rpc_parse.c | 7 ------- usr.bin/rpcgen/rpc_sample.c | 1 - usr.bin/rpcgen/rpc_scan.c | 7 ------- usr.bin/rpcgen/rpc_svcout.c | 7 ------- usr.bin/rpcgen/rpc_tblout.c | 7 ------- usr.bin/rpcgen/rpc_util.c | 7 ------- usr.bin/systat/tcp.c | 9 --------- usr.sbin/rpc.lockd/test.c | 8 -------- 64 files changed, 9 insertions(+), 342 deletions(-) diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x index b5de5c6d865d..efbe8f4ba246 100644 --- a/include/rpc/rpcb_prot.x +++ b/include/rpc/rpcb_prot.x @@ -33,8 +33,6 @@ #ifdef RPC_HDR % -%/* #pragma ident "@(#)rpcb_prot.x 1.5 94/04/29 SMI" */ -% %#ifndef _KERNEL % #endif diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x index 6e47bdb218d3..51d315327a00 100644 --- a/include/rpcsvc/bootparam_prot.x +++ b/include/rpcsvc/bootparam_prot.x @@ -45,12 +45,6 @@ %#include %#include %#include -#else -%#ifndef lint -%/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include #endif const MAX_MACHINE_NAME = 255; diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x index 7d6b94d96067..63e4c8798152 100644 --- a/include/rpcsvc/crypt.x +++ b/include/rpcsvc/crypt.x @@ -30,10 +30,6 @@ * SUCH DAMAGE. */ -#ifndef RPC_HDR -%#include -#endif - /* * This protocol definition exists because of the U.S. government and * its stupid export laws. We can't export DES code from the United diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x index 09a20049832e..9143b979f16f 100644 --- a/include/rpcsvc/key_prot.x +++ b/include/rpcsvc/key_prot.x @@ -45,10 +45,6 @@ * requirements. */ -%/* From: #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */ -%/* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ -%#include -% %/* % * Compiled from key_prot.x using rpcgen. % * DO NOT EDIT THIS FILE! diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x index b78dbfc20c3c..4dcfa00aab24 100644 --- a/include/rpcsvc/klm_prot.x +++ b/include/rpcsvc/klm_prot.x @@ -38,14 +38,6 @@ * above the kernel. */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const LM_MAXSTRLEN = 1024; /* diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x index e67cbc73d867..b3a4e11aa2c7 100644 --- a/include/rpcsvc/mount.x +++ b/include/rpcsvc/mount.x @@ -33,14 +33,6 @@ * Protocol description for the mount program */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */ const MNTNAMLEN = 255; /* maximum bytes in a name argument */ const FHSIZE = 32; /* size in bytes of a file handle */ diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x index 9706c5a03bbd..99ac2fd68e85 100644 --- a/include/rpcsvc/nfs_prot.x +++ b/include/rpcsvc/nfs_prot.x @@ -29,14 +29,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const NFS_PORT = 2049; const NFS_MAXDATA = 8192; const NFS_MAXPATHLEN = 1024; diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x index e83784159fe5..07a9c48e7638 100644 --- a/include/rpcsvc/nis.x +++ b/include/rpcsvc/nis.x @@ -29,10 +29,6 @@ % * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. % */ -#ifndef RPC_HDR -%#include -#endif - /* * * RPC Language Protocol description file for NIS Plus diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x index c728736e3213..2b204f617b29 100644 --- a/include/rpcsvc/nis_cache.x +++ b/include/rpcsvc/nis_cache.x @@ -35,10 +35,6 @@ * All Rights Reserved. */ -#ifndef RPC_HDR -%#include -#endif - #ifdef RPC_HDR %#include %#include diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x index af7a291d1baa..3e74bbca50cd 100644 --- a/include/rpcsvc/nis_callback.x +++ b/include/rpcsvc/nis_callback.x @@ -36,10 +36,6 @@ * All Rights Reserved. */ -#ifndef RPC_HDR -%#include -#endif - /* * * RPCL description of the Callback Service. diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x index f53d81996801..a8581ce9da0d 100644 --- a/include/rpcsvc/nlm_prot.x +++ b/include/rpcsvc/nlm_prot.x @@ -8,14 +8,8 @@ #ifdef RPC_HDR %#define LM_MAXSTRLEN 1024 %#define MAXNAMELEN LM_MAXSTRLEN+1 -#else -%#include -%#ifndef lint -%/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $"); -%#endif /* not lint */ #endif +/* $NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $ */ /* * status of a call to the lock manager diff --git a/include/rpcsvc/pmap_prot.x b/include/rpcsvc/pmap_prot.x index fb8a3bbde044..d64bfc3cf73a 100644 --- a/include/rpcsvc/pmap_prot.x +++ b/include/rpcsvc/pmap_prot.x @@ -34,9 +34,6 @@ #ifdef RPC_HDR % -%#pragma ident "@(#)pmap_prot.x 1.6 94/04/29 SMI" -%#include -% %#ifndef _KERNEL % #endif diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x index 20cce24e0ffa..78003204df0f 100644 --- a/include/rpcsvc/rex.x +++ b/include/rpcsvc/rex.x @@ -33,14 +33,6 @@ * Remote execution (rex) protocol specification */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const STRINGSIZE = 1024; typedef string rexstring<1024>; diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x index 1b6dcada2ff1..3e2a426b6b9f 100644 --- a/include/rpcsvc/rnusers.x +++ b/include/rpcsvc/rnusers.x @@ -33,14 +33,6 @@ * Find out about remote users */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const MAXUSERS = 100; const MAXUTLEN = 256; diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x index 31cf2f31e856..6349c35413d3 100644 --- a/include/rpcsvc/rquota.x +++ b/include/rpcsvc/rquota.x @@ -3,10 +3,6 @@ * Requires unix authentication */ -#ifndef RPC_HDR -%#include -#endif - const RQ_PATHLEN = 1024; struct sq_dqblk { diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x index 1b62470777e8..17e9c9fedf3a 100644 --- a/include/rpcsvc/rstat.x +++ b/include/rpcsvc/rstat.x @@ -44,13 +44,6 @@ % %#endif /* ndef FSCALE */ -#else - -%#ifndef lint -%/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include #endif /* def RPC_HDR */ const RSTAT_CPUSTATES = 4; diff --git a/include/rpcsvc/rwall.x b/include/rpcsvc/rwall.x index 6c26c1f18f3e..0c3a989ede0f 100644 --- a/include/rpcsvc/rwall.x +++ b/include/rpcsvc/rwall.x @@ -31,8 +31,6 @@ %/* % * Copyright (c) 1984, 1990 by Sun Microsystems, Inc. % */ -% -%/* from @(#)rwall.x 1.6 91/03/11 TIRPC 1.0 */ #ifdef RPC_HDR % diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index 89c51ca1b543..14aaeadee8a7 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -35,10 +35,6 @@ * */ -#ifndef RPC_HDR -%#include -#endif - program SM_PROG { version SM_VERS { /* res_stat = stat_succ if status monitor agrees to monitor */ diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x index 406d318a4943..8ef42f972c44 100644 --- a/include/rpcsvc/spray.x +++ b/include/rpcsvc/spray.x @@ -34,14 +34,6 @@ * Useful for testing flakiness of network interfaces */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - const SPRAYMAX = 8845; /* max amount can spray */ /* diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index 3567e2bd3fad..fff06557b67e 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -33,10 +33,6 @@ * Protocol description file for the Yellow Pages Service */ -#ifndef RPC_HDR -%#include -#endif - const YPMAXRECORD = 16777216; const YPMAXDOMAIN = 64; const YPMAXMAP = 64; diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index 2ad2215689f3..15741f37b27d 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -34,14 +34,6 @@ * Requires unix authentication */ -#ifndef RPC_HDR -%#ifndef lint -%/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/ -%/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/ -%#endif /* not lint */ -%#include -#endif - program YPPASSWDPROG { version YPPASSWDVERS { /* diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x index 328a07432f0d..b989ad29468b 100644 --- a/include/rpcsvc/ypupdate_prot.x +++ b/include/rpcsvc/ypupdate_prot.x @@ -32,7 +32,6 @@ % * Copyright (c) 1986, 1990 by Sun Microsystems, Inc. % */ % -%/* from @(#)ypupdate_prot.x 1.3 91/03/11 TIRPC 1.0 */ #ifndef RPC_HDR %#include #endif diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h index 7d8e1008c84f..d08f9d881ce0 100644 --- a/kerberos5/include/config.h +++ b/kerberos5/include/config.h @@ -3,8 +3,7 @@ #ifndef RCSID -#define RCSID(msg) \ -static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } +#define RCSID(msg) #endif /* Maximum values on all known systems */ diff --git a/lib/libc/db/docs/hash.usenix.ps b/lib/libc/db/docs/hash.usenix.ps index e050cdeba59f..98adfdf209b5 100644 --- a/lib/libc/db/docs/hash.usenix.ps +++ b/lib/libc/db/docs/hash.usenix.ps @@ -3,7 +3,6 @@ %%Title: stdin (ditroff) %%CreationDate: Tue Dec 11 15:06:45 1990 %%EndComments -% @(#)psdit.pro 1.3 4/15/88 % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 diff --git a/lib/libc/db/docs/libtp.usenix.ps b/lib/libc/db/docs/libtp.usenix.ps index 57df42730902..2ec31308cb0e 100644 --- a/lib/libc/db/docs/libtp.usenix.ps +++ b/lib/libc/db/docs/libtp.usenix.ps @@ -3,7 +3,6 @@ %%Title: stdin (ditroff) %%CreationDate: Thu Dec 12 15:32:11 1991 %%EndComments -% @(#)psdit.pro 1.3 4/15/88 % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c index 17b5027700f4..07e6d0a0fa20 100644 --- a/lib/libc/rpc/clnt_bcast.c +++ b/lib/libc/rpc/clnt_bcast.c @@ -33,9 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro"; -#endif /* * clnt_bcast.c * Client interface to broadcast service. diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c index ca31d3104b6c..78fc5e47d444 100644 --- a/lib/libc/rpc/clnt_dg.c +++ b/lib/libc/rpc/clnt_dg.c @@ -33,9 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro"; -#endif /* * Implements a connectionless client side RPC. */ diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c index 6d9265e8c0f7..eb61171733d6 100644 --- a/lib/libc/rpc/svc_auth.c +++ b/lib/libc/rpc/svc_auth.c @@ -33,9 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; -#endif /* * svc_auth.c, Server-side rpc authenticator interface. * diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c index eb7ed28bb0ca..ea08811ba1ae 100644 --- a/lib/libc/rpc/svc_generic.c +++ b/lib/libc/rpc/svc_generic.c @@ -34,9 +34,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro"; -#endif /* * svc_generic.c, Server side for RPC. * diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c index ed02db771704..66e08ff782a7 100644 --- a/lib/libc/string/wcscmp.c +++ b/lib/libc/string/wcscmp.c @@ -32,13 +32,9 @@ * SUCH DAMAGE. */ -#include -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93"; -#if 0 -__RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ + +/* $NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $ */ + #include /* diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c index a7b2189d5fb9..141e42c3087f 100644 --- a/lib/libc/string/wcsncmp.c +++ b/lib/libc/string/wcsncmp.c @@ -29,13 +29,8 @@ * SUCH DAMAGE. */ -#include -#if 0 -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93"; -__RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $"); -#endif /* LIBC_SCCS and not lint */ -#endif +/* $NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $ */ + #include int diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c index 219b2a91e0e2..574826f4d8f0 100644 --- a/sbin/fsck/preen.c +++ b/sbin/fsck/preen.c @@ -31,14 +31,7 @@ * SUCH DAMAGE. */ -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)preen.c 8.5 (Berkeley) 4/28/95"; -#else -__RCSID("$NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $"); -#endif -#endif /* not lint */ +/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */ #include #include diff --git a/sbin/ipf/ipf/bpf_filter.c b/sbin/ipf/ipf/bpf_filter.c index b380eb8e20ee..bd7012d2f1ab 100644 --- a/sbin/ipf/ipf/bpf_filter.c +++ b/sbin/ipf/ipf/bpf_filter.c @@ -37,11 +37,6 @@ * SUCH DAMAGE. */ -#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) -static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.3 2006/10/03 11:25:56 darrenr Exp $ (LBL)"; -#endif - #include #include #include diff --git a/sbin/ipf/ipsend/ip.c b/sbin/ipf/ipsend/ip.c index 14197c382260..177563e65c9c 100644 --- a/sbin/ipf/ipsend/ip.c +++ b/sbin/ipf/ipsend/ip.c @@ -4,10 +4,6 @@ * * See the IPFILTER.LICENCE file for details on licencing. */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995"; -static const char rcsid[] = "@(#)$Id$"; -#endif #include #include #include diff --git a/sbin/ipf/ipsend/ipresend.c b/sbin/ipf/ipsend/ipresend.c index be7b5bc1943a..c00367a4a586 100644 --- a/sbin/ipf/ipsend/ipresend.c +++ b/sbin/ipf/ipsend/ipresend.c @@ -5,10 +5,6 @@ * See the IPFILTER.LICENCE file for details on licencing. * */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id$"; -#endif #include #include #include diff --git a/sbin/ipf/ipsend/iptest.c b/sbin/ipf/ipsend/iptest.c index 16b97c221f41..db31168cd380 100644 --- a/sbin/ipf/ipsend/iptest.c +++ b/sbin/ipf/ipsend/iptest.c @@ -5,10 +5,6 @@ * See the IPFILTER.LICENCE file for details on licencing. * */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id$"; -#endif #include #include #include diff --git a/sbin/ipf/ipsend/iptests.c b/sbin/ipf/ipsend/iptests.c index 3fccf1389f6c..1015e74a3254 100644 --- a/sbin/ipf/ipsend/iptests.c +++ b/sbin/ipf/ipsend/iptests.c @@ -5,10 +5,6 @@ * See the IPFILTER.LICENCE file for details on licencing. * */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id$"; -#endif #include #include #if defined(__NetBSD__) && defined(__vax__) diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index 0699c6802114..ab6da7271c17 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -34,18 +34,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1992, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -/* -static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95"; -*/ -#endif /* not lint */ - #include #include #include diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c index 6013eb9d5ffc..b7bd79a462d7 100644 --- a/sbin/quotacheck/preen.c +++ b/sbin/quotacheck/preen.c @@ -31,14 +31,7 @@ * SUCH DAMAGE. */ -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)preen.c 8.5 (Berkeley) 4/28/95"; -#else -__RCSID("$NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $"); -#endif -#endif /* not lint */ +/* $NetBSD: preen.c,v 1.18 1998/07/26 20:02:36 mycroft Exp $ */ #include #include diff --git a/sbin/rcorder/hash.c b/sbin/rcorder/hash.c index e2231461f1a9..a40e52529d06 100644 --- a/sbin/rcorder/hash.c +++ b/sbin/rcorder/hash.c @@ -40,19 +40,6 @@ * SUCH DAMAGE. */ -#ifdef MAKE_BOOTSTRAP -static char rcsid[] = "$NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $"; -#else -#include -#ifndef lint -#if 0 -static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93"; -#else -__RCSID("$NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $"); -#endif -#endif /* not lint */ -#endif - #include #include diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 8e12a539b87f..10084b53a1e1 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -1,5 +1,4 @@ -; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 7d796df1aed3..6b40a89db66d 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1,5 +1,4 @@ -; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux32_sysent.c, linux32_proto.h and linux32_syscall.h. diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index e3c39e50986c..d0ba99861153 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1,5 +1,4 @@ -; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 6692495f0d2d..63aa8c2a5d7e 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,5 +1,3 @@ -; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 -; ; System call name/number master file. ; Processed to created init_sysent.c, syscalls.c and syscall.h. diff --git a/sys/libkern/arm/muldi3.c b/sys/libkern/arm/muldi3.c index 21b357d49eb4..d41e9b99e080 100644 --- a/sys/libkern/arm/muldi3.c +++ b/sys/libkern/arm/muldi3.c @@ -35,14 +35,6 @@ * SUCH DAMAGE. */ -#include -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)muldi3.c 8.1 (Berkeley) 6/4/93"; -#else -#endif -#endif /* LIBC_SCCS and not lint */ - #include /* diff --git a/sys/rpc/clnt_dg.c b/sys/rpc/clnt_dg.c index 6d0b4fe5b76e..f06f6b034c9a 100644 --- a/sys/rpc/clnt_dg.c +++ b/sys/rpc/clnt_dg.c @@ -33,10 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro"; -#endif -#include /* * Implements a connectionless client side RPC. */ diff --git a/sys/rpc/svc_auth.c b/sys/rpc/svc_auth.c index 1addbbe7928a..6acb1fb0d4b9 100644 --- a/sys/rpc/svc_auth.c +++ b/sys/rpc/svc_auth.c @@ -33,10 +33,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; -#endif -#include /* * svc_auth.c, Server-side rpc authenticator interface. * diff --git a/sys/rpc/svc_generic.c b/sys/rpc/svc_generic.c index c5ea544cf8de..b2626d66490d 100644 --- a/sys/rpc/svc_generic.c +++ b/sys/rpc/svc_generic.c @@ -34,10 +34,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro"; -#endif -#include /* * svc_generic.c, Server side for RPC. * diff --git a/usr.bin/compress/doc/README b/usr.bin/compress/doc/README index 4357c92d5bda..cae983721c6f 100644 --- a/usr.bin/compress/doc/README +++ b/usr.bin/compress/doc/README @@ -1,6 +1,3 @@ - - @(#)README 8.1 (Berkeley) 6/9/93 - Compress version 4.0 improvements over 3.0: o compress() speedup (10-50%) by changing division hash to xor o decompress() speedup (5-10%) diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index 796ab66c0c6e..df4a2d7eb132 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -32,13 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -static const char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; -#endif /* not lint */ -#include #include #include #include diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c index 53a369f10506..9d8fdbe1fb0f 100644 --- a/usr.bin/factor/factor.c +++ b/usr.bin/factor/factor.c @@ -30,20 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#include -#ifdef __COPYRIGHT -__COPYRIGHT("@(#) Copyright (c) 1989, 1993\ - The Regents of the University of California. All rights reserved."); -#endif -#ifdef __SCCSID -__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95"); -#endif -#ifdef __RCSID -__RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $"); -#endif -#endif /* not lint */ - /* * factor - factor a number into primes * diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index c5b461f3389b..4af5af94e329 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -/* -static char sccsid[] = "@(#)option.c 8.2 (Berkeley) 4/16/94"; -*/ - #include #include #include diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c index 4162b089761b..a06ca686a483 100644 --- a/usr.bin/rpcgen/rpc_clntout.c +++ b/usr.bin/rpcgen/rpc_clntout.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler * Copyright (C) 1987, Sun Microsytsems, Inc. diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c index 284a0f61d763..8c2864847850 100644 --- a/usr.bin/rpcgen/rpc_cout.c +++ b/usr.bin/rpcgen/rpc_cout.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_cout.c, XDR routine outputter for the RPC protocol compiler * Copyright (C) 1987, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c index 927075823ced..9c298930fa93 100644 --- a/usr.bin/rpcgen/rpc_hout.c +++ b/usr.bin/rpcgen/rpc_hout.c @@ -27,13 +27,6 @@ * Mountain View, California 94043 */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI"; -#endif -#endif - -#include /* * rpc_hout.c, Header file outputter for the RPC protocol compiler * Copyright (C) 1987, Sun Microsystems, Inc. diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c index 1b2e01905a40..8d5afad86cff 100644 --- a/usr.bin/rpcgen/rpc_main.c +++ b/usr.bin/rpcgen/rpc_main.c @@ -28,13 +28,6 @@ */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI"; *** 148 LINES SKIPPED *** From nobody Mon Nov 27 05:24:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD76Rtsz51hB5; Mon, 27 Nov 2023 05:24: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 4SdvD75z09z4XD0; Mon, 27 Nov 2023 05:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w3xr0xwe2tw7sE8O79IJ4QKPfn1RUzv+ERgLXNVfe/E=; b=iSonbIw0sLyvpOx6yldnt3uI+jGcb2yRINETllF59OcYo9Wlwnr5LrBoaKaLaZIVNOqFAn dbuSn5V86vXLI1au1oow8KuY0kbf+ezH2vwZobfr+CX5b1OX98t4+zHfqZYSGFjmweAt+8 RQDCjaXkgSbOPzI0EG43RzVIy2YKxZ3KmwzqJpkewaRDQx/jleRbEWztzdi62IFj6KDX23 /YR7VojW2rASAF/tw63tNPL0c3CFne/+tArvYJZBr4G/VCpCD6oTTA3ms8t2vuIxCDe71b LL3w3rgZI71q4iOIg+dUngAOO8phjUopsNdfuTAj85hY4X7mwvzySAumONnn9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w3xr0xwe2tw7sE8O79IJ4QKPfn1RUzv+ERgLXNVfe/E=; b=f8VCr/aCwGKJ/mnpgckl47d2Z9GDP9x//eoJUdJhT7RY4y5z6sUGQuCXeJqi1/f4As2Gg+ 7aF+tcuZyb2qR68parKgW1zHoNAffbnrAACVzRhA7doIZDfr/6rEHBBNe7RG74A9DLmSwu /5uRy++nVzxIESJ/wRKVGGVHr3bRppEp0W+qN/EEzZtZdYKAb4yHxsZqD55gz2R+A7E5tB p8FIegx8YntzsVQtgtHx1HpGUW1BdcjpzZ8a9kK2Fg43gi2+2xTldMKvY/gA1mDMLbrvI9 /l0FsSavFhytZKSqloIUFI0xITWeVk0GfLL7NXpUE8Hcvt3gIL61ALAZPSFZPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062695; a=rsa-sha256; cv=none; b=U6ClSsxJY1MOncikTbWp3ah6S9E3TWS8YOOSGBWBe7FrLHa2hhnzd++K08Ah/zZvcDPGb3 CfpnIHO31T90uH5P4LaTjj579+Tq1de1MqfKWDrm9fDj38bbqV/TN0xW3oruCGp+OODCrb hLqIiMZyHD12W4RTvHDCeVr8rppODUc1l/GUcp6KTnC+RjLC/Q6vvZ8mMRFdhCRCQMHeqS LUjD2By8U6MnyzefYvsNckrYZE8j5gXsD8qHmU64Woi59c4uQ2i+16x0ZTRBuVm7Gl8qR9 XYsTpY7BbKQ3GJ3TwlQzMnKSBt7xvHQdXTQsF5Acd7ChuItRLdWtxJ79I+YIjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD74jw0zBJs; Mon, 27 Nov 2023 05:24: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 3AR5Ot9o066279; Mon, 27 Nov 2023 05:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5OtVJ066276; Mon, 27 Nov 2023 05:24:55 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:55 GMT Message-Id: <202311270524.3AR5OtVJ066276@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: 0b8224d1cc9d - main - Remove copyright strings ifdef'd out List-Id: Commit messages for the main 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: 0b8224d1cc9dc6c9778ba04a75b2c8d47e5d7481 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0b8224d1cc9dc6c9778ba04a75b2c8d47e5d7481 commit 0b8224d1cc9dc6c9778ba04a75b2c8d47e5d7481 Author: Warner Losh AuthorDate: 2023-11-24 07:45:36 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:58 +0000 Remove copyright strings ifdef'd out We've ifdef'd out the copyright strings for some time now. Go ahead and remove the ifdefs. Plus whatever other detritis was left over from other recent removals. These copyright strings are present in the comments and are largely from CSRG's attempt at adding their copyright to every binary file (which modern interpretations of the license doesn't require). Sponsored by: Netflix --- bin/cat/cat.c | 10 ---------- bin/chflags/chflags.c | 10 ---------- bin/chio/chio.c | 8 -------- bin/chmod/chmod.c | 9 --------- bin/cp/cp.c | 9 --------- bin/date/date.c | 9 --------- bin/dd/dd.c | 9 --------- bin/df/df.c | 9 --------- bin/domainname/domainname.c | 9 --------- bin/echo/echo.c | 9 --------- bin/ed/main.c | 9 --------- bin/hostname/hostname.c | 9 --------- bin/kill/kill.c | 9 --------- bin/ln/ln.c | 9 --------- bin/ls/ls.c | 9 --------- bin/mkdir/mkdir.c | 9 --------- bin/mv/mv.c | 9 --------- bin/pax/pax.c | 9 --------- bin/ps/ps.c | 10 ---------- bin/pwd/pwd.c | 9 --------- bin/rm/rm.c | 9 --------- bin/rmdir/rmdir.c | 9 --------- bin/sh/main.c | 9 --------- bin/sh/mknodes.c | 9 --------- bin/sh/mksyntax.c | 9 --------- bin/sleep/sleep.c | 9 --------- bin/stty/stty.c | 9 --------- bin/sync/sync.c | 9 --------- lib/libc/db/test/dbtest.c | 6 ------ lib/libc/db/test/hash.tests/driver2.c | 6 ------ lib/libc/db/test/hash.tests/tcreat3.c | 6 ------ lib/libc/db/test/hash.tests/tdel.c | 6 ------ lib/libc/db/test/hash.tests/thash4.c | 6 ------ lib/libc/db/test/hash.tests/tread2.c | 6 ------ lib/libc/db/test/hash.tests/tseq.c | 6 ------ lib/libc/db/test/hash.tests/tverify.c | 6 ------ lib/libc/quad/TESTS/divrem.c | 6 ------ lib/libc/quad/TESTS/mul.c | 6 ------ lib/libc/stdtime/strftime.c | 10 ---------- lib/libc/stdtime/strptime.c | 8 -------- libexec/comsat/comsat.c | 9 --------- libexec/fingerd/fingerd.c | 9 --------- libexec/ftpd/ftpd.c | 12 ------------ libexec/getty/main.c | 9 --------- libexec/rbootd/rbootd.c | 9 --------- libexec/talkd/talkd.c | 9 --------- libexec/tftpd/tftpd.c | 9 --------- sbin/adjkerntz/adjkerntz.c | 8 -------- sbin/bsdlabel/bsdlabel.c | 9 --------- sbin/clri/clri.c | 10 ---------- sbin/dmesg/dmesg.c | 9 --------- sbin/dump/main.c | 9 --------- sbin/dumpfs/dumpfs.c | 9 --------- sbin/dumpon/dumpon.c | 9 --------- sbin/ffsinfo/ffsinfo.c | 7 ------- sbin/fsck_ffs/globs.c | 9 --------- sbin/fsck_ffs/main.c | 9 --------- sbin/growfs/growfs.c | 8 -------- sbin/ifconfig/ifconfig.c | 6 ------ sbin/init/init.c | 9 --------- sbin/mknod/mknod.c | 9 --------- sbin/mount/mount.c | 7 ------- sbin/mount/mount_fs.c | 9 --------- sbin/mount_nfs/mount_nfs.c | 9 --------- sbin/mount_nullfs/mount_nullfs.c | 9 --------- sbin/mount_unionfs/mount_unionfs.c | 9 --------- sbin/newfs/newfs.c | 9 --------- sbin/nfsiod/nfsiod.c | 9 --------- sbin/ping/ping.c | 9 --------- sbin/ping/ping6.c | 10 ---------- sbin/ping/utils.c | 9 --------- sbin/quotacheck/quotacheck.c | 9 --------- sbin/reboot/reboot.c | 9 --------- sbin/restore/main.c | 10 ---------- sbin/route/route.c | 10 ---------- sbin/routed/main.c | 3 --- sbin/routed/rtquery/rtquery.c | 14 -------------- sbin/shutdown/shutdown.c | 9 --------- sbin/swapon/swapon.c | 9 --------- sbin/tunefs/tunefs.c | 9 --------- sbin/umount/umount.c | 9 --------- usr.bin/banner/banner.c | 10 ---------- usr.bin/basename/basename.c | 10 ---------- usr.bin/biff/biff.c | 10 ---------- usr.bin/bintrans/uudecode.c | 9 --------- usr.bin/bintrans/uuencode.c | 9 --------- usr.bin/caesar/caesar.c | 9 --------- usr.bin/calendar/calendar.c | 10 ---------- usr.bin/calendar/io.c | 10 ---------- usr.bin/calendar/pom.c | 9 --------- usr.bin/cap_mkdb/cap_mkdb.c | 10 ---------- usr.bin/chpass/chpass.c | 9 --------- usr.bin/cksum/cksum.c | 10 ---------- usr.bin/cmp/cmp.c | 10 ---------- usr.bin/col/col.c | 10 ---------- usr.bin/colrm/colrm.c | 10 ---------- usr.bin/column/column.c | 10 ---------- usr.bin/comm/comm.c | 10 ---------- usr.bin/compress/compress.c | 10 ---------- usr.bin/ctags/ctags.c | 10 ---------- usr.bin/dirname/dirname.c | 7 ------- usr.bin/du/du.c | 9 --------- usr.bin/env/env.c | 10 ---------- usr.bin/expand/expand.c | 9 --------- usr.bin/false/false.c | 7 ------- usr.bin/find/main.c | 6 ------ usr.bin/finger/finger.c | 10 ---------- usr.bin/fold/fold.c | 10 ---------- usr.bin/fortune/fortune/fortune.c | 9 --------- usr.bin/fortune/strfile/strfile.c | 9 --------- usr.bin/fortune/unstr/unstr.c | 9 --------- usr.bin/from/from.c | 9 --------- usr.bin/gcore/gcore.c | 9 --------- usr.bin/gprof/gprof.c | 10 ---------- usr.bin/gzip/gzip.c | 6 ------ usr.bin/head/head.c | 9 --------- usr.bin/hexdump/hexdump.c | 9 --------- usr.bin/id/id.c | 9 --------- usr.bin/join/join.c | 9 --------- usr.bin/jot/jot.c | 9 --------- usr.bin/kdump/kdump.c | 9 --------- usr.bin/ktrace/ktrace.c | 10 ---------- usr.bin/lam/lam.c | 9 --------- usr.bin/last/last.c | 7 ------- usr.bin/lastcomm/lastcomm.c | 9 --------- usr.bin/leave/leave.c | 9 --------- usr.bin/locate/bigram/locate.bigram.c | 10 ---------- usr.bin/locate/code/locate.code.c | 9 --------- usr.bin/locate/locate/locate.c | 10 ---------- usr.bin/lock/lock.c | 9 --------- usr.bin/logger/logger.c | 10 ---------- usr.bin/logname/logname.c | 7 ------- usr.bin/look/look.c | 9 --------- usr.bin/mail/main.c | 9 --------- usr.bin/mesg/mesg.c | 9 --------- usr.bin/mkfifo/mkfifo.c | 9 --------- usr.bin/mkstr/mkstr.c | 10 ---------- usr.bin/morse/morse.c | 5 ----- usr.bin/msgs/msgs.c | 10 ---------- usr.bin/mt/mt.c | 10 ---------- usr.bin/netstat/main.c | 10 ---------- usr.bin/nfsstat/nfsstat.c | 9 --------- usr.bin/nice/nice.c | 10 ---------- usr.bin/nl/nl.c | 7 ------- usr.bin/nohup/nohup.c | 9 --------- usr.bin/number/number.c | 9 --------- usr.bin/paste/paste.c | 10 ---------- usr.bin/pom/pom.c | 9 --------- usr.bin/pr/pr.c | 10 ---------- usr.bin/primes/primes.c | 9 --------- usr.bin/printenv/printenv.c | 10 ---------- usr.bin/printf/printf.c | 11 ----------- usr.bin/quota/quota.c | 7 ------- usr.bin/random/random.c | 9 --------- usr.bin/renice/renice.c | 10 ---------- usr.bin/rev/rev.c | 10 ---------- usr.bin/ruptime/ruptime.c | 8 -------- usr.bin/rwall/rwall.c | 8 -------- usr.bin/rwho/rwho.c | 10 ---------- usr.bin/script/script.c | 6 ------ usr.bin/sed/main.c | 8 -------- usr.bin/showmount/showmount.c | 9 --------- usr.bin/split/split.c | 8 -------- usr.bin/su/su.c | 10 ---------- usr.bin/tail/tail.c | 7 ------- usr.bin/talk/talk.c | 8 -------- usr.bin/tcopy/tcopy.c | 8 -------- usr.bin/tee/tee.c | 9 --------- usr.bin/tftp/main.c | 10 ---------- usr.bin/time/time.c | 9 --------- usr.bin/tip/tip/remote.c | 10 ---------- usr.bin/tip/tip/tip.c | 10 ---------- usr.bin/touch/touch.c | 8 -------- usr.bin/tr/tr.c | 8 -------- usr.bin/true/true.c | 7 ------- usr.bin/tsort/tsort.c | 8 -------- usr.bin/tty/tty.c | 10 ---------- usr.bin/ul/ul.c | 9 --------- usr.bin/uname/uname.c | 8 -------- usr.bin/unexpand/unexpand.c | 8 -------- usr.bin/uniq/uniq.c | 9 --------- usr.bin/vgrind/regexp.c | 8 -------- usr.bin/vgrind/vfontedpr.c | 8 -------- usr.bin/vmstat/vmstat.c | 10 ---------- usr.bin/w/w.c | 8 -------- usr.bin/wall/wall.c | 8 -------- usr.bin/wc/wc.c | 10 ---------- usr.bin/what/what.c | 8 -------- usr.bin/whois/whois.c | 10 ---------- usr.bin/write/write.c | 10 ---------- usr.bin/xargs/xargs.c | 9 --------- usr.bin/xinstall/xinstall.c | 10 ---------- usr.bin/xstr/xstr.c | 7 ------- usr.bin/yes/yes.c | 9 --------- usr.sbin/accton/accton.c | 9 --------- usr.sbin/arp/arp.c | 9 --------- usr.sbin/bluetooth/btpand/btpand.c | 4 ---- usr.sbin/chown/chown.c | 10 ---------- usr.sbin/chroot/chroot.c | 9 --------- usr.sbin/config/main.cc | 9 --------- usr.sbin/cron/cron/globals.h | 3 --- usr.sbin/edquota/edquota.c | 10 ---------- usr.sbin/inetd/inetd.c | 9 --------- usr.sbin/lpr/filters/lpf.c | 9 --------- usr.sbin/lpr/lpc/cmds.c | 9 --------- usr.sbin/lpr/lpc/lpc.c | 9 --------- usr.sbin/lpr/lpd/lpd.c | 9 --------- usr.sbin/lpr/lpd/printjob.c | 9 --------- usr.sbin/lpr/lpd/recvjob.c | 9 --------- usr.sbin/lpr/lpq/lpq.c | 9 --------- usr.sbin/lpr/lpr/lpr.c | 9 --------- usr.sbin/lpr/lprm/lprm.c | 9 --------- usr.sbin/lpr/lptest/lptest.c | 9 --------- usr.sbin/lpr/pac/pac.c | 9 --------- usr.sbin/mountd/mountd.c | 10 ---------- usr.sbin/nfsd/nfsd.c | 9 --------- usr.sbin/pstat/pstat.c | 9 --------- usr.sbin/pwd_mkdb/pwd_mkdb.c | 10 ---------- usr.sbin/quotaon/quotaon.c | 9 --------- usr.sbin/rarpd/rarpd.c | 8 -------- usr.sbin/repquota/repquota.c | 9 --------- usr.sbin/rmt/rmt.c | 9 --------- usr.sbin/rwhod/rwhod.c | 10 ---------- usr.sbin/sa/main.c | 8 -------- usr.sbin/syslogd/syslogd.c | 10 ---------- usr.sbin/traceroute6/traceroute6.c | 9 --------- usr.sbin/vipw/vipw.c | 9 --------- 227 files changed, 2003 deletions(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 7b39caa84d00..852617010ce2 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -32,16 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ -#endif - -#ifndef lint -#endif /* not lint */ #include #include #include diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index 6704f569cd33..b92d5b6439f5 100644 --- a/bin/chflags/chflags.c +++ b/bin/chflags/chflags.c @@ -29,16 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1992, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif - -#endif - -#include #include #include diff --git a/bin/chio/chio.c b/bin/chio/chio.c index eaa46775edac..4feafe5ce720 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -35,14 +35,6 @@ * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ -#if 0 -#ifndef lint -static const char copyright[] = - "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; -#endif /* not lint */ -#endif - -#include #include #include #include diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c index 67dc03e1f99d..78bf3137b9ed 100644 --- a/bin/chmod/chmod.c +++ b/bin/chmod/chmod.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1989, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include diff --git a/bin/cp/cp.c b/bin/cp/cp.c index f8610229e4c8..1510943ab5f6 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -32,15 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1988, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include /* * Cp copies source files to target files. * diff --git a/bin/date/date.c b/bin/date/date.c index abc51c307f47..9f6a2336de97 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1985, 1987, 1988, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#if 0 -#endif - #include #include #include diff --git a/bin/dd/dd.c b/bin/dd/dd.c index a2997ea12249..ca79b684bf1e 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -33,15 +33,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1991, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/df/df.c b/bin/df/df.c index f59b21963eb2..db5b8b18beae 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -34,15 +34,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1980, 1990, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index 54be99392865..dbf8f9b8d29b 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1988, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include diff --git a/bin/echo/echo.c b/bin/echo/echo.c index b2e82e9990d9..b8f7507c416e 100644 --- a/bin/echo/echo.c +++ b/bin/echo/echo.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include diff --git a/bin/ed/main.c b/bin/ed/main.c index bddf6c1e9c2c..fefb83b7bc71 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -26,15 +26,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#if 0 -static const char copyright[] = -"@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\ - All rights reserved.\n"; -#endif -#endif /* not lint */ - -#include /* * CREDITS * diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c index 3b2d51230955..c122656ec237 100644 --- a/bin/hostname/hostname.c +++ b/bin/hostname/hostname.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1988, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include diff --git a/bin/kill/kill.c b/bin/kill/kill.c index 500f9384cbb9..f3d323a1ff49 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -33,15 +33,6 @@ * as a builtin for /bin/sh (#define SHELL). */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1988, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 3481d40ccb4f..2a4597b5fe36 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1987, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 1bd5b7f2c88d..6af7715fa5f0 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -32,15 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1989, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#if 0 -#endif -#include #include #include #include diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 725d88235645..e67c99ce2a3a 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1983, 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 1104a2710174..1dee9348cc3b 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -32,15 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1989, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 1a42013e4923..70611e54be95 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -33,15 +33,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 075856187ded..cbee10c20d53 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -36,16 +36,6 @@ * ------+---------+---------+-------- + --------+---------+---------+---------* */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1990, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#if 0 -#endif - -#include #include #include #include diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 4edef62fe961..a49c638b1dee 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1991, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/rm/rm.c b/bin/rm/rm.c index c139955e2174..16bbf7403fd4 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1990, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index 9e27c9832c07..c5d3db831309 100644 --- a/bin/rmdir/rmdir.c +++ b/bin/rmdir/rmdir.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1992, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/sh/main.c b/bin/sh/main.c index b4759b67ee0c..23147c1db0be 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -32,15 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c index 4fbf01906cb3..0c5dfb1accfb 100644 --- a/bin/sh/mknodes.c +++ b/bin/sh/mknodes.c @@ -32,15 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include /* * This program reads the nodetypes file and nodes.c.pat file. It generates * the files nodes.h and nodes.c. diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c index a8a671ffa0a9..60570d0f60a4 100644 --- a/bin/sh/mksyntax.c +++ b/bin/sh/mksyntax.c @@ -32,15 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include /* * This program creates syntax.h and syntax.c. */ diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index 7922ebff661b..20e525ce093c 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -27,15 +27,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1988, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include #include diff --git a/bin/stty/stty.c b/bin/stty/stty.c index ecee736cccab..38834aaccea0 100644 --- a/bin/stty/stty.c +++ b/bin/stty/stty.c @@ -27,15 +27,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1989, 1991, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include diff --git a/bin/sync/sync.c b/bin/sync/sync.c index 7eb4368531d3..7560e794d35f 100644 --- a/bin/sync/sync.c +++ b/bin/sync/sync.c @@ -27,15 +27,6 @@ * SUCH DAMAGE. */ -#if 0 -#ifndef lint -static char const copyright[] = -"@(#) Copyright (c) 1987, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#endif -#include #include #include diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c index 233153e88ef8..8ce8239f41b6 100644 --- a/lib/libc/db/test/dbtest.c +++ b/lib/libc/db/test/dbtest.c @@ -29,12 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1992, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include #include diff --git a/lib/libc/db/test/hash.tests/driver2.c b/lib/libc/db/test/hash.tests/driver2.c index d557968b0191..eb05a6da2dab 100644 --- a/lib/libc/db/test/hash.tests/driver2.c +++ b/lib/libc/db/test/hash.tests/driver2.c @@ -32,12 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - /* * Test driver, to try to tackle the large ugly-split problem. */ diff --git a/lib/libc/db/test/hash.tests/tcreat3.c b/lib/libc/db/test/hash.tests/tcreat3.c index 8c6f930e22d4..163992dd17a6 100644 --- a/lib/libc/db/test/hash.tests/tcreat3.c +++ b/lib/libc/db/test/hash.tests/tcreat3.c @@ -32,12 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include #include #include diff --git a/lib/libc/db/test/hash.tests/tdel.c b/lib/libc/db/test/hash.tests/tdel.c index 3488f23ac4c1..78a5618995a9 100644 --- a/lib/libc/db/test/hash.tests/tdel.c +++ b/lib/libc/db/test/hash.tests/tdel.c @@ -32,12 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include #include #include diff --git a/lib/libc/db/test/hash.tests/thash4.c b/lib/libc/db/test/hash.tests/thash4.c index 311ddcf00c5e..8dfdf003eafe 100644 --- a/lib/libc/db/test/hash.tests/thash4.c +++ b/lib/libc/db/test/hash.tests/thash4.c @@ -32,12 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include #include #include diff --git a/lib/libc/db/test/hash.tests/tread2.c b/lib/libc/db/test/hash.tests/tread2.c index 2d175f46ffae..eead3b3105f0 100644 --- a/lib/libc/db/test/hash.tests/tread2.c +++ b/lib/libc/db/test/hash.tests/tread2.c @@ -32,12 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include #include #include diff --git a/lib/libc/db/test/hash.tests/tseq.c b/lib/libc/db/test/hash.tests/tseq.c index c96b118f4f57..5b27d80881e9 100644 --- a/lib/libc/db/test/hash.tests/tseq.c +++ b/lib/libc/db/test/hash.tests/tseq.c @@ -32,12 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include #include #include diff --git a/lib/libc/db/test/hash.tests/tverify.c b/lib/libc/db/test/hash.tests/tverify.c index 4b42d045724f..6a2342c96bd9 100644 --- a/lib/libc/db/test/hash.tests/tverify.c +++ b/lib/libc/db/test/hash.tests/tverify.c @@ -32,12 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include #include #include diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c index 4a213f7a26e6..728c0786f464 100644 --- a/lib/libc/quad/TESTS/divrem.c +++ b/lib/libc/quad/TESTS/divrem.c @@ -33,12 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include main() diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c index 3d4657fafb26..9306284f3faf 100644 --- a/lib/libc/quad/TESTS/mul.c +++ b/lib/libc/quad/TESTS/mul.c @@ -33,12 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - #include main() diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c index 8196f1bd81f6..8e0bbcb6d1df 100644 --- a/lib/libc/stdtime/strftime.c +++ b/lib/libc/stdtime/strftime.c *** 3764 LINES SKIPPED *** From nobody Mon Nov 27 05:24:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvD91h6sz51h3X; Mon, 27 Nov 2023 05:24: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 4SdvD904q2z4XMS; Mon, 27 Nov 2023 05:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mthqwX8FD3Mo4ULkGbqvhfATI4LCu8J1FtwZIEVbzJk=; b=SyaKFomJqXMhWZ52WJUjAC1d55L5mCPzbTo1vOvebEsoNzF+GAgFJ5mgRQBvo9UyZ3Xnpw 9d21OYGw+GPdX2pdJ34f6fZIriGWkRC2GwQ9arfe1l0UeKOYbD5GjDNBu2QgccWqE1jDW4 mjKy5bqGbeDaUqD1LLOdW883OnSaMXhVUFfMDz8jwLm9SjInTMF4+z+1z5QR46QpfL2LsU 8behfswTWWNvG/CkNdUWEG0h9VI8Sx1oB7CF4KI/ncrnWp4mKR9FrlfN1qup4TkTIWcNgW sbxewHA5EROgleYMJDhB0u9/Y0A6TTMPDbFCjaFnggdgYdz5wqbic9p+3+d30g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mthqwX8FD3Mo4ULkGbqvhfATI4LCu8J1FtwZIEVbzJk=; b=rku43Eo0diE1T3VFp5P+fTWJp9WljiF0mjtGhA5k21PDPSHtIPiXVAjoNuFE/oFhr7oBOM TIXGiD75M63NgQbd72Q2AKViMN6AjwTZ4TiDYCI42Fk//ST8l0LCHSuaJbs9CqRT3JCUTD T+R7ANJslArZH4/dugXc3OqumbGTN2+0IqZbUBt/jXo6fPvUNlz7UndClmhOLqy1LPr3du Ga7G0feAflfPq5Z2ak8EXzjP1Q+xv9rZt4iD2Y3DpY3vRgwkx6IB0RUzeF3K8EwzkK8f5E PlxrvdJwfpW9B7T4W7jVHyu5LJYu4QiH2Otnb83F5SAVP+7A/FMZ7urCqL52pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062697; a=rsa-sha256; cv=none; b=o2f6OworamxBIyAFMZpPCKIZkfc08FCzT0dq5phDbHpS3pr/iCQLzlqzoH7yULuBQgrK9l QjTJ9IGAbPw+w/vY84tx1LvQXoVcrJpaHridqKve1whJkKLDmy353WiVekyl90Tx2YnvT2 /uacI0vs95RPuZLpzkzAD05EUQiU0cvkZ2yk6BSYv9xnzO+JTu94mxNY6XZ3uQfuJpyEAl jvY81Eugj027pT6fdSgohiEspf5VwDx8FbpRhUBDuUrpi1ufHWCmsRWID6n1le1pzOA7PQ 8HSvttTIZiseU3zCxUHbEEaQHZkGrlJwNct+JbvLuSzgeT/cq97YNcTiaBdbzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD85qsyz9lt; Mon, 27 Nov 2023 05:24: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 3AR5OuMh066330; Mon, 27 Nov 2023 05:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Ount066327; Mon, 27 Nov 2023 05:24:56 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:56 GMT Message-Id: <202311270524.3AR5Ount066327@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: e043f37205ff - main - bin: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: e043f37205ffbde5627ff299ad25cd532f2956f0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e043f37205ffbde5627ff299ad25cd532f2956f0 commit e043f37205ffbde5627ff299ad25cd532f2956f0 Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:59 +0000 bin: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- bin/cat/cat.c | 1 - bin/cp/utils.c | 3 --- bin/date/date.c | 1 - bin/dd/args.c | 3 --- bin/dd/conv.c | 3 --- bin/dd/conv_tab.c | 3 --- bin/dd/misc.c | 3 --- bin/dd/position.c | 3 --- bin/ed/glbl.c | 1 - bin/getfacl/getfacl.c | 2 -- bin/kenv/kenv.c | 1 - bin/ls/cmp.c | 3 --- bin/ls/print.c | 3 --- bin/ls/util.c | 3 --- bin/pax/ar_io.c | 3 --- bin/pax/ar_subs.c | 3 --- bin/pax/buf_subs.c | 3 --- bin/pax/cache.c | 3 --- bin/pax/cpio.c | 3 --- bin/pax/file_subs.c | 3 --- bin/pax/ftree.c | 3 --- bin/pax/gen_subs.c | 3 --- bin/pax/getoldopt.c | 1 - bin/pax/options.c | 4 ---- bin/pax/pat_rep.c | 3 --- bin/pax/sel_subs.c | 3 --- bin/pax/tables.c | 3 --- bin/pax/tar.c | 3 --- bin/pax/tty_subs.c | 3 --- bin/pkill/pkill.c | 1 - bin/ps/fmt.c | 4 ---- bin/ps/keyword.c | 3 --- bin/ps/nlist.c | 4 ---- bin/ps/print.c | 4 ---- bin/pwait/pwait.c | 1 - bin/realpath/realpath.c | 1 - bin/setfacl/file.c | 1 - bin/setfacl/mask.c | 1 - bin/setfacl/merge.c | 1 - bin/setfacl/remove.c | 1 - bin/setfacl/setfacl.c | 1 - bin/sh/alias.c | 3 --- bin/sh/cd.c | 3 --- bin/sh/error.c | 3 --- bin/sh/eval.c | 3 --- bin/sh/exec.c | 3 --- bin/sh/expand.c | 3 --- bin/sh/histedit.c | 3 --- bin/sh/input.c | 3 --- bin/sh/jobs.c | 3 --- bin/sh/mail.c | 3 --- bin/sh/memalloc.c | 3 --- bin/sh/miscbltin.c | 3 --- bin/sh/mystring.c | 3 --- bin/sh/options.c | 3 --- bin/sh/output.c | 3 --- bin/sh/parser.c | 3 --- bin/sh/redir.c | 3 --- bin/sh/show.c | 3 --- bin/sh/trap.c | 3 --- bin/sh/var.c | 3 --- bin/stty/cchar.c | 3 --- bin/stty/gfmt.c | 3 --- bin/stty/key.c | 3 --- bin/stty/modes.c | 3 --- bin/stty/print.c | 3 --- bin/stty/util.c | 3 --- bin/test/test.c | 1 - bin/uuidgen/uuidgen.c | 1 - 69 files changed, 180 deletions(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 852617010ce2..c3812c6d9ca4 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 107e6638e453..2e1a50635a15 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/date/date.c b/bin/date/date.c index 9f6a2336de97..0ff3b9f74cbd 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/dd/args.c b/bin/dd/args.c index c16b37528f94..10bb89e632b0 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/bin/dd/conv.c b/bin/dd/conv.c index 2ac1e1229976..d64d57040fca 100644 --- a/bin/dd/conv.c +++ b/bin/dd/conv.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c index 7f256e8fd032..feba45826e03 100644 --- a/bin/dd/conv_tab.c +++ b/bin/dd/conv_tab.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/bin/dd/misc.c b/bin/dd/misc.c index c9c99a13280f..05c19b5b2073 100644 --- a/bin/dd/misc.c +++ b/bin/dd/misc.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/bin/dd/position.c b/bin/dd/position.c index 07a46e4a53fb..c092b5c5f8db 100644 --- a/bin/dd/position.c +++ b/bin/dd/position.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c index 94967f8389aa..d0a1d570ee16 100644 --- a/bin/ed/glbl.c +++ b/bin/ed/glbl.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c index 25d0731559c6..3ac9e61555de 100644 --- a/bin/getfacl/getfacl.c +++ b/bin/getfacl/getfacl.c @@ -30,8 +30,6 @@ * and send the results to stdout */ - -#include #include #include #include diff --git a/bin/kenv/kenv.c b/bin/kenv/kenv.c index 6d414ec892d1..fe7ec4236bfb 100644 --- a/bin/kenv/kenv.c +++ b/bin/kenv/kenv.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c index cc8263f227c2..4c60506f3456 100644 --- a/bin/ls/cmp.c +++ b/bin/ls/cmp.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/bin/ls/print.c b/bin/ls/print.c index 75917d60002b..979ad0ffc43e 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/bin/ls/util.c b/bin/ls/util.c index b10169b2d321..40610faa5fae 100644 --- a/bin/ls/util.c +++ b/bin/ls/util.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 440098d20fcf..c595870aaa5e 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index 37505c9573f9..8f8a5b842626 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index 8ee498f2f821..7f9b31881d56 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/cache.c b/bin/pax/cache.c index 363e5454b6b2..d15c9c223447 100644 --- a/bin/pax/cache.c +++ b/bin/pax/cache.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index f036fa42442a..8ae40f461343 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 32fecc84bcd4..7c68e643f04c 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index dc14613365df..400eb2faad30 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index 4497b9d95a6d..a92303f63106 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c index 98e03aef7e60..6b0e83c23a24 100644 --- a/bin/pax/getoldopt.c +++ b/bin/pax/getoldopt.c @@ -10,7 +10,6 @@ * in the Public Domain for your edification and enjoyment. */ -#include #include #include #include diff --git a/bin/pax/options.c b/bin/pax/options.c index 58c5758053a6..3567820acced 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -33,10 +33,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 832ffb995cde..0c416741f5d8 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 4c19e898f152..ccbb77ccbb5c 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/tables.c b/bin/pax/tables.c index ba1ab3989ff8..e1e7b7d6d43e 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/tar.c b/bin/pax/tar.c index 10e0c33a7e8d..50a9a41623ca 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c index 139f1c9965c7..73424e12389a 100644 --- a/bin/pax/tty_subs.c +++ b/bin/pax/tty_subs.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c index 3be7bccd14cc..4b894a986062 100644 --- a/bin/pkill/pkill.c +++ b/bin/pkill/pkill.c @@ -32,7 +32,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c index 34f50fb377d2..87e2e0f49a34 100644 --- a/bin/ps/fmt.c +++ b/bin/ps/fmt.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index a1d8516d5e98..82c08d3e75f1 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c index bed7dcca3215..8c6a4814e4d5 100644 --- a/bin/ps/nlist.c +++ b/bin/ps/nlist.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include diff --git a/bin/ps/print.c b/bin/ps/print.c index 9f48f98c3c43..fc6f7ab25428 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c index c3adb2a8b741..0fae22562607 100644 --- a/bin/pwait/pwait.c +++ b/bin/pwait/pwait.c @@ -31,7 +31,6 @@ * OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/realpath/realpath.c b/bin/realpath/realpath.c index 61263e508f5b..9ee7f3126003 100644 --- a/bin/realpath/realpath.c +++ b/bin/realpath/realpath.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c index aee3c76b6c33..24ef3869cf4c 100644 --- a/bin/setfacl/file.c +++ b/bin/setfacl/file.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c index 09a97fdc466c..5154b17fb5bc 100644 --- a/bin/setfacl/mask.c +++ b/bin/setfacl/mask.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c index 981997c51ddd..d77a52ed2f25 100644 --- a/bin/setfacl/merge.c +++ b/bin/setfacl/merge.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c index 78b3d09e4404..5bfab9c2ec9d 100644 --- a/bin/setfacl/remove.c +++ b/bin/setfacl/remove.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c index 2cb27b5796d0..02f10944f169 100644 --- a/bin/setfacl/setfacl.c +++ b/bin/setfacl/setfacl.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/bin/sh/alias.c b/bin/sh/alias.c index 239b85f977bc..a02554d66e24 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include "shell.h" #include "output.h" diff --git a/bin/sh/cd.c b/bin/sh/cd.c index 4c8b4c49ac0f..b908c4320c04 100644 --- a/bin/sh/cd.c +++ b/bin/sh/cd.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/error.c b/bin/sh/error.c index 8f129509b8bc..fcc2f309ccbc 100644 --- a/bin/sh/error.c +++ b/bin/sh/error.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include /* * Errors and exceptions. */ diff --git a/bin/sh/eval.c b/bin/sh/eval.c index a92adc348c2a..7caf1972a39d 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/exec.c b/bin/sh/exec.c index b05dff807266..f7788d0758e3 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/expand.c b/bin/sh/expand.c index 4403fa8205e7..dfafe35fbaca 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -34,9 +34,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index d2ad33356883..5aea58650c67 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/input.c b/bin/sh/input.c index 859f2a650fdc..26f233ebf7b6 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include /* defines BUFSIZ */ #include #include diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 45f3f66bc7eb..90b5892f72b7 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/mail.c b/bin/sh/mail.c index c5abc9bc3d8e..97ea41d8da67 100644 --- a/bin/sh/mail.c +++ b/bin/sh/mail.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include /* * Routines to check for mail. (Perhaps make part of main.c?) */ diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c index ee4dff26fac4..7850bb147b01 100644 --- a/bin/sh/memalloc.c +++ b/bin/sh/memalloc.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include "shell.h" #include "output.h" diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index e0e332845221..6364bd10a584 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include /* * Miscellaneous builtins. */ diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c index 3d4f5d145446..9ac590d39f64 100644 --- a/bin/sh/mystring.c +++ b/bin/sh/mystring.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include /* * String functions. * diff --git a/bin/sh/options.c b/bin/sh/options.c index c00d82a136ae..2dab8f4ea998 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/output.c b/bin/sh/output.c index 33d5af4be915..baf4b8b7cc17 100644 --- a/bin/sh/output.c +++ b/bin/sh/output.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include /* * Shell output routines. We use our own output routines because: * When a builtin command is interrupted we have to discard diff --git a/bin/sh/parser.c b/bin/sh/parser.c index aa181e567bb1..0c1b7a91c257 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/redir.c b/bin/sh/redir.c index 66196dc110b9..eb0fc618a73e 100644 --- a/bin/sh/redir.c +++ b/bin/sh/redir.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/show.c b/bin/sh/show.c index 0b772dd18eab..1ccd4583d3a9 100644 --- a/bin/sh/show.c +++ b/bin/sh/show.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/trap.c b/bin/sh/trap.c index 0b95278eaf68..2863026a4794 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/sh/var.c b/bin/sh/var.c index 262e3e5b1066..2f9820a91bdd 100644 --- a/bin/sh/var.c +++ b/bin/sh/var.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c index c43985cd1054..4a65d1b518d5 100644 --- a/bin/stty/cchar.c +++ b/bin/stty/cchar.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c index d42496a4a440..fbd21382dd82 100644 --- a/bin/stty/gfmt.c +++ b/bin/stty/gfmt.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/bin/stty/key.c b/bin/stty/key.c index cdf3e308fede..6e8f635ac237 100644 --- a/bin/stty/key.c +++ b/bin/stty/key.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/bin/stty/modes.c b/bin/stty/modes.c index db0d7b16cda8..d63b958680de 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include "stty.h" diff --git a/bin/stty/print.c b/bin/stty/print.c index 7e305e94907c..d7ab2abbcf14 100644 *** 50 LINES SKIPPED *** From nobody Mon Nov 27 05:24:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDB1p3hz51hVQ; Mon, 27 Nov 2023 05:24: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 4SdvDB10t9z4XGv; Mon, 27 Nov 2023 05:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJ46isfs4TdujBP1JFNNG2ajE2TDHeCJdpGDSBYmGYc=; b=BxTdllRf8cAsBnSByLwLRRG4wSfTp1axLCqL6gsYB8U4NDojfpzJDAUSgvqRLrRwiKbUR3 n2fpvWOtTYggGjg8GWHQB3s2UEmkpn/0eKGpB/6tbEb/zpKDhQRzP08kpcikTIFH4l2cqR DJKnMcgUE/dXPVS+G+UKrH4x1Y56YTwy9EtI273kt6cqm3EfWwQRPmA2dQi84kZ5KHyUao csVzaupq+uEYoOqR1BmIIJv3xd35j/66W4i1VBEL/t0jr8Jvlj6rUasXIMFh3PjUaYkOBX NNX27cnPzAwNmEGyE7wrfmo5jhwKsGW15y61B15ti/wcrdTMWYAHINadUDV+fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJ46isfs4TdujBP1JFNNG2ajE2TDHeCJdpGDSBYmGYc=; b=hWHGhnhyQ/g6H3DeT4frE9G0QZ1PqNhWIm9AVTnA01bE4u3BSnE7I2+5bGQY6zxm5RC+xX ee84Ce+YVj0mBRBY3PT/oW9j7YKeEPqbhDMEBWF3uAxr0BG9J5kJZkK2pNYwiCLO5rArfI ffiw0k0bNmijcfJ8mlWzSb9q3trpK8pZUPn368kqbVvjJ4wpB+cv5WFy42jMlqNlQft+4a 7OohE4oG+iLylvSmu3RJmkSbsDIE+WTiCowP+YBmJiXmzL/+v5uujZ9g31Y8xHipMBzkGd rYAycihsoeC+NX5BJ5DhmKb68wBSQ5a3JJDitTOQ24Jyude3XPCFTE26b90isQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062698; a=rsa-sha256; cv=none; b=X23BZFXKIjquw5t338ZdddL4p84CVzTqZSHXMYnp9VKEJXrgrM8P/D9YQ3BsaaSv3r6VX5 uh/JT9zU1NUbOVdQA/i4OZcJaFKgVUE66oQtznp4W2iRGQ9gc7zOdyQYmbAFrU8ZZhjK6F eS8sK4KKNW70eyGtMBPGxTkpasFtM2Pysb68C86K4MZdSWeNQDNm2++mQzkL679Rfkvqjv AldU8FQKNV3hZDGym+TQiY2ikAcW2wFG3T7rnUxoXXGxQjUOyM9cvIiJFTRPjCOUOHWeWc 6OZGgq25uGco/hkm650xHJPEjELGrb/TJhYLbtcZPvZGlq8ce7rDgQVrO7l59A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvD96s93zB7S; Mon, 27 Nov 2023 05:24: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 3AR5OvUF066381; Mon, 27 Nov 2023 05:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5OvNf066378; Mon, 27 Nov 2023 05:24:57 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:57 GMT Message-Id: <202311270524.3AR5OvNf066378@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: 33ccf366718d - main - include: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: 33ccf366718d189f206f1ed6c43cbcb7b50a2e6c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=33ccf366718d189f206f1ed6c43cbcb7b50a2e6c commit 33ccf366718d189f206f1ed6c43cbcb7b50a2e6c Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:59 +0000 include: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- include/iconv.h | 2 -- include/mqueue.h | 1 - include/nl_types.h | 1 - include/sched.h | 1 - include/stringlist.h | 2 +- include/unistd.h | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/iconv.h b/include/iconv.h index 05e7427a4bf0..a5a830b75fac 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -33,12 +33,10 @@ #ifndef _ICONV_H_ #define _ICONV_H_ -#include #include #include -#include #include #ifdef __cplusplus diff --git a/include/mqueue.h b/include/mqueue.h index 910be7481796..b814c3f1b4ad 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -29,7 +29,6 @@ #ifndef _MQUEUE_H_ #define _MQUEUE_H_ -#include #include #include #include diff --git a/include/nl_types.h b/include/nl_types.h index 6ba15132126d..120d1911631f 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -34,7 +34,6 @@ #ifndef _NL_TYPES_H_ #define _NL_TYPES_H_ -#include #include #ifdef _NLS_PRIVATE diff --git a/include/sched.h b/include/sched.h index e03f076febb1..14512559e2a8 100644 --- a/include/sched.h +++ b/include/sched.h @@ -29,7 +29,6 @@ #ifndef __SCHED_H__ #define __SCHED_H__ -#include #include #include #if __BSD_VISIBLE diff --git a/include/stringlist.h b/include/stringlist.h index c4eff6714f41..c0ac84ef8679 100644 --- a/include/stringlist.h +++ b/include/stringlist.h @@ -30,7 +30,7 @@ #ifndef _STRINGLIST_H #define _STRINGLIST_H -#include + #include /* diff --git a/include/unistd.h b/include/unistd.h index afcb6c0ed700..e3e5675b3da0 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -32,7 +32,6 @@ #ifndef _UNISTD_H_ #define _UNISTD_H_ -#include #include /* XXX adds too much pollution. */ #include #include From nobody Mon Nov 27 05:24:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDC3sfhz51hPZ; Mon, 27 Nov 2023 05:24: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 4SdvDC1rSsz4XQT; Mon, 27 Nov 2023 05:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=blOMbAPmj5IgziIyN8FuZGX6XVC32wAxNZf6jcX24Qo=; b=kgAVFCNQtRE8TAyE2Sbs5QWlUTk1fSrEGbM+C5JKQBOT3S+LY7XFiF0DEBteSWk6xCOztv exEm2d9HgrqVkyeSWHyssnn8FC39sAIyEFLGxMpNJLv8tdknGxVQZK2cSGeZwaqiSjdS3+ 0LJsV9Fyv34SxX1/nh1hy0TlIpaMpSgmB0kRzZFuJfsk7S5TjyCkvAp8O9J+GadfVpwv9p 6Y/Srhk9POhAye7Hg6SzJxn0Ti/cGdaY5s1CmoikEhBk9lEv/Ctt5v3BW5/WZnlaAajA70 2xU65/c6J3VeLeZAOwUJA4ABOtCebxNM+ffhULqLrdFxs8bz1Zv5q5JqQQQ3sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=blOMbAPmj5IgziIyN8FuZGX6XVC32wAxNZf6jcX24Qo=; b=YkY/zKSPedcvABiXK/dLaSblTYGe2xMBZOIo57m0na+IeQC0I2+NCsXVCg5dn5CYlv8x+V nTKKwTEXNf17bkQYEGmmoMf5ga8YO31gms08WH0N4PK54FrMJtReddo8QEtbmoMOkX05xI 4Bs6daAQsIvmal2yRzzhPIgs+6xRAGRo+3hvoUibaGd8ZeogqDOIxZv5mk9Z2XVqF/5lqK zUc7BvimVCCCBzDSR21HCAh60UOK6sMo+zZgZ029sqscNnTkUEZFYnP9cIztuQLdSMQiDw UmeUzIDhH8vYsdAziQndnILHvo0vUM/q5jnoI3+j1w/NLctWa8FIFTZcp7wTeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062699; a=rsa-sha256; cv=none; b=pFHOu+KiHycBf0oZ3rzYGBJLwYVGFb+oX7BSZfRqCWeP4XxJpsps038YJct7r36xPCwfOm a+MouKzSyM4hbrwHd19dphj22XzeNA4Ix/kXpvEdceWYNjari8WTXEuX5nynKajmt5pUN0 17EjHwzchsiX1IK4lrIgDDBaiZvJ/Dic0CiCN1PXrEsuseCqloDgiGh+1FmRTlDQMEYjQ6 tS9GkYcBsk/xPLxFXo1M3qCjpep/fs+QYkMVoyiMgbGDTD1hiqOVzWo4Z2AtjOgrRC7d4A c6H7Ph1IedbiluHZyjytdCKI1A89aCFa6WrQ43bzACt9FdIDdsZeLQOV6lLRsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDC0yFyzBJt; Mon, 27 Nov 2023 05:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR5Oxmh066441; Mon, 27 Nov 2023 05:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5Ox3B066437; Mon, 27 Nov 2023 05:24:59 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:24:59 GMT Message-Id: <202311270524.3AR5Ox3B066437@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: a2f733abcff6 - main - lib: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: a2f733abcff64628b7771a47089628b7327a88bd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a2f733abcff64628b7771a47089628b7327a88bd commit a2f733abcff64628b7771a47089628b7327a88bd Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:59 +0000 lib: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- lib/csu/arm/crt1_c.c | 1 - lib/csu/common/crtbegin.c | 1 - lib/csu/tests/cxx_constructors.cc | 1 - lib/csu/tests/fini_test.c | 1 - lib/flua/libjail/lua_jail.c | 1 - lib/geom/concat/geom_concat.c | 1 - lib/geom/eli/geom_eli.c | 1 - lib/geom/journal/geom_journal.c | 1 - lib/geom/journal/geom_journal_ufs.c | 1 - lib/geom/label/geom_label.c | 1 - lib/geom/mirror/geom_mirror.c | 1 - lib/geom/multipath/geom_multipath.c | 1 - lib/geom/raid/geom_raid.c | 1 - lib/geom/raid3/geom_raid3.c | 1 - lib/geom/shsec/geom_shsec.c | 1 - lib/geom/stripe/geom_stripe.c | 1 - lib/geom/virstor/geom_virstor.c | 1 - lib/libbe/be.c | 1 - lib/libc/db/recno/rec_seq.c | 1 - lib/libc/rpc/svc_dg.c | 2 -- lib/libc/stdio/vfwprintf.c | 2 -- lib/libc/stdio/vfwscanf.c | 2 -- lib/libc/stdlib/getopt_long.c | 2 -- lib/libc/stdlib/ptsname.c | 3 --- lib/libc/string/wcsncpy.c | 2 -- lib/libc/string/wcsstr.c | 2 -- lib/libcam/camlib.c | 1 - lib/libcam/camlib.h | 1 - lib/libcam/scsi_cmdparse.c | 1 - lib/libcam/scsi_wrap.c | 1 - lib/libcasper/libcasper/libcasper.c | 1 - lib/libcasper/libcasper/libcasper_service.c | 1 - lib/libcasper/libcasper/service.c | 1 - lib/libcasper/libcasper/zygote.c | 1 - lib/libcasper/services/cap_dns/tests/dns_test.c | 1 - lib/libcasper/services/cap_fileargs/cap_fileargs.c | 1 - lib/libcasper/services/cap_fileargs/tests/fileargs_test.c | 1 - lib/libcasper/services/cap_grp/tests/grp_test.c | 1 - lib/libcasper/services/cap_net/tests/net_test.c | 1 - lib/libcasper/services/cap_netdb/tests/netdb_test.c | 1 - lib/libcasper/services/cap_pwd/cap_pwd.c | 1 - lib/libcasper/services/cap_pwd/tests/pwd_test.c | 1 - lib/libcasper/services/cap_sysctl/cap_sysctl.c | 1 - lib/libcasper/services/cap_sysctl/tests/sysctl_test.c | 1 - lib/libcompat/4.1/ftime.c | 1 - lib/libcrypt/crypt-md5.c | 1 - lib/libcrypt/crypt-nthash.c | 1 - lib/libcrypt/crypt.c | 1 - lib/libcrypt/misc.c | 1 - lib/libdevctl/devctl.c | 1 - lib/libdevinfo/devinfo.h | 1 - lib/libdevstat/devstat.c | 1 - lib/libdpv/dialogrc.c | 1 - lib/libdpv/dprompt.c | 1 - lib/libefivar/efivar-dp-xlate.c | 1 - lib/libexecinfo/tests/sigtramp_test.c | 2 +- lib/libfetch/common.c | 1 - lib/libfetch/fetch.c | 1 - lib/libfetch/file.c | 1 - lib/libfigpar/figpar.c | 1 - lib/libfigpar/string_m.c | 1 - lib/libgeom/geom_util.c | 1 - lib/libiconv_modules/DECHanyu/citrus_dechanyu.c | 2 +- lib/libiconv_modules/EUC/citrus_euc.c | 1 - lib/libiconv_modules/EUCTW/citrus_euctw.c | 1 - lib/libiconv_modules/GBK2K/citrus_gbk2k.c | 1 - lib/libiconv_modules/ISO2022/citrus_iso2022.c | 1 - lib/libiconv_modules/JOHAB/citrus_johab.c | 2 +- lib/libiconv_modules/MSKanji/citrus_mskanji.c | 2 -- lib/libiconv_modules/UTF8/citrus_utf8.c | 1 - lib/libiconv_modules/ZW/citrus_zw.c | 1 - lib/libipsec/ipsec_dump_policy.c | 1 - lib/libipsec/ipsec_get_policylen.c | 1 - lib/libipsec/ipsec_strerror.c | 1 - lib/libipsec/pfkey.c | 1 - lib/libipsec/pfkey_dump.c | 1 - lib/libipsec/policy_parse.y | 2 +- lib/libipsec/test-policy.c | 1 - lib/libiscsiutil/pdu.c | 1 - lib/libjail/jail.c | 1 - lib/libjail/jail_getid.c | 1 - lib/libkvm/kvm.h | 1 - lib/libkvm/kvm_arm.c | 1 - lib/libkvm/kvm_cptime.c | 1 - lib/libkvm/kvm_getswapinfo.c | 1 - lib/libkvm/kvm_minidump_powerpc64.c | 1 - lib/libkvm/kvm_minidump_powerpc64_hpt.c | 1 - lib/libkvm/kvm_pcpu.c | 1 - lib/libkvm/kvm_powerpc.c | 1 - lib/libkvm/kvm_powerpc64.c | 1 - lib/libkvm/kvm_private.c | 1 - lib/libkvm/kvm_vnet.c | 1 - lib/libkvm/tests/kvm_geterr_test.c | 1 - lib/libkvm/tests/kvm_open2_test.c | 1 - lib/libkvm/tests/kvm_open_test.c | 1 - lib/libkvm/tests/kvm_read_test.c | 1 - lib/libkvm/tests/kvm_test_common.c | 1 - lib/libmd/md5c.c | 1 - lib/libmd/mdXhl.c | 1 - lib/libmd/mddriver.c | 1 - lib/libmd/ripemd.h | 1 - lib/libmd/rmd160c.c | 1 - lib/libmd/rmddriver.c | 1 - lib/libmd/sha.h | 1 - lib/libmd/sha0c.c | 1 - lib/libmd/sha1c.c | 1 - lib/libmd/shadriver.c | 1 - lib/libmd/skeindriver.c | 1 - lib/libmemstat/memstat_malloc.c | 1 - lib/libmt/mtlib.c | 1 - lib/libnetbsd/sockaddr_snprintf.c | 1 - lib/libnetbsd/strsuftoll.c | 1 - lib/libnetbsd/util.c | 1 - lib/libnetgraph/debug.c | 1 - lib/libnetgraph/msg.c | 1 - lib/libnetgraph/sock.c | 1 - lib/libnv/msgio.c | 1 - lib/libnv/tests/dnv_tests.cc | 1 - lib/libnv/tests/nv_array_tests.cc | 1 - lib/libnv/tests/nvlist_send_recv_test.c | 1 - lib/libopenbsd/getdtablecount.c | 1 - lib/libpam/modules/pam_chroot/pam_chroot.c | 1 - lib/libpam/modules/pam_exec/pam_exec.c | 1 - lib/libpam/modules/pam_group/pam_group.c | 1 - lib/libpam/modules/pam_krb5/pam_krb5.c | 1 - lib/libpam/modules/pam_ksu/pam_ksu.c | 2 +- lib/libpam/modules/pam_login_access/login_access.c | 1 - lib/libpam/modules/pam_nologin/pam_nologin.c | 1 - lib/libpam/modules/pam_radius/pam_radius.c | 1 - lib/libpam/modules/pam_securetty/pam_securetty.c | 1 - lib/libpam/modules/pam_ssh/pam_ssh.c | 1 - lib/libpam/modules/pam_tacplus/pam_tacplus.c | 1 - lib/libpam/modules/pam_unix/pam_unix.c | 1 - lib/libpjdlog/pjdlog.c | 1 - lib/libpmc/libpmc.c | 1 - lib/libpmc/pmc.h | 1 - lib/libpmc/pmclog.c | 1 - lib/libpmcstat/libpmcstat_event.c | 1 - lib/libpmcstat/libpmcstat_image.c | 1 - lib/libpmcstat/libpmcstat_logging.c | 1 - lib/libpmcstat/libpmcstat_process.c | 1 - lib/libpmcstat/libpmcstat_string.c | 1 - lib/libpmcstat/libpmcstat_symbol.c | 1 - lib/libproc/proc_bkpt.c | 1 - lib/libproc/proc_create.c | 1 - lib/libproc/proc_regs.c | 1 - lib/libproc/proc_sym.c | 1 - lib/libproc/proc_util.c | 1 - lib/libproc/tests/proc_test.c | 1 - lib/libprocstat/cd9660.c | 1 - lib/libprocstat/common_kvm.c | 1 - lib/libprocstat/core.c | 1 - lib/libprocstat/libprocstat.c | 1 - lib/libprocstat/libprocstat_compat.c | 1 - lib/libprocstat/zfs_defs.c | 1 - lib/libradius/radlib.c | 1 - lib/librss/librss.c | 1 - lib/librt/aio.c | 1 - lib/librt/mq.c | 1 - lib/librt/timer.c | 1 - lib/librtld_db/rtld_db.c | 1 - lib/libsbuf/tests/sbuf_core_test.c | 1 - lib/libsbuf/tests/sbuf_stdio_test.c | 1 - lib/libsbuf/tests/sbuf_string_test.c | 1 - lib/libsecureboot/verify_file.c | 2 +- lib/libssp/fortify_stubs.c | 1 - lib/libsysdecode/errno.c | 1 - lib/libsysdecode/linux.c | 1 - lib/libsysdecode/signal.c | 1 - lib/libsysdecode/support.c | 1 - lib/libsysdecode/utrace.c | 1 - lib/libtacplus/taclib.c | 1 - lib/libthr/tests/umtx_op_test.c | 1 - lib/libthr/thread/thr_ctrdtr.c | 1 - lib/libthr/thread/thr_kern.c | 1 - lib/libthr/thread/thr_list.c | 1 - lib/libthr/thread/thr_malloc.c | 1 - lib/libthr/thread/thr_pshared.c | 1 - lib/libthr/thread/thr_spinlock.c | 1 - lib/libthr/thread/thr_stack.c | 1 - lib/libthr/thread/thr_symbols.c | 1 - lib/libthread_db/arch/aarch64/libpthread_md.c | 1 - lib/libthread_db/arch/arm/libpthread_md.c | 1 - lib/libthread_db/arch/i386/libpthread_md.c | 1 - lib/libthread_db/arch/powerpc/libpthread_md.c | 1 - lib/libthread_db/arch/riscv/libpthread_md.c | 1 - lib/libufs/block.c | 1 - lib/libufs/cgroup.c | 1 - lib/libufs/inode.c | 1 - lib/libufs/sblock.c | 1 - lib/libufs/type.c | 1 - lib/libulog/ulog_login.c | 1 - lib/libusbhid/data.c | 1 - lib/libusbhid/descr.c | 1 - lib/libusbhid/descr_compat.c | 1 - lib/libusbhid/usage.c | 1 - lib/libutil/_secure_path.c | 1 - lib/libutil/expand_number.c | 1 - lib/libutil/fparseln.c | 1 - lib/libutil/getlocalbase.c | 1 - lib/libutil/gr_util.c | 1 - lib/libutil/hexdump.c | 1 - lib/libutil/humanize_number.c | 1 - lib/libutil/kinfo_getallproc.c | 1 - lib/libutil/kinfo_getproc.c | 1 - lib/libutil/kinfo_getvmobject.c | 1 - lib/libutil/login_auth.c | 1 - lib/libutil/login_cap.c | 1 - lib/libutil/login_class.c | 1 - lib/libutil/login_crypt.c | 1 - lib/libutil/login_ok.c | 1 - lib/libutil/login_times.c | 1 - lib/libutil/pidfile.c | 1 - lib/libutil/property.c | 1 - lib/libutil/realhostname.c | 1 - lib/libutil/tests/flopen_test.c | 1 - lib/libutil/tests/grp_test.c | 1 - lib/libutil/tests/pidfile_test.c | 1 - lib/libutil/tests/trimdomain-nodomain_test.c | 1 - lib/libutil/tests/trimdomain_test.c | 1 - lib/libutil/trimdomain.c | 1 - lib/libveriexec/veriexec_check.c | 1 - lib/libveriexec/veriexec_get.c | 1 - lib/libvgl/bitmap.c | 1 - lib/libvmmapi/vmmapi.c | 1 - lib/libvmmapi/vmmapi.h | 1 - lib/libvmmapi/vmmapi_freebsd.c | 1 - lib/msun/amd64/fenv.c | 1 - lib/msun/i387/fenv.c | 1 - lib/msun/tests/cexp_test.c | 1 - lib/msun/tests/csqrt_test.c | 1 - lib/msun/tests/ctrig_test.c | 1 - lib/msun/tests/fenv_test.c | 1 - lib/msun/tests/fma_test.c | 1 - lib/msun/tests/invctrig_test.c | 1 - lib/msun/tests/logarithm_test.c | 1 - lib/msun/tests/nan_test.c | 1 - lib/msun/tests/nearbyint_test.c | 1 - lib/msun/tests/trig_test.c | 1 - 239 files changed, 6 insertions(+), 248 deletions(-) diff --git a/lib/csu/arm/crt1_c.c b/lib/csu/arm/crt1_c.c index 7de2d333a598..bb40f262f5c2 100644 --- a/lib/csu/arm/crt1_c.c +++ b/lib/csu/arm/crt1_c.c @@ -41,7 +41,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/lib/csu/common/crtbegin.c b/lib/csu/common/crtbegin.c index ddeec986a431..d6978859af4a 100644 --- a/lib/csu/common/crtbegin.c +++ b/lib/csu/common/crtbegin.c @@ -21,7 +21,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include "crt.h" diff --git a/lib/csu/tests/cxx_constructors.cc b/lib/csu/tests/cxx_constructors.cc index 3568c4528c36..3c04053884d2 100644 --- a/lib/csu/tests/cxx_constructors.cc +++ b/lib/csu/tests/cxx_constructors.cc @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/csu/tests/fini_test.c b/lib/csu/tests/fini_test.c index 9475b40f4271..79dbceb8a37c 100644 --- a/lib/csu/tests/fini_test.c +++ b/lib/csu/tests/fini_test.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/flua/libjail/lua_jail.c b/lib/flua/libjail/lua_jail.c index b463f5c894ee..f364b090b3f9 100644 --- a/lib/flua/libjail/lua_jail.c +++ b/lib/flua/libjail/lua_jail.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/concat/geom_concat.c b/lib/geom/concat/geom_concat.c index df05b0994d79..424f60ce0179 100644 --- a/lib/geom/concat/geom_concat.c +++ b/lib/geom/concat/geom_concat.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c index 1efb760830c4..4dd1c5dea35d 100644 --- a/lib/geom/eli/geom_eli.c +++ b/lib/geom/eli/geom_eli.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/journal/geom_journal.c b/lib/geom/journal/geom_journal.c index 0f252a3aa26e..85eb6f88ae84 100644 --- a/lib/geom/journal/geom_journal.c +++ b/lib/geom/journal/geom_journal.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/journal/geom_journal_ufs.c b/lib/geom/journal/geom_journal_ufs.c index c01bf71da126..fc81663ec96a 100644 --- a/lib/geom/journal/geom_journal_ufs.c +++ b/lib/geom/journal/geom_journal_ufs.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/label/geom_label.c b/lib/geom/label/geom_label.c index a8ec9b45628a..1daf3df1c5c2 100644 --- a/lib/geom/label/geom_label.c +++ b/lib/geom/label/geom_label.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/mirror/geom_mirror.c b/lib/geom/mirror/geom_mirror.c index bdd9391e3315..8b47592803d9 100644 --- a/lib/geom/mirror/geom_mirror.c +++ b/lib/geom/mirror/geom_mirror.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/multipath/geom_multipath.c b/lib/geom/multipath/geom_multipath.c index 4a9ddfc2cd1c..e4cb123594c3 100644 --- a/lib/geom/multipath/geom_multipath.c +++ b/lib/geom/multipath/geom_multipath.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/raid/geom_raid.c b/lib/geom/raid/geom_raid.c index cec3506f5757..f73b42e91e85 100644 --- a/lib/geom/raid/geom_raid.c +++ b/lib/geom/raid/geom_raid.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/raid3/geom_raid3.c b/lib/geom/raid3/geom_raid3.c index c4b0d0227c67..4967cec75448 100644 --- a/lib/geom/raid3/geom_raid3.c +++ b/lib/geom/raid3/geom_raid3.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/shsec/geom_shsec.c b/lib/geom/shsec/geom_shsec.c index 8a41b18def20..227bdcf39b7d 100644 --- a/lib/geom/shsec/geom_shsec.c +++ b/lib/geom/shsec/geom_shsec.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/stripe/geom_stripe.c b/lib/geom/stripe/geom_stripe.c index f0acd5fa45e3..da3a726db370 100644 --- a/lib/geom/stripe/geom_stripe.c +++ b/lib/geom/stripe/geom_stripe.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/geom/virstor/geom_virstor.c b/lib/geom/virstor/geom_virstor.c index 5b81c43c0acc..131ece0107c7 100644 --- a/lib/geom/virstor/geom_virstor.c +++ b/lib/geom/virstor/geom_virstor.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 38e5e44abb53..c74ec9b0f3dc 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c index 5ba51eb916e4..7f1ba88e73df 100644 --- a/lib/libc/db/recno/rec_seq.c +++ b/lib/libc/db/recno/rec_seq.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c index ddd9c25e21e3..892fe5ceaa53 100644 --- a/lib/libc/rpc/svc_dg.c +++ b/lib/libc/rpc/svc_dg.c @@ -34,8 +34,6 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -#if defined(LIBC_SCCS) && !defined(lint) -#endif /* * svc_dg.c, Server side for connectionless RPC. * diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index ca62716d38dd..d43b472f7730 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -37,8 +37,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif /* * Actual wprintf innards. * diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c index 3f66d57e67b6..57206a8407d5 100644 --- a/lib/libc/stdio/vfwscanf.c +++ b/lib/libc/stdio/vfwscanf.c @@ -39,8 +39,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif #include "namespace.h" #include #include diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c index 1fdc5e3047af..5cf6a55649bd 100644 --- a/lib/libc/stdlib/getopt_long.c +++ b/lib/libc/stdlib/getopt_long.c @@ -49,8 +49,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#if 0 -#endif #include #include #include diff --git a/lib/libc/stdlib/ptsname.c b/lib/libc/stdlib/ptsname.c index ea1bc9c7b7f6..adbf0e1692a4 100644 --- a/lib/libc/stdlib/ptsname.c +++ b/lib/libc/stdlib/ptsname.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include "namespace.h" #include #include diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c index 4302ce2d2ede..a02a8292c0d1 100644 --- a/lib/libc/string/wcsncpy.c +++ b/lib/libc/string/wcsncpy.c @@ -32,8 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif #include /* diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c index b874d1d6e9bd..beb5e8931742 100644 --- a/lib/libc/string/wcsstr.c +++ b/lib/libc/string/wcsstr.c @@ -32,8 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif #include /* diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c index 6074cdebeb63..6b3e62e13e6f 100644 --- a/lib/libcam/camlib.c +++ b/lib/libcam/camlib.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h index 621ac5bf08d4..c82a529181cb 100644 --- a/lib/libcam/camlib.h +++ b/lib/libcam/camlib.h @@ -64,7 +64,6 @@ #ifndef _CAMLIB_H #define _CAMLIB_H -#include #include #include diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c index 81c8708c8d68..5aa69cd88fdb 100644 --- a/lib/libcam/scsi_cmdparse.c +++ b/lib/libcam/scsi_cmdparse.c @@ -37,7 +37,6 @@ * From: scsi.c,v 1.8 1997/02/22 15:07:54 peter Exp $ */ -#include #include #include diff --git a/lib/libcam/scsi_wrap.c b/lib/libcam/scsi_wrap.c index e5bd76e6e9be..584f760bcc42 100644 --- a/lib/libcam/scsi_wrap.c +++ b/lib/libcam/scsi_wrap.c @@ -28,7 +28,6 @@ * details. */ -#include #include #include diff --git a/lib/libcasper/libcasper/libcasper.c b/lib/libcasper/libcasper/libcasper.c index 095bbb9161e4..9cc008cdb7bc 100644 --- a/lib/libcasper/libcasper/libcasper.c +++ b/lib/libcasper/libcasper/libcasper.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcasper/libcasper/libcasper_service.c b/lib/libcasper/libcasper/libcasper_service.c index 3468b520e275..df58f48d78eb 100644 --- a/lib/libcasper/libcasper/libcasper_service.c +++ b/lib/libcasper/libcasper/libcasper_service.c @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcasper/libcasper/service.c b/lib/libcasper/libcasper/service.c index 103791676272..70418db50085 100644 --- a/lib/libcasper/libcasper/service.c +++ b/lib/libcasper/libcasper/service.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcasper/libcasper/zygote.c b/lib/libcasper/libcasper/zygote.c index e0dcc665ee9e..976e391d8dcb 100644 --- a/lib/libcasper/libcasper/zygote.c +++ b/lib/libcasper/libcasper/zygote.c @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcasper/services/cap_dns/tests/dns_test.c b/lib/libcasper/services/cap_dns/tests/dns_test.c index 3786414053ad..2b50ab446dd1 100644 --- a/lib/libcasper/services/cap_dns/tests/dns_test.c +++ b/lib/libcasper/services/cap_dns/tests/dns_test.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libcasper/services/cap_fileargs/cap_fileargs.c b/lib/libcasper/services/cap_fileargs/cap_fileargs.c index 859c862ef9e5..233b47ede613 100644 --- a/lib/libcasper/services/cap_fileargs/cap_fileargs.c +++ b/lib/libcasper/services/cap_fileargs/cap_fileargs.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c index 4df43f183735..7d499542abe9 100644 --- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c +++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c @@ -23,7 +23,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcasper/services/cap_grp/tests/grp_test.c b/lib/libcasper/services/cap_grp/tests/grp_test.c index c120c61e0cf1..5441c8e9bdca 100644 --- a/lib/libcasper/services/cap_grp/tests/grp_test.c +++ b/lib/libcasper/services/cap_grp/tests/grp_test.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index dcb897de467b..735e78fc51e0 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -23,7 +23,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcasper/services/cap_netdb/tests/netdb_test.c b/lib/libcasper/services/cap_netdb/tests/netdb_test.c index d4498e68ace0..5b984a8f6bd2 100644 --- a/lib/libcasper/services/cap_netdb/tests/netdb_test.c +++ b/lib/libcasper/services/cap_netdb/tests/netdb_test.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libcasper/services/cap_pwd/cap_pwd.c b/lib/libcasper/services/cap_pwd/cap_pwd.c index 263bc4cfd582..6bae01601d60 100644 --- a/lib/libcasper/services/cap_pwd/cap_pwd.c +++ b/lib/libcasper/services/cap_pwd/cap_pwd.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libcasper/services/cap_pwd/tests/pwd_test.c b/lib/libcasper/services/cap_pwd/tests/pwd_test.c index e56c037536e2..ff796005e298 100644 --- a/lib/libcasper/services/cap_pwd/tests/pwd_test.c +++ b/lib/libcasper/services/cap_pwd/tests/pwd_test.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libcasper/services/cap_sysctl/cap_sysctl.c b/lib/libcasper/services/cap_sysctl/cap_sysctl.c index 7d7f280fd00b..8e185e6474a0 100644 --- a/lib/libcasper/services/cap_sysctl/cap_sysctl.c +++ b/lib/libcasper/services/cap_sysctl/cap_sysctl.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c b/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c index 2e5ec83e1c82..19803692141b 100644 --- a/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c +++ b/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c index 5ea57bca40fd..cb832e6c2526 100644 --- a/lib/libcompat/4.1/ftime.c +++ b/lib/libcompat/4.1/ftime.c @@ -30,7 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libcrypt/crypt-md5.c b/lib/libcrypt/crypt-md5.c index 3fb80c1ba540..52d38c64cdeb 100644 --- a/lib/libcrypt/crypt-md5.c +++ b/lib/libcrypt/crypt-md5.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libcrypt/crypt-nthash.c b/lib/libcrypt/crypt-nthash.c index cc9dbf7533cd..774fe3437c25 100644 --- a/lib/libcrypt/crypt-nthash.c +++ b/lib/libcrypt/crypt-nthash.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libcrypt/crypt.c b/lib/libcrypt/crypt.c index b4d0743df6cf..aaf3552f95ff 100644 --- a/lib/libcrypt/crypt.c +++ b/lib/libcrypt/crypt.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libcrypt/misc.c b/lib/libcrypt/misc.c index ce55f5234fa7..e5db6b5dd838 100644 --- a/lib/libcrypt/misc.c +++ b/lib/libcrypt/misc.c @@ -29,7 +29,6 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include "crypt.h" diff --git a/lib/libdevctl/devctl.c b/lib/libdevctl/devctl.c index 20483e08da64..bc82d8b7b470 100644 --- a/lib/libdevctl/devctl.c +++ b/lib/libdevctl/devctl.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libdevinfo/devinfo.h b/lib/libdevinfo/devinfo.h index 32af3a0398a9..07e2043d43ce 100644 --- a/lib/libdevinfo/devinfo.h +++ b/lib/libdevinfo/devinfo.h @@ -30,7 +30,6 @@ #ifndef _DEVINFO_H_INCLUDED #define _DEVINFO_H_INCLUDED -#include #include #include diff --git a/lib/libdevstat/devstat.c b/lib/libdevstat/devstat.c index 7aca8c5733d0..879e6e09b3a9 100644 --- a/lib/libdevstat/devstat.c +++ b/lib/libdevstat/devstat.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libdpv/dialogrc.c b/lib/libdpv/dialogrc.c index fb4552e2db80..2ac745964e15 100644 --- a/lib/libdpv/dialogrc.c +++ b/lib/libdpv/dialogrc.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libdpv/dprompt.c b/lib/libdpv/dprompt.c index b891d4c779fa..66f785ac86a1 100644 --- a/lib/libdpv/dprompt.c +++ b/lib/libdpv/dprompt.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #define _BSD_SOURCE /* to get dprintf() prototype in stdio.h below */ diff --git a/lib/libefivar/efivar-dp-xlate.c b/lib/libefivar/efivar-dp-xlate.c index 6723cf707f50..1e816cecbb81 100644 --- a/lib/libefivar/efivar-dp-xlate.c +++ b/lib/libefivar/efivar-dp-xlate.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libexecinfo/tests/sigtramp_test.c b/lib/libexecinfo/tests/sigtramp_test.c index b8eecfddf43d..a4943d8d7f4f 100644 --- a/lib/libexecinfo/tests/sigtramp_test.c +++ b/lib/libexecinfo/tests/sigtramp_test.c @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: BSD-2-Clause */ -#include + #include #include diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index dfa742577585..4191ee4ed8b7 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -29,7 +29,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c index 135ee8dad151..8fdcc8e8752e 100644 --- a/lib/libfetch/fetch.c +++ b/lib/libfetch/fetch.c @@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c index 3cb8893f9d46..0d46ce38b5a2 100644 --- a/lib/libfetch/file.c +++ b/lib/libfetch/file.c @@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/lib/libfigpar/figpar.c b/lib/libfigpar/figpar.c index 642291ca7c6b..803ebadc3f49 100644 *** 2164 LINES SKIPPED *** From nobody Mon Nov 27 05:25:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDD4kpGz51hRw; Mon, 27 Nov 2023 05:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvDD3SRCz4XN9; Mon, 27 Nov 2023 05:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1oL9GW+1bPBRy11grOCz7CKT4SPc50zxTsmUMrMm8Pg=; b=lqZXN/1KkOzwwhfQEYrwd+k8pTYDZPV36LXhjnVtDOVC3+xvb572IXsgks3vGk1mMwFgUn OwGIcuruddxtR060rLHhDEdB3uO3gwq7eaoMhgFhAjBfwIcepkPxs8ItU+863t+o6K1wp3 86T8Xv0HSh342lR2HeSxZpbm/hvMWvQDS6nAgZUysk3Y/VcvOkIo2wOjs8wnYxiDfHdpEG OOeVszIIAPfW1YvO1+CHdYZYpnzvOR6n/ro3ZNo0zeV9UcUChWoFcB7jfkpxHArbh51cpU Xa+sVVYrCBoF+7jEah4JidSdZ+2ogh69TX/36NhbpM/UHQ3pzZmK2xukPfJgjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1oL9GW+1bPBRy11grOCz7CKT4SPc50zxTsmUMrMm8Pg=; b=TkvGrFp98pOC9SnS3dTT6QmTGgCsg/8jSWJiCw7vUbUkpDvlci3g0iyt3vVQnG6lkhNCpu TAJ4ILsmwZarmcxtaPt36Tq97+IZbEqTFxq+4We1PWpNQtT0voiTFrMLPJ26TVF8CmDEws 19JVhkQWFxbiNmawVAATUdxWqpGr1qdArN6khThui02aOT7H0M7HPfEXeR9ip5SWSW2ioj VZ0WMFdjimSjmQOdGFaDGVkh/+7LT7NpUx2Kr+O1JAoHtDstQd4lmmwAMLk5JX09+5VRYF hS2Fuwhg2ZGUmKOOedv1q3poRM3gIvo+OqZD3nBqoDpY0XbzzaJMeGibvIQ/lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062700; a=rsa-sha256; cv=none; b=YRqTOS2vQ+foJaB5Tnrld4anYL0pM2j9pVtXBmEMKXFATQdgWLuW5Oxmlc87abmc41Sszu PjPtZw4cSM4YXS5dNXxv548X/1nTLCgkMugacZRBroDZayWSODCILY+W/ZOnhxb6xkMUq+ vFImmiWjfexUhZvPiCgHxcVnUajSPHgCCQXIM/tEiW3ZlPmwLf1rSsyzxsYU+V1JBBgu9q YIjbC3WtLFT2ODYzHKHAmx1Xi7qSIdAUZqbTjwbg9V+DLmth+pvlNs7bd6J+gA6rJgfglb cY/EJp+A+CpHdp7Ch7FYd4NJZYgDLziC8JNZcSJLlNgA3LjPdI4f0httV0V4JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDD1nWqzB9w; Mon, 27 Nov 2023 05:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR5P0lb066517; Mon, 27 Nov 2023 05:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P0Zp066515; Mon, 27 Nov 2023 05:25:00 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:00 GMT Message-Id: <202311270525.3AR5P0Zp066515@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: a6fe717c2a87 - main - libexec: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: a6fe717c2a876105123214c05176cd74106fb94b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a6fe717c2a876105123214c05176cd74106fb94b commit a6fe717c2a876105123214c05176cd74106fb94b Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:59 +0000 libexec: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- libexec/bootpd/bootpd.c | 1 - libexec/bootpd/bootpgw/bootpgw.c | 1 - libexec/bootpd/rtmsg.c | 1 - libexec/ftpd/ftpcmd.y | 4 ---- libexec/ftpd/logwtmp.c | 4 ---- libexec/ftpd/popen.c | 4 ---- libexec/getty/chat.c | 1 - libexec/getty/init.c | 3 --- libexec/getty/subr.c | 3 --- libexec/mknetid/parse_group.c | 3 --- libexec/phttpget/phttpget.c | 1 - libexec/rbootd/bpf.c | 3 --- libexec/rbootd/conf.c | 3 --- libexec/rbootd/parseconf.c | 3 --- libexec/rbootd/rmpproto.c | 3 --- libexec/rbootd/utils.c | 3 --- libexec/rpc.rquotad/rquotad.c | 1 - libexec/rpc.rstatd/rstat_proc.c | 3 --- libexec/rtld-elf/aarch64/reloc.c | 1 - libexec/rtld-elf/arm/reloc.c | 1 - libexec/rtld-elf/riscv/reloc.c | 1 - libexec/rtld-elf/rtld-libc/rtld_libc.c | 2 +- libexec/rtld-elf/rtld-libc/rtld_libc.h | 1 - libexec/rtld-elf/rtld.c | 1 - libexec/talkd/announce.c | 3 --- libexec/talkd/print.c | 3 --- libexec/talkd/process.c | 3 --- libexec/talkd/table.c | 3 --- libexec/tftpd/tests/functional.c | 1 - libexec/tftpd/tftp-file.c | 1 - libexec/tftpd/tftp-io.c | 1 - libexec/tftpd/tftp-options.c | 1 - libexec/tftpd/tftp-transfer.c | 1 - 33 files changed, 1 insertion(+), 68 deletions(-) diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c index 14edf3333722..f73671dab074 100644 --- a/libexec/bootpd/bootpd.c +++ b/libexec/bootpd/bootpd.c @@ -37,7 +37,6 @@ SOFTWARE. * See ./ToDo */ -#include #include #include #include diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c index 74f159cb397e..168231002c0b 100644 --- a/libexec/bootpd/bootpgw/bootpgw.c +++ b/libexec/bootpd/bootpgw/bootpgw.c @@ -30,7 +30,6 @@ SOFTWARE. * one subnet to a BOOTP server on a different subnet. */ -#include #include #include #include diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c index a0ee5ed6897b..f2dbaf6eae33 100644 --- a/libexec/bootpd/rtmsg.c +++ b/libexec/bootpd/rtmsg.c @@ -39,7 +39,6 @@ * from arp.c 8.2 (Berkeley) 1/2/94 */ -#include #include /* * Verify that we are at least 4.4 BSD diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 620acad07395..742de2f4c086 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -36,10 +36,6 @@ %{ -#ifndef lint -#endif /* not lint */ - -#include #include #include #include diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c index 376af74b2d7c..85db1f13419d 100644 --- a/libexec/ftpd/logwtmp.c +++ b/libexec/ftpd/logwtmp.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - -#include #include #include #include diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c index e950e78dcc30..5f48356a376f 100644 --- a/libexec/ftpd/popen.c +++ b/libexec/ftpd/popen.c @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - -#include #include #include #include diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c index b4e6cf83899e..f1fa6f504b85 100644 --- a/libexec/getty/chat.c +++ b/libexec/getty/chat.c @@ -23,7 +23,6 @@ * For semi-intelligent modem handling. */ -#include #include #include #include diff --git a/libexec/getty/init.c b/libexec/getty/init.c index a3fb952e93bf..c304f86b568f 100644 --- a/libexec/getty/init.c +++ b/libexec/getty/init.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - /* * Getty table initializations. * diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index 68035c22a333..05186f593bf4 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - /* * Melbourne getty. */ diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c index 4fcb5bbc2d9c..c385dfad5190 100644 --- a/libexec/mknetid/parse_group.c +++ b/libexec/mknetid/parse_group.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - /* * This is a slightly modified chunk of getgrent(3). All the YP support * and unneeded functions have been stripped out. diff --git a/libexec/phttpget/phttpget.c b/libexec/phttpget/phttpget.c index e51fdaea59e3..33ef1eb04edf 100644 --- a/libexec/phttpget/phttpget.c +++ b/libexec/phttpget/phttpget.c @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c index 39914264c8da..449d9bb5567b 100644 --- a/libexec/rbootd/bpf.c +++ b/libexec/rbootd/bpf.c @@ -40,9 +40,6 @@ * Author: Jeff Forys, University of Utah CSS */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c index d11c367a1695..dc9e3ac6a60d 100644 --- a/libexec/rbootd/conf.c +++ b/libexec/rbootd/conf.c @@ -40,9 +40,6 @@ * Author: Jeff Forys, University of Utah CSS */ -#ifndef lint -#endif /* not lint */ - #include #include diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c index 18a73c592da2..7a8b1028b497 100644 --- a/libexec/rbootd/parseconf.c +++ b/libexec/rbootd/parseconf.c @@ -40,9 +40,6 @@ * Author: Jeff Forys, University of Utah CSS */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c index b1459c998588..8f431255d85b 100644 --- a/libexec/rbootd/rmpproto.c +++ b/libexec/rbootd/rmpproto.c @@ -40,9 +40,6 @@ * Author: Jeff Forys, University of Utah CSS */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c index 4cf333bbbea0..e89c7d085f49 100644 --- a/libexec/rbootd/utils.c +++ b/libexec/rbootd/utils.c @@ -40,9 +40,6 @@ * Author: Jeff Forys, University of Utah CSS */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c index a8ff56a0171a..ce55bd87da62 100644 --- a/libexec/rpc.rquotad/rquotad.c +++ b/libexec/rpc.rquotad/rquotad.c @@ -4,7 +4,6 @@ * There is no copyright, you can use it as you want. */ -#include #include #include #include diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index 74ac15071a95..ba4874bda382 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -27,9 +27,6 @@ * Mountain View, California 94043 */ -#ifndef lint -#endif - /* * rstat service: built with rstat.x and derived from rpc.rstatd.c * diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index 907377f2619a..44d390c5e083 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c index 6efc9f499761..4683ebf74fee 100644 --- a/libexec/rtld-elf/arm/reloc.c +++ b/libexec/rtld-elf/arm/reloc.c @@ -1,6 +1,5 @@ /* $NetBSD: mdreloc.c,v 1.23 2003/07/26 15:04:38 mrg Exp $ */ -#include #include #include #include diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index d806e1ec3d63..43522a5a790f 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/libexec/rtld-elf/rtld-libc/rtld_libc.c b/libexec/rtld-elf/rtld-libc/rtld_libc.c index ef61c2b094bc..c4feab5e184d 100644 --- a/libexec/rtld-elf/rtld-libc/rtld_libc.c +++ b/libexec/rtld-elf/rtld-libc/rtld_libc.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include + #include #include #include diff --git a/libexec/rtld-elf/rtld-libc/rtld_libc.h b/libexec/rtld-elf/rtld-libc/rtld_libc.h index 57a11af90e11..35b4ef32cf87 100644 --- a/libexec/rtld-elf/rtld-libc/rtld_libc.h +++ b/libexec/rtld-elf/rtld-libc/rtld_libc.h @@ -32,7 +32,6 @@ #ifndef _RTLD_AVOID_LIBC_DEPS_H_ #define _RTLD_AVOID_LIBC_DEPS_H_ -#include #include #include #include diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 831a854cffb8..49de41f81583 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -38,7 +38,6 @@ * John Polstra . */ -#include #include #include #include diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c index a12a1ed18e55..80c663ba48b4 100644 --- a/libexec/talkd/announce.c +++ b/libexec/talkd/announce.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c index 9d48fe347906..8852dceba193 100644 --- a/libexec/talkd/print.c +++ b/libexec/talkd/print.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - /* debug print routines */ #include diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c index 4ea01a45169f..39ef14a37be1 100644 --- a/libexec/talkd/process.c +++ b/libexec/talkd/process.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - /* * process.c handles the requests, which can be of three types: * ANNOUNCE - announce to a user that a talk is wanted diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c index ff4aed54b014..0de6ff52c667 100644 --- a/libexec/talkd/table.c +++ b/libexec/talkd/table.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - /* * Routines to handle insertion, deletion, etc on the table * of requests kept by the daemon. Nothing fancy here, linear diff --git a/libexec/tftpd/tests/functional.c b/libexec/tftpd/tests/functional.c index 1d5c1e17c420..0bdbcfe559ed 100644 --- a/libexec/tftpd/tests/functional.c +++ b/libexec/tftpd/tests/functional.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/libexec/tftpd/tftp-file.c b/libexec/tftpd/tftp-file.c index 949cf9c74752..405d1b9018c9 100644 --- a/libexec/tftpd/tftp-file.c +++ b/libexec/tftpd/tftp-file.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/libexec/tftpd/tftp-io.c b/libexec/tftpd/tftp-io.c index b5f39423fd60..d43e5f5505f9 100644 --- a/libexec/tftpd/tftp-io.c +++ b/libexec/tftpd/tftp-io.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/libexec/tftpd/tftp-options.c b/libexec/tftpd/tftp-options.c index ee413603fbfb..7a261ac3d7c3 100644 --- a/libexec/tftpd/tftp-options.c +++ b/libexec/tftpd/tftp-options.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/libexec/tftpd/tftp-transfer.c b/libexec/tftpd/tftp-transfer.c index 5655d912ab6a..ea386f8a3c1a 100644 --- a/libexec/tftpd/tftp-transfer.c +++ b/libexec/tftpd/tftp-transfer.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include From nobody Mon Nov 27 05:25:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDF5Qwkz51hS8; Mon, 27 Nov 2023 05:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvDF4NlVz4XRJ; Mon, 27 Nov 2023 05:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ba0XdfTF3ytohKrtN22ID8Qiczp/ZJXI1fuITZQYpQ=; b=eB7egSCdU/BcVjUwocf6OxQ6jo9MuTu+IL399aJ54BCaTPk7e9sF5ZC/tBoZXkCZrOQZJ1 2xcJ8hDXcX7xzUo1uXOjTGeF5NfAWXtf06/CrQ0rCUaxfbWqxotQEIGv3tvvqc0pUK15lm HV3QSriwNSQ05lbt+k06PD16hvjSfCzrBzyHZV/30VbWNYUUBOs3oW5Ey6GN9EEEhVNzdo 19Om002y4rbDF6nFdh3IktSWajXsvTI6evfKbnqV4ueK3wFszIIRRdJIFqJQgC5Abn8XZR k9BxyN21HteQgZ7leyoUHx6/C/wPlIaGrio8yFpTg51PdGvYrj3N1gzjLm3QXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ba0XdfTF3ytohKrtN22ID8Qiczp/ZJXI1fuITZQYpQ=; b=ljmZo7vZ51AH8xw72h34ai9mMsV9aSfyciYYnFSYQZhUxbNSd3hmRTDXNIcl7z24ypgoXZ E26XqDFRdKt0fyjysPeKSMVDiv1bJdTeg/8WUqtyH8SXFeOoCh+ttzj5/z22SDxHHW3trg udkLl1MdzgOm9GFDqrzciglcjmCF9WQBgPeKPu7KLtwa6mwrGzpmllZOvpmTfpXfvJzDG5 hR3ayjFS50zkHxLYnW7D8AaHOru3GWQcqyz5jK9VSZGKxV0TfNv33uhEduFSSGY4ZZdvT/ OOfK7WAFGGhuzcPdRpmiyOD/gwlky+uGW9zwAZytvww4KDOKqCxzh7WOgs5A6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062701; a=rsa-sha256; cv=none; b=oZ2IGbKV7coBe75llI67AMJkmMVypI2ALw2iaJBozYXHqN9Y+ChaU+NXOfKiIx5X265O8G jgAg1Ium08rbUqgreEuoCP0pfYnBYfjXEaZhkOo+DtbmLnDxPLBKn/eOakHRORy3w4yhEC NSFeW3LZJo5uQhHp9kHdCdV/mGjaW8NAs9nCBAYwJIYCJMdPFukl/bW7iiLWTQFYKcoLUP TfetlO0UViUNObVLWX5VaHQNg4U35whFpn31WKYsFREntubasZRTqpg0Bn/zwAtlE/5cSu 9iLiWLhEaqdif4yg2JLMEH9mqULnPJXV4hREWli08tTt7Dhgh/xp8urIymRDcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDF2pRXzBJv; Mon, 27 Nov 2023 05:25: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 3AR5P1j1066569; Mon, 27 Nov 2023 05:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P1dP066566; Mon, 27 Nov 2023 05:25:01 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:01 GMT Message-Id: <202311270525.3AR5P1dP066566@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: 32e86a82f548 - main - sbin: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: 32e86a82f54826f14ea381affa6674db3aa3b5ae Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=32e86a82f54826f14ea381affa6674db3aa3b5ae commit 32e86a82f54826f14ea381affa6674db3aa3b5ae Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:59 +0000 sbin: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- sbin/bectl/bectl.c | 1 - sbin/bectl/bectl_jail.c | 1 - sbin/bectl/bectl_list.c | 1 - sbin/camcontrol/depop.c | 1 - sbin/camcontrol/fwdownload.c | 1 - sbin/camcontrol/timestamp.c | 1 - sbin/ccdconfig/ccdconfig.c | 1 - sbin/conscontrol/conscontrol.c | 1 - sbin/ddb/ddb_capture.c | 1 - sbin/ddb/ddb_script.c | 1 - sbin/decryptcore/decryptcore.c | 1 - sbin/devd/devd.cc | 1 - sbin/devfs/devfs.c | 1 - sbin/devfs/rule.c | 1 - sbin/devmatch/devmatch.c | 1 - sbin/dump/dumprmt.c | 3 --- sbin/dump/itime.c | 3 --- sbin/dump/optr.c | 3 --- sbin/dump/tape.c | 3 --- sbin/dump/traverse.c | 3 --- sbin/dump/unctime.c | 3 --- sbin/fdisk/fdisk_mbr_enc.c | 1 - sbin/fsck/fsck.c | 1 - sbin/fsck_ffs/dir.c | 3 --- sbin/fsck_ffs/ea.c | 1 - sbin/fsck_ffs/fsutil.c | 3 --- sbin/fsck_ffs/inode.c | 3 --- sbin/fsck_ffs/pass1.c | 3 --- sbin/fsck_ffs/pass1b.c | 3 --- sbin/fsck_ffs/pass2.c | 3 --- sbin/fsck_ffs/pass3.c | 3 --- sbin/fsck_ffs/pass4.c | 3 --- sbin/fsck_ffs/pass5.c | 3 --- sbin/fsck_ffs/setup.c | 3 --- sbin/fsck_ffs/suj.c | 1 - sbin/fsck_ffs/utilities.c | 3 --- sbin/geom/core/geom.c | 1 - sbin/geom/misc/subr.c | 1 - sbin/hastctl/hastctl.c | 1 - sbin/hastd/activemap.c | 1 - sbin/hastd/control.c | 1 - sbin/hastd/ebuf.c | 1 - sbin/hastd/hastd.c | 1 - sbin/hastd/hooks.c | 1 - sbin/hastd/nv.c | 1 - sbin/hastd/pjdlog.c | 1 - sbin/hastd/primary.c | 1 - sbin/hastd/proto.c | 1 - sbin/hastd/proto_common.c | 1 - sbin/hastd/proto_socketpair.c | 1 - sbin/hastd/proto_tcp.c | 1 - sbin/hastd/secondary.c | 1 - sbin/hastd/subr.c | 1 - sbin/ifconfig/ifgre.c | 1 - sbin/ifconfig/ifipsec.c | 1 - sbin/ifconfig/ifvxlan.c | 1 - sbin/ipfw/nat64clat.c | 1 - sbin/ipfw/nat64lsn.c | 1 - sbin/ipfw/nat64stl.c | 1 - sbin/ipfw/nptv6.c | 1 - sbin/kldconfig/kldconfig.c | 1 - sbin/kldload/kldload.c | 1 - sbin/kldstat/kldstat.c | 1 - sbin/kldunload/kldunload.c | 1 - sbin/md5/md5.c | 1 - sbin/mdmfs/mdmfs.c | 1 - sbin/mount/getmntopts.c | 3 --- sbin/mount/vfslist.c | 3 --- sbin/mount_fusefs/mount_fusefs.c | 1 - sbin/newfs/mkfs.c | 3 --- sbin/nvmecontrol/comnd.c | 1 - sbin/nvmecontrol/devlist.c | 1 - sbin/nvmecontrol/firmware.c | 1 - sbin/nvmecontrol/format.c | 1 - sbin/nvmecontrol/identify.c | 1 - sbin/nvmecontrol/identify_ext.c | 1 - sbin/nvmecontrol/logpage.c | 1 - sbin/nvmecontrol/modules/intel/intel.c | 1 - sbin/nvmecontrol/modules/samsung/samsung.c | 1 - sbin/nvmecontrol/modules/wdc/wdc.c | 1 - sbin/nvmecontrol/ns.c | 1 - sbin/nvmecontrol/nsid.c | 1 - sbin/nvmecontrol/nvmecontrol.c | 1 - sbin/nvmecontrol/passthru.c | 1 - sbin/nvmecontrol/perftest.c | 1 - sbin/nvmecontrol/power.c | 1 - sbin/nvmecontrol/reset.c | 1 - sbin/nvmecontrol/resv.c | 1 - sbin/nvmecontrol/sanitize.c | 1 - sbin/nvmecontrol/selftest.c | 1 - sbin/pfctl/pf_print_state.c | 1 - sbin/pfctl/pf_ruleset.c | 1 - sbin/pfctl/pfctl_optimize.c | 1 - sbin/pfctl/pfctl_osfp.c | 1 - sbin/pfctl/pfctl_parser.c | 1 - sbin/pfctl/pfctl_radix.c | 1 - sbin/pfctl/pfctl_table.c | 1 - sbin/pfctl/tests/pfctl_test.c | 2 +- sbin/pfilctl/pfilctl.c | 1 - sbin/ping/main.c | 1 - sbin/ping/tests/in_cksum_test.c | 1 - sbin/restore/dirs.c | 3 --- sbin/restore/interactive.c | 4 ---- sbin/restore/restore.c | 4 ---- sbin/restore/symtab.c | 3 --- sbin/restore/tape.c | 4 ---- sbin/restore/utilities.c | 3 --- sbin/routed/rtquery/rtquery.c | 1 - sbin/savecore/savecore.c | 1 - sbin/sysctl/sysctl.c | 1 - sbin/zfsbootcfg/zfsbootcfg.c | 1 - 111 files changed, 1 insertion(+), 166 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 05ed8d6be5bd..e398e055a3b2 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/bectl/bectl_jail.c b/sbin/bectl/bectl_jail.c index ae48202163de..fa063962dada 100644 --- a/sbin/bectl/bectl_jail.c +++ b/sbin/bectl/bectl_jail.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/bectl/bectl_list.c b/sbin/bectl/bectl_list.c index 0fcb5deb37f3..c158aa9b1600 100644 --- a/sbin/bectl/bectl_list.c +++ b/sbin/bectl/bectl_list.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/camcontrol/depop.c b/sbin/camcontrol/depop.c index 3be67650cdae..4aff0284abe1 100644 --- a/sbin/camcontrol/depop.c +++ b/sbin/camcontrol/depop.c @@ -50,7 +50,6 @@ * 'depop' provides a wrapper around all these functions. */ -#include #include #include diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c index 25b98c804e3e..2ab18c93392b 100644 --- a/sbin/camcontrol/fwdownload.c +++ b/sbin/camcontrol/fwdownload.c @@ -49,7 +49,6 @@ * specified device. */ -#include #include #include diff --git a/sbin/camcontrol/timestamp.c b/sbin/camcontrol/timestamp.c index 403c126c95d9..3130dec188dc 100644 --- a/sbin/camcontrol/timestamp.c +++ b/sbin/camcontrol/timestamp.c @@ -35,7 +35,6 @@ * SCSI tape drive timestamp support */ -#include #include #include diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index fd62c459a78f..6b8086ef0213 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -32,7 +32,6 @@ * NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ */ -#include #include #include #include diff --git a/sbin/conscontrol/conscontrol.c b/sbin/conscontrol/conscontrol.c index b8890cf22030..9c7ec9175910 100644 --- a/sbin/conscontrol/conscontrol.c +++ b/sbin/conscontrol/conscontrol.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ddb/ddb_capture.c b/sbin/ddb/ddb_capture.c index fcff16e292ea..ab8b2c1ed0bb 100644 --- a/sbin/ddb/ddb_capture.c +++ b/sbin/ddb/ddb_capture.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ddb/ddb_script.c b/sbin/ddb/ddb_script.c index c40b8b96b21f..76724df8d772 100644 --- a/sbin/ddb/ddb_script.c +++ b/sbin/ddb/ddb_script.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/decryptcore/decryptcore.c b/sbin/decryptcore/decryptcore.c index adeccfac8d47..1e7cf4070e51 100644 --- a/sbin/decryptcore/decryptcore.c +++ b/sbin/decryptcore/decryptcore.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 05715c18708f..8d621e42a232 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -63,7 +63,6 @@ // - devd needs to document the unix domain socket // - devd.conf needs more details on the supported statements. -#include #include #include #include diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c index 72feed7fb857..ae8954e9d88b 100644 --- a/sbin/devfs/devfs.c +++ b/sbin/devfs/devfs.c @@ -30,7 +30,6 @@ * DEVFS control. */ -#include #include #include diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c index b9b493ae3742..d07104d1de13 100644 --- a/sbin/devfs/rule.c +++ b/sbin/devfs/rule.c @@ -30,7 +30,6 @@ * Rule subsystem manipulation. */ -#include #include #include #include diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 2485120c57b6..d93a35e5633d 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index ef75be6f2a1f..4f61905eb60e 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index adeaa044ff4f..ba6ccaf47f04 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index 15d34020b24c..f263f48374ae 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index dd3a7672586d..e448bacf61b6 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include #include diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index c166b6a1af24..ccc2d0a625e9 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include #include diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c index 86ce682642b5..82ee12597c05 100644 --- a/sbin/dump/unctime.c +++ b/sbin/dump/unctime.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - #include /* diff --git a/sbin/fdisk/fdisk_mbr_enc.c b/sbin/fdisk/fdisk_mbr_enc.c index 6fe99bbba1b3..d621124c7a85 100644 --- a/sbin/fdisk/fdisk_mbr_enc.c +++ b/sbin/fdisk/fdisk_mbr_enc.c @@ -33,7 +33,6 @@ * NB! This file must be usable both in kernel and userland. */ -#include #include #include #include diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c index 6bef9a31b8f5..4c24cc9813e1 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c @@ -34,7 +34,6 @@ * $NetBSD: fsck.c,v 1.30 2003/08/07 10:04:15 agc Exp $ */ -#include #include #include #include diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 597cb1996401..cc63aadae04c 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c index 8e5e8ebe8aa0..f6ebc5c072fc 100644 --- a/sbin/fsck_ffs/ea.c +++ b/sbin/fsck_ffs/ea.c @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 7e9a2c4661ef..aa536fb5dd4e 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 8b154d972dd3..5b004cd29c90 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 99da2db3bc6b..f4f97a38097b 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index fe6acd4c27db..3fb9cab89078 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index d92bf22c4394..1755a1295a9e 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c index ac0b61437ccb..853f5d62382f 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c index bddd7ca9a94f..a261051c432a 100644 --- a/sbin/fsck_ffs/pass4.c +++ b/sbin/fsck_ffs/pass4.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index efe36ca42cb4..528a6956c4a1 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 71088ee13849..f10f02d159c3 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index e1fd54229d69..73be60c5e5b4 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c index e5ec06cb101e..56655089b9d6 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index ccaf7adca305..950f6790b1a8 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c index 2d3db86c943f..18bac7108ed0 100644 --- a/sbin/geom/misc/subr.c +++ b/sbin/geom/misc/subr.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c index ab2d618c698c..224adce2810e 100644 --- a/sbin/hastctl/hastctl.c +++ b/sbin/hastctl/hastctl.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c index f5e3c60fd0a0..42f3d03b5482 100644 --- a/sbin/hastd/activemap.c +++ b/sbin/hastd/activemap.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include /* powerof2() */ #include diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c index f6f937d3b180..13a0c5e0af30 100644 --- a/sbin/hastd/control.c +++ b/sbin/hastd/control.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/ebuf.c b/sbin/hastd/ebuf.c index 522e4e821b11..fdb5c442bfa5 100644 --- a/sbin/hastd/ebuf.c +++ b/sbin/hastd/ebuf.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c index f303f277e0ad..c62b85fd1925 100644 --- a/sbin/hastd/hastd.c +++ b/sbin/hastd/hastd.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c index 7a5ccb4e22e6..43ba6f06851a 100644 --- a/sbin/hastd/hooks.c +++ b/sbin/hastd/hooks.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c index 5f50ae349023..47499ce27294 100644 --- a/sbin/hastd/nv.c +++ b/sbin/hastd/nv.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/pjdlog.c b/sbin/hastd/pjdlog.c index 6726cab47697..3dbbe163812e 100644 --- a/sbin/hastd/pjdlog.c +++ b/sbin/hastd/pjdlog.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index 76c454d14a74..5d166a088b9b 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c index 56ff4933c9b8..93c9a064215d 100644 --- a/sbin/hastd/proto.c +++ b/sbin/hastd/proto.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c index 143b7666b7ca..39ef696f5b69 100644 --- a/sbin/hastd/proto_common.c +++ b/sbin/hastd/proto_common.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c index ab30a6a27263..2d3d61693e1b 100644 --- a/sbin/hastd/proto_socketpair.c +++ b/sbin/hastd/proto_socketpair.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c index dc5a23da7b23..aeec887433f8 100644 --- a/sbin/hastd/proto_tcp.c +++ b/sbin/hastd/proto_tcp.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include /* MAXHOSTNAMELEN */ #include diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index bf118d7e1237..6bf889bba657 100644 --- a/sbin/hastd/secondary.c +++ b/sbin/hastd/secondary.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index 27641a6f8acb..2a26482b3727 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c index dda04e363bfc..3eeed8f3d200 100644 --- a/sbin/ifconfig/ifgre.c +++ b/sbin/ifconfig/ifgre.c @@ -25,7 +25,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ifconfig/ifipsec.c b/sbin/ifconfig/ifipsec.c index 6fd1f9f630f4..b8ab38d6165a 100644 --- a/sbin/ifconfig/ifipsec.c +++ b/sbin/ifconfig/ifipsec.c @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ifconfig/ifvxlan.c b/sbin/ifconfig/ifvxlan.c index e4871da645fd..cbea685b6ba0 100644 --- a/sbin/ifconfig/ifvxlan.c +++ b/sbin/ifconfig/ifvxlan.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/ipfw/nat64clat.c b/sbin/ipfw/nat64clat.c index e8b767a0c801..63fa7dae14e2 100644 --- a/sbin/ipfw/nat64clat.c +++ b/sbin/ipfw/nat64clat.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ipfw/nat64lsn.c b/sbin/ipfw/nat64lsn.c index f50ea3661236..0a3e0415d459 100644 --- a/sbin/ipfw/nat64lsn.c +++ b/sbin/ipfw/nat64lsn.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ipfw/nat64stl.c b/sbin/ipfw/nat64stl.c index d8dd239e7daa..b6c970001f5c 100644 --- a/sbin/ipfw/nat64stl.c +++ b/sbin/ipfw/nat64stl.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c index fc9ce638b8af..83bf4c768fd9 100644 --- a/sbin/ipfw/nptv6.c +++ b/sbin/ipfw/nptv6.c @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/kldconfig/kldconfig.c b/sbin/kldconfig/kldconfig.c index 27956a961ccf..570ca5cbf713 100644 --- a/sbin/kldconfig/kldconfig.c +++ b/sbin/kldconfig/kldconfig.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/kldload/kldload.c b/sbin/kldload/kldload.c index c573a253c7c3..82469a2d40f3 100644 --- a/sbin/kldload/kldload.c +++ b/sbin/kldload/kldload.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c index 60d12e0327ab..79c647576440 100644 --- a/sbin/kldstat/kldstat.c +++ b/sbin/kldstat/kldstat.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sbin/kldunload/kldunload.c b/sbin/kldunload/kldunload.c index ebdc17ce414f..69739d0f4afe 100644 --- a/sbin/kldunload/kldunload.c +++ b/sbin/kldunload/kldunload.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 15fd7ebec5d4..abaadb12f3ee 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -17,7 +17,6 @@ * documentation and/or software. */ -#include #include #include #include diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index dbd206f953d2..93fa9e8ff0c0 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -32,7 +32,6 @@ * the deprecated mount_mfs(8). */ -#include #include #include #include diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index 331584d885cb..0912b1e1a306 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include diff --git a/sbin/mount/vfslist.c b/sbin/mount/vfslist.c index 6648866234b0..ea6086651483 100644 --- a/sbin/mount/vfslist.c +++ b/sbin/mount/vfslist.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ *** 541 LINES SKIPPED *** From nobody Mon Nov 27 05:25:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDG6KL5z51hLF; Mon, 27 Nov 2023 05:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvDG4rxFz4XHl; Mon, 27 Nov 2023 05:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LwHzHb10/HIae3lPlh0ESuf+M5GFAAM2IsyGCMVauzE=; b=xzXq6+wd9QI8iSmXthBAx2HQewOt7VeDJQI/0Vr54LflRW8m9fLruGb3zZWGlZR1/aEVYi s08ip9YcDMB6mJKHtccIJ2s5qae4eIg9JY0ZgvAXvO2SXj1OvXkdsBhhNbc0mMhogKNZOW LMcq81yEXW0llLTqE59VET17/6vVIiRVgTFPgi6av0Z+bwAv+Hdmc/yAWqWqJhjIK23YSh lQTCC5xUVLrbouiplzx3ItHOoc9+z10Qm/bProBT8/1MDlw/9Mb7wN8JekZlfzYhN85x1z /wIJIWRFGtu6ytzQVhB/ZWUZt0Q8ymE1aP9nVUmeSbXwqOQs8g5VeB3wIgzUyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LwHzHb10/HIae3lPlh0ESuf+M5GFAAM2IsyGCMVauzE=; b=SrUIwKQ5R40DsQjMCvFsMESDU8adoWE45Rbo9+aikor+N+yDcJBXySObpZnQHSHEu4iauB L7fZlAZq0SBjbVSIhDVMz0qu58dIhUEGw5D4AIvJS72BtHfGt1E3ZEY6Epedewj00R5Yco 3r9KnojBZtYonBLH0ny4z9VonrmFv5x6rF4KC9YahsB08NqOF6Ykw50dItBWErzRpab3d8 1YUnQbUbNvBjExH47UPsDJ+dlxX2VXVVPlyOotWzfFugF/QlXQNTYelM7fuiCWTKTwpd0h 7clKaf1FXfHVym5v4bI6Qv1KeagKEQLDm/DLdkHd8Nexv6MDttmW/GSF0EWhmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062702; a=rsa-sha256; cv=none; b=OTr2cxxNlvOZFRf7a7yhKnuqHyS8Ia8jF6rfjBR+PWqFRzCQ0lzR7WtCIT4uqE+n1+/Kev bEHloq6+UAayZl49D4hN0MMT0Hw6qnUg96LJIv6icouFNkgu4oTHc/OOxiWt8bx8bOia4/ yicbmlMT6Y1HTNtn1e6KcOUpnt8+N19FeA56cx/UBZlQ/8EeEa53FDQcytjgOdepkPbvxN 1lWgaLYs4nt0HkN5x6phKz9+oacwh2t4fXAvjieuqCPj72RetZqLhMN0MD2eHcKb3nH0Si ZiDEjwc1oef1dhQ9GMmk6b9FgrbBRoXfip46drg2zGxEE5wO9V5t6zz57wrECw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDG3qSTzB9x; Mon, 27 Nov 2023 05:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR5P2Kj066620; Mon, 27 Nov 2023 05:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P27B066617; Mon, 27 Nov 2023 05:25:02 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:02 GMT Message-Id: <202311270525.3AR5P27B066617@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: c8813424c9d1 - main - secure: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: c8813424c9d126a6a743269f6e092d4fd8b39e0a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c8813424c9d126a6a743269f6e092d4fd8b39e0a commit c8813424c9d126a6a743269f6e092d4fd8b39e0a Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:23:59 +0000 secure: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- secure/lib/libcrypt/crypt-des.c | 1 - 1 file changed, 1 deletion(-) diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c index f96933ab1bfd..f274ce3a6e29 100644 --- a/secure/lib/libcrypt/crypt-des.c +++ b/secure/lib/libcrypt/crypt-des.c @@ -56,7 +56,6 @@ * alignment). */ -#include #include #include #include From nobody Mon Nov 27 05:25:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDJ43Xlz51hNC; Mon, 27 Nov 2023 05:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvDH6MbVz4XRt; Mon, 27 Nov 2023 05:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2GGAXTYuDa+rCtxLtN+R9OPTL/cLNEK8Lm75i8jJFo=; b=wx5XVsjKyzgHgwSRJfhIzTTGb4mqYUuU6FHc2O3cLZdoZHrCKv+p35bw49WNqlLLhQ9I7T IeY00eieXrre9sYiVJGTZqV+v2sKooj7EXJhykIqzjhZO8oFdukIvzpnb+hjy7kurGiLo5 bWPqUlXf+csTP4dlNRalocEjPR6JIRnVIq4P3BbrJJj/maQMdF7+Nrdu9WAYqazUeff827 2+Uuo0NeKNtoMTAeqqv3D6izFWYhmcuEEyh0woQffrbzPIC3Vxlq9BJhy693hg72xHAnsJ Np3xItBv16NZ6bV5A9ThnS8s8mHj3Salk2sCHBEVDCXZsJFV4YIV8Cj5z+Wx3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2GGAXTYuDa+rCtxLtN+R9OPTL/cLNEK8Lm75i8jJFo=; b=Qo+blzcsibL6rnmpuZKtxaN1r/4jRRPGMnVLh76qK0tx2QZMYgvabMV4ZElG6w8F7AA0HP FY1YmT0+9SbLOyNa59K7/RKahDKkcIZ/VSaEZggNNsEk+iAFGiCXF/MznVMrj0NH8p2kAZ Cs/i7jHT0TEpu2z7RR2LEDfYCiDZhGT0GF2Zv/PTQJ5+6aXtOH7ftmkG25aGGkel3U0AUd wWRxVkKKj6sOuTWlf4y3kyUHIFTzgkCW2O6rSBauRMi0LxbIOYi/xpNkCcXK7OU+JMAfVr cCaSHHG5sGOHxsBKfXX1Acs4UEL1Tw9NJuBl0q0xKYYAZuhULOBxHVKrl+Owew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062704; a=rsa-sha256; cv=none; b=MrwmYt5IIkRvGoSW3AH6Ahs7VV2Y49jN8/wE3wZ3RPFmNDNR5iwBUupBFKqZJr37E7sJWM G5UAAN8VT0Gf7uyPR8PPyecRMgbB+gPsHgDQwO0ZSCu8VFPaTdg5DQbRL912LKNkvfm81O 1PeYNrJYM5+j6v9AE4DBttSsqJYnoQDT8fs35K5zjW1GyvKhNsQvB2xQhzenr+N+ybUIP/ coAUMeRXO4xz5vfeKsiuBg/VygkgZIfd/x4CoRfBC/gzj6JLCtK1w8+ZATm50yrXz+pr5O E09+XntPmXKcewELgog1TXDvBucE4rIKYcQ/TyYIu000MO4W2IR66OLP6nbMoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDH4t19zB7T; Mon, 27 Nov 2023 05:25: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 3AR5P3pT066675; Mon, 27 Nov 2023 05:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P3e5066672; Mon, 27 Nov 2023 05:25:03 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:03 GMT Message-Id: <202311270525.3AR5P3e5066672@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: 0044e9124e47 - main - share: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: 0044e9124e474b5d45a77df328d0d7b00ec7e57b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0044e9124e474b5d45a77df328d0d7b00ec7e57b commit 0044e9124e474b5d45a77df328d0d7b00ec7e57b Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:00 +0000 share: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- share/examples/kld/firmware/fwconsumer/fw_consumer.c | 1 - share/examples/kld/khelp/h_example.c | 1 - share/examples/kld/random_adaptor/random_adaptor_example.c | 1 - share/examples/modules/skel.c | 1 - 4 files changed, 4 deletions(-) diff --git a/share/examples/kld/firmware/fwconsumer/fw_consumer.c b/share/examples/kld/firmware/fwconsumer/fw_consumer.c index 05c93446eed3..8d749fed65df 100644 --- a/share/examples/kld/firmware/fwconsumer/fw_consumer.c +++ b/share/examples/kld/firmware/fwconsumer/fw_consumer.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/share/examples/kld/khelp/h_example.c b/share/examples/kld/khelp/h_example.c index 5bca2b36af50..fea7826a1fb4 100644 --- a/share/examples/kld/khelp/h_example.c +++ b/share/examples/kld/khelp/h_example.c @@ -37,7 +37,6 @@ * documented in an attempt to explain how everything fits together. */ -#include #include #include #include diff --git a/share/examples/kld/random_adaptor/random_adaptor_example.c b/share/examples/kld/random_adaptor/random_adaptor_example.c index f462f64cd174..6dd3321d1286 100644 --- a/share/examples/kld/random_adaptor/random_adaptor_example.c +++ b/share/examples/kld/random_adaptor/random_adaptor_example.c @@ -27,7 +27,6 @@ * */ -#include #include #include #include diff --git a/share/examples/modules/skel.c b/share/examples/modules/skel.c index beb461720dfa..3c2cbd8eb8b1 100644 --- a/share/examples/modules/skel.c +++ b/share/examples/modules/skel.c @@ -37,7 +37,6 @@ * */ -#include #include #include #include From nobody Mon Nov 27 05:25:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDK0wfrz51hLT; Mon, 27 Nov 2023 05:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvDJ6WRbz4XS2; Mon, 27 Nov 2023 05:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sbHJmCZ56YFS9WrymAySFoWgimlKrURwx/gusZufD2I=; b=KWiQjeppdbqZeRyyEglULI6ADt23TwZO3u9P77QMMzbhoSUz+bscfOfoUzAzDZ9x1Z3eC0 8v8lEbWl5rck5FrS2QTIrGCmQ83NcHGEqzYknnD774BiYwAoT8d8xgRMh6iVOi0wKBd6gT A6sJJokoA+6K/foFJPetgCZukMni3yiZ2FsgLbkElgA00TpOTptOOWALnJggC/ZpA9uNRR loFe31n1W1jK24qGmlZ2CqQJTHkYBhNsr/BGOZ/KGwbsyyFLA+IBTsmovJF8kRRQ1/TKCA ANbLavroqQFMYHPQ9BIaJEgmT8E/U7lKxiFouniLc55CdRtDi/bQKdTi5+S2BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sbHJmCZ56YFS9WrymAySFoWgimlKrURwx/gusZufD2I=; b=TpsLntXYZmivivdMPJeGawkL/3dbrqqM8ROIfnl537gmTlOgbt/PigszFNPmEywbnkwKlt rbyPvBjM/7RU7Viqcd+cYcWgpoCIKLEJeTT+rrbadoQ8AOm4nyc6woC361X4oiupT8WS4k /kpfmwYAyw0YydjST4wxLYHokTAzGuJhtUo0YxdjIRs8it9H1gUz+uXdkT1L3s7C7VF84W hgAVihUclNDQn7x5lZmh2qTped+9odMAi0Pfb+umEGu0Ah/ANkHjgoTQXv6rcXDQUeSEPu xK/UW+5Wl1ZEbYPBzglikegfsagtZrV0yP9sH+Xzh894EwebVJ1ncgchzrnoyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062704; a=rsa-sha256; cv=none; b=Z5bx36Zyt6PHGZwe89fUfotv4IlYoCqhtBjBLtCxWV1Gmr34eHpGgzaDiuyuzUofmoZBZA yg9UZPV3BaOOht5lC6EUQg5HYxc4GaFa4JUEysuMIJAiwlPJylvnmvUw3QQ/BY/KDT0E76 ZjmL2YVKvdngiyp5doX6rLHBAOiUOaxEorXicso0vcfSmqeaI0rQ/H/qkYzAcsR27I/20I tW4hdedR5F9VXH0NEP+c9KpmgihcOQl/Ju1WiElWTNbbL4TO7GtUG51eWhvj19l5a4jFls NRV2O0sWI3/U2/n8MBNDmVdrWuOoHZQF9KH2YRIlKia9klhcd8YZb/2/myQ+CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDJ5dS4z9lv; Mon, 27 Nov 2023 05:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR5P4kb066732; Mon, 27 Nov 2023 05:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P41N066729; Mon, 27 Nov 2023 05:25:04 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:04 GMT Message-Id: <202311270525.3AR5P41N066729@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: 7c43148a9748 - main - stand: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: 7c43148a974877188a930e4078a164f83da8e652 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7c43148a974877188a930e4078a164f83da8e652 commit 7c43148a974877188a930e4078a164f83da8e652 Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:00 +0000 stand: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- stand/arm64/libarm64/cache.c | 1 - stand/common/bcache.c | 1 - stand/common/console.c | 1 - stand/common/gfx_fb.c | 1 - stand/common/install.c | 1 - stand/common/interp_forth.c | 1 - stand/common/load_elf.c | 1 - stand/common/load_elf_obj.c | 1 - stand/common/ls.c | 1 - stand/common/reloc_elf.c | 1 - stand/common/self_reloc.c | 1 - stand/common/tslog.c | 1 - stand/efi/boot1/boot1.c | 1 - stand/efi/boot1/proto.c | 1 - stand/efi/boot1/ufs_module.c | 2 +- stand/efi/boot1/zfs_module.c | 2 +- stand/efi/fdt/efi_fdt.c | 1 - stand/efi/gptboot/proto.c | 1 - stand/efi/libefi/efi_console.c | 1 - stand/efi/libefi/efichar.c | 1 - stand/efi/libefi/efihttp.c | 1 - stand/efi/libefi/efinet.c | 1 - stand/efi/libefi/efizfs.c | 1 - stand/efi/loader/arch/arm/exec.c | 1 - stand/efi/loader/arch/riscv/exec.c | 1 - stand/efi/loader/copy.c | 1 - stand/i386/boot0/boot0.S | 7 ------- stand/i386/boot2/boot2.c | 1 - stand/i386/common/cons.c | 1 - stand/i386/common/drv.c | 1 - stand/i386/gptboot/gptboot.c | 1 - stand/i386/isoboot/isoboot.c | 1 - stand/i386/libi386/elf32_freebsd.c | 1 - stand/i386/libi386/multiboot.c | 1 - stand/kboot/hostcons.c | 1 - stand/kboot/hostdisk.c | 1 - stand/kboot/kbootfdt.c | 1 - stand/liblua/lutils.c | 1 - stand/libofw/ofw_console.c | 1 - stand/libofw/ofw_memory.c | 1 - stand/libofw/ofw_net.c | 1 - stand/libofw/openfirm.h | 1 - stand/libsa/__main.c | 1 - stand/libsa/arp.c | 1 - stand/libsa/bcd.c | 1 - stand/libsa/cd9660read.c | 1 - stand/libsa/dev.c | 1 - stand/libsa/ether.c | 1 - stand/libsa/globals.c | 1 - stand/libsa/gpt.c | 1 - stand/libsa/in_cksum.c | 1 - stand/libsa/ip.c | 1 - stand/libsa/net.c | 1 - stand/libsa/netif.c | 1 - stand/libsa/nfs.c | 1 - stand/libsa/preload.c | 1 - stand/libsa/random.c | 1 - stand/libsa/rarp.c | 1 - stand/libsa/read.c | 1 - stand/libsa/readdir.c | 1 - stand/libsa/tslog.c | 1 - stand/libsa/twiddle.c | 1 - stand/libsa/udp.c | 1 - stand/libsa/write.c | 1 - stand/libsa/zalloc.c | 1 - stand/libsa/zfs/nvlist.c | 1 - stand/powerpc/boot1.chrp/boot1.c | 1 - stand/powerpc/ofw/elf_freebsd.c | 1 - stand/uboot/copy.c | 1 - stand/uboot/elf_freebsd.c | 1 - stand/uboot/glue.c | 1 - stand/uboot/main.c | 1 - stand/uboot/net.c | 1 - stand/uboot/uboot_disk.c | 1 - stand/uboot/uboot_fdt.c | 1 - stand/userboot/userboot/elf32_freebsd.c | 1 - 76 files changed, 2 insertions(+), 82 deletions(-) diff --git a/stand/arm64/libarm64/cache.c b/stand/arm64/libarm64/cache.c index 291b55f3b250..7b74f584ffe3 100644 --- a/stand/arm64/libarm64/cache.c +++ b/stand/arm64/libarm64/cache.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/common/bcache.c b/stand/common/bcache.c index 2b4603525740..f4805cbaa715 100644 --- a/stand/common/bcache.c +++ b/stand/common/bcache.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include /* * Simple hashed block cache diff --git a/stand/common/console.c b/stand/common/console.c index d9d075ef7bde..82cb552b4ef2 100644 --- a/stand/common/console.c +++ b/stand/common/console.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 27ac66f259b1..c10d227a5fc8 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -82,7 +82,6 @@ * from VGA colors to console colors, while we are reading RGB data. */ -#include #include #include #include diff --git a/stand/common/install.c b/stand/common/install.c index 418799822e4e..b827b1fe9da2 100644 --- a/stand/common/install.c +++ b/stand/common/install.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/interp_forth.c b/stand/common/interp_forth.c index 0320e081d406..854addb22d5c 100644 --- a/stand/common/interp_forth.c +++ b/stand/common/interp_forth.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include /* to pick up __FreeBSD_version */ #include #include diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index 9f3b015fef7e..d53c0f8b5b84 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/load_elf_obj.c b/stand/common/load_elf_obj.c index 86e0fb2b5d22..263553df5e90 100644 --- a/stand/common/load_elf_obj.c +++ b/stand/common/load_elf_obj.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/ls.c b/stand/common/ls.c index daeecfa488da..0cf57f7e281c 100644 --- a/stand/common/ls.c +++ b/stand/common/ls.c @@ -37,7 +37,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/reloc_elf.c b/stand/common/reloc_elf.c index a7243bc634fd..cf5010a06ccd 100644 --- a/stand/common/reloc_elf.c +++ b/stand/common/reloc_elf.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/common/self_reloc.c b/stand/common/self_reloc.c index 39dad510b0b0..a4faeeace63f 100644 --- a/stand/common/self_reloc.c +++ b/stand/common/self_reloc.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/tslog.c b/stand/common/tslog.c index 6f27b9ebc316..8a17b0ca110c 100644 --- a/stand/common/tslog.c +++ b/stand/common/tslog.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c index 19627e870201..908baf400972 100644 --- a/stand/efi/boot1/boot1.c +++ b/stand/efi/boot1/boot1.c @@ -19,7 +19,6 @@ * purpose. */ -#include #include #include #include diff --git a/stand/efi/boot1/proto.c b/stand/efi/boot1/proto.c index cec4e2d1942c..6660d39a921b 100644 --- a/stand/efi/boot1/proto.c +++ b/stand/efi/boot1/proto.c @@ -19,7 +19,6 @@ * purpose. */ -#include #include #include #include diff --git a/stand/efi/boot1/ufs_module.c b/stand/efi/boot1/ufs_module.c index 6848dd79eec0..0bdd5c018b06 100644 --- a/stand/efi/boot1/ufs_module.c +++ b/stand/efi/boot1/ufs_module.c @@ -32,7 +32,7 @@ #include #include -#include + #include #include #include diff --git a/stand/efi/boot1/zfs_module.c b/stand/efi/boot1/zfs_module.c index 01b95e06e38f..16722b33f0b9 100644 --- a/stand/efi/boot1/zfs_module.c +++ b/stand/efi/boot1/zfs_module.c @@ -26,7 +26,7 @@ #include #include #include -#include + #include #include #include diff --git a/stand/efi/fdt/efi_fdt.c b/stand/efi/fdt/efi_fdt.c index 7010a272d9db..adf830e44182 100644 --- a/stand/efi/fdt/efi_fdt.c +++ b/stand/efi/fdt/efi_fdt.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/gptboot/proto.c b/stand/efi/gptboot/proto.c index 54a229db7bca..e2face6c23e5 100644 --- a/stand/efi/gptboot/proto.c +++ b/stand/efi/gptboot/proto.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c index 1758cd9d4d6d..4a3219ef3017 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/efichar.c b/stand/efi/libefi/efichar.c index 0703c167de47..86642d325754 100644 --- a/stand/efi/libefi/efichar.c +++ b/stand/efi/libefi/efichar.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #ifdef _STANDALONE diff --git a/stand/efi/libefi/efihttp.c b/stand/efi/libefi/efihttp.c index 081b34336cb0..bcc0f7e4d79e 100644 --- a/stand/efi/libefi/efihttp.c +++ b/stand/efi/libefi/efihttp.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/libefi/efinet.c b/stand/efi/libefi/efinet.c index ede8b7297f17..62fc203c83b5 100644 --- a/stand/efi/libefi/efinet.c +++ b/stand/efi/libefi/efinet.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/efizfs.c b/stand/efi/libefi/efizfs.c index 83551596bb32..1c80f1ae26b9 100644 --- a/stand/efi/libefi/efizfs.c +++ b/stand/efi/libefi/efizfs.c @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/loader/arch/arm/exec.c b/stand/efi/loader/arch/arm/exec.c index 99ee498b1b65..85a8c26ade30 100644 --- a/stand/efi/loader/arch/arm/exec.c +++ b/stand/efi/loader/arch/arm/exec.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/loader/arch/riscv/exec.c b/stand/efi/loader/arch/riscv/exec.c index 686a42028608..3c40517ea968 100644 --- a/stand/efi/loader/arch/riscv/exec.c +++ b/stand/efi/loader/arch/riscv/exec.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index 12f7273edacd..3f2d1c6c20b0 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S index d92f8dcb05f1..123e66fca970 100644 --- a/stand/i386/boot0/boot0.S +++ b/stand/i386/boot0/boot0.S @@ -16,18 +16,11 @@ */ /* build options: */ -#ifdef SIO /* use serial console on COM1. */ -#endif #ifdef PXE /* enable PXE/INT18 booting with F6 */ #define SAVE_MORE_MEMORY #endif -#ifdef CHECK_DRIVE /* make sure we boot from a HD. */ -#endif - -#ifdef ONLY_F_KEYS /* Only F1..F6, no digits on console */ -#endif #ifdef VOLUME_SERIAL /* support Volume serial number */ #define B0_BASE 0x1ae /* move the internal data area */ diff --git a/stand/i386/boot2/boot2.c b/stand/i386/boot2/boot2.c index da699b58b3b4..b886c70f3808 100644 --- a/stand/i386/boot2/boot2.c +++ b/stand/i386/boot2/boot2.c @@ -13,7 +13,6 @@ * purpose. */ -#include #include #include #include diff --git a/stand/i386/common/cons.c b/stand/i386/common/cons.c index c3a44499b5b4..1007d6965d95 100644 --- a/stand/i386/common/cons.c +++ b/stand/i386/common/cons.c @@ -13,7 +13,6 @@ * purpose. */ -#include #include #include diff --git a/stand/i386/common/drv.c b/stand/i386/common/drv.c index bc8927dc6c5e..394e1b1e8493 100644 --- a/stand/i386/common/drv.c +++ b/stand/i386/common/drv.c @@ -14,7 +14,6 @@ * purpose. */ -#include #include #include diff --git a/stand/i386/gptboot/gptboot.c b/stand/i386/gptboot/gptboot.c index 7cae837f9a56..949c00cdf544 100644 --- a/stand/i386/gptboot/gptboot.c +++ b/stand/i386/gptboot/gptboot.c @@ -13,7 +13,6 @@ * purpose. */ -#include #include #include #include diff --git a/stand/i386/isoboot/isoboot.c b/stand/i386/isoboot/isoboot.c index 4c3f7af8537a..4ffe83cdc9fe 100644 --- a/stand/i386/isoboot/isoboot.c +++ b/stand/i386/isoboot/isoboot.c @@ -13,7 +13,6 @@ * purpose. */ -#include #include #include #include diff --git a/stand/i386/libi386/elf32_freebsd.c b/stand/i386/libi386/elf32_freebsd.c index 185dc0c08d0f..ae5702e5e65f 100644 --- a/stand/i386/libi386/elf32_freebsd.c +++ b/stand/i386/libi386/elf32_freebsd.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c index 1ac5aefebf38..e11da0444fcd 100644 --- a/stand/i386/libi386/multiboot.c +++ b/stand/i386/libi386/multiboot.c @@ -34,7 +34,6 @@ * http://www.gnu.org/software/grub/manual/multiboot/multiboot.html */ -#include #include #include #include diff --git a/stand/kboot/hostcons.c b/stand/kboot/hostcons.c index 24e26af2ab19..114188adcff2 100644 --- a/stand/kboot/hostcons.c +++ b/stand/kboot/hostcons.c @@ -23,7 +23,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include "bootstrap.h" #include "host_syscall.h" diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c index a659c6e63530..552ae68daced 100644 --- a/stand/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c @@ -24,7 +24,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/kboot/kbootfdt.c b/stand/kboot/kbootfdt.c index 34c475f0bb3a..70844820d345 100644 --- a/stand/kboot/kbootfdt.c +++ b/stand/kboot/kbootfdt.c @@ -23,7 +23,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/liblua/lutils.c b/stand/liblua/lutils.c index d6c9051f9039..1792d0c8c620 100644 --- a/stand/liblua/lutils.c +++ b/stand/liblua/lutils.c @@ -25,7 +25,6 @@ * */ -#include #include #include "lua.h" diff --git a/stand/libofw/ofw_console.c b/stand/libofw/ofw_console.c index 76942358e5c5..42ff045e8831 100644 --- a/stand/libofw/ofw_console.c +++ b/stand/libofw/ofw_console.c @@ -26,7 +26,6 @@ * the rights to redistribute these changes. */ -#include #include #include "bootstrap.h" diff --git a/stand/libofw/ofw_memory.c b/stand/libofw/ofw_memory.c index cd95827cba9a..67a4527e07b4 100644 --- a/stand/libofw/ofw_memory.c +++ b/stand/libofw/ofw_memory.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libofw/ofw_net.c b/stand/libofw/ofw_net.c index 15bac848a340..b4bcb7a00fe2 100644 --- a/stand/libofw/ofw_net.c +++ b/stand/libofw/ofw_net.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/libofw/openfirm.h b/stand/libofw/openfirm.h index f41fc20cfa7d..35d10c320b57 100644 --- a/stand/libofw/openfirm.h +++ b/stand/libofw/openfirm.h @@ -60,7 +60,6 @@ * Prototypes for Open Firmware Interface Routines */ -#include #include typedef uint32_t ihandle_t; diff --git a/stand/libsa/__main.c b/stand/libsa/__main.c index f65f3a4105b4..2c057104476c 100644 --- a/stand/libsa/__main.c +++ b/stand/libsa/__main.c @@ -30,7 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include void __main(void); diff --git a/stand/libsa/arp.c b/stand/libsa/arp.c index e461d9322e7e..eff8b9f332a3 100644 --- a/stand/libsa/arp.c +++ b/stand/libsa/arp.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/libsa/bcd.c b/stand/libsa/bcd.c index 600d2bbff703..2f55bf9eda3c 100644 --- a/stand/libsa/bcd.c +++ b/stand/libsa/bcd.c @@ -3,7 +3,6 @@ * Cannot be copyrighted. */ -#include #include u_char const bcd2bin_data[] = { diff --git a/stand/libsa/cd9660read.c b/stand/libsa/cd9660read.c index 4a4501ada529..6062eb061506 100644 --- a/stand/libsa/cd9660read.c +++ b/stand/libsa/cd9660read.c @@ -32,7 +32,6 @@ /* Originally derived from libsa/cd9660.c: */ /* $NetBSD: cd9660.c,v 1.5 1997/06/26 19:11:33 drochner Exp $ */ -#include #include #include #include diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c index ea81e0f92115..1edc843d508c 100644 --- a/stand/libsa/dev.c +++ b/stand/libsa/dev.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/ether.c b/stand/libsa/ether.c index e9dae723e99d..08ef131e9e0e 100644 --- a/stand/libsa/ether.c +++ b/stand/libsa/ether.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/libsa/globals.c b/stand/libsa/globals.c index ca8d190eeeef..2797045d4faf 100644 --- a/stand/libsa/globals.c +++ b/stand/libsa/globals.c @@ -7,7 +7,6 @@ * must be included extraneously. */ -#include #include #include #include diff --git a/stand/libsa/gpt.c b/stand/libsa/gpt.c index 14e9821eef8e..0ba3f0ee1985 100644 --- a/stand/libsa/gpt.c +++ b/stand/libsa/gpt.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/in_cksum.c b/stand/libsa/in_cksum.c index f4d5a91b1b5a..15b2adb6080c 100644 --- a/stand/libsa/in_cksum.c +++ b/stand/libsa/in_cksum.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/ip.c b/stand/libsa/ip.c index 753aeb1bae5e..2c2acf2eda16 100644 --- a/stand/libsa/ip.c +++ b/stand/libsa/ip.c @@ -37,7 +37,6 @@ * once we will implement the support for tcp. */ -#include #include #include #include diff --git a/stand/libsa/net.c b/stand/libsa/net.c index 20731d90b6aa..76b31c50d1e7 100644 --- a/stand/libsa/net.c +++ b/stand/libsa/net.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/netif.c b/stand/libsa/netif.c index 30e1528bdfea..d8398b861af0 100644 --- a/stand/libsa/netif.c +++ b/stand/libsa/netif.c @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/libsa/nfs.c b/stand/libsa/nfs.c index 1cc8fb009944..ee6af8a726c7 100644 --- a/stand/libsa/nfs.c +++ b/stand/libsa/nfs.c @@ -28,7 +28,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/libsa/preload.c b/stand/libsa/preload.c index 9ca80e2c6ab2..499075c0efac 100644 --- a/stand/libsa/preload.c +++ b/stand/libsa/preload.c @@ -24,7 +24,6 @@ * */ -#include #include #include "stand.h" diff --git a/stand/libsa/random.c b/stand/libsa/random.c index a6d903ed2e02..d17d636e1597 100644 --- a/stand/libsa/random.c +++ b/stand/libsa/random.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include static long randseed = 1; diff --git a/stand/libsa/rarp.c b/stand/libsa/rarp.c index 9c5daad5cd42..20bbd56de6e6 100644 --- a/stand/libsa/rarp.c +++ b/stand/libsa/rarp.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/libsa/read.c b/stand/libsa/read.c index df150f8f0fbe..e610f8a0779c 100644 --- a/stand/libsa/read.c +++ b/stand/libsa/read.c @@ -58,7 +58,6 @@ * rights to redistribute these changes. */ -#include #include #include "stand.h" diff --git a/stand/libsa/readdir.c b/stand/libsa/readdir.c index 56c2b880d214..558ff99b265c 100644 --- a/stand/libsa/readdir.c +++ b/stand/libsa/readdir.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include "stand.h" diff --git a/stand/libsa/tslog.c b/stand/libsa/tslog.c index 4501746474ea..7a92ee6c23f3 100644 --- a/stand/libsa/tslog.c +++ b/stand/libsa/tslog.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #if defined(__amd64__) || defined(__i386__) diff --git a/stand/libsa/twiddle.c b/stand/libsa/twiddle.c index 43cdca25a367..9ecfbeac3389 100644 --- a/stand/libsa/twiddle.c +++ b/stand/libsa/twiddle.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include #include "stand.h" diff --git a/stand/libsa/udp.c b/stand/libsa/udp.c index 7a5942bbef95..a0a662a19976 100644 --- a/stand/libsa/udp.c +++ b/stand/libsa/udp.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/libsa/write.c b/stand/libsa/write.c index 16a6fc7eaa60..06b9bfc63ac2 100644 --- a/stand/libsa/write.c +++ b/stand/libsa/write.c @@ -58,7 +58,6 @@ * rights to redistribute these changes. */ -#include #include #include "stand.h" diff --git a/stand/libsa/zalloc.c b/stand/libsa/zalloc.c index 3bee66c02201..98738cf1f357 100644 --- a/stand/libsa/zalloc.c +++ b/stand/libsa/zalloc.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include /* diff --git a/stand/libsa/zfs/nvlist.c b/stand/libsa/zfs/nvlist.c index e6634ec969d4..6cb496a57b26 100644 --- a/stand/libsa/zfs/nvlist.c +++ b/stand/libsa/zfs/nvlist.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/powerpc/boot1.chrp/boot1.c b/stand/powerpc/boot1.chrp/boot1.c index 2804a2a2befd..cdacb05c31ce 100644 --- a/stand/powerpc/boot1.chrp/boot1.c +++ b/stand/powerpc/boot1.chrp/boot1.c @@ -15,7 +15,6 @@ * purpose. */ -#include #include #include #include diff --git a/stand/powerpc/ofw/elf_freebsd.c b/stand/powerpc/ofw/elf_freebsd.c index 5cd8a974cfb6..21ab834f76fa 100644 --- a/stand/powerpc/ofw/elf_freebsd.c +++ b/stand/powerpc/ofw/elf_freebsd.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/uboot/copy.c b/stand/uboot/copy.c index cc12cfaeef35..e5e985c85b27 100644 --- a/stand/uboot/copy.c +++ b/stand/uboot/copy.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/uboot/elf_freebsd.c b/stand/uboot/elf_freebsd.c index 42ed4080c363..6c764d143881 100644 --- a/stand/uboot/elf_freebsd.c +++ b/stand/uboot/elf_freebsd.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/uboot/glue.c b/stand/uboot/glue.c index 782636817001..8d8e2a57d1fc 100644 --- a/stand/uboot/glue.c +++ b/stand/uboot/glue.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/uboot/main.c b/stand/uboot/main.c index 0106243a0e1e..6147757ced71 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/uboot/net.c b/stand/uboot/net.c index e703afcadca4..969724ea02df 100644 --- a/stand/uboot/net.c +++ b/stand/uboot/net.c @@ -25,7 +25,6 @@ *** 43 LINES SKIPPED *** From nobody Mon Nov 27 05:25:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDL6KvKz51hLh; Mon, 27 Nov 2023 05:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvDL5Sg0z4XTY; Mon, 27 Nov 2023 05:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VtANFlEOFKfJWuYWqkatumXwoSbiUw63MstWejfs27M=; b=Q/MgmaG3JhYm961deqUn0zVIPEoaeweYIZiDI7LZp5xD1f/l8oj9AQC0bt/lhSBOipOV5X L94hZL4I+ocbSOT3JPTYxG8HMc3gLSoXyqhjcSUcpWo1lWUkDkp3hUalF6HnHxmoBE/ANC np/vThe6p4XO2eNvjZfNEezoqcVIWm3eX1V/YajvZvO9M2ojyB9kT1Ak3r16cxg75NBphO y1Qgkw0Z6mrZxbt0i4c+56EBgUXBqtdzGgjKdgIbyPa7WRBSnl7Z34TJ8uMPVqx6aVc1jB kk1toQ0tJf+sUlWXMO7jRGnNG1pOSG9jlIXR59AQFqzhXbMfp+5cPDS56nw1Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VtANFlEOFKfJWuYWqkatumXwoSbiUw63MstWejfs27M=; b=n24AtFUr59tUsEZEPAnY370XItOV50fJTPa0dRupKX+RufleXlg7IWqnNgXQzEJP57B3RL mVUYvwSnxM7IkR+8VQ9SZlBdTf9c8rOsfljL4wTPB6gw+CierPIoICwQxPYA0sFEhN1UWh gtO1U/yyEUtB99CjDGUzFpIrvaCXBZXU8HEyNvyd8uOO8cHuaWv3DVBR4NLiRAINdUGvc2 zyc8JJamS9aPSZT4r+8swF5vJ28mn0dWfsjvHi48MsWvELBG/g0QPmSfyaApY9aDnSzUX4 uNDVNbpD2r+N0zgClpRy7F9A6/tybVnZjh2+wssh7qd/5nJK3qzycnmVYs6WFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062706; a=rsa-sha256; cv=none; b=cAJalgHEEAoCDNSMhLM3fkjtUDsXICx8y8BUovgGYhlNbveOnf/G4xxehOjzoaJR8ELSpk d8X159j2D+UEZyj/suJ1G5Jr+zEFAtxA0C3oocapQapLu8U4Y/2OR5hO6mirEYP+inMhUf CvgQiOu27EsQOi03v9upC5R68ttWyU2TgjMV5zayEYRUw5TVjKH1NPSFLozlyo8J4Jv4oK YBLUugooEcw+2iONtsFp+Tu2kncvCsUzMk6OXhER8KbZ4JsUHQyV/ETmXsKZ5qYZAi+Pii wYygnM9APKNVAYMOU34O8rA7FIONeBUAWsWgMVJVZ6E0Vwhvmf2UrD/AFSrGlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDL3ltPzB54; Mon, 27 Nov 2023 05:25: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 3AR5P674066790; Mon, 27 Nov 2023 05:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P5hl066780; Mon, 27 Nov 2023 05:25:05 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:05 GMT Message-Id: <202311270525.3AR5P5hl066780@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: fdafd315ad0d - main - sys: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: fdafd315ad0d0f28a11b9fb4476a9ab059c62b92 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fdafd315ad0d0f28a11b9fb4476a9ab059c62b92 commit fdafd315ad0d0f28a11b9fb4476a9ab059c62b92 Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:00 +0000 sys: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- sys/amd64/acpica/acpi_machdep.c | 1 - sys/amd64/acpica/acpi_wakeup.c | 1 - sys/amd64/amd64/db_trace.c | 1 - sys/amd64/amd64/efirt_machdep.c | 1 - sys/amd64/amd64/elf_machdep.c | 1 - sys/amd64/amd64/fpu.c | 1 - sys/amd64/amd64/gdb_machdep.c | 1 - sys/amd64/amd64/io.c | 1 - sys/amd64/amd64/ptrace_machdep.c | 1 - sys/amd64/amd64/uio_machdep.c | 1 - sys/amd64/amd64/uma_machdep.c | 1 - sys/amd64/ia32/ia32_misc.c | 1 - sys/amd64/ia32/ia32_reg.c | 1 - sys/amd64/ia32/ia32_signal.c | 1 - sys/amd64/pci/pci_cfgreg.c | 1 - sys/amd64/sgx/sgx.c | 1 - sys/amd64/sgx/sgx_linux.c | 1 - sys/amd64/vmm/amd/amdiommu.c | 1 - sys/amd64/vmm/amd/amdv.c | 1 - sys/amd64/vmm/amd/amdvi_hw.c | 1 - sys/amd64/vmm/amd/npt.c | 1 - sys/amd64/vmm/amd/svm_genassym.c | 1 - sys/amd64/vmm/intel/ept.c | 1 - sys/amd64/vmm/intel/vmcs.c | 1 - sys/amd64/vmm/intel/vmx_genassym.c | 1 - sys/amd64/vmm/intel/vmx_msr.c | 1 - sys/amd64/vmm/intel/vtd.c | 1 - sys/amd64/vmm/io/iommu.c | 1 - sys/amd64/vmm/io/ppt.c | 1 - sys/amd64/vmm/vmm_host.c | 1 - sys/amd64/vmm/vmm_ioport.c | 1 - sys/amd64/vmm/vmm_lapic.c | 1 - sys/amd64/vmm/vmm_mem.c | 1 - sys/amd64/vmm/vmm_snapshot.c | 1 - sys/amd64/vmm/vmm_stat.c | 1 - sys/amd64/vmm/vmm_util.c | 1 - sys/amd64/vmm/x86.c | 1 - sys/arm/allwinner/a10/a10_padconf.c | 1 - sys/arm/allwinner/a10_ahci.c | 1 - sys/arm/allwinner/a10_codec.c | 1 - sys/arm/allwinner/a10_dmac.c | 1 - sys/arm/allwinner/a10_sramc.c | 1 - sys/arm/allwinner/a10_timer.c | 1 - sys/arm/allwinner/a13/a13_padconf.c | 1 - sys/arm/allwinner/a20/a20_cpu_cfg.c | 1 - sys/arm/allwinner/a20/a20_padconf.c | 1 - sys/arm/allwinner/a31/a31_padconf.c | 1 - sys/arm/allwinner/a31/a31_r_padconf.c | 1 - sys/arm/allwinner/a31/a31s_padconf.c | 1 - sys/arm/allwinner/a31_dmac.c | 1 - sys/arm/allwinner/a33/a33_padconf.c | 1 - sys/arm/allwinner/a33_codec.c | 1 - sys/arm/allwinner/a64/a64_padconf.c | 1 - sys/arm/allwinner/a64/a64_r_padconf.c | 1 - sys/arm/allwinner/a64/sun50i_a64_acodec.c | 1 - sys/arm/allwinner/a83t/a83t_padconf.c | 1 - sys/arm/allwinner/a83t/a83t_r_padconf.c | 1 - sys/arm/allwinner/aw_ccu.c | 1 - sys/arm/allwinner/aw_cir.c | 1 - sys/arm/allwinner/aw_dwc3.c | 1 - sys/arm/allwinner/aw_gmacclk.c | 1 - sys/arm/allwinner/aw_gpio.c | 2 +- sys/arm/allwinner/aw_i2s.c | 1 - sys/arm/allwinner/aw_machdep.c | 1 - sys/arm/allwinner/aw_mmc.c | 1 - sys/arm/allwinner/aw_mp.c | 1 - sys/arm/allwinner/aw_pwm.c | 1 - sys/arm/allwinner/aw_reset.c | 1 - sys/arm/allwinner/aw_rsb.c | 1 - sys/arm/allwinner/aw_rtc.c | 1 - sys/arm/allwinner/aw_spi.c | 1 - sys/arm/allwinner/aw_syscon.c | 1 - sys/arm/allwinner/aw_thermal.c | 1 - sys/arm/allwinner/aw_ts.c | 1 - sys/arm/allwinner/aw_usb3phy.c | 1 - sys/arm/allwinner/aw_usbphy.c | 1 - sys/arm/allwinner/aw_wdog.c | 2 +- sys/arm/allwinner/axp81x.c | 1 - sys/arm/allwinner/clkng/aw_ccung.c | 1 - sys/arm/allwinner/clkng/aw_clk_frac.c | 1 - sys/arm/allwinner/clkng/aw_clk_m.c | 1 - sys/arm/allwinner/clkng/aw_clk_mipi.c | 1 - sys/arm/allwinner/clkng/aw_clk_nkmp.c | 1 - sys/arm/allwinner/clkng/aw_clk_nm.c | 1 - sys/arm/allwinner/clkng/aw_clk_nmm.c | 1 - sys/arm/allwinner/clkng/aw_clk_np.c | 1 - sys/arm/allwinner/clkng/aw_clk_prediv_mux.c | 1 - sys/arm/allwinner/clkng/ccu_a10.c | 1 - sys/arm/allwinner/clkng/ccu_a13.c | 1 - sys/arm/allwinner/clkng/ccu_a31.c | 1 - sys/arm/allwinner/clkng/ccu_a64.c | 1 - sys/arm/allwinner/clkng/ccu_a83t.c | 1 - sys/arm/allwinner/clkng/ccu_de2.c | 1 - sys/arm/allwinner/clkng/ccu_h3.c | 1 - sys/arm/allwinner/clkng/ccu_h6.c | 1 - sys/arm/allwinner/clkng/ccu_h6_r.c | 1 - sys/arm/allwinner/clkng/ccu_sun8i_r.c | 1 - sys/arm/allwinner/h3/h3_padconf.c | 1 - sys/arm/allwinner/h3/h3_r_padconf.c | 1 - sys/arm/allwinner/h6/h6_padconf.c | 1 - sys/arm/allwinner/h6/h6_r_padconf.c | 1 - sys/arm/allwinner/if_awg.c | 1 - sys/arm/allwinner/if_emac.c | 1 - sys/arm/altera/socfpga/socfpga_a10_manager.c | 1 - sys/arm/altera/socfpga/socfpga_common.c | 1 - sys/arm/altera/socfpga/socfpga_machdep.c | 1 - sys/arm/altera/socfpga/socfpga_manager.c | 1 - sys/arm/altera/socfpga/socfpga_mp.c | 1 - sys/arm/altera/socfpga/socfpga_rstmgr.c | 1 - sys/arm/annapurna/alpine/alpine_ccu.c | 1 - sys/arm/annapurna/alpine/alpine_machdep.c | 1 - sys/arm/annapurna/alpine/alpine_machdep_mp.c | 1 - sys/arm/annapurna/alpine/alpine_nb_service.c | 1 - sys/arm/annapurna/alpine/alpine_pci.c | 1 - sys/arm/annapurna/alpine/alpine_pci_msix.c | 1 - sys/arm/annapurna/alpine/alpine_serdes.c | 1 - sys/arm/arm/autoconf.c | 1 - sys/arm/arm/bus_space_base.c | 1 - sys/arm/arm/bus_space_generic.c | 1 - sys/arm/arm/busdma_machdep.c | 1 - sys/arm/arm/cpufunc.c | 2 +- sys/arm/arm/cpuinfo.c | 1 - sys/arm/arm/db_disasm.c | 1 - sys/arm/arm/db_trace.c | 1 - sys/arm/arm/disassem.c | 1 - sys/arm/arm/elf_machdep.c | 1 - sys/arm/arm/exec_machdep.c | 1 - sys/arm/arm/fiq.c | 1 - sys/arm/arm/gdb_machdep.c | 1 - sys/arm/arm/genassym.c | 1 - sys/arm/arm/generic_timer.c | 1 - sys/arm/arm/gic_acpi.c | 1 - sys/arm/arm/gic_fdt.c | 1 - sys/arm/arm/identcpu-v6.c | 1 - sys/arm/arm/machdep.c | 1 - sys/arm/arm/machdep_boot.c | 1 - sys/arm/arm/machdep_intr.c | 1 - sys/arm/arm/machdep_kdb.c | 1 - sys/arm/arm/machdep_ptrace.c | 1 - sys/arm/arm/mp_machdep.c | 1 - sys/arm/arm/mpcore_timer.c | 1 - sys/arm/arm/nexus.c | 1 - sys/arm/arm/ofw_machdep.c | 1 - sys/arm/arm/pl310.c | 1 - sys/arm/arm/pmu_acpi.c | 1 - sys/arm/arm/pmu_fdt.c | 1 - sys/arm/arm/ptrace_machdep.c | 1 - sys/arm/arm/sc_machdep.c | 1 - sys/arm/arm/sp804.c | 1 - sys/arm/arm/stack_machdep.c | 1 - sys/arm/arm/stdatomic.c | 1 - sys/arm/arm/syscall.c | 1 - sys/arm/arm/trap-v6.c | 1 - sys/arm/arm/uio_machdep.c | 1 - sys/arm/arm/undefined.c | 1 - sys/arm/arm/unwind.c | 1 - sys/arm/arm/vm_machdep.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_clkman.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_dma.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_fb.c | 2 +- sys/arm/broadcom/bcm2835/bcm2835_fbd.c | 2 +- sys/arm/broadcom/bcm2835/bcm2835_firmware.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_ft5406.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_machdep.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_mbox.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h | 1 - sys/arm/broadcom/bcm2835/bcm2835_pwm.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_sdhci.c | 2 +- sys/arm/broadcom/bcm2835/bcm2835_spi.c | 2 +- sys/arm/broadcom/bcm2835/bcm2835_systimer.c | 1 - sys/arm/broadcom/bcm2835/bcm2835_vcio.c | 2 +- sys/arm/broadcom/bcm2835/bcm2835_wdog.c | 2 +- sys/arm/broadcom/bcm2835/bcm2836_mp.c | 1 - sys/arm/broadcom/bcm2835/bcm2838_pci.c | 1 - sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c | 1 - sys/arm/freescale/imx/imx6_audmux.c | 1 - sys/arm/freescale/imx/imx6_ipu.c | 1 - sys/arm/freescale/imx/imx6_machdep.c | 1 - sys/arm/freescale/imx/imx6_mp.c | 1 - sys/arm/freescale/imx/imx6_sdma.c | 1 - sys/arm/freescale/imx/imx6_ssi.c | 1 - sys/arm/freescale/imx/imx_console.c | 1 - sys/arm/freescale/imx/imx_gpt.c | 1 - sys/arm/freescale/imx/imx_i2c.c | 1 - sys/arm/freescale/imx/imx_machdep.c | 1 - sys/arm/freescale/imx/imx_wdog.c | 1 - sys/arm/freescale/vybrid/vf_adc.c | 1 - sys/arm/freescale/vybrid/vf_anadig.c | 1 - sys/arm/freescale/vybrid/vf_ccm.c | 1 - sys/arm/freescale/vybrid/vf_dcu4.c | 1 - sys/arm/freescale/vybrid/vf_dmamux.c | 1 - sys/arm/freescale/vybrid/vf_edma.c | 1 - sys/arm/freescale/vybrid/vf_gpio.c | 1 - sys/arm/freescale/vybrid/vf_i2c.c | 1 - sys/arm/freescale/vybrid/vf_iomuxc.c | 1 - sys/arm/freescale/vybrid/vf_machdep.c | 1 - sys/arm/freescale/vybrid/vf_mscm.c | 1 - sys/arm/freescale/vybrid/vf_port.c | 1 - sys/arm/freescale/vybrid/vf_sai.c | 1 - sys/arm/freescale/vybrid/vf_spi.c | 1 - sys/arm/freescale/vybrid/vf_src.c | 1 - sys/arm/freescale/vybrid/vf_tcon.c | 1 - sys/arm/mv/a37x0_gpio.c | 1 - sys/arm/mv/a37x0_spi.c | 1 - sys/arm/mv/armada/thermal.c | 2 +- sys/arm/mv/armada/wdt.c | 1 - sys/arm/mv/armada38x/armada38x.c | 1 - sys/arm/mv/armada38x/armada38x_mp.c | 2 +- sys/arm/mv/armada38x/armada38x_rtc.c | 1 - sys/arm/mv/armada38x/pmsu.c | 1 - sys/arm/mv/armadaxp/armadaxp.c | 1 - sys/arm/mv/clk/a37x0_periph_clk_driver.c | 1 - sys/arm/mv/clk/a37x0_tbg.c | 1 - sys/arm/mv/clk/a37x0_tbg_pll.c | 1 - sys/arm/mv/clk/a37x0_xtal.c | 1 - sys/arm/mv/clk/armada38x_gateclk.c | 1 - sys/arm/mv/clk/armada38x_gen.c | 1 - sys/arm/mv/clk/periph.c | 1 - sys/arm/mv/clk/periph_clk_d.c | 1 - sys/arm/mv/clk/periph_clk_fixed.c | 1 - sys/arm/mv/clk/periph_clk_gate.c | 1 - sys/arm/mv/clk/periph_clk_mux_gate.c | 1 - sys/arm/mv/gpio.c | 1 - sys/arm/mv/ic.c | 1 - sys/arm/mv/mv_ap806_clock.c | 1 - sys/arm/mv/mv_ap806_gicp.c | 1 - sys/arm/mv/mv_ap806_sei.c | 1 - sys/arm/mv/mv_common.c | 1 - sys/arm/mv/mv_cp110_clock.c | 1 - sys/arm/mv/mv_cp110_icu.c | 1 - sys/arm/mv/mv_cp110_icu_bus.c | 1 - sys/arm/mv/mv_pci.c | 1 - sys/arm/mv/mv_pci_ctrl.c | 1 - sys/arm/mv/mv_spi.c | 1 - sys/arm/mv/mv_thermal.c | 1 - sys/arm/mv/mvebu_pinctrl.c | 1 - sys/arm/mv/rtc.c | 1 - sys/arm/mv/timer.c | 1 - sys/arm/nvidia/as3722_gpio.c | 1 - sys/arm/nvidia/as3722_regulators.c | 1 - sys/arm/nvidia/as3722_rtc.c | 1 - sys/arm/nvidia/drm2/hdmi.c | 1 - sys/arm/nvidia/drm2/tegra_bo.c | 1 - sys/arm/nvidia/drm2/tegra_dc.c | 1 - sys/arm/nvidia/drm2/tegra_drm_subr.c | 1 - sys/arm/nvidia/drm2/tegra_fb.c | 1 - sys/arm/nvidia/drm2/tegra_hdmi.c | 1 - sys/arm/nvidia/drm2/tegra_host1x.c | 1 - sys/arm/nvidia/tegra124/tegra124_car.c | 1 - sys/arm/nvidia/tegra124/tegra124_clk_per.c | 1 - sys/arm/nvidia/tegra124/tegra124_clk_pll.c | 1 - sys/arm/nvidia/tegra124/tegra124_clk_super.c | 1 - sys/arm/nvidia/tegra124/tegra124_coretemp.c | 1 - sys/arm/nvidia/tegra124/tegra124_cpufreq.c | 1 - sys/arm/nvidia/tegra124/tegra124_machdep.c | 1 - sys/arm/nvidia/tegra124/tegra124_mp.c | 1 - sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c | 1 - sys/arm/nvidia/tegra_efuse.c | 1 - sys/arm/qemu/virt_machdep.c | 1 - sys/arm/qemu/virt_mp.c | 1 - sys/arm/qualcomm/ipq4018_machdep.c | 1 - sys/arm/qualcomm/ipq4018_mp.c | 1 - sys/arm/qualcomm/ipq4018_usb_hs_phy.c | 1 - sys/arm/qualcomm/ipq4018_usb_ss_phy.c | 1 - sys/arm/qualcomm/qcom_cpu_kpssv2.c | 1 - sys/arm/qualcomm/qcom_scm_legacy.c | 1 - sys/arm/rockchip/rk32xx_machdep.c | 1 - sys/arm/rockchip/rk32xx_mp.c | 1 - sys/arm/ti/am335x/am3359_cppi41.c | 1 - sys/arm/ti/am335x/am335x_dmtimer.c | 1 - sys/arm/ti/am335x/am335x_ecap.c | 1 - sys/arm/ti/am335x/am335x_ehrpwm.c | 1 - sys/arm/ti/am335x/am335x_gpio.c | 1 - sys/arm/ti/am335x/am335x_lcd_syscons.c | 2 +- sys/arm/ti/am335x/am335x_pwmss.c | 1 - sys/arm/ti/am335x/am335x_rtc.c | 1 - sys/arm/ti/am335x/am335x_scm.c | 1 - sys/arm/ti/am335x/am335x_scm_padconf.c | 1 - sys/arm/ti/am335x/am335x_usb_phy.c | 1 - sys/arm/ti/clk/clock_common.c | 1 - sys/arm/ti/clk/ti_clk_clkctrl.c | 1 - sys/arm/ti/clk/ti_clk_dpll.c | 1 - sys/arm/ti/clk/ti_clkctrl.c | 1 - sys/arm/ti/clk/ti_divider_clock.c | 1 - sys/arm/ti/clk/ti_dpll_clock.c | 1 - sys/arm/ti/clk/ti_gate_clock.c | 1 - sys/arm/ti/clk/ti_mux_clock.c | 1 - sys/arm/ti/omap4/omap4_gpio.c | 2 +- sys/arm/ti/omap4/omap4_l2cache.c | 1 - sys/arm/ti/omap4/omap4_mp.c | 1 - sys/arm/ti/omap4/omap4_prcm_clks.c | 1 - sys/arm/ti/omap4/omap4_scm_padconf.c | 2 +- sys/arm/ti/omap4/omap4_wugen.c | 1 - sys/arm/ti/omap4/pandaboard/pandaboard.c | 2 +- sys/arm/ti/ti_cpuid.c | 1 - sys/arm/ti/ti_edma3.c | 1 - sys/arm/ti/ti_i2c.c | 1 - sys/arm/ti/ti_machdep.c | 1 - sys/arm/ti/ti_mbox.c | 2 +- sys/arm/ti/ti_omap4_cm.c | 1 - sys/arm/ti/ti_pinmux.c | 2 +- sys/arm/ti/ti_prcm.c | 1 - sys/arm/ti/ti_prm.c | 1 - sys/arm/ti/ti_scm_syscon.c | 1 - sys/arm/ti/ti_sdhci.c | 2 +- sys/arm/ti/ti_sdma.c | 1 - sys/arm/ti/ti_spi.c | 2 +- sys/arm/ti/ti_sysc.c | 1 - sys/arm/ti/ti_wdt.c | 2 +- sys/arm/ti/usb/omap_ehci.c | 2 +- sys/arm/ti/usb/omap_host.c | 1 - sys/arm/ti/usb/omap_tll.c | 1 - sys/arm/xilinx/uart_dev_cdnc.c | 1 - sys/arm/xilinx/zy7_devcfg.c | 1 - sys/arm/xilinx/zy7_ehci.c | 1 - sys/arm/xilinx/zy7_gpio.c | 1 - sys/arm/xilinx/zy7_l2cache.c | 1 - sys/arm/xilinx/zy7_machdep.c | 1 - sys/arm/xilinx/zy7_mp.c | 1 - sys/arm/xilinx/zy7_slcr.c | 1 - sys/arm/xilinx/zy7_spi.c | 1 - sys/arm64/acpica/OsdEnvironment.c | 1 - sys/arm64/acpica/acpi_iort.c | 1 - sys/arm64/acpica/acpi_machdep.c | 1 - sys/arm64/acpica/acpi_wakeup.c | 1 - sys/arm64/acpica/pci_cfgreg.c | 1 - sys/arm64/arm64/busdma_bounce.c | 1 - sys/arm64/arm64/busdma_machdep.c | 1 - sys/arm64/arm64/clock.c | 1 - sys/arm64/arm64/cpu_errata.c | 1 - sys/arm64/arm64/db_disasm.c | 1 - sys/arm64/arm64/db_interface.c | 1 - sys/arm64/arm64/db_trace.c | 1 - sys/arm64/arm64/debug_monitor.c | 1 - sys/arm64/arm64/disassem.c | 1 - sys/arm64/arm64/dump_machdep.c | 1 - sys/arm64/arm64/efirt_machdep.c | 1 - sys/arm64/arm64/elf_machdep.c | 1 - sys/arm64/arm64/exec_machdep.c | 1 - sys/arm64/arm64/freebsd32_machdep.c | 1 - sys/arm64/arm64/genassym.c | 1 - sys/arm64/arm64/gic_v3.c | 1 - sys/arm64/arm64/gic_v3_acpi.c | 1 - sys/arm64/arm64/gic_v3_fdt.c | 1 - sys/arm64/arm64/gicv3_its.c | 1 - sys/arm64/arm64/identcpu.c | 1 - sys/arm64/arm64/machdep.c | 1 - sys/arm64/arm64/machdep_boot.c | 1 - sys/arm64/arm64/mem.c | 1 - sys/arm64/arm64/mp_machdep.c | 1 - sys/arm64/arm64/nexus.c | 1 - sys/arm64/arm64/ofw_machdep.c | 1 - sys/arm64/arm64/ptrace_machdep.c | 1 - sys/arm64/arm64/ptrauth.c | 1 - sys/arm64/arm64/stack_machdep.c | 1 - sys/arm64/arm64/sys_machdep.c | 1 - sys/arm64/arm64/trap.c | 1 - sys/arm64/arm64/uio_machdep.c | 1 - sys/arm64/arm64/uma_machdep.c | 1 - sys/arm64/arm64/undefined.c | 1 - sys/arm64/arm64/unwind.c | 1 - sys/arm64/arm64/vm_machdep.c | 1 - sys/arm64/broadcom/brcmmdio/mdio_mux_iproc.c | 1 - sys/arm64/broadcom/brcmmdio/mdio_nexus_iproc.c | 1 - sys/arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c | 1 - sys/arm64/broadcom/genet/if_genet.c | 1 - sys/arm64/cavium/thunder_pcie_fdt.c | 1 - sys/arm64/coresight/coresight.c | 1 - sys/arm64/coresight/coresight_acpi.c | 1 - sys/arm64/coresight/coresight_cmd.c | 1 - sys/arm64/coresight/coresight_cpu_debug.c | 1 - sys/arm64/coresight/coresight_etm4x.c | 1 - sys/arm64/coresight/coresight_etm4x_acpi.c | 1 - sys/arm64/coresight/coresight_etm4x_fdt.c | 1 - sys/arm64/coresight/coresight_fdt.c | 1 - sys/arm64/coresight/coresight_funnel.c | 1 - sys/arm64/coresight/coresight_funnel_acpi.c | 1 - sys/arm64/coresight/coresight_funnel_fdt.c | 1 - sys/arm64/coresight/coresight_replicator.c | 1 - sys/arm64/coresight/coresight_replicator_acpi.c | 1 - sys/arm64/coresight/coresight_replicator_fdt.c | 1 - sys/arm64/coresight/coresight_tmc.c | 1 - sys/arm64/coresight/coresight_tmc_acpi.c | 1 - sys/arm64/coresight/coresight_tmc_fdt.c | 1 - sys/arm64/freescale/imx/clk/imx_clk_composite.c | 1 - sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c | 1 - sys/arm64/freescale/imx/clk/imx_clk_gate.c | 1 - sys/arm64/freescale/imx/clk/imx_clk_mux.c | 1 - sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c | 1 - sys/arm64/freescale/imx/imx7gpc.c | 1 - sys/arm64/intel/stratix10-soc-fpga-mgr.c | 1 - sys/arm64/intel/stratix10-svc.c | 1 - sys/arm64/iommu/iommu.c | 1 - sys/arm64/iommu/smmu.c | 1 - sys/arm64/iommu/smmu_acpi.c | 1 - sys/arm64/iommu/smmu_fdt.c | 1 - sys/arm64/iommu/smmu_quirks.c | 1 - sys/arm64/nvidia/tegra210/max77620_gpio.c | 1 - sys/arm64/nvidia/tegra210/max77620_regulators.c | 1 - sys/arm64/nvidia/tegra210/max77620_rtc.c | 1 - sys/arm64/nvidia/tegra210/tegra210_car.c | 1 - sys/arm64/nvidia/tegra210/tegra210_clk_per.c | 1 - sys/arm64/nvidia/tegra210/tegra210_clk_pll.c | 1 - sys/arm64/nvidia/tegra210/tegra210_clk_super.c | 1 - sys/arm64/nvidia/tegra210/tegra210_coretemp.c | 1 - sys/arm64/nvidia/tegra210/tegra210_cpufreq.c | 1 - sys/arm64/nvidia/tegra210/tegra210_pmc.c | 1 - sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c | 1 - sys/arm64/qoriq/clk/ls1028a_clkgen.c | 1 - sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c | 2 +- sys/arm64/qoriq/clk/ls1046a_clkgen.c | 1 - sys/arm64/qoriq/clk/ls1088a_clkgen.c | 1 - sys/arm64/qoriq/clk/qoriq_clk_pll.c | 1 - sys/arm64/qoriq/clk/qoriq_clkgen.c | 1 - sys/arm64/qoriq/qoriq_dw_pci.c | 1 - sys/arm64/qoriq/qoriq_gpio_pic.c | 1 - sys/arm64/qualcomm/qcom_gcc.c | 1 - sys/arm64/rockchip/clk/rk3288_cru.c | 1 - sys/arm64/rockchip/clk/rk3328_cru.c | 1 - sys/arm64/rockchip/clk/rk3399_cru.c | 1 - sys/arm64/rockchip/clk/rk3399_pmucru.c | 1 - sys/arm64/rockchip/clk/rk_clk_armclk.c | 1 - sys/arm64/rockchip/clk/rk_clk_composite.c | 1 - sys/arm64/rockchip/clk/rk_clk_fract.c | 1 - sys/arm64/rockchip/clk/rk_clk_gate.c | 1 - sys/arm64/rockchip/clk/rk_clk_mux.c | 1 - sys/arm64/rockchip/clk/rk_clk_pll.c | 1 - sys/arm64/rockchip/clk/rk_cru.c | 1 - sys/arm64/rockchip/rk3328_codec.c | 1 - sys/arm64/rockchip/rk3399_emmcphy.c | 1 - sys/arm64/rockchip/rk_dwc3.c | 1 - sys/arm64/rockchip/rk_gpio.c | 1 - sys/arm64/rockchip/rk_grf.c | 1 - sys/arm64/rockchip/rk_i2c.c | 1 - sys/arm64/rockchip/rk_i2s.c | 1 - sys/arm64/rockchip/rk_iodomain.c | 1 - sys/arm64/rockchip/rk_otp.c | 1 - sys/arm64/rockchip/rk_pcie.c | 1 - sys/arm64/rockchip/rk_pcie_phy.c | 1 - sys/arm64/rockchip/rk_pinctrl.c | 1 - sys/arm64/rockchip/rk_pmu.c | 1 - sys/arm64/rockchip/rk_pwm.c | 1 - sys/arm64/rockchip/rk_spi.c | 1 - sys/arm64/rockchip/rk_typec_phy.c | 1 - sys/arm64/rockchip/rk_usb2phy.c | 1 - sys/arm64/rockchip/rk_usbphy.c | 1 - sys/cddl/compat/opensolaris/kern/opensolaris.c | 1 - sys/cddl/compat/opensolaris/kern/opensolaris_acl.c | 1 - sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c | 1 - sys/cddl/compat/opensolaris/kern/opensolaris_proc.c | 1 - sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c | 1 - sys/cddl/compat/opensolaris/kern/opensolaris_vm.c | 1 - sys/cddl/dev/dtmalloc/dtmalloc.c | 1 - sys/cddl/dev/dtrace/dtrace_test.c | 2 +- sys/cddl/dev/dtrace/x86/instr_size.c | 4 ---- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 1 - sys/cddl/dev/fbt/arm/fbt_isa.c | 1 - sys/cddl/dev/fbt/fbt.c | 1 - sys/cddl/dev/fbt/powerpc/fbt_isa.c | 1 - sys/cddl/dev/fbt/riscv/fbt_isa.c | 1 - sys/cddl/dev/fbt/x86/fbt_isa.c | 1 - sys/cddl/dev/profile/profile.c | 1 - sys/cddl/dev/prototype.c | 1 - sys/cddl/dev/sdt/sdt.c | 1 - sys/cddl/dev/systrace/systrace.c | 1 - sys/compat/freebsd32/freebsd32_abort2.c | 1 - sys/compat/freebsd32/freebsd32_ioctl.c | 1 - sys/compat/lindebugfs/lindebugfs.c | 1 - sys/compat/linuxkpi/common/include/linux/fs.h | 1 - sys/compat/linuxkpi/common/include/linux/gfp.h | 1 - sys/compat/linuxkpi/common/include/linux/in.h | 1 - sys/compat/linuxkpi/common/include/linux/kernel.h | 1 - sys/compat/linuxkpi/common/include/linux/module.h | 1 - sys/compat/linuxkpi/common/include/linux/types.h | 1 - sys/compat/linuxkpi/common/src/linux_80211.c | 1 - sys/compat/linuxkpi/common/src/linux_80211_macops.c | 1 - sys/compat/linuxkpi/common/src/linux_domain.c | 1 - sys/compat/linuxkpi/common/src/linux_hdmi.c | 2 +- sys/compat/linuxkpi/common/src/linux_hrtimer.c | 1 - sys/compat/linuxkpi/common/src/linux_i2c.c | 1 - sys/compat/linuxkpi/common/src/linux_i2cbb.c | 1 - sys/compat/linuxkpi/common/src/linux_idr.c | 1 - sys/compat/linuxkpi/common/src/linux_kmod.c | 1 - sys/compat/linuxkpi/common/src/linux_mhi.c | 1 - sys/compat/linuxkpi/common/src/linux_netdev.c | 1 - sys/compat/linuxkpi/common/src/linux_page.c | 1 - sys/compat/linuxkpi/common/src/linux_pci.c | 1 - sys/compat/linuxkpi/common/src/linux_radix.c | 1 - sys/compat/linuxkpi/common/src/linux_rcu.c | 1 - sys/compat/linuxkpi/common/src/linux_schedule.c | 1 - sys/compat/linuxkpi/common/src/linux_seq_file.c | 1 - sys/compat/linuxkpi/common/src/linux_shmemfs.c | 1 - sys/compat/linuxkpi/common/src/linux_shrinker.c | 2 -- sys/compat/linuxkpi/common/src/linux_simple_attr.c | 1 - sys/compat/linuxkpi/common/src/linux_tasklet.c | 1 - sys/crypto/aesni/aesni.c | 1 - sys/crypto/aesni/aesni_wrap.c | 1 - sys/crypto/aesni/intel_sha1.c | 2 +- sys/crypto/aesni/intel_sha256.c | 2 +- sys/crypto/armv8/armv8_crypto.c | 1 - sys/crypto/armv8/armv8_crypto_wrap.c | 1 - sys/crypto/blake2/blake2_cryptodev.c | 1 - sys/crypto/camellia/camellia.c | 1 - sys/crypto/ccp/ccp_lsb.c | 1 - sys/crypto/chacha20/chacha.c | 1 - sys/crypto/des/des_ecb.c | 1 - sys/crypto/des/des_enc.c | 1 - sys/crypto/des/des_setkey.c | 1 - sys/crypto/libsodium/utils.c | 1 - sys/crypto/openssl/ossl.c | 1 - sys/crypto/openssl/ossl_aes.c | 1 - sys/crypto/rc4/rc4.c | 1 - sys/crypto/rijndael/rijndael-alg-fst.c | 2 +- sys/crypto/rijndael/rijndael-api-fst.c | 1 - sys/crypto/rijndael/rijndael-api.c | 1 - sys/crypto/sha1.c | 1 - sys/crypto/sha2/sha256c_arm64.c | 1 - sys/crypto/sha2/sha512c_arm64.c | 1 - sys/crypto/siphash/siphash.c | 1 - sys/crypto/siphash/siphash_test.c | 2 +- sys/crypto/via/padlock.c | 1 - sys/crypto/via/padlock_cipher.c | 1 - sys/crypto/via/padlock_hash.c | 1 - sys/ddb/db_access.c | 1 - sys/ddb/db_break.c | 1 - sys/ddb/db_command.c | 1 - sys/ddb/db_examine.c | 1 - sys/ddb/db_expr.c | 1 - sys/ddb/db_input.c | 1 - sys/ddb/db_lex.c | 1 - sys/ddb/db_main.c | 1 - sys/ddb/db_print.c | 1 - sys/ddb/db_run.c | 1 - sys/ddb/db_script.c | 1 - sys/ddb/db_thread.c | 1 - sys/ddb/db_variables.c | 1 - sys/ddb/db_watch.c | 1 - sys/ddb/db_write_cmd.c | 1 - sys/dev/aacraid/aacraid_endian.c | 1 - sys/dev/acpica/Osd/OsdInterrupt.c | 1 - sys/dev/acpica/Osd/OsdTable.c | 1 - sys/dev/acpica/acpi_container.c | 1 - sys/dev/acpica/acpi_package.c | 1 - sys/dev/acpica/acpi_quirk.c | 1 - sys/dev/adb/adb_bus.c | 1 - sys/dev/adb/adb_kbd.c | 1 - sys/dev/adb/adb_mouse.c | 1 - sys/dev/adlink/adlink.c | 2 +- sys/dev/ae/if_ae.c | 1 - sys/dev/age/if_age.c | 1 - sys/dev/agp/agp_ali.c | 1 - sys/dev/agp/agp_amd.c | 1 - sys/dev/agp/agp_amd64.c | 1 - sys/dev/agp/agp_apple.c | 1 - sys/dev/agp/agp_ati.c | 1 - sys/dev/agp/agp_intel.c | 1 - sys/dev/agp/agp_sis.c | 1 - sys/dev/agp/agp_via.c | 1 - sys/dev/ahci/ahci.c | 1 - sys/dev/ahci/ahci_pci.c | 1 - sys/dev/ahci/ahciem.c | 1 - sys/dev/al_eth/al_eth.c | 1 - sys/dev/alc/if_alc.c | 1 - sys/dev/ale/if_ale.c | 1 - sys/dev/alpm/alpm.c | 1 - sys/dev/altera/atse/if_atse_fdt.c | 1 - sys/dev/altera/avgen/altera_avgen.c | 1 - sys/dev/altera/avgen/altera_avgen_fdt.c | 1 - sys/dev/altera/avgen/altera_avgen_nexus.c | 1 - sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c | 1 - sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c | 1 - sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c | 1 - sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c | 1 - sys/dev/altera/pio/pio.c | 1 - sys/dev/altera/sdcard/altera_sdcard_disk.c | 1 - sys/dev/altera/sdcard/altera_sdcard_fdt.c | 1 - sys/dev/altera/sdcard/altera_sdcard_io.c | 1 - sys/dev/altera/sdcard/altera_sdcard_nexus.c | 1 - sys/dev/amdpm/amdpm.c | 1 - sys/dev/amdsmb/amdsmb.c | 1 - sys/dev/amdsmn/amdsmn.c | 1 - sys/dev/amdtemp/amdtemp.c | 1 - sys/dev/asmc/asmc.c | 1 - sys/dev/ata/ata-all.c | 1 - sys/dev/ata/ata-dma.c | 1 - sys/dev/ata/ata-isa.c | 1 - sys/dev/ata/ata-lowlevel.c | 1 - sys/dev/ata/ata-pci.c | 1 - sys/dev/ata/ata-sata.c | 1 - sys/dev/ata/chipsets/ata-acard.c | 1 - sys/dev/ata/chipsets/ata-acerlabs.c | 1 - sys/dev/ata/chipsets/ata-amd.c | 1 - sys/dev/ata/chipsets/ata-ati.c | 1 - sys/dev/ata/chipsets/ata-cenatek.c | 1 - sys/dev/ata/chipsets/ata-cypress.c | 1 - sys/dev/ata/chipsets/ata-cyrix.c | 1 - sys/dev/ata/chipsets/ata-highpoint.c | 1 - sys/dev/ata/chipsets/ata-intel.c | 1 - sys/dev/ata/chipsets/ata-ite.c | 1 - sys/dev/ata/chipsets/ata-jmicron.c | 1 - sys/dev/ata/chipsets/ata-marvell.c | 1 - sys/dev/ata/chipsets/ata-micron.c | 1 - sys/dev/ata/chipsets/ata-national.c | 1 - sys/dev/ata/chipsets/ata-netcell.c | 1 - sys/dev/ata/chipsets/ata-nvidia.c | 1 - sys/dev/ata/chipsets/ata-promise.c | 1 - sys/dev/ata/chipsets/ata-serverworks.c | 1 - sys/dev/ata/chipsets/ata-siliconimage.c | 1 - sys/dev/ata/chipsets/ata-sis.c | 1 - sys/dev/ata/chipsets/ata-via.c | 1 - sys/dev/ath/ah_osdep.h | 2 +- sys/dev/ath/ah_osdep_ar5210.c | 1 - sys/dev/ath/ah_osdep_ar5211.c | 1 - sys/dev/ath/ah_osdep_ar5212.c | 1 - sys/dev/ath/ah_osdep_ar5416.c | 1 - sys/dev/ath/ah_osdep_ar9300.c | 1 - sys/dev/axgbe/if_axgbe.c | 1 - sys/dev/axgbe/if_axgbe_pci.c | 1 - sys/dev/axgbe/xgbe-sysctl.c | 1 - sys/dev/backlight/backlight.c | 1 - sys/dev/beri/beri_mem.c | 1 - sys/dev/beri/beri_ring.c | 1 - sys/dev/beri/virtio/network/if_vtbe.c | 1 - sys/dev/beri/virtio/virtio.c | 1 - sys/dev/beri/virtio/virtio_block.c | 1 - sys/dev/beri/virtio/virtio_mmio_platform.c | 1 - sys/dev/bfe/if_bfe.c | 1 - sys/dev/bhnd/bcma/bcma.c | 1 - sys/dev/bhnd/bcma/bcma_bhndb.c | 1 - sys/dev/bhnd/bcma/bcma_erom.c | 1 - sys/dev/bhnd/bcma/bcma_subr.c | 1 - sys/dev/bhnd/bhnd_erom.c | 1 - sys/dev/bhnd/bhnd_subr.c | 1 - sys/dev/bhnd/bhndb/bhnd_bhndb.c | 1 - sys/dev/bhnd/bhndb/bhndb_hwdata.c | 1 - sys/dev/bhnd/bhndb/bhndb_subr.c | 1 - sys/dev/bhnd/cores/chipc/chipc_cfi.c | 1 - sys/dev/bhnd/cores/chipc/chipc_gpio.c | 1 - sys/dev/bhnd/cores/chipc/chipc_spi.c | 1 - sys/dev/bhnd/cores/chipc/chipc_subr.c | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu.c | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_data_bcm.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_data_sprom_subr.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_iores.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_plist.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_store.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_store_subr.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_subr.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_value.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_value_fmts.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c | 1 - sys/dev/bhnd/nvram/bhnd_nvram_value_subr.c | 1 - sys/dev/bhnd/siba/siba.c | 1 - sys/dev/bhnd/siba/siba_bhndb.c | 1 - sys/dev/bhnd/siba/siba_erom.c | 1 - sys/dev/bhnd/siba/siba_subr.c | 1 - sys/dev/bnxt/bnxt_sysctl.c | 1 - sys/dev/bnxt/bnxt_txrx.c | 1 - sys/dev/bnxt/if_bnxt.c | 1 - sys/dev/bxe/bxe.h | 1 - sys/dev/bxe/bxe_stats.h | 1 - sys/dev/cadence/if_cgem.c | 1 - sys/dev/cardbus/cardbus.c | 1 - sys/dev/cardbus/cardbus_device.c | 2 +- sys/dev/cesa/cesa.c | 1 - sys/dev/cfe/cfe_console.c | 1 - sys/dev/cfe/cfe_resource.c | 1 - sys/dev/cfi/cfi_bus_fdt.c | 1 - sys/dev/cfi/cfi_bus_nexus.c | 1 - sys/dev/cfi/cfi_disk.c | 1 - sys/dev/chromebook_platform/chromebook_platform.c | 1 - sys/dev/coretemp/coretemp.c | 1 - sys/dev/cpuctl/cpuctl.c | 1 - sys/dev/cpufreq/cpufreq_dt.c | 1 - sys/dev/cpufreq/ichss.c | 1 - sys/dev/cxgb/cxgb_include.h | 1 - sys/dev/cxgb/cxgb_t3fw.c | 2 +- sys/dev/cxgb/sys/uipc_mvec.c | 1 - sys/dev/cxgbe/crypto/t4_crypto.c | 1 - sys/dev/cxgbe/crypto/t4_keyctx.c | 1 - sys/dev/cxgbe/crypto/t6_kern_tls.c | 1 - sys/dev/cxgbe/cudbg/cudbg_common.c | 1 - sys/dev/cxgbe/cudbg/cudbg_flash_utils.c | 1 - sys/dev/cxgbe/cudbg/cudbg_lib.c | 1 - sys/dev/cxgbe/cudbg/cudbg_wtp.c | 1 - sys/dev/cxgbe/if_cc.c | 1 - sys/dev/cxgbe/if_ccv.c | 1 - sys/dev/cxgbe/if_cxl.c | 1 - sys/dev/cxgbe/if_cxlv.c | 1 - sys/dev/cxgbe/t4_iov.c | 1 - sys/dev/cxgbe/t4_mp_ring.c | 1 - sys/dev/dpaa/bman.c | 1 - sys/dev/dpaa/bman_fdt.c | 2 +- sys/dev/dpaa/bman_portals.c | 2 +- sys/dev/dpaa/fman.c | 1 - sys/dev/dpaa/fman_fdt.c | 1 - sys/dev/dpaa/fman_mdio.c | 1 - sys/dev/dpaa/if_dtsec.c | 1 - sys/dev/dpaa/if_dtsec_fdt.c | 1 - sys/dev/dpaa/if_dtsec_im.c | 1 - sys/dev/dpaa/if_dtsec_rm.c | 1 - sys/dev/dpaa/portals_common.c | 2 +- sys/dev/dpaa/qman.c | 1 - sys/dev/dpaa/qman_fdt.c | 2 +- sys/dev/dpaa/qman_portals.c | 2 +- sys/dev/dpaa2/dpaa2_console.c | 1 - sys/dev/dpaa2/memac_mdio_acpi.c | 1 - sys/dev/dpaa2/memac_mdio_common.c | 1 - sys/dev/dpaa2/memac_mdio_fdt.c | 1 - sys/dev/dpms/dpms.c | 1 - sys/dev/drm2/drm_bufs.c | 1 - sys/dev/drm2/drm_dp_iic_helper.c | 1 - sys/dev/drm2/drm_gem_names.c | 1 - sys/dev/dwc/dwc1000_core.c | 1 - sys/dev/dwc/dwc1000_dma.c | 1 - sys/dev/dwc/if_dwc.c | 1 - sys/dev/dwc/if_dwc_aw.c | 1 - sys/dev/dwc/if_dwc_rk.c | 1 - sys/dev/dwc/if_dwc_socfpga.c | 1 - sys/dev/efidev/efidev.c | 1 - sys/dev/efidev/efirtc.c | 1 - sys/dev/ena/ena_sysctl.c | 2 +- sys/dev/enetc/enetc.h | 1 - sys/dev/enetc/enetc_mdio.c | 1 - sys/dev/enetc/if_enetc.c | 1 - sys/dev/eqos/if_eqos.c | 2 +- sys/dev/eqos/if_eqos_fdt.c | 2 +- sys/dev/et/if_et.c | 1 - sys/dev/etherswitch/felix/felix.c | 1 - sys/dev/exca/exca.c | 1 - sys/dev/extres/clk/clk_bus.c | 1 - sys/dev/extres/clk/clk_div.c | 1 - sys/dev/extres/clk/clk_gate.c | 1 - sys/dev/extres/clk/clk_link.c | 1 - sys/dev/extres/clk/clk_mux.c | 1 - sys/dev/extres/hwreset/hwreset.c | 2 +- sys/dev/extres/hwreset/hwreset_array.c | 2 +- sys/dev/extres/nvmem/nvmem.c | 1 - sys/dev/extres/phy/phy_usb.c | 1 - sys/dev/extres/regulator/regulator_bus.c | 1 - sys/dev/extres/syscon/syscon_generic.c | 1 - sys/dev/extres/syscon/syscon_power.c | 1 - sys/dev/fb/fbd.c | 1 - sys/dev/fdc/fdc_acpi.c | 1 - sys/dev/fdc/fdc_isa.c | 1 - sys/dev/fdt/fdt_arm_platform.c | 1 - sys/dev/fdt/fdt_clock.c | 1 - sys/dev/fdt/fdt_common.c | 1 - sys/dev/fdt/fdt_pinctrl.c | 1 - sys/dev/fdt/fdt_slicer.c | 1 - sys/dev/fdt/simple_mfd.c | 1 - sys/dev/fdt/simplebus.c | 1 - sys/dev/filemon/filemon.c | 1 - sys/dev/firewire/firewire.c | 1 - sys/dev/firmware/arm/scmi.c | 1 - sys/dev/firmware/arm/scmi_clk.c | 1 - sys/dev/firmware/arm/scmi_shmem.c | 1 - sys/dev/flash/at45d.c | 1 - sys/dev/ftwd/ftwd.c | 1 - sys/dev/glxsb/glxsb.c | 1 - sys/dev/glxsb/glxsb_hash.c | 1 - sys/dev/goldfish/goldfish_rtc.c | 1 - sys/dev/gpio/chvgpio.c | 2 +- sys/dev/gpio/dwgpio/dwgpio.c | 1 - sys/dev/gpio/dwgpio/dwgpio_bus.c | 1 - sys/dev/gpio/gpiobus.c | 1 - sys/dev/gpio/gpioc.c | 1 - sys/dev/gpio/gpiokeys_codes.c | 1 - sys/dev/gpio/gpiopps.c | 1 - sys/dev/gpio/gpioregulator.c | 1 - sys/dev/gpio/gpioths.c | 1 - sys/dev/gpio/ofw_gpiobus.c | 1 - sys/dev/gpio/pl061.c | 1 - sys/dev/gpio/pl061_acpi.c | 1 - sys/dev/gpio/pl061_fdt.c | 1 - sys/dev/gpio/qoriq_gpio.c | 1 - sys/dev/hid/bcm5974.c | 1 - sys/dev/hid/hidbus.c | 1 - sys/dev/hid/ietp.c | 1 - sys/dev/hptiop/hptiop.c | 1 - sys/dev/hptmv/entry.c | 1 - sys/dev/hwpmc/hwpmc_arm.c | 1 - sys/dev/hwpmc/hwpmc_arm64.c | 1 - sys/dev/hwpmc/hwpmc_arm64_md.c | 1 - sys/dev/hwpmc/hwpmc_armv7.c | 1 - sys/dev/hwpmc/hwpmc_cmn600.c | 1 - sys/dev/hwpmc/hwpmc_core.c | 1 - sys/dev/hwpmc/hwpmc_dmc620.c | 1 - sys/dev/hwpmc/hwpmc_e500.c | 1 - sys/dev/hwpmc/hwpmc_intel.c | 1 - sys/dev/hwpmc/hwpmc_logging.c | 1 - sys/dev/hwpmc/hwpmc_mod.c | 1 - sys/dev/hwpmc/hwpmc_mpc7xxx.c | 1 - sys/dev/hwpmc/hwpmc_power8.c | 1 - sys/dev/hwpmc/hwpmc_powerpc.c | 1 - sys/dev/hwpmc/hwpmc_ppc970.c | 1 - sys/dev/hwpmc/hwpmc_soft.c | 1 - sys/dev/hwpmc/hwpmc_tsc.c | 1 - sys/dev/hwpmc/hwpmc_uncore.c | 1 - sys/dev/hwpmc/hwpmc_x86.c | 1 - sys/dev/hyperv/hvsock/hv_sock.c | 1 - sys/dev/hyperv/input/hv_kbdc.c | 1 - sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 2 +- sys/dev/hyperv/utilities/hv_kvp.c | 1 - sys/dev/hyperv/utilities/hv_snapshot.c | 1 - sys/dev/hyperv/utilities/vmbus_heartbeat.c | 1 - sys/dev/hyperv/utilities/vmbus_ic.c | 1 - sys/dev/hyperv/utilities/vmbus_shutdown.c | 1 - sys/dev/hyperv/utilities/vmbus_timesync.c | 1 - sys/dev/hyperv/vmbus/aarch64/hyperv_aarch64.c | 1 - sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c | 1 - sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c | 1 - sys/dev/hyperv/vmbus/hyperv.c | 2 +- sys/dev/hyperv/vmbus/hyperv_busdma.c | 1 - sys/dev/hyperv/vmbus/i386/hyperv_machdep.c | 1 - sys/dev/hyperv/vmbus/vmbus.c | 2 +- sys/dev/hyperv/vmbus/vmbus_br.c | 1 - sys/dev/hyperv/vmbus/vmbus_chan.c | 1 - sys/dev/hyperv/vmbus/vmbus_et.c | 1 - sys/dev/hyperv/vmbus/vmbus_res.c | 1 - sys/dev/hyperv/vmbus/vmbus_xact.c | 1 - sys/dev/hyperv/vmbus/x86/hyperv_x86.c | 2 +- sys/dev/hyperv/vmbus/x86/vmbus_x86.c | 2 +- sys/dev/ichwd/ichwd.c | 1 - sys/dev/ida/ida_pci.c | 1 - sys/dev/iicbus/acpi_iicbus.c | 1 - sys/dev/iicbus/adc/ad7417.c | 1 - sys/dev/iicbus/controller/cadence/cdnc_i2c.c | 1 - sys/dev/iicbus/controller/opencores/iicoc.c | 1 - sys/dev/iicbus/controller/opencores/iicoc_fdt.c | 1 - sys/dev/iicbus/controller/opencores/iicoc_pci.c | 1 - sys/dev/iicbus/controller/twsi/a10_twsi.c | 1 - sys/dev/iicbus/controller/twsi/mv_twsi.c | 1 - sys/dev/iicbus/controller/twsi/twsi.c | 1 - sys/dev/iicbus/gpio/tca64xx.c | 1 - sys/dev/iicbus/iiconf.c | 1 - sys/dev/iicbus/ofw_iicbus.c | 1 - sys/dev/iicbus/pmic/act8846_regulator.c | 1 - sys/dev/iicbus/pmic/fan53555.c | 1 - sys/dev/iicbus/pmic/rockchip/rk805.c | 1 - sys/dev/iicbus/pmic/rockchip/rk808.c | 1 - sys/dev/iicbus/pmic/rockchip/rk817.c | 1 - sys/dev/iicbus/pmic/rockchip/rk8xx.c | 1 - sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c | 1 - sys/dev/iicbus/pmic/rockchip/rk8xx_regulators.c | 1 - sys/dev/iicbus/pmic/rockchip/rk8xx_rtc.c | 1 - sys/dev/iicbus/pmic/silergy/sy8106a.c | 1 - sys/dev/iicbus/pmic/silergy/syr827.c | 1 - sys/dev/iicbus/pwm/adm1030.c | 1 - sys/dev/iicbus/pwm/adt746x.c | 1 - sys/dev/iicbus/sensor/ds1631.c | 1 - sys/dev/iicbus/sensor/ds1775.c | 1 - sys/dev/iicbus/sensor/max6690.c | 1 - sys/dev/intel/pchtherm.c | 1 - sys/dev/intel/spi_acpi.c | 1 - sys/dev/intel/spi_pci.c | 1 - sys/dev/intpm/intpm.c | 1 - sys/dev/io/iodev.c | 1 - sys/dev/ioat/ioat_test.c | 1 - sys/dev/iommu/busdma_iommu.c | 1 - sys/dev/ipmi/ipmi.c | 1 - sys/dev/ipmi/ipmi_acpi.c | 1 - sys/dev/ipmi/ipmi_bt.c | 1 - sys/dev/ipmi/ipmi_isa.c | 1 - sys/dev/ipmi/ipmi_kcs.c | 1 - sys/dev/ipmi/ipmi_opal.c | 1 - sys/dev/ipmi/ipmi_pci.c | 1 - sys/dev/ipmi/ipmi_smbios.c | 1 - sys/dev/ipmi/ipmi_smbus.c | 1 - sys/dev/ipmi/ipmi_smic.c | 1 - sys/dev/ipmi/ipmi_ssif.c | 1 - sys/dev/ips/ips.c | 1 - sys/dev/isci/environment.h | 2 +- sys/dev/iscsi/icl.c | 1 - sys/dev/iscsi/icl_soft.c | 1 - sys/dev/iscsi/icl_soft_proxy.c | 1 - sys/dev/iscsi/iscsi.c | 1 - sys/dev/iser/icl_iser.h | 1 - sys/dev/ismt/ismt.c | 1 - sys/dev/isp/isp_pci.c | 2 +- sys/dev/ispfw/ispfw.c | 1 - sys/dev/itwd/itwd.c | 1 - sys/dev/jme/if_jme.c | 1 - sys/dev/kvm_clock/kvm_clock.c | 1 - sys/dev/le/am7990.c | 1 - sys/dev/le/am79900.c | 1 - sys/dev/le/if_le_isa.c | 1 - sys/dev/le/if_le_pci.c | 1 - sys/dev/le/lance.c | 1 - sys/dev/led/led.c | 1 - sys/dev/mailbox/arm/arm_doorbell.c | 1 - sys/dev/malo/if_malo.c | 4 ---- sys/dev/malo/if_malo_pci.c | 4 ---- sys/dev/malo/if_malohal.c | 4 ---- sys/dev/mana/gdma_main.c | 2 +- sys/dev/mana/gdma_util.c | 2 +- sys/dev/mana/hw_channel.c | 2 +- sys/dev/mana/mana_en.c | 2 +- sys/dev/mana/shm_channel.c | 2 +- sys/dev/mem/memdev.c | 1 - sys/dev/mem/memutil.c | 1 - sys/dev/mfi/mfi_linux.c | 1 - sys/dev/mge/if_mge.c | 1 - sys/dev/mii/dp83822phy.c | 1 - sys/dev/mii/dp83867phy.c | 1 - sys/dev/mii/mcommphy.c | 1 - sys/dev/mii/mii_bitbang.c | 1 - sys/dev/mlx/mlx_pci.c | 1 - sys/dev/mlx5/mlx5_core/mlx5_fwdump.c | 1 - sys/dev/mmc/host/dwmmc.c | 1 - sys/dev/mmc/host/dwmmc_altera.c | 1 - sys/dev/mmc/host/dwmmc_hisi.c | 1 - sys/dev/mmc/host/dwmmc_rockchip.c | 1 - sys/dev/mmc/host/dwmmc_samsung.c | 1 - sys/dev/mmc/mmc.c | 1 - sys/dev/mmc/mmc_fdt_helpers.c | 1 - sys/dev/mmc/mmc_helpers.c | 1 - sys/dev/mmc/mmc_pwrseq.c | 1 - sys/dev/mmc/mmc_subr.c | 1 - sys/dev/mmc/mmcsd.c | 1 - sys/dev/mmcnull/mmcnull.c | 1 - sys/dev/mpi3mr/mpi3mr.c | 1 - sys/dev/mpi3mr/mpi3mr.h | 1 - sys/dev/mpi3mr/mpi3mr_app.c | 1 - sys/dev/mpi3mr/mpi3mr_cam.c | 1 - sys/dev/mpt/mpt_user.c | 1 - sys/dev/mrsas/mrsas_linux.c | 1 - sys/dev/msk/if_msk.c | 1 - sys/dev/mvs/mvs.c | 1 - sys/dev/mvs/mvs_pci.c | 1 - sys/dev/mvs/mvs_soc.c | 1 - sys/dev/mwl/if_mwl_pci.c | 4 ---- sys/dev/mxge/if_mxge.c | 1 - sys/dev/mxge/mxge_eth_z8e.c | 2 +- sys/dev/mxge/mxge_ethp_z8e.c | 2 +- sys/dev/mxge/mxge_rss_eth_z8e.c | 2 +- sys/dev/mxge/mxge_rss_ethp_z8e.c | 2 +- sys/dev/my/if_my.c | 1 - sys/dev/ncthwm/ncthwm.c | 1 - sys/dev/neta/if_mvneta.c | 2 +- sys/dev/neta/if_mvneta_fdt.c | 2 +- sys/dev/netmap/netmap_kloop.c | 2 +- sys/dev/nfsmb/nfsmb.c | 1 - sys/dev/ntb/if_ntb/if_ntb.c | 1 - sys/dev/ntb/ntb.c | 1 - sys/dev/ntb/ntb_hw/ntb_hw_amd.c | 1 - sys/dev/ntb/ntb_hw/ntb_hw_intel.c | 1 - sys/dev/ntb/ntb_hw/ntb_hw_plx.c | 1 - sys/dev/ntb/ntb_transport.c | 1 - sys/dev/ntb/test/ntb_tool.c | 1 - sys/dev/null/null.c | 1 - sys/dev/nvd/nvd.c | 1 - sys/dev/nvdimm/nvdimm_e820.c | 1 - sys/dev/nvdimm/nvdimm_nfit.c | 1 - sys/dev/nvdimm/nvdimm_ns.c | 1 - *** 22811 LINES SKIPPED *** From nobody Mon Nov 27 05:25:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDM6kHPz51hQR; Mon, 27 Nov 2023 05:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdvDM5rJgz4XWw; Mon, 27 Nov 2023 05:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+U0xJDFe3meW/1ylR7U6OPSXZ1igDnpgfxR66UAM1s=; b=VrirgxIEw5UQUB1fusmgfayBkpLtiVNPM+lDx6nl6bCO3LrUIXr9JNQSrkEvmqti9JXO1Q e6gvFdqnz0YQPdaOLW/2o4+t4fQrPPoB6duODBa3HgWZ49GliP5W90AI2WUNZaLOpSK6ne AjygGF7anZkC393wUAOQgNd4lm8UmmEq9IleEBkTYccKXMdtcOLjfsAQA/R+5H+nFpz9E1 Km7RJ3LrYmYffu+67jFWa5ec0utHrHr59Stsz7JpNPSE7e9W/pTb8+bgdbuimcB2GwsUQR Up/s1ZNuIyuCoeEUZX+ts+mvDZyiRSjrkMPYg9noDXy6DasQRAp98j8QEZ4lIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+U0xJDFe3meW/1ylR7U6OPSXZ1igDnpgfxR66UAM1s=; b=T+GGpca4vALI4/eIYuKQWTGCsBvwLtHauC6qpjvpGjXUaItnVvCofx262TKIEV7QNDGriV bYY0JWWCyfZoXa9WHqj2bza7ndxbzfEkTqvbCWF/soj2jtyhgi/m62jmqzqz+x4tHXmGNJ lFuD63mjWi+4R+Gu0zHj0LImtOB3AaMlui0f3c75g27+/7gj7pEO5R687ORcg9F4yQVu/9 tqzgObGfFLu7Nlp6lbVAeElw6tAx5yuG9deXBEJnKl2sxUelJobYNO3E4MgaBKLF4jrs8X o/Hci6Bq81qd8C6JdwvPwnTI+XGmMSFz9CApp+rmbDG7rWqwSRuXqbBs+5yTJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062707; a=rsa-sha256; cv=none; b=LaiPLPY1CqHKKDv8qoD7DVZYiCnqoJ6pZ3FZO5hvKjCTQ/MEmqvjUz5S2RFufupzzmLreP jAG6ShSMcHVh17WDDXUvZSuiKT1LQ+0BPyKLAGJQeBVc3Vezm/U3o0jsYX0M9VLDhATKNr bnz3pI3tgsfhX2tr5D5CeS9Yh1Hfkd26Ewzsxxb2QkcASrgsXKZvr1iK4+p1Mug0JSDy7A VpWd5+IKOeX0nbUsMpHP03OtYf0e2Z/1gTUAjvelOTdayU2Gld9sYln8DQbTuK8dzLzj+q 8N1h5S+sWODtUzWl0rxXQMpIqygTiSR7ghw4kQgXc5+yBrepZCkf5fap6uEPIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDM4cTYzBK4; Mon, 27 Nov 2023 05:25: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 3AR5P7Z9066841; Mon, 27 Nov 2023 05:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P72e066838; Mon, 27 Nov 2023 05:25:07 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:07 GMT Message-Id: <202311270525.3AR5P72e066838@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: 6dced2c6358e - main - tests: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: 6dced2c6358e467ac1dccd99f6f648d4f71957a8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6dced2c6358e467ac1dccd99f6f648d4f71957a8 commit 6dced2c6358e467ac1dccd99f6f648d4f71957a8 Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:01 +0000 tests: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- tests/sys/capsicum/bindat_connectat.c | 1 - tests/sys/capsicum/ioctls_test.c | 1 - tests/sys/devrandom/uint128_test.c | 1 - tests/sys/fifo/fifo_kqueue.c | 1 - tests/sys/kern/acct/acct_test.c | 1 - tests/sys/kern/fdgrowtable_test.c | 1 - tests/sys/kern/kcov.c | 1 - tests/sys/kern/kern_copyin.c | 1 - tests/sys/kern/kern_descrip_test.c | 1 - tests/sys/kern/pipe/pipe_kqueue_test.c | 1 - tests/sys/kern/ptrace_test.c | 1 - tests/sys/kern/sched_affinity.c | 2 +- tests/sys/kern/subr_physmem_test.c | 1 - tests/sys/kern/sys_getrandom.c | 1 - tests/sys/kern/unix_passfd_test.c | 1 - tests/sys/net/routing/test_rtsock_ops.c | 1 - tests/sys/netinet/ip6_v4mapped_test.c | 1 - tests/sys/netinet/ip_reass_test.c | 1 - tests/sys/netinet/so_reuseport_lb_test.c | 1 - tests/sys/netinet/tcp_connect_port_test.c | 1 - tests/sys/posixshm/posixshm_test.c | 1 - tests/sys/vfs/lookup_cap_dotdot.c | 1 - 22 files changed, 1 insertion(+), 22 deletions(-) diff --git a/tests/sys/capsicum/bindat_connectat.c b/tests/sys/capsicum/bindat_connectat.c index 397bbbd562ae..2d7ec706c1cc 100644 --- a/tests/sys/capsicum/bindat_connectat.c +++ b/tests/sys/capsicum/bindat_connectat.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/capsicum/ioctls_test.c b/tests/sys/capsicum/ioctls_test.c index d35e1582861b..5db58279071c 100644 --- a/tests/sys/capsicum/ioctls_test.c +++ b/tests/sys/capsicum/ioctls_test.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/devrandom/uint128_test.c b/tests/sys/devrandom/uint128_test.c index 2c9b956c9c8f..a59adba1a7c7 100644 --- a/tests/sys/devrandom/uint128_test.c +++ b/tests/sys/devrandom/uint128_test.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tests/sys/fifo/fifo_kqueue.c b/tests/sys/fifo/fifo_kqueue.c index 43af68545ba9..9052ed599282 100644 --- a/tests/sys/fifo/fifo_kqueue.c +++ b/tests/sys/fifo/fifo_kqueue.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/kern/acct/acct_test.c b/tests/sys/kern/acct/acct_test.c index b3028d518885..f0f016b9cc26 100644 --- a/tests/sys/kern/acct/acct_test.c +++ b/tests/sys/kern/acct/acct_test.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tests/sys/kern/fdgrowtable_test.c b/tests/sys/kern/fdgrowtable_test.c index e066c97a05fb..75c3d6701c0c 100644 --- a/tests/sys/kern/fdgrowtable_test.c +++ b/tests/sys/kern/fdgrowtable_test.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/kern/kcov.c b/tests/sys/kern/kcov.c index 914511f7d137..cecc0cda78ea 100644 --- a/tests/sys/kern/kcov.c +++ b/tests/sys/kern/kcov.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/kern/kern_copyin.c b/tests/sys/kern/kern_copyin.c index 25c9eda96541..6ad195d5d055 100644 --- a/tests/sys/kern/kern_copyin.c +++ b/tests/sys/kern/kern_copyin.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/kern/kern_descrip_test.c b/tests/sys/kern/kern_descrip_test.c index b181187fa168..a315156c36de 100644 --- a/tests/sys/kern/kern_descrip_test.c +++ b/tests/sys/kern/kern_descrip_test.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/kern/pipe/pipe_kqueue_test.c b/tests/sys/kern/pipe/pipe_kqueue_test.c index b432e839c102..ee2e9ce68c7a 100644 --- a/tests/sys/kern/pipe/pipe_kqueue_test.c +++ b/tests/sys/kern/pipe/pipe_kqueue_test.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index 5666215f9377..bd176e2963f0 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/kern/sched_affinity.c b/tests/sys/kern/sched_affinity.c index dce8678bcf6e..cbba226b3fa2 100644 --- a/tests/sys/kern/sched_affinity.c +++ b/tests/sys/kern/sched_affinity.c @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: BSD-2-Clause */ -#include + #include #include #include diff --git a/tests/sys/kern/subr_physmem_test.c b/tests/sys/kern/subr_physmem_test.c index 92420fd39ee5..b810a2016473 100644 --- a/tests/sys/kern/subr_physmem_test.c +++ b/tests/sys/kern/subr_physmem_test.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tests/sys/kern/sys_getrandom.c b/tests/sys/kern/sys_getrandom.c index 5f1acdc2efb1..6b6553bbdaac 100644 --- a/tests/sys/kern/sys_getrandom.c +++ b/tests/sys/kern/sys_getrandom.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index d8c0efe5b9ea..9c9a6a175ceb 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/net/routing/test_rtsock_ops.c b/tests/sys/net/routing/test_rtsock_ops.c index bc1694116404..ab4be93cc1af 100644 --- a/tests/sys/net/routing/test_rtsock_ops.c +++ b/tests/sys/net/routing/test_rtsock_ops.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/netinet/ip6_v4mapped_test.c b/tests/sys/netinet/ip6_v4mapped_test.c index bbc8d11d63ef..fa23192f56e4 100644 --- a/tests/sys/netinet/ip6_v4mapped_test.c +++ b/tests/sys/netinet/ip6_v4mapped_test.c @@ -31,7 +31,6 @@ * This test is derived from tcp_connect_port_test.c. */ -#include #include #include #include diff --git a/tests/sys/netinet/ip_reass_test.c b/tests/sys/netinet/ip_reass_test.c index f649dd9ad4db..a65bfa34e1d4 100644 --- a/tests/sys/netinet/ip_reass_test.c +++ b/tests/sys/netinet/ip_reass_test.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 5d3b2ab03af8..64fe0b53618d 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tests/sys/netinet/tcp_connect_port_test.c b/tests/sys/netinet/tcp_connect_port_test.c index c8d211cc87cc..ad087afb162d 100644 --- a/tests/sys/netinet/tcp_connect_port_test.c +++ b/tests/sys/netinet/tcp_connect_port_test.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index c97a10bb0a86..efc903d4ee04 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tests/sys/vfs/lookup_cap_dotdot.c b/tests/sys/vfs/lookup_cap_dotdot.c index 416c045d2f5d..fa26a13568ca 100644 --- a/tests/sys/vfs/lookup_cap_dotdot.c +++ b/tests/sys/vfs/lookup_cap_dotdot.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include From nobody Mon Nov 27 05:25:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDP36qpz51hSf; Mon, 27 Nov 2023 05:25: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 4SdvDN6XvRz4XPl; Mon, 27 Nov 2023 05:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EyOGGj39JZD6SFbA7NUlsCe/r9sCPqSau5P5WsDc7TY=; b=OBpCiAwfEhLCDLiRVpYM6jz68Cd/b4mthU81JO0sV+sRKIzTktcy1H2zVIraeAJlySXIXa 9z1S+P/V1IXKDb4JyVcvH7UmQBAEL4Jg17bYde4d9VyTv4V7XOS1/nIsWvEI89I4Ok/CU6 0AhpKFXJK75G3qSM5yqG517wTWerykPefwmgep5Z90eUmedRwJu/+6PdMo+umVNlOQz5+A pxMDDqjXlgaUg0FpneLeJ7T9l+zmv6rEyIeNzH1f/Wy6HeFCLEcEvStRVkVIaiKFV3uMIu +ZZ2UfmIjrcwO7DYAQPodgcB8+csZi01mgNmhVdB1DpbhiCSKYFA9FrEO6NvEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EyOGGj39JZD6SFbA7NUlsCe/r9sCPqSau5P5WsDc7TY=; b=R1g4cEa4SUkKD5h5VX6HVUuecf8Srd1MVRgvcMMyxiF10+G6fGdnOP9yOVuuMOJ2PIPt8R B5HocIvthrqZYmW0AknVFKirXUjuMIf8xBovOaL6Kbd22qSRrJ1ThHol+tgtIrx7fs9o10 JfrI5xpqbLAAfpO/sqirsrACDDfhStM1ZMSqvsCpnL5LPBgffC3MtBcqUIIbf4IGhZaHKm x0sK+xoXkNAjNIrtbkCQUblYPgT889hASamlFVB+K0RGSshHP9B3jlvVr5A3Jt5/UhOtZH mRYcJ5jTVsRIT/A+HEGsuBnLEhw7WmDQipCh1OrWyi4VjFZ7sueE+NOFb7OaTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062709; a=rsa-sha256; cv=none; b=uGrDx9a/umKeLkMbvEyFfUwhUoI985Ur58KvsbZ2v0y7hsyGW5ygDoem0EE/BCU8fJzov/ JlRnbNmvwIlu/jP/cFC5BICuRgfRBVT6F+/fKBsJb0a3g7BHiGuT2tUDh8yC9ghJot5blq VmXpTOmF1O645fBOoKn9TYq69ugmnAAVL4k77SGtbC7P22PU3Sr8c6C6mKk98OxHYX8OXe u4Zuk2ALqlFrbmkO0+iAih5o62h4fgGIQu/ZFIp9IJ9XBvZzy1vGg/xwyaIOwRkjONqUri MzWVmErC2NO6iULE34WG1eOjuW+Xc1piOBufLPdn9m+qDWcpZOuHWSYYiCKLgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDN5fvXzB9y; Mon, 27 Nov 2023 05:25: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 3AR5P81b066893; Mon, 27 Nov 2023 05:25:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P8EY066890; Mon, 27 Nov 2023 05:25:08 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:08 GMT Message-Id: <202311270525.3AR5P8EY066890@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: 6bfca4dcab07 - main - tools: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: 6bfca4dcab07dad45a805879d954876b353c0810 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6bfca4dcab07dad45a805879d954876b353c0810 commit 6bfca4dcab07dad45a805879d954876b353c0810 Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:01 +0000 tools: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- tools/build/cross-build/capsicum_stubs.c | 2 +- tools/build/cross-build/fgetln_fallback.c | 2 +- tools/build/cross-build/include/linux/libutil.h | 1 - tools/bus_space/C/lang.c | 1 - tools/regression/aio/aiop/aiop.c | 1 - tools/regression/capsicum/syscalls/cap_fcntls_limit.c | 1 - tools/regression/capsicum/syscalls/cap_getmode.c | 1 - tools/regression/capsicum/syscalls/cap_ioctls_limit.c | 1 - tools/regression/capsicum/syscalls/misc.c | 1 - tools/regression/ethernet/ethermulti/ethermulti.c | 1 - tools/regression/geom_gpt/gctl_test_helper.c | 1 - tools/regression/kthread/kld/kthrdlk.c | 1 - tools/regression/netinet/ipbroadcast/ipbroadcast.c | 1 - tools/regression/netinet/ipmulticast/ipmulticast.c | 1 - tools/regression/netinet6/inet6_rth/inet6_rth-segments.c | 1 - tools/regression/netinet6/inet6_rth/test_subr.c | 1 - tools/regression/posixsem/posixsem.c | 1 - tools/regression/redzone9/redzone.c | 1 - tools/regression/security/cap_test/cap_test_capabilities.c | 1 - tools/regression/security/cap_test/cap_test_capmode.c | 1 - tools/regression/security/cap_test/cap_test_fcntl.c | 1 - tools/regression/security/cap_test/cap_test_pdfork.c | 1 - tools/regression/security/cap_test/cap_test_pdkill.c | 1 - tools/regression/security/cap_test/cap_test_relative.c | 1 - tools/regression/security/cap_test/cap_test_sysctl.c | 1 - tools/regression/security/open_to_operation/open_to_operation.c | 1 - tools/regression/sockets/udp_pingpong/udp_pingpong.c | 1 - tools/regression/sockets/unix_cmsg/t_cmsg_len.c | 1 - tools/regression/sockets/unix_cmsg/t_cmsgcred.c | 1 - tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c | 1 - tools/regression/sockets/unix_cmsg/t_generic.c | 1 - tools/regression/sockets/unix_cmsg/t_peercred.c | 1 - tools/regression/sockets/unix_cmsg/t_sockcred.c | 1 - tools/regression/sockets/unix_cmsg/unix_cmsg.c | 1 - tools/test/iconv/const-gnuism.c | 1 - tools/test/iconv/posix/posix.c | 1 - tools/test/pthread_vfork/pthread_vfork_test.c | 1 - tools/test/ptrace/scescx.c | 1 - tools/test/stress2/misc/kern_umtx_inf_loop.sh | 1 - tools/test/stress2/misc/ldt.sh | 1 - tools/tools/aac/aac_checkq.c | 1 - tools/tools/bootparttest/bootparttest.c | 1 - tools/tools/dmardump/dmardump.c | 1 - tools/tools/drm/radeon/mkregtable/mkregtable.c | 1 - tools/tools/ifpifa/ifpifa.c | 2 +- tools/tools/ipw/ipwstats.c | 1 - tools/tools/iwi/iwistats.c | 1 - tools/tools/mfi/mfi_checkq.c | 1 - tools/tools/ncpus/biosmptable.c | 1 - tools/tools/netmap/nmreplay.c | 3 +-- tools/tools/pciroms/pciroms.c | 1 - tools/tools/pirtool/pirtool.c | 2 +- tools/tools/switch_tls/switch_tls.c | 1 - tools/tools/tscdrift/tscdrift.c | 2 -- tools/tools/vhba/vhba.h | 2 +- 55 files changed, 6 insertions(+), 57 deletions(-) diff --git a/tools/build/cross-build/capsicum_stubs.c b/tools/build/cross-build/capsicum_stubs.c index 5c7d0e617adf..75eff8534fc4 100644 --- a/tools/build/cross-build/capsicum_stubs.c +++ b/tools/build/cross-build/capsicum_stubs.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include + #include #include diff --git a/tools/build/cross-build/fgetln_fallback.c b/tools/build/cross-build/fgetln_fallback.c index 9bd202c125da..000cd38ce596 100644 --- a/tools/build/cross-build/fgetln_fallback.c +++ b/tools/build/cross-build/fgetln_fallback.c @@ -26,7 +26,7 @@ */ #include -#include + #include #include diff --git a/tools/build/cross-build/include/linux/libutil.h b/tools/build/cross-build/include/linux/libutil.h index 3a9652c27098..8f9ca406edc1 100644 --- a/tools/build/cross-build/include/linux/libutil.h +++ b/tools/build/cross-build/include/linux/libutil.h @@ -35,7 +35,6 @@ */ #pragma once -#include #include #include diff --git a/tools/bus_space/C/lang.c b/tools/bus_space/C/lang.c index a96a45f212e2..e6d242b5a7f8 100644 --- a/tools/bus_space/C/lang.c +++ b/tools/bus_space/C/lang.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/tools/regression/aio/aiop/aiop.c b/tools/regression/aio/aiop/aiop.c index e83e9047cb86..4b6bc986600b 100644 --- a/tools/regression/aio/aiop/aiop.c +++ b/tools/regression/aio/aiop/aiop.c @@ -38,7 +38,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/capsicum/syscalls/cap_fcntls_limit.c b/tools/regression/capsicum/syscalls/cap_fcntls_limit.c index 55627579963b..d26f3e3b7c36 100644 --- a/tools/regression/capsicum/syscalls/cap_fcntls_limit.c +++ b/tools/regression/capsicum/syscalls/cap_fcntls_limit.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/capsicum/syscalls/cap_getmode.c b/tools/regression/capsicum/syscalls/cap_getmode.c index a2584895b179..72596b615877 100644 --- a/tools/regression/capsicum/syscalls/cap_getmode.c +++ b/tools/regression/capsicum/syscalls/cap_getmode.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/capsicum/syscalls/cap_ioctls_limit.c b/tools/regression/capsicum/syscalls/cap_ioctls_limit.c index b0d392c8f0c0..68bdefb417ce 100644 --- a/tools/regression/capsicum/syscalls/cap_ioctls_limit.c +++ b/tools/regression/capsicum/syscalls/cap_ioctls_limit.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/capsicum/syscalls/misc.c b/tools/regression/capsicum/syscalls/misc.c index 914c606ac904..704fd70b83ff 100644 --- a/tools/regression/capsicum/syscalls/misc.c +++ b/tools/regression/capsicum/syscalls/misc.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/ethernet/ethermulti/ethermulti.c b/tools/regression/ethernet/ethermulti/ethermulti.c index b278a106b946..4b1b00c78cab 100644 --- a/tools/regression/ethernet/ethermulti/ethermulti.c +++ b/tools/regression/ethernet/ethermulti/ethermulti.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/geom_gpt/gctl_test_helper.c b/tools/regression/geom_gpt/gctl_test_helper.c index 700ce0aeb169..1ac8dceb50fd 100644 --- a/tools/regression/geom_gpt/gctl_test_helper.c +++ b/tools/regression/geom_gpt/gctl_test_helper.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/kthread/kld/kthrdlk.c b/tools/regression/kthread/kld/kthrdlk.c index 8e4ed1a35853..5d970b95959d 100644 --- a/tools/regression/kthread/kld/kthrdlk.c +++ b/tools/regression/kthread/kld/kthrdlk.c @@ -32,7 +32,6 @@ * */ -#include #include #include #include diff --git a/tools/regression/netinet/ipbroadcast/ipbroadcast.c b/tools/regression/netinet/ipbroadcast/ipbroadcast.c index 43957e9fd108..6177ce964749 100644 --- a/tools/regression/netinet/ipbroadcast/ipbroadcast.c +++ b/tools/regression/netinet/ipbroadcast/ipbroadcast.c @@ -28,7 +28,6 @@ * Test utility for IPv4 broadcast sockets. */ -#include #include #include #include diff --git a/tools/regression/netinet/ipmulticast/ipmulticast.c b/tools/regression/netinet/ipmulticast/ipmulticast.c index 7bd97dfc002a..eb06c544a7ea 100644 --- a/tools/regression/netinet/ipmulticast/ipmulticast.c +++ b/tools/regression/netinet/ipmulticast/ipmulticast.c @@ -32,7 +32,6 @@ * TODO: Merge multicast socket option tests from ipsockopt. */ -#include #include #include #include diff --git a/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c b/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c index c3de967cc5b5..5ca6bfcdde76 100644 --- a/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c +++ b/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c @@ -25,7 +25,6 @@ * */ -#include #include #include diff --git a/tools/regression/netinet6/inet6_rth/test_subr.c b/tools/regression/netinet6/inet6_rth/test_subr.c index 2beedd837027..59d4e43fff6d 100644 --- a/tools/regression/netinet6/inet6_rth/test_subr.c +++ b/tools/regression/netinet6/inet6_rth/test_subr.c @@ -25,7 +25,6 @@ * */ -#include #include #include diff --git a/tools/regression/posixsem/posixsem.c b/tools/regression/posixsem/posixsem.c index d03a64c04b9b..0668a0d4f4fb 100644 --- a/tools/regression/posixsem/posixsem.c +++ b/tools/regression/posixsem/posixsem.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/redzone9/redzone.c b/tools/regression/redzone9/redzone.c index d4d5c3e3e785..579e5a08cda7 100644 --- a/tools/regression/redzone9/redzone.c +++ b/tools/regression/redzone9/redzone.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_capabilities.c b/tools/regression/security/cap_test/cap_test_capabilities.c index 9fa60a2f8dd2..b22749360bb1 100644 --- a/tools/regression/security/cap_test/cap_test_capabilities.c +++ b/tools/regression/security/cap_test/cap_test_capabilities.c @@ -34,7 +34,6 @@ * various object types. */ -#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_capmode.c b/tools/regression/security/cap_test/cap_test_capmode.c index 81dce2e758e2..9d1eaf45ea85 100644 --- a/tools/regression/security/cap_test/cap_test_capmode.c +++ b/tools/regression/security/cap_test/cap_test_capmode.c @@ -31,7 +31,6 @@ * whether or not they return the expected ECAPMODE. */ -#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_fcntl.c b/tools/regression/security/cap_test/cap_test_fcntl.c index b08bc3f88288..5ef9c55a3e4d 100644 --- a/tools/regression/security/cap_test/cap_test_fcntl.c +++ b/tools/regression/security/cap_test/cap_test_fcntl.c @@ -29,7 +29,6 @@ * Test that fcntl works in capability mode. */ -#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_pdfork.c b/tools/regression/security/cap_test/cap_test_pdfork.c index 791c83855647..fdd0b5d6ad04 100644 --- a/tools/regression/security/cap_test/cap_test_pdfork.c +++ b/tools/regression/security/cap_test/cap_test_pdfork.c @@ -31,7 +31,6 @@ * whether or not they return the expected ECAPMODE. */ -#include #include #include diff --git a/tools/regression/security/cap_test/cap_test_pdkill.c b/tools/regression/security/cap_test/cap_test_pdkill.c index be4cae793d5b..2f2a18b3baa7 100644 --- a/tools/regression/security/cap_test/cap_test_pdkill.c +++ b/tools/regression/security/cap_test/cap_test_pdkill.c @@ -31,7 +31,6 @@ * whether or not they return the expected ECAPMODE. */ -#include #include #include diff --git a/tools/regression/security/cap_test/cap_test_relative.c b/tools/regression/security/cap_test/cap_test_relative.c index 517ff0bf5733..ef2e561b0158 100644 --- a/tools/regression/security/cap_test/cap_test_relative.c +++ b/tools/regression/security/cap_test/cap_test_relative.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_sysctl.c b/tools/regression/security/cap_test/cap_test_sysctl.c index 04982c1e9fc0..dcc6970606da 100644 --- a/tools/regression/security/cap_test/cap_test_sysctl.c +++ b/tools/regression/security/cap_test/cap_test_sysctl.c @@ -29,7 +29,6 @@ * Test that various sysctls are (and aren't) available on capability mode. */ -#include #include #include #include diff --git a/tools/regression/security/open_to_operation/open_to_operation.c b/tools/regression/security/open_to_operation/open_to_operation.c index 444c574aa078..235b785b5993 100644 --- a/tools/regression/security/open_to_operation/open_to_operation.c +++ b/tools/regression/security/open_to_operation/open_to_operation.c @@ -89,7 +89,6 @@ * XXXRW: message queue and shared memory fds? */ -#include #include #include #include diff --git a/tools/regression/sockets/udp_pingpong/udp_pingpong.c b/tools/regression/sockets/udp_pingpong/udp_pingpong.c index 9babe144adcb..2fe342debdc6 100644 --- a/tools/regression/sockets/udp_pingpong/udp_pingpong.c +++ b/tools/regression/sockets/udp_pingpong/udp_pingpong.c @@ -34,7 +34,6 @@ * sure it makes sense. */ -#include #include #include #include diff --git a/tools/regression/sockets/unix_cmsg/t_cmsg_len.c b/tools/regression/sockets/unix_cmsg/t_cmsg_len.c index c0064f15fd2e..d9e4b6fb99ae 100644 --- a/tools/regression/sockets/unix_cmsg/t_cmsg_len.c +++ b/tools/regression/sockets/unix_cmsg/t_cmsg_len.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/sockets/unix_cmsg/t_cmsgcred.c b/tools/regression/sockets/unix_cmsg/t_cmsgcred.c index de87f1d62b2a..a1f6dc43e1db 100644 --- a/tools/regression/sockets/unix_cmsg/t_cmsgcred.c +++ b/tools/regression/sockets/unix_cmsg/t_cmsgcred.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c b/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c index 323458f9748e..af4232470812 100644 --- a/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c +++ b/tools/regression/sockets/unix_cmsg/t_cmsgcred_sockcred.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/sockets/unix_cmsg/t_generic.c b/tools/regression/sockets/unix_cmsg/t_generic.c index 7add752433d8..8b4e251e92fe 100644 --- a/tools/regression/sockets/unix_cmsg/t_generic.c +++ b/tools/regression/sockets/unix_cmsg/t_generic.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/sockets/unix_cmsg/t_peercred.c b/tools/regression/sockets/unix_cmsg/t_peercred.c index f10ee2833df4..cbea69eaea97 100644 --- a/tools/regression/sockets/unix_cmsg/t_peercred.c +++ b/tools/regression/sockets/unix_cmsg/t_peercred.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/sockets/unix_cmsg/t_sockcred.c b/tools/regression/sockets/unix_cmsg/t_sockcred.c index d6156dc74c39..d5171946f988 100644 --- a/tools/regression/sockets/unix_cmsg/t_sockcred.c +++ b/tools/regression/sockets/unix_cmsg/t_sockcred.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/regression/sockets/unix_cmsg/unix_cmsg.c b/tools/regression/sockets/unix_cmsg/unix_cmsg.c index 45a2fd021791..bd3753140b46 100644 --- a/tools/regression/sockets/unix_cmsg/unix_cmsg.c +++ b/tools/regression/sockets/unix_cmsg/unix_cmsg.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/test/iconv/const-gnuism.c b/tools/test/iconv/const-gnuism.c index e30a23cc68ac..957f7e0786c7 100644 --- a/tools/test/iconv/const-gnuism.c +++ b/tools/test/iconv/const-gnuism.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tools/test/iconv/posix/posix.c b/tools/test/iconv/posix/posix.c index 1ca9d43d9caa..36e662f882f7 100644 --- a/tools/test/iconv/posix/posix.c +++ b/tools/test/iconv/posix/posix.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tools/test/pthread_vfork/pthread_vfork_test.c b/tools/test/pthread_vfork/pthread_vfork_test.c index 1f65f70a1c3c..6525e51fe6f7 100644 --- a/tools/test/pthread_vfork/pthread_vfork_test.c +++ b/tools/test/pthread_vfork/pthread_vfork_test.c @@ -26,7 +26,6 @@ * */ -#include #include #include #include diff --git a/tools/test/ptrace/scescx.c b/tools/test/ptrace/scescx.c index fc6aed86da4b..27a00b40f737 100644 --- a/tools/test/ptrace/scescx.c +++ b/tools/test/ptrace/scescx.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/test/stress2/misc/kern_umtx_inf_loop.sh b/tools/test/stress2/misc/kern_umtx_inf_loop.sh index b8088814d7b2..2c4d99149480 100755 --- a/tools/test/stress2/misc/kern_umtx_inf_loop.sh +++ b/tools/test/stress2/misc/kern_umtx_inf_loop.sh @@ -46,7 +46,6 @@ EOF * SUCH DAMAGE. */ -#include #include #include diff --git a/tools/test/stress2/misc/ldt.sh b/tools/test/stress2/misc/ldt.sh index 21c7055d76fe..7b23548c9eea 100755 --- a/tools/test/stress2/misc/ldt.sh +++ b/tools/test/stress2/misc/ldt.sh @@ -284,7 +284,6 @@ EOF cat > fault.c < #include #include #include diff --git a/tools/tools/aac/aac_checkq.c b/tools/tools/aac/aac_checkq.c index 220d2eb7b793..007f224ba003 100644 --- a/tools/tools/aac/aac_checkq.c +++ b/tools/tools/aac/aac_checkq.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/tools/bootparttest/bootparttest.c b/tools/tools/bootparttest/bootparttest.c index af784027f95e..7556f02929f8 100644 --- a/tools/tools/bootparttest/bootparttest.c +++ b/tools/tools/bootparttest/bootparttest.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tools/tools/dmardump/dmardump.c b/tools/tools/dmardump/dmardump.c index 08b2570ba6e5..6888200983bc 100644 --- a/tools/tools/dmardump/dmardump.c +++ b/tools/tools/dmardump/dmardump.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/tools/drm/radeon/mkregtable/mkregtable.c b/tools/tools/drm/radeon/mkregtable/mkregtable.c index e39264fbcd2b..5a82b6b75849 100644 --- a/tools/tools/drm/radeon/mkregtable/mkregtable.c +++ b/tools/tools/drm/radeon/mkregtable/mkregtable.c @@ -9,7 +9,6 @@ * Dave Airlie */ -#include #include #include #include diff --git a/tools/tools/ifpifa/ifpifa.c b/tools/tools/ifpifa/ifpifa.c index 493be768f048..bc8f7352bbb6 100644 --- a/tools/tools/ifpifa/ifpifa.c +++ b/tools/tools/ifpifa/ifpifa.c @@ -28,7 +28,7 @@ #include #include -#include + #include #include #include diff --git a/tools/tools/ipw/ipwstats.c b/tools/tools/ipw/ipwstats.c index 1da6efeeaea5..8b95607397b0 100644 --- a/tools/tools/ipw/ipwstats.c +++ b/tools/tools/ipw/ipwstats.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tools/tools/iwi/iwistats.c b/tools/tools/iwi/iwistats.c index 16044f1a7ba7..48572e44a875 100644 --- a/tools/tools/iwi/iwistats.c +++ b/tools/tools/iwi/iwistats.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/tools/tools/mfi/mfi_checkq.c b/tools/tools/mfi/mfi_checkq.c index ca3fc0c7fa8c..05d0e97e21d6 100644 --- a/tools/tools/mfi/mfi_checkq.c +++ b/tools/tools/mfi/mfi_checkq.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/tools/ncpus/biosmptable.c b/tools/tools/ncpus/biosmptable.c index 0289409939be..848eadf02d0f 100644 --- a/tools/tools/ncpus/biosmptable.c +++ b/tools/tools/ncpus/biosmptable.c @@ -30,7 +30,6 @@ * the number of cpu's identified. */ -#include #include #include diff --git a/tools/tools/netmap/nmreplay.c b/tools/tools/netmap/nmreplay.c index 75b5b8b5f62b..257157c48945 100644 --- a/tools/tools/netmap/nmreplay.c +++ b/tools/tools/netmap/nmreplay.c @@ -1538,8 +1538,7 @@ uniform_delay_run(struct _qs *q, struct _cfg *arg) { uint64_t x = my_random24(); q->cur_delay = arg->d[0] + ((arg->d[2] * x) >> 24); -#if 0 /* COMPUTE_STATS */ -#endif /* COMPUTE_STATS */ + return 0; } diff --git a/tools/tools/pciroms/pciroms.c b/tools/tools/pciroms/pciroms.c index 0e5e3236c96f..48bd7be75eef 100644 --- a/tools/tools/pciroms/pciroms.c +++ b/tools/tools/pciroms/pciroms.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/tools/tools/pirtool/pirtool.c b/tools/tools/pirtool/pirtool.c index 024810109a72..03659dbb56dd 100644 --- a/tools/tools/pirtool/pirtool.c +++ b/tools/tools/pirtool/pirtool.c @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ -#include + #include #include #include diff --git a/tools/tools/switch_tls/switch_tls.c b/tools/tools/switch_tls/switch_tls.c index 2e214af2e45b..e79cba5a30f8 100644 --- a/tools/tools/switch_tls/switch_tls.c +++ b/tools/tools/switch_tls/switch_tls.c @@ -17,7 +17,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/tools/tools/tscdrift/tscdrift.c b/tools/tools/tscdrift/tscdrift.c index 7d8940e9f3a1..cf20993bd1ee 100644 --- a/tools/tools/tscdrift/tscdrift.c +++ b/tools/tools/tscdrift/tscdrift.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ - -#include #include #include #include diff --git a/tools/tools/vhba/vhba.h b/tools/tools/vhba/vhba.h index 9e9ca0e7eabe..d6b32b10b56d 100644 --- a/tools/tools/vhba/vhba.h +++ b/tools/tools/vhba/vhba.h @@ -26,7 +26,7 @@ /* * Virtual HBA defines */ -#include + #include #include #include From nobody Mon Nov 27 05:25:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDQ1h2Nz51hC6; Mon, 27 Nov 2023 05:25: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 4SdvDQ0JXjz4XVM; Mon, 27 Nov 2023 05:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oNWifty+DjmQCd2TA58+oUhtY1a6qsp8/awEErZYts4=; b=srBqeVpkmsghLk3i1+qk8N1yD1/FY9Hg45DMgJKk/i3z0gFvIjxjCpkTxyv6SAYjd/GisT D39CKyCJIJoKPT9ZDHfMhQeERF+fr3Cw6YB/3jfDxy8G680ICn+Pvel74CpW1Vnqg5JDUB WqaeJz3zMUDylSCajmHqeg8HqmfOrCRL54wHZ7/IcV6Yx1uax9uhCKKsaP3PlvTvCmsIoD GIGgg2OKNzV4ih0KytzNyEOtUje8QVON0LOqZhLPiMxXo1pU6fylVtFksUXoXaEDK3MTwV n01mdveDY/d5WLwkQWJQReWZunDdr6sl24vcon5tDzF/ZZc6Ka76E9t5RsOMwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oNWifty+DjmQCd2TA58+oUhtY1a6qsp8/awEErZYts4=; b=P41KjeG3FMGDHdQ0ivBckZHfbcOa0q5tECgaAH+29v7s2irWG31m9a8mdoI/WoVoclYQtJ i25d+YlKP762wDIg87tu3SaJwYLPvxsVv6oqCn0SIw8HuiJF5EW6CZX0Rr425swPWcJkRx uJ9BZjI/yvxIo/5zsS/CQQLHdIzr8euK7sWjIPxxvQxUq+Lp4pTQB5okOilFMgnLPmIvv/ 3gC7ShFYG9Uk02ZjpNaRlY1pRslKEukeZQwMWB+98Ud86hXGLQeh6Jq7tM/TS0Usc9kdSW MjXhFktVk54ZEJo2KzLYsNE/NIvTb5NAFNuJn0Urw3JEQ5LDhuX688bjfy2FkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062710; a=rsa-sha256; cv=none; b=FBKaNQdNYSZ+kUq89t2u+o47jsU8i3fKkd+16jAuVlWvlwkqsBHy8W/DX8jpDCIl7VzC44 thOtz9Tcxs0AkOhijYomwd2ip3VKGpVvin/EWB5V0Vq5CymQyp9VT1UsPzEAglSW3GKbfW TQOruRXln7SF4MvreBZ1t55KS+aLJTSly8Pc86rkqALyWuaSWCAiCxFFpWiZK98AZS10jv zJhBvQwUWERla1jKQB7ndU9yShEtoaPhT9dAsHvtddGiRXIXfBHrDfYBYJH5J2k3R+lZYi E0ail9PHycd+ZqSK+q1FTf1Q1GxPX+gCaj62e+JtcaEZ8a6P2j3rq8mm3xEjlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDP6Vb2z9lw; Mon, 27 Nov 2023 05:25: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 3AR5P9F8066952; Mon, 27 Nov 2023 05:25:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5P91o066949; Mon, 27 Nov 2023 05:25:09 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:09 GMT Message-Id: <202311270525.3AR5P91o066949@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: 5e3934b15a27 - main - usr.bin: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: 5e3934b15a2741b2de6b217e77dc9d798d740804 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5e3934b15a2741b2de6b217e77dc9d798d740804 commit 5e3934b15a2741b2de6b217e77dc9d798d740804 Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:01 +0000 usr.bin: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- usr.bin/apply/apply.c | 4 ---- usr.bin/bc/bc.y | 1 - usr.bin/brandelf/brandelf.c | 1 - usr.bin/bsdiff/bsdiff/bsdiff.c | 1 - usr.bin/c99/c99.c | 1 - usr.bin/chat/chat.c | 1 - usr.bin/chkey/chkey.c | 3 --- usr.bin/chpass/edit.c | 4 ---- usr.bin/chpass/field.c | 4 ---- usr.bin/chpass/table.c | 3 --- usr.bin/chpass/util.c | 3 --- usr.bin/cksum/crc.c | 3 --- usr.bin/cksum/crc32.c | 1 - usr.bin/cksum/print.c | 4 ---- usr.bin/cksum/sum1.c | 4 ---- usr.bin/cksum/sum2.c | 3 --- usr.bin/cmp/link.c | 1 - usr.bin/cmp/misc.c | 4 ---- usr.bin/cmp/regular.c | 4 ---- usr.bin/cmp/special.c | 4 ---- usr.bin/csplit/csplit.c | 1 - usr.bin/ctags/C.c | 3 --- usr.bin/ctags/fortran.c | 3 --- usr.bin/ctags/lisp.c | 3 --- usr.bin/ctags/print.c | 3 --- usr.bin/ctags/tree.c | 3 --- usr.bin/ctags/yacc.c | 3 --- usr.bin/ctlstat/ctlstat.c | 1 - usr.bin/diff/diffreg.c | 1 - usr.bin/diff3/diff3.c | 3 --- usr.bin/elfdump/elfdump.c | 1 - usr.bin/enigma/enigma.c | 1 - usr.bin/fetch/fetch.c | 1 - usr.bin/find/find.c | 2 -- usr.bin/find/function.c | 2 -- usr.bin/find/ls.c | 2 -- usr.bin/find/misc.c | 2 -- usr.bin/find/operator.c | 2 -- usr.bin/find/option.c | 1 - usr.bin/finger/lprint.c | 4 ---- usr.bin/finger/net.c | 4 ---- usr.bin/finger/sprint.c | 4 ---- usr.bin/finger/util.c | 4 ---- usr.bin/fstat/fstat.c | 1 - usr.bin/fsync/fsync.c | 3 --- usr.bin/getaddrinfo/getaddrinfo.c | 1 - usr.bin/getconf/getconf.c | 1 - usr.bin/gprof/arcs.c | 3 --- usr.bin/gprof/dfn.c | 3 --- usr.bin/gprof/elf.c | 1 - usr.bin/gprof/hertz.c | 3 --- usr.bin/gprof/lookup.c | 3 --- usr.bin/gprof/printgprof.c | 3 --- usr.bin/gprof/printlist.c | 3 --- usr.bin/grep/file.c | 1 - usr.bin/grep/queue.c | 1 - usr.bin/hexdump/conv.c | 1 - usr.bin/hexdump/display.c | 3 --- usr.bin/hexdump/hexsyntax.c | 3 --- usr.bin/hexdump/odsyntax.c | 3 --- usr.bin/hexdump/parse.c | 3 --- usr.bin/iconv/iconv.c | 1 - usr.bin/ident/ident.c | 1 - usr.bin/indent/args.c | 3 --- usr.bin/indent/indent.c | 4 ---- usr.bin/indent/indent.h | 3 --- usr.bin/indent/io.c | 3 --- usr.bin/indent/lexi.c | 3 --- usr.bin/indent/parse.c | 3 --- usr.bin/indent/pr_comment.c | 3 --- usr.bin/ipcrm/ipcrm.c | 1 - usr.bin/ipcs/ipc.c | 1 - usr.bin/ipcs/ipcs.c | 1 - usr.bin/kdump/linux.c | 1 - usr.bin/killall/killall.c | 1 - usr.bin/ktrace/subr.c | 4 ---- usr.bin/ktrdump/ktrdump.c | 1 - usr.bin/lastcomm/readrec.c | 1 - usr.bin/ldd/ldd.c | 1 - usr.bin/localedef/charmap.c | 2 +- usr.bin/localedef/collate.c | 2 +- usr.bin/localedef/localedef.h | 2 +- usr.bin/lockf/lockf.c | 1 - usr.bin/login/login.c | 3 --- usr.bin/login/login_audit.c | 1 - usr.bin/login/login_fbtab.c | 1 - usr.bin/lsvfs/lsvfs.c | 1 - usr.bin/m4/misc.c | 1 - usr.bin/mail/cmd1.c | 3 --- usr.bin/mail/cmd2.c | 3 --- usr.bin/mail/cmd3.c | 3 --- usr.bin/mail/cmdtab.c | 3 --- usr.bin/mail/collect.c | 3 --- usr.bin/mail/edit.c | 3 --- usr.bin/mail/fio.c | 3 --- usr.bin/mail/getname.c | 3 --- usr.bin/mail/head.c | 3 --- usr.bin/mail/lex.c | 3 --- usr.bin/mail/list.c | 3 --- usr.bin/mail/names.c | 3 --- usr.bin/mail/popen.c | 3 --- usr.bin/mail/quit.c | 3 --- usr.bin/mail/send.c | 3 --- usr.bin/mail/strings.c | 3 --- usr.bin/mail/temp.c | 3 --- usr.bin/mail/tty.c | 3 --- usr.bin/mail/util.c | 3 --- usr.bin/mail/v7.local.c | 3 --- usr.bin/mail/vars.c | 3 --- usr.bin/mail/version.c | 3 --- usr.bin/ministat/ministat.c | 1 - usr.bin/mkcsmapper/yacc.y | 1 - usr.bin/mkesdb/yacc.y | 1 - usr.bin/mkimg/mkimg.c | 1 - usr.bin/mkuzip/mkuz_conveyor.c | 1 - usr.bin/mkuzip/mkuz_lzma.c | 1 - usr.bin/mkuzip/mkuz_zlib.c | 1 - usr.bin/mkuzip/mkuzip.c | 1 - usr.bin/netstat/bpf.c | 1 - usr.bin/netstat/common.c | 1 - usr.bin/netstat/if.c | 4 ---- usr.bin/netstat/inet.c | 4 ---- usr.bin/netstat/inet6.c | 3 --- usr.bin/netstat/ipsec.c | 4 ---- usr.bin/netstat/mbuf.c | 4 ---- usr.bin/netstat/netgraph.c | 1 - usr.bin/netstat/nhgrp.c | 1 - usr.bin/netstat/nhops.c | 1 - usr.bin/netstat/pfkey.c | 4 ---- usr.bin/netstat/route.c | 4 ---- usr.bin/netstat/route_netlink.c | 1 - usr.bin/netstat/sctp.c | 4 ---- usr.bin/netstat/unix.c | 3 --- usr.bin/newgrp/newgrp.c | 1 - usr.bin/newkey/generic.c | 3 --- usr.bin/newkey/newkey.c | 5 +---- usr.bin/newkey/update.c | 5 +---- usr.bin/passwd/passwd.c | 1 - usr.bin/pathchk/pathchk.c | 1 - usr.bin/posixshmcontrol/posixshmcontrol.c | 1 - usr.bin/pr/egetopt.c | 3 --- usr.bin/primes/pattern.c | 3 --- usr.bin/primes/pr_tbl.c | 3 --- usr.bin/procstat/procstat.c | 1 - usr.bin/procstat/procstat_args.c | 1 - usr.bin/procstat/procstat_auxv.c | 1 - usr.bin/procstat/procstat_basic.c | 1 - usr.bin/procstat/procstat_bin.c | 1 - usr.bin/procstat/procstat_cred.c | 1 - usr.bin/procstat/procstat_cs.c | 1 - usr.bin/procstat/procstat_files.c | 1 - usr.bin/procstat/procstat_kstack.c | 1 - usr.bin/procstat/procstat_penv.c | 1 - usr.bin/procstat/procstat_ptlwpinfo.c | 1 - usr.bin/procstat/procstat_pwdx.c | 1 - usr.bin/procstat/procstat_rlimit.c | 1 - usr.bin/procstat/procstat_rusage.c | 1 - usr.bin/procstat/procstat_sigs.c | 1 - usr.bin/procstat/procstat_threads.c | 1 - usr.bin/procstat/procstat_vm.c | 1 - usr.bin/quota/quota.c | 2 +- usr.bin/random/randomize_fd.c | 1 - usr.bin/rctl/rctl.c | 1 - usr.bin/rpcinfo/rpcinfo.c | 3 --- usr.bin/sdiff/edit.c | 1 - usr.bin/sdiff/sdiff.c | 1 - usr.bin/sockstat/sockstat.c | 1 - usr.bin/soelim/soelim.c | 1 - usr.bin/sort/coll.c | 1 - usr.bin/sort/vsort.c | 1 - usr.bin/systat/pigs.c | 3 --- usr.bin/systat/sctp.c | 1 - usr.bin/systat/sysput.c | 1 - usr.bin/systat/tcp.c | 1 - usr.bin/systat/zarc.c | 1 - usr.bin/tabs/tabs.c | 1 - usr.bin/tail/reverse.c | 4 ---- usr.bin/talk/talk.h | 1 - usr.bin/tftp/tftp.c | 3 --- usr.bin/tip/libacu/biz22.c | 4 ---- usr.bin/tip/libacu/biz31.c | 4 ---- usr.bin/tip/libacu/courier.c | 4 ---- usr.bin/tip/libacu/df.c | 4 ---- usr.bin/tip/libacu/dn11.c | 4 ---- usr.bin/tip/libacu/hayes.c | 4 ---- usr.bin/tip/libacu/t3000.c | 4 ---- usr.bin/tip/libacu/v3451.c | 4 ---- usr.bin/tip/libacu/v831.c | 4 ---- usr.bin/tip/libacu/ventel.c | 4 ---- usr.bin/tip/tip/acu.c | 4 ---- usr.bin/tip/tip/acutab.c | 4 ---- usr.bin/tip/tip/cmds.c | 4 ---- usr.bin/tip/tip/cmdtab.c | 4 ---- usr.bin/tip/tip/cu.c | 4 ---- usr.bin/tip/tip/hunt.c | 4 ---- usr.bin/tip/tip/log.c | 4 ---- usr.bin/tip/tip/partab.c | 4 ---- usr.bin/tip/tip/tipout.c | 4 ---- usr.bin/tip/tip/uucplock.c | 4 ---- usr.bin/tip/tip/value.c | 4 ---- usr.bin/tip/tip/vars.c | 4 ---- usr.bin/unifdef/tests/unifdef_test.sh | 3 +-- usr.bin/users/users.cc | 1 - usr.bin/vtfontcvt/vtfontcvt.c | 1 - usr.bin/w/proc_compare.c | 4 ---- usr.bin/who/who.c | 1 - usr.bin/ypwhich/ypwhich.c | 1 - 207 files changed, 7 insertions(+), 476 deletions(-) diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index edeb9c60679a..727351c8ff87 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y index 245748528a53..c270330281a8 100644 --- a/usr.bin/bc/bc.y +++ b/usr.bin/bc/bc.y @@ -30,7 +30,6 @@ * easy regression testing. */ -#include #include #include diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c index 2c908efdc227..e99af06c428a 100644 --- a/usr.bin/brandelf/brandelf.c +++ b/usr.bin/brandelf/brandelf.c @@ -29,7 +29,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c index 9836b8ee96f4..a4813253b23e 100644 --- a/usr.bin/bsdiff/bsdiff/bsdiff.c +++ b/usr.bin/bsdiff/bsdiff/bsdiff.c @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c index 9040aab4e7f0..688321d170bc 100644 --- a/usr.bin/c99/c99.c +++ b/usr.bin/c99/c99.c @@ -34,7 +34,6 @@ * specially. */ -#include #include #include diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c index c15c3037d8a0..64dc6cba0dcf 100644 --- a/usr.bin/chat/chat.c +++ b/usr.bin/chat/chat.c @@ -77,7 +77,6 @@ * */ -#include #include #include #include diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c index f5876396cb2c..8309237990f1 100644 --- a/usr.bin/chkey/chkey.c +++ b/usr.bin/chkey/chkey.c @@ -28,9 +28,6 @@ * Mountain View, California 94043 */ -#if 0 -#endif - #include /* * Copyright (C) 1986, Sun Microsystems, Inc. diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c index 55607f72a3c5..978a3eb1a63f 100644 --- a/usr.bin/chpass/edit.c +++ b/usr.bin/chpass/edit.c @@ -40,10 +40,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c index 80dcdfacea7f..b64f33e06fdb 100644 --- a/usr.bin/chpass/field.c +++ b/usr.bin/chpass/field.c @@ -40,10 +40,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c index 2d9a449578bc..53ed54e825af 100644 --- a/usr.bin/chpass/table.c +++ b/usr.bin/chpass/table.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif -#include #include #include #include "chpass.h" diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c index 369eaba16acc..9e3b3f7903c7 100644 --- a/usr.bin/chpass/util.c +++ b/usr.bin/chpass/util.c @@ -40,9 +40,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c index 6c91e9f2cb5d..1a49e1526874 100644 --- a/usr.bin/cksum/crc.c +++ b/usr.bin/cksum/crc.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c index 646704dcea47..2eb3e1b7d190 100644 --- a/usr.bin/cksum/crc32.c +++ b/usr.bin/cksum/crc32.c @@ -11,7 +11,6 @@ * Spencer Garrett */ -#include #include #include diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c index b86e174a10e9..345b36b64c44 100644 --- a/usr.bin/cksum/print.c +++ b/usr.bin/cksum/print.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - -#include #include #include diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c index da710cb2e90a..6174bae00adf 100644 --- a/usr.bin/cksum/sum1.c +++ b/usr.bin/cksum/sum1.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ - -#include #include #include diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c index 26572076943f..ae74226e5266 100644 --- a/usr.bin/cksum/sum2.c +++ b/usr.bin/cksum/sum2.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include diff --git a/usr.bin/cmp/link.c b/usr.bin/cmp/link.c index 550273cb471a..33b0fa46458c 100644 --- a/usr.bin/cmp/link.c +++ b/usr.bin/cmp/link.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c index 35922deee42d..78b431b6f6a9 100644 --- a/usr.bin/cmp/misc.c +++ b/usr.bin/cmp/misc.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index 38d1110dbd3a..0b78b83968c7 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c index 5ca1e64f3e09..f29d3b454f64 100644 --- a/usr.bin/cmp/special.c +++ b/usr.bin/cmp/special.c @@ -29,10 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include diff --git a/usr.bin/csplit/csplit.c b/usr.bin/csplit/csplit.c index dd645396948d..59aa7eb3d2d9 100644 --- a/usr.bin/csplit/csplit.c +++ b/usr.bin/csplit/csplit.c @@ -44,7 +44,6 @@ * assumption about the input. */ -#include #include #include diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c index ba0ef146058b..283a08ec555d 100644 --- a/usr.bin/ctags/C.c +++ b/usr.bin/ctags/C.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c index 8c355cecd3ca..55d8d824f568 100644 --- a/usr.bin/ctags/fortran.c +++ b/usr.bin/ctags/fortran.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c index e6e22fb71cfb..e219fcee4634 100644 --- a/usr.bin/ctags/lisp.c +++ b/usr.bin/ctags/lisp.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c index ea8a603a040a..e1b0957104c0 100644 --- a/usr.bin/ctags/print.c +++ b/usr.bin/ctags/print.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c index 3e654c3d909b..e8250bcbcf67 100644 --- a/usr.bin/ctags/tree.c +++ b/usr.bin/ctags/tree.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c index 8044e4a2df60..502fbc98b714 100644 --- a/usr.bin/ctags/yacc.c +++ b/usr.bin/ctags/yacc.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include diff --git a/usr.bin/ctlstat/ctlstat.c b/usr.bin/ctlstat/ctlstat.c index 8aed0f52e350..3a2f9b7a0939 100644 --- a/usr.bin/ctlstat/ctlstat.c +++ b/usr.bin/ctlstat/ctlstat.c @@ -38,7 +38,6 @@ * Authors: Ken Merry , Will Andrews */ -#include #include #include #include diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 447b48fe79ed..348741f8ccca 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -64,7 +64,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 78638ea2428c..c72ea0747589 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -62,9 +62,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif /* not lint */ -#include #include #include #include diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c index e5d5bccc414e..49704cde1b08 100644 --- a/usr.bin/elfdump/elfdump.c +++ b/usr.bin/elfdump/elfdump.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c index 32f8972b238a..b985163476c4 100644 --- a/usr.bin/enigma/enigma.c +++ b/usr.bin/enigma/enigma.c @@ -10,7 +10,6 @@ * Upgraded to function properly on 64-bit machines. */ -#include #include #include diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 8be5742386e7..05c0211ead49 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -29,7 +29,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c index 6b9696ea71df..54b4fdd679e4 100644 --- a/usr.bin/find/find.c +++ b/usr.bin/find/find.c @@ -32,8 +32,6 @@ * SUCH DAMAGE. */ - -#include #include #include diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index 03e49fc62b64..43aa2301439c 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -32,8 +32,6 @@ * SUCH DAMAGE. */ - -#include #include #include #include diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c index a61d9cb7dbcd..86434f53e9fd 100644 --- a/usr.bin/find/ls.c +++ b/usr.bin/find/ls.c @@ -29,8 +29,6 @@ * SUCH DAMAGE. */ - -#include #include #include diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c index 01c9f9145fa2..7963e3baa4d3 100644 --- a/usr.bin/find/misc.c +++ b/usr.bin/find/misc.c @@ -32,8 +32,6 @@ * SUCH DAMAGE. */ - -#include #include #include diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c index f65b800c32a6..3b4936fe055b 100644 --- a/usr.bin/find/operator.c +++ b/usr.bin/find/operator.c @@ -32,8 +32,6 @@ * SUCH DAMAGE. */ - -#include #include #include diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index 4af5af94e329..166fc75e9c51 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c index 11491e5a7c8e..6d5e828eb274 100644 --- a/usr.bin/finger/lprint.c +++ b/usr.bin/finger/lprint.c @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c index 59356cd09e1f..e2f1eb99d623 100644 --- a/usr.bin/finger/net.c +++ b/usr.bin/finger/net.c @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c index 1d65b23ae073..d8649a1f57f6 100644 --- a/usr.bin/finger/sprint.c +++ b/usr.bin/finger/sprint.c @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c index 621f3455e82e..183e46290013 100644 --- a/usr.bin/finger/util.c +++ b/usr.bin/finger/util.c @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - -#include #include #include #include diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index c3374ecfffac..328e35e9138f 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c index 16d5a176da93..9968bc8614a5 100644 --- a/usr.bin/fsync/fsync.c +++ b/usr.bin/fsync/fsync.c @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -#ifndef lint -#endif /* not lint */ -#include #include #include #include diff --git a/usr.bin/getaddrinfo/getaddrinfo.c b/usr.bin/getaddrinfo/getaddrinfo.c index f01ccd7b2e10..da84259a3c2e 100644 --- a/usr.bin/getaddrinfo/getaddrinfo.c +++ b/usr.bin/getaddrinfo/getaddrinfo.c @@ -29,7 +29,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c index a4434c31fd36..ed69d5f0454b 100644 --- a/usr.bin/getconf/getconf.c +++ b/usr.bin/getconf/getconf.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c index fe032e68a516..5e8ba06402a3 100644 --- a/usr.bin/gprof/arcs.c +++ b/usr.bin/gprof/arcs.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include "gprof.h" diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c index 081a245c544c..b0bafc18fb52 100644 --- a/usr.bin/gprof/dfn.c +++ b/usr.bin/gprof/dfn.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include "gprof.h" diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c index f46bc07524f5..a237e1dd4c02 100644 --- a/usr.bin/gprof/elf.c +++ b/usr.bin/gprof/elf.c @@ -33,7 +33,6 @@ /* From: */ #endif -#include #include #include #include diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c index 9717b1b6253b..2d1b6edca52a 100644 --- a/usr.bin/gprof/hertz.c +++ b/usr.bin/gprof/hertz.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c index 00445ea86a45..1d53744f59cc 100644 --- a/usr.bin/gprof/lookup.c +++ b/usr.bin/gprof/lookup.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include "gprof.h" diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c index 92e48a89b497..07791bf2d154 100644 --- a/usr.bin/gprof/printgprof.c +++ b/usr.bin/gprof/printgprof.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c index a5d33fc1e0c6..a248aa9f3226 100644 --- a/usr.bin/gprof/printlist.c +++ b/usr.bin/gprof/printlist.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#if 0 -#endif - #include #include #include diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index 3349b72842ca..0b8240504ce6 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -31,7 +31,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c index 6c4815992d0f..296e19fb0f6d 100644 --- a/usr.bin/grep/queue.c +++ b/usr.bin/grep/queue.c @@ -34,7 +34,6 @@ * Dodge. It is used in place of to get a better performance. */ -#include #include #include *** 2023 LINES SKIPPED *** From nobody Mon Nov 27 05:25:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDR2sl9z51hYH; Mon, 27 Nov 2023 05:25: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 4SdvDR1qmyz4Xjs; Mon, 27 Nov 2023 05:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kV804jNtGrT6Nm0DglRqUSl8zpEQAE38ln+54GY53Ys=; b=nIaPcbGgd/ofDaPWyse+t7mmM5YWdvkkGVWnEiBAn7k8YPP8gUZhOUILSI5XVywDsjnrsD A/sVkam/FWH+8YrN38TCCbfFpNrfLrOMUw+ImAHRxuXDqTgW0y1tk0/9p2BquwUgqIF7zN TlF/1y+txFh7HrrcSnzU0Drbczt5CdZnftJuin5EYi7F984p5qe5exaY2pWedJVQ5hfEWs oWHTeU95bA3kpeirWdSepHM/jr947ooiNjjjX+t00s9HI0rLz15rkMuEhy6fS10WrOIxdL LLLsh+GA/PGFZ/L1YXQNlzGVXBour5hPr+NXiVehpSvC28mSH3H5ZFhqKc1NUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kV804jNtGrT6Nm0DglRqUSl8zpEQAE38ln+54GY53Ys=; b=Y847SFyTOaMukTc6rSjqavYcWysxMDLOYhf6v/L8AVR+kaY6BaxNCl1V/QciOBxx5/P6wa 7KsNKJl1MaCVGfnca9Uj8TDgEAGAl2As/0mA01fSepByV8qCSiNz2ja9vU45ZHGGIfAaM6 FhFTr/4PM3tUof6omTt8mYGXxUTrBTvaMfswJ4U51lj/WdPMWqoCMODtp5hlg9/1GD6DFP lCsI3nBMFtMK/xEwgtZPw74xlxvt/nBppYJKTmQ924zJ45WP8LjjRtNUb984fEmexFFH/p NoWaVlIzqFoMt6EmxKL38ObLy3vZFaUmKKs7fYarua8SN4o33LByFlVHqeMgPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062711; a=rsa-sha256; cv=none; b=uBTCh/LLjrOZlGrIUtdH+D8iooTwwzxy4TQS7ppdHmMTnikhbKfapXko+Ol6WzVLjIuVxp ccTvUS+qjHcfQ8RgfmqVRpBbsVsyOPurOF4jd/ftnHV3CahkVaVZSHDsOxx1VCkSJL/2g2 +2IgS9kjdLaNZQbFdvHSHpst4eQDtXHDRgQ8YTY2rGnVWDcgbOGeMHM6JfipX0xvvdUNRj lirr0mG7wThfOCUf0PfCCbNuOcRXNlywoOxW9IyzPq1SIN9/3ugyFaNv0lBYhFqJBKSvTI MoXkO7M9+NEcwf+bOgd5pu92kY+xHDTfv/shZE0xjYUjOEBPrnZWj4F/nUaiyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDR0xPVzBJw; Mon, 27 Nov 2023 05:25: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 3AR5PBt8067003; Mon, 27 Nov 2023 05:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PAKW067000; Mon, 27 Nov 2023 05:25:10 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:10 GMT Message-Id: <202311270525.3AR5PAKW067000@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: 4d65a7c6951c - main - usr.sbin: Automated cleanup of cdefs and other formatting List-Id: Commit messages for the main 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: 4d65a7c6951cea0333f1a0c1b32c38489cdfa6c5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4d65a7c6951cea0333f1a0c1b32c38489cdfa6c5 commit 4d65a7c6951cea0333f1a0c1b32c38489cdfa6c5 Author: Warner Losh AuthorDate: 2023-11-24 20:12:57 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:01 +0000 usr.sbin: Automated cleanup of cdefs and other formatting Apply the following automated changes to try to eliminate no-longer-needed sys/cdefs.h includes as well as now-empty blank lines in a row. Remove /^#if.*\n#endif.*\n#include\s+.*\n/ Remove /\n+#include\s+.*\n+#if.*\n#endif.*\n+/ Remove /\n+#if.*\n#endif.*\n+/ Remove /^#if.*\n#endif.*\n/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Remove /\n+#include\s+\n#include\s+/ Sponsored by: Netflix --- usr.sbin/autofs/automount.c | 1 - usr.sbin/autofs/automountd.c | 1 - usr.sbin/autofs/autounmountd.c | 1 - usr.sbin/autofs/common.c | 1 - usr.sbin/autofs/defined.c | 1 - usr.sbin/autofs/popen.c | 1 - usr.sbin/bhyve/acpi.c | 1 - usr.sbin/bhyve/amd64/atkbdc.c | 1 - usr.sbin/bhyve/amd64/fwctl.c | 2 +- usr.sbin/bhyve/amd64/inout.c | 1 - usr.sbin/bhyve/amd64/ioapic.c | 1 - usr.sbin/bhyve/amd64/kernemu_dev.c | 2 +- usr.sbin/bhyve/amd64/mptbl.c | 1 - usr.sbin/bhyve/amd64/pci_irq.c | 2 -- usr.sbin/bhyve/amd64/pci_lpc.c | 1 - usr.sbin/bhyve/amd64/pm.c | 1 - usr.sbin/bhyve/amd64/post.c | 1 - usr.sbin/bhyve/amd64/ps2kbd.c | 1 - usr.sbin/bhyve/amd64/ps2mouse.c | 1 - usr.sbin/bhyve/amd64/rtc.c | 1 - usr.sbin/bhyve/amd64/spinup_ap.c | 1 - usr.sbin/bhyve/amd64/task_switch.c | 1 - usr.sbin/bhyve/amd64/vga.c | 1 - usr.sbin/bhyve/amd64/xmsr.c | 1 - usr.sbin/bhyve/bhyvegc.c | 1 - usr.sbin/bhyve/bhyverun.c | 1 - usr.sbin/bhyve/block_if.c | 1 - usr.sbin/bhyve/console.c | 1 - usr.sbin/bhyve/gdb.c | 1 - usr.sbin/bhyve/iov.c | 1 - usr.sbin/bhyve/mem.c | 1 - usr.sbin/bhyve/net_utils.c | 1 - usr.sbin/bhyve/pci_ahci.c | 1 - usr.sbin/bhyve/pci_e82545.c | 1 - usr.sbin/bhyve/pci_emul.c | 1 - usr.sbin/bhyve/pci_fbuf.c | 1 - usr.sbin/bhyve/pci_hda.c | 1 - usr.sbin/bhyve/pci_passthru.c | 1 - usr.sbin/bhyve/pci_uart.c | 1 - usr.sbin/bhyve/pci_virtio_9p.c | 1 - usr.sbin/bhyve/pci_virtio_block.c | 1 - usr.sbin/bhyve/pci_virtio_console.c | 1 - usr.sbin/bhyve/pci_virtio_input.c | 1 - usr.sbin/bhyve/pci_virtio_net.c | 1 - usr.sbin/bhyve/pci_virtio_rnd.c | 1 - usr.sbin/bhyve/pci_virtio_scsi.c | 1 - usr.sbin/bhyve/pci_xhci.c | 2 +- usr.sbin/bhyve/pctestdev.c | 1 - usr.sbin/bhyve/rfb.c | 1 - usr.sbin/bhyve/smbiostbl.c | 1 - usr.sbin/bhyve/snapshot.c | 1 - usr.sbin/bhyve/sockstream.c | 1 - usr.sbin/bhyve/tpm_intf_crb.c | 1 - usr.sbin/bhyve/tpm_ppi_qemu.c | 1 - usr.sbin/bhyve/uart_emul.c | 1 - usr.sbin/bhyve/usb_emul.c | 1 - usr.sbin/bhyve/virtio.c | 1 - usr.sbin/bhyve/vmgenc.c | 2 +- usr.sbin/bhyvectl/bhyvectl.c | 1 - usr.sbin/binmiscctl/binmiscctl.c | 1 - usr.sbin/boot0cfg/boot0cfg.c | 1 - usr.sbin/bsdinstall/distextract/distextract.c | 1 - usr.sbin/bsdinstall/distfetch/distfetch.c | 1 - usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c | 1 - usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c | 1 - usr.sbin/config/mkheaders.c | 3 --- usr.sbin/config/mkmakefile.cc | 3 --- usr.sbin/config/mkoptions.cc | 3 --- usr.sbin/cpucontrol/amd10h.c | 1 - usr.sbin/crunch/crunchgen/crunched_main.c | 1 - usr.sbin/crunch/crunchgen/crunchgen.c | 1 - usr.sbin/ctladm/ctladm.c | 1 - usr.sbin/ctld/ctld.c | 1 - usr.sbin/ctld/isns.c | 1 - usr.sbin/ctld/kernel.c | 1 - usr.sbin/cxgbetool/cxgbetool.c | 1 - usr.sbin/daemon/daemon.c | 1 - usr.sbin/devinfo/devinfo.c | 1 - usr.sbin/efitable/efitable.c | 1 - usr.sbin/fstyp/exfat.c | 1 - usr.sbin/fstyp/fstyp.c | 1 - usr.sbin/fstyp/ufs.c | 1 - usr.sbin/fstyp/zfs.c | 1 - usr.sbin/gssd/gssd.c | 1 - usr.sbin/ifmcstat/ifmcstat.c | 1 - usr.sbin/iovctl/iovctl.c | 1 - usr.sbin/iovctl/parse.c | 1 - usr.sbin/iovctl/validate.c | 1 - usr.sbin/iscsid/discovery.c | 1 - usr.sbin/iscsid/iscsid.c | 1 - usr.sbin/iscsid/login.c | 1 - usr.sbin/jail/command.c | 1 - usr.sbin/jail/config.c | 1 - usr.sbin/jail/jail.c | 1 - usr.sbin/jls/jls.c | 1 - usr.sbin/kbdmap/kbdmap.c | 1 - usr.sbin/keyserv/keyserv.c | 3 --- usr.sbin/keyserv/setkey.c | 3 --- usr.sbin/kldxref/ef_riscv.c | 1 - usr.sbin/lpr/common_source/common.c | 3 --- usr.sbin/lpr/common_source/displayq.c | 3 --- usr.sbin/lpr/common_source/printcap.c | 3 --- usr.sbin/lpr/common_source/rmjob.c | 3 --- usr.sbin/lpr/common_source/startdaemon.c | 3 --- usr.sbin/lpr/lpc/cmdtab.c | 3 --- usr.sbin/lpr/lpd/lpdchar.c | 3 --- usr.sbin/lpr/lpd/modes.c | 3 --- usr.sbin/mailwrapper/mailwrapper.c | 1 - usr.sbin/makefs/cd9660.c | 1 - usr.sbin/makefs/cd9660/cd9660_debug.c | 1 - usr.sbin/makefs/cd9660/cd9660_strings.c | 1 - usr.sbin/makefs/ffs/buf.c | 1 - usr.sbin/makefs/ffs/ffs_alloc.c | 1 - usr.sbin/makefs/ffs/ffs_balloc.c | 1 - usr.sbin/makefs/ffs/ffs_bswap.c | 1 - usr.sbin/makefs/ffs/ffs_subr.c | 1 - usr.sbin/makefs/ffs/mkfs.c | 1 - usr.sbin/makefs/ffs/ufs_bmap.c | 1 - usr.sbin/makefs/makefs.c | 1 - usr.sbin/makefs/msdos.c | 1 - usr.sbin/makefs/msdos/msdosfs_conv.c | 1 - usr.sbin/makefs/msdos/msdosfs_denode.c | 1 - usr.sbin/makefs/msdos/msdosfs_vnops.c | 1 - usr.sbin/makefs/mtree.c | 1 - usr.sbin/makefs/walk.c | 2 -- usr.sbin/mld6query/mld6.c | 1 - usr.sbin/mlx5tool/mlx5tool.c | 1 - usr.sbin/moused/moused.c | 1 - usr.sbin/mpsutil/mps_cmd.c | 1 - usr.sbin/mpsutil/mps_debug.c | 1 - usr.sbin/mpsutil/mps_set.c | 1 - usr.sbin/mpsutil/mps_show.c | 1 - usr.sbin/mpsutil/mpsutil.c | 1 - usr.sbin/mptutil/mpt_cam.c | 1 - usr.sbin/mptutil/mpt_cmd.c | 1 - usr.sbin/mptutil/mpt_config.c | 1 - usr.sbin/mptutil/mpt_drive.c | 1 - usr.sbin/mptutil/mpt_evt.c | 1 - usr.sbin/mptutil/mpt_show.c | 1 - usr.sbin/mptutil/mpt_volume.c | 1 - usr.sbin/mptutil/mptutil.c | 1 - usr.sbin/mtest/mtest.c | 1 - usr.sbin/nfscbd/nfscbd.c | 1 - usr.sbin/nfsdumpstate/nfsdumpstate.c | 1 - usr.sbin/nfsrevoke/nfsrevoke.c | 1 - usr.sbin/nfsuserd/nfsuserd.c | 1 - usr.sbin/ngctl/main.c | 1 - usr.sbin/nscd/agents/group.c | 1 - usr.sbin/nscd/agents/passwd.c | 1 - usr.sbin/nscd/agents/services.c | 1 - usr.sbin/nscd/mp_rs_query.c | 1 - usr.sbin/nscd/mp_ws_query.c | 1 - usr.sbin/nscd/nscd.c | 1 - usr.sbin/nscd/nscdcli.c | 1 - usr.sbin/nscd/query.c | 1 - usr.sbin/ofwdump/ofw_util.c | 1 - usr.sbin/pkg/config.c | 1 - usr.sbin/pkg/pkg.c | 1 - usr.sbin/pmc/cmd_pmc_filter.cc | 1 - usr.sbin/pmc/cmd_pmc_list.c | 1 - usr.sbin/pmc/cmd_pmc_stat.c | 1 - usr.sbin/pmc/cmd_pmc_summary.cc | 1 - usr.sbin/pmc/pmc_util.c | 1 - usr.sbin/pmcannotate/pmcannotate.c | 1 - usr.sbin/pmccontrol/pmccontrol.c | 1 - usr.sbin/pmcstat/pmcpl_annotate.c | 1 - usr.sbin/pmcstat/pmcpl_annotate_cg.c | 1 - usr.sbin/pmcstat/pmcpl_callgraph.c | 1 - usr.sbin/pmcstat/pmcpl_calltree.c | 1 - usr.sbin/pmcstat/pmcpl_gprof.c | 1 - usr.sbin/pmcstat/pmcstat.c | 1 - usr.sbin/pmcstat/pmcstat_log.c | 1 - usr.sbin/powerd/powerd.c | 1 - usr.sbin/ppp/async.c | 1 - usr.sbin/pppctl/pppctl.c | 1 - usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c | 1 - usr.sbin/pw/pwupd.h | 1 - usr.sbin/quot/quot.c | 1 - usr.sbin/rpc.lockd/kern.c | 1 - usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c | 1 - usr.sbin/rpc.tlsservd/rpc.tlsservd.c | 1 - usr.sbin/rpc.yppasswdd/yppasswdd_main.c | 1 - usr.sbin/rpc.yppasswdd/yppasswdd_server.c | 1 - usr.sbin/rpc.ypupdated/update.c | 3 --- usr.sbin/rpcbind/check_bound.c | 3 --- usr.sbin/rpcbind/pmap_svc.c | 3 --- usr.sbin/rpcbind/rpcbind.c | 3 --- usr.sbin/rtprio/rtprio.c | 1 - usr.sbin/rtsold/cap_llflags.c | 1 - usr.sbin/rtsold/cap_script.c | 1 - usr.sbin/sa/db.c | 1 - usr.sbin/sa/pdb.c | 1 - usr.sbin/sa/usrdb.c | 1 - usr.sbin/services_mkdb/services_mkdb.c | 1 - usr.sbin/spi/spi.c | 1 - usr.sbin/tcpdrop/tcpdrop.c | 1 - usr.sbin/uefisign/child.c | 1 - usr.sbin/ugidfw/ugidfw.c | 1 - usr.sbin/watch/watch.c | 1 - usr.sbin/ypbind/yp_ping.c | 3 --- usr.sbin/ypbind/ypbind.c | 1 - usr.sbin/yppoll/yppoll.c | 1 - usr.sbin/ypserv/common/yplib_host.c | 1 - usr.sbin/ypserv/yp_extern.h | 2 +- usr.sbin/ypset/ypset.c | 1 - 205 files changed, 5 insertions(+), 243 deletions(-) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index 6637e16c9129..32aa2300d094 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -29,7 +29,6 @@ * */ -#include #include #include #include diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c index 50136044b503..54e5558768b1 100644 --- a/usr.sbin/autofs/automountd.c +++ b/usr.sbin/autofs/automountd.c @@ -29,7 +29,6 @@ * */ -#include #include #include #include diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c index 04705faaaf9e..0230510d6e78 100644 --- a/usr.sbin/autofs/autounmountd.c +++ b/usr.sbin/autofs/autounmountd.c @@ -29,7 +29,6 @@ * */ -#include #include #include #include diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c index b6e435603dc7..18756752876c 100644 --- a/usr.sbin/autofs/common.c +++ b/usr.sbin/autofs/common.c @@ -29,7 +29,6 @@ * */ -#include #include #include #include diff --git a/usr.sbin/autofs/defined.c b/usr.sbin/autofs/defined.c index 01bc8218ac5d..578684b589fd 100644 --- a/usr.sbin/autofs/defined.c +++ b/usr.sbin/autofs/defined.c @@ -34,7 +34,6 @@ * such as ${OSNAME}, in maps. */ -#include #include #include #include diff --git a/usr.sbin/autofs/popen.c b/usr.sbin/autofs/popen.c index 2d3790ff2b0d..38c4a10e327e 100644 --- a/usr.sbin/autofs/popen.c +++ b/usr.sbin/autofs/popen.c @@ -38,7 +38,6 @@ * */ -#include #include #include #include diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 050e1a0ab75f..b3d3c13fc946 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -36,7 +36,6 @@ * above the MPTable. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/amd64/atkbdc.c b/usr.sbin/bhyve/amd64/atkbdc.c index c5dea0d220cf..5fa7f3cb779a 100644 --- a/usr.sbin/bhyve/amd64/atkbdc.c +++ b/usr.sbin/bhyve/amd64/atkbdc.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/fwctl.c b/usr.sbin/bhyve/amd64/fwctl.c index 5e930cdb2051..76e2eaf67849 100644 --- a/usr.sbin/bhyve/amd64/fwctl.c +++ b/usr.sbin/bhyve/amd64/fwctl.c @@ -30,7 +30,7 @@ * Guest firmware interface. Uses i/o ports x510/x511 as Qemu does, * but with a request/response messaging protocol. */ -#include + #include #include #include diff --git a/usr.sbin/bhyve/amd64/inout.c b/usr.sbin/bhyve/amd64/inout.c index 898dc9aa1ea5..478678aae1fd 100644 --- a/usr.sbin/bhyve/amd64/inout.c +++ b/usr.sbin/bhyve/amd64/inout.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/amd64/ioapic.c b/usr.sbin/bhyve/amd64/ioapic.c index 89bb891fdaf0..9ad1c501fbae 100644 --- a/usr.sbin/bhyve/amd64/ioapic.c +++ b/usr.sbin/bhyve/amd64/ioapic.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/kernemu_dev.c b/usr.sbin/bhyve/amd64/kernemu_dev.c index 54ca55307c62..d1577a7b3e99 100644 --- a/usr.sbin/bhyve/amd64/kernemu_dev.c +++ b/usr.sbin/bhyve/amd64/kernemu_dev.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include + #include #include #include diff --git a/usr.sbin/bhyve/amd64/mptbl.c b/usr.sbin/bhyve/amd64/mptbl.c index e2653ddcf37d..4be412524b60 100644 --- a/usr.sbin/bhyve/amd64/mptbl.c +++ b/usr.sbin/bhyve/amd64/mptbl.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/amd64/pci_irq.c b/usr.sbin/bhyve/amd64/pci_irq.c index 12c2d94925ad..24593befee49 100644 --- a/usr.sbin/bhyve/amd64/pci_irq.c +++ b/usr.sbin/bhyve/amd64/pci_irq.c @@ -27,8 +27,6 @@ * SUCH DAMAGE. */ - -#include #include #include diff --git a/usr.sbin/bhyve/amd64/pci_lpc.c b/usr.sbin/bhyve/amd64/pci_lpc.c index 5c2a2a7965b0..d6e7689ccce1 100644 --- a/usr.sbin/bhyve/amd64/pci_lpc.c +++ b/usr.sbin/bhyve/amd64/pci_lpc.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/amd64/pm.c b/usr.sbin/bhyve/amd64/pm.c index e54854dee855..80882e3b8082 100644 --- a/usr.sbin/bhyve/amd64/pm.c +++ b/usr.sbin/bhyve/amd64/pm.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/post.c b/usr.sbin/bhyve/amd64/post.c index 53ca34f418b5..6e44bb47bd3b 100644 --- a/usr.sbin/bhyve/amd64/post.c +++ b/usr.sbin/bhyve/amd64/post.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/ps2kbd.c b/usr.sbin/bhyve/amd64/ps2kbd.c index c9e122b8bbd3..27b5ccd0b316 100644 --- a/usr.sbin/bhyve/amd64/ps2kbd.c +++ b/usr.sbin/bhyve/amd64/ps2kbd.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/ps2mouse.c b/usr.sbin/bhyve/amd64/ps2mouse.c index f0b4b7cabd91..e99c5c21b6f0 100644 --- a/usr.sbin/bhyve/amd64/ps2mouse.c +++ b/usr.sbin/bhyve/amd64/ps2mouse.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/rtc.c b/usr.sbin/bhyve/amd64/rtc.c index ef1bdcaf7a2c..21c3099740bb 100644 --- a/usr.sbin/bhyve/amd64/rtc.c +++ b/usr.sbin/bhyve/amd64/rtc.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/spinup_ap.c b/usr.sbin/bhyve/amd64/spinup_ap.c index f874efcd374b..df90ad6443d0 100644 --- a/usr.sbin/bhyve/amd64/spinup_ap.c +++ b/usr.sbin/bhyve/amd64/spinup_ap.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/task_switch.c b/usr.sbin/bhyve/amd64/task_switch.c index c316d18142a7..d311d2b1b6c3 100644 --- a/usr.sbin/bhyve/amd64/task_switch.c +++ b/usr.sbin/bhyve/amd64/task_switch.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/amd64/vga.c b/usr.sbin/bhyve/amd64/vga.c index 9e78ed93424e..7c43ad8f3bd6 100644 --- a/usr.sbin/bhyve/amd64/vga.c +++ b/usr.sbin/bhyve/amd64/vga.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/amd64/xmsr.c b/usr.sbin/bhyve/amd64/xmsr.c index 7481df4669e7..cd80e4ef782e 100644 --- a/usr.sbin/bhyve/amd64/xmsr.c +++ b/usr.sbin/bhyve/amd64/xmsr.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/bhyvegc.c b/usr.sbin/bhyve/bhyvegc.c index 1527343412bf..860a4b115eb1 100644 --- a/usr.sbin/bhyve/bhyvegc.c +++ b/usr.sbin/bhyve/bhyvegc.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 8147dcd3872b..8163ab0d810a 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 29b8910101f6..32543f9f3a18 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/console.c b/usr.sbin/bhyve/console.c index 176ae2e2a298..1440c0604787 100644 --- a/usr.sbin/bhyve/console.c +++ b/usr.sbin/bhyve/console.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include "bhyvegc.h" diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index a6c0700308e7..be730a75b3e6 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/iov.c b/usr.sbin/bhyve/iov.c index d01c7a5601f4..5ebc426227a6 100644 --- a/usr.sbin/bhyve/iov.c +++ b/usr.sbin/bhyve/iov.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c index b4cb93a1cea4..b0c09dbf5ddf 100644 --- a/usr.sbin/bhyve/mem.c +++ b/usr.sbin/bhyve/mem.c @@ -32,7 +32,6 @@ * so it can be searched within the range. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/net_utils.c b/usr.sbin/bhyve/net_utils.c index 9230895b49fe..7dc37dce06b3 100644 --- a/usr.sbin/bhyve/net_utils.c +++ b/usr.sbin/bhyve/net_utils.c @@ -25,7 +25,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index 1eef285a871c..636df5c6e9b1 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c index 7ab8f13f74f9..1afcb559f2bb 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index e91b4d0a1e20..3d6797c7168e 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c index 9a4d7900751a..247b7cb69c9a 100644 --- a/usr.sbin/bhyve/pci_fbuf.c +++ b/usr.sbin/bhyve/pci_fbuf.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c index 6f0c1b6cfba9..8bd84a5113eb 100644 --- a/usr.sbin/bhyve/pci_hda.c +++ b/usr.sbin/bhyve/pci_hda.c @@ -27,7 +27,6 @@ * */ -#include #include #include diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 0a80ee649689..13d422eaa59c 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c index 362238bf3168..054f9af0f5cc 100644 --- a/usr.sbin/bhyve/pci_uart.c +++ b/usr.sbin/bhyve/pci_uart.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/pci_virtio_9p.c b/usr.sbin/bhyve/pci_virtio_9p.c index 77ea2f4bed75..3db7c86e0eb2 100644 --- a/usr.sbin/bhyve/pci_virtio_9p.c +++ b/usr.sbin/bhyve/pci_virtio_9p.c @@ -30,7 +30,6 @@ * VirtIO filesystem passthrough using 9p protocol. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c index 680c53c0c974..ff1920600ae5 100644 --- a/usr.sbin/bhyve/pci_virtio_block.c +++ b/usr.sbin/bhyve/pci_virtio_block.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c index a0bb8591811c..921cb29032cf 100644 --- a/usr.sbin/bhyve/pci_virtio_console.c +++ b/usr.sbin/bhyve/pci_virtio_console.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/pci_virtio_input.c b/usr.sbin/bhyve/pci_virtio_input.c index 389e6d2e9313..2da773df90be 100644 --- a/usr.sbin/bhyve/pci_virtio_input.c +++ b/usr.sbin/bhyve/pci_virtio_input.c @@ -31,7 +31,6 @@ * virtio input device emulation. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c index 1bf45aadfd4f..20977e90d32f 100644 --- a/usr.sbin/bhyve/pci_virtio_net.c +++ b/usr.sbin/bhyve/pci_virtio_net.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/pci_virtio_rnd.c b/usr.sbin/bhyve/pci_virtio_rnd.c index 779a664a636a..78da5d39528e 100644 --- a/usr.sbin/bhyve/pci_virtio_rnd.c +++ b/usr.sbin/bhyve/pci_virtio_rnd.c @@ -33,7 +33,6 @@ * once it has been seeded at bootup. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index 08b52a55d385..409e8c1c21ae 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index 99c1d20b3378..8654dd9e7a14 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -32,7 +32,7 @@ devices: tablet USB tablet mouse */ -#include + #include #include #include diff --git a/usr.sbin/bhyve/pctestdev.c b/usr.sbin/bhyve/pctestdev.c index 539016a51876..55bc06f8e5b4 100644 --- a/usr.sbin/bhyve/pctestdev.c +++ b/usr.sbin/bhyve/pctestdev.c @@ -29,7 +29,6 @@ * Emulation of selected legacy test/debug interfaces expected by KVM-unit-tests */ -#include #include #include #include diff --git a/usr.sbin/bhyve/rfb.c b/usr.sbin/bhyve/rfb.c index db2924fee453..bb989a33f484 100644 --- a/usr.sbin/bhyve/rfb.c +++ b/usr.sbin/bhyve/rfb.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c index 0bc15087ac62..4a98278d5e61 100644 --- a/usr.sbin/bhyve/smbiostbl.c +++ b/usr.sbin/bhyve/smbiostbl.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index edce55c03eae..5569cc065617 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #ifndef WITHOUT_CAPSICUM #include diff --git a/usr.sbin/bhyve/sockstream.c b/usr.sbin/bhyve/sockstream.c index 5b877fa11d44..9a93c6c27c9e 100644 --- a/usr.sbin/bhyve/sockstream.c +++ b/usr.sbin/bhyve/sockstream.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c index 6aeafe7f0ec1..af0214dd1760 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -5,7 +5,6 @@ * Author: Corvin Köhne */ -#include #include #include #include diff --git a/usr.sbin/bhyve/tpm_ppi_qemu.c b/usr.sbin/bhyve/tpm_ppi_qemu.c index 8bea45ea3208..ad66ecb09683 100644 --- a/usr.sbin/bhyve/tpm_ppi_qemu.c +++ b/usr.sbin/bhyve/tpm_ppi_qemu.c @@ -5,7 +5,6 @@ * Author: Corvin Köhne */ -#include #include #include #include diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c index 917ce36b67f6..a8c28fb5f230 100644 --- a/usr.sbin/bhyve/uart_emul.c +++ b/usr.sbin/bhyve/uart_emul.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include #ifndef WITHOUT_CAPSICUM diff --git a/usr.sbin/bhyve/usb_emul.c b/usr.sbin/bhyve/usb_emul.c index dba11ef0922b..1cb9d3043209 100644 --- a/usr.sbin/bhyve/usb_emul.c +++ b/usr.sbin/bhyve/usb_emul.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c index 0aeafa011bbc..26df39ceb5b3 100644 --- a/usr.sbin/bhyve/virtio.c +++ b/usr.sbin/bhyve/virtio.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bhyve/vmgenc.c b/usr.sbin/bhyve/vmgenc.c index 4da5bb90e2fa..4dbbc7533f8b 100644 --- a/usr.sbin/bhyve/vmgenc.c +++ b/usr.sbin/bhyve/vmgenc.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include + #include #include #include diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 843e7a7b9dd5..a055be46d8d4 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/binmiscctl/binmiscctl.c b/usr.sbin/binmiscctl/binmiscctl.c index c2c541155805..6a4950c9bf3a 100644 --- a/usr.sbin/binmiscctl/binmiscctl.c +++ b/usr.sbin/binmiscctl/binmiscctl.c @@ -25,7 +25,6 @@ * */ -#include #include #include #include diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c index 8c00329f53d9..2a919f0b2f2e 100644 --- a/usr.sbin/boot0cfg/boot0cfg.c +++ b/usr.sbin/boot0cfg/boot0cfg.c @@ -27,7 +27,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/usr.sbin/bsdinstall/distextract/distextract.c b/usr.sbin/bsdinstall/distextract/distextract.c index 0cb89ffabcbe..32bd9453eb80 100644 --- a/usr.sbin/bsdinstall/distextract/distextract.c +++ b/usr.sbin/bsdinstall/distextract/distextract.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/usr.sbin/bsdinstall/distfetch/distfetch.c b/usr.sbin/bsdinstall/distfetch/distfetch.c index 01f5f1aa214b..c431e187799d 100644 --- a/usr.sbin/bsdinstall/distfetch/distfetch.c +++ b/usr.sbin/bsdinstall/distfetch/distfetch.c *** 1750 LINES SKIPPED *** From nobody Mon Nov 27 05:25:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDS42G7z51hbY; Mon, 27 Nov 2023 05:25: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 4SdvDS30Qrz4XXp; Mon, 27 Nov 2023 05:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2pV00RGvSFwQcMEvTHHx9W9bJQQp+U4GlIgtuV1kZI=; b=PUVSI4M/M8w9kKcdBEiKS1ytMbVumVLHRT961bF6iolar55n7W+E4p54Q/5AK5zjNi+VVK Nin7zgpNyfapStE20X59Mk8V6iB/vBSx3bxPGHmQtUDIPmwZLGVkJ9/KmvIVs34BnM6SrR WqaI4zxh8idxgiWr5xxaKqogbFMuFDF/QRC0ztiObxbQYi3/SyME34uC3gkCY6iFU1U5rb ZaK+l658du5yRqhFCeBb31Cs+5KptmXJT7jTJ+ECJjbldLPBXRmFrjojCqspY3Lqx4Z4MS QZMvqkLJXDv8rK4VVch+/6oJHjSNb8mNySz+pkBmhKTGrMXrqUPaikgN0piNEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2pV00RGvSFwQcMEvTHHx9W9bJQQp+U4GlIgtuV1kZI=; b=CtTcVcJWJWOGwEPTgBrnv0JFSB2i6Pz6rKWUt1cuv979AZzsVOkGzFCn2EClUc1itsLjhf 3GBIsCWID6Z4FfwIiymh9HbhikAYuaEt+8e9oJJHg0SXVJF86rNtF0NbE8K25u4wnuFCiE l3pQ8Z/qnu4ADc3OK4i2Uj2FCU/Ydg8Rgezrcc8tfByUdWU7oUsQn3xVecq3pF5n2mxZgO RP6reSJHjHGta14nXJTPD8P0x533UP2cVrsCIOCGBetXNT0LkJI3+lh5M0eLCTPbbvdHtg ITcGOGCOo3hWa7mH6UMSmJ+DWaHiHqX8eGLskIuCPtrNPYvl9cK1C/8BxyAOEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062712; a=rsa-sha256; cv=none; b=WKYJ3Exz+dQWOpf1s4pBUPtRrMCA/bLUgzEPOJNWRQdLFUbs2TPw/PLWjvBT2RB0IBE+ZB Bv9ETIoVl5eomv/TOlLibx+LA9ZLjopkoJ0FMhPjlKTHFdV1Qxm4JrUVyOjkJ44pWopS5Z b7flAUiGgzUfDFq3hJ6V/yvdG3GUC5KdJqod9kd2Ujhh4GWM2/8+JhqXIU8E/W3L3ZgU10 WFPkxh+YNQFZryDZ+Q3Q4FjC8agHMyvnaqK3bjvyn16owOEXSgfyMVvXw5xgGzsKfJ79wA N8Cbcg9MyXKjSNOHp3Hl46aK4TmlVBzbPQSqzZyjmaP7cvc1FtY5nMl61UEJCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDS1wZczBK5; Mon, 27 Nov 2023 05:25: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 3AR5PCew067045; Mon, 27 Nov 2023 05:25:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PCcE067042; Mon, 27 Nov 2023 05:25:12 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:12 GMT Message-Id: <202311270525.3AR5PCcE067042@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: 45aa39f88403 - main - cdefs: Remove __GNUCLIKE___SECTION, it's unused. List-Id: Commit messages for the main 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: 45aa39f884033997c87f513fe7175f465132e468 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=45aa39f884033997c87f513fe7175f465132e468 commit 45aa39f884033997c87f513fe7175f465132e468 Author: Warner Losh AuthorDate: 2023-11-20 22:39:45 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:01 +0000 cdefs: Remove __GNUCLIKE___SECTION, it's unused. __GNUCLIKE___SECTION is unused, remove it. Also remove it from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 2 -- tests/sys/opencrypto/cryptodevh.py | 1 - 2 files changed, 3 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index ff0981d59d29..10eb0d6ede5f 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -74,8 +74,6 @@ #if defined(__GNUC__) -#define __GNUCLIKE___SECTION 1 - #define __GNUCLIKE_CTOR_SECTION_HANDLING 1 #define __GNUCLIKE_BUILTIN_CONSTANT_P 1 diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index 9db7d5d12d9c..8f8b384305ce 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -23,7 +23,6 @@ def __has_include(x): return 0 def __has_builtin(x): return 0 -__GNUCLIKE___SECTION = 1 __GNUCLIKE_CTOR_SECTION_HANDLING = 1 __GNUCLIKE_BUILTIN_CONSTANT_P = 1 __GNUCLIKE_BUILTIN_VARARGS = 1 From nobody Mon Nov 27 05:25:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDT6nC4z51hT0; Mon, 27 Nov 2023 05:25: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 4SdvDT3YZ3z4Xpj; Mon, 27 Nov 2023 05:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p8hIz7xYG0spz/3XNJhE7IwxKTycbVrPIG9wLzCxVqE=; b=PoTEiXMQcAnUBcWM/TrwCxlqDF3ur/L2GEizL+md/R/Ta3jjrkhyQGaEqBrU/9yva26o5p vZ1IYzxjifi17wcz6/avV/Zevkg4I+v/8dq8T7+vlZXNLcw3LFeY1qk/AD/WGq+LFjcrIJ 2GJKxV6qJRWn3hon7IeGSgHE2HD+FaYw49RRlGlXODAb2UUYlNEoiz/pPAMRQD/sXBGGc+ w3kjIGs4AtHFp5Gf6OjHItl20hJuku/e6wCPpqa2YCNzCWZI78jVK1eBUWdMmnZp0u4c1i bm94QS0j7bnX6Uaf0jze+vLHsL9ioZA85aEq7sJmomXZR4CL9lU1HJ0F46ARHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p8hIz7xYG0spz/3XNJhE7IwxKTycbVrPIG9wLzCxVqE=; b=PDWcPGRx5lAo2qsNd9N/teL3qkT8GOLWc0+q/AELYTHdA/hhqlX+kHmPhdmfxG051d5cvX EAXeIEZOk1HJuwmX2ZFLxVywgZp0Iu32Sdmy3dfAmRD0zPMU9qR2TOvlh43h5kTHa7EnWS yo5MiJGwq8DCHs3bkPE6sNA7ykgM3SKOkMS8z2brxSDCHgpv6CVKJnvwpvKmYnNcknmnzJ 1So7zzpLnn5cjS0OaL2h3hQMN594IuXw57+w4sZMRl5lNpp9+y4kRx9JEDIK01HWjPNsvU n6Z/nvUqPszJPfmHfIfe/35GvZFzDVQHp/g8Km4dRbhOPVGSwGgGmUztIglrLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062713; a=rsa-sha256; cv=none; b=ihCKYfozl5Ko+56n9YFJVdMa6pEMXhr427gjotE5BYBiFRhofwWDmgjzn0KxSRcaRszSmi 26LdTxWZ/zwvFILTKlO7YUh1mB+OEwlDAUlGB1Wac2bQ5X4WN2UxKps1C5mJRfPO6lX6E5 hF7GyibfsEzA+S125Atw/P1SJ9aF9Sbq9UTb/Zk5O0B7URf1bTdBdVBS01knoTCZEL2rQb qS3Wn51zeEpUnp9cpdZfzgDtHM/niWheM3rhIx9OUSjSIO07C+VS78FzM0OczKyRmInRtg PhWmBbRCYgCTUmLOefGT2yS5qUA86Jn97wgyRWvVOB8uP7V5qGsHfoOXvLoKbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDT2gH3zB55; Mon, 27 Nov 2023 05:25: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 3AR5PDRM067087; Mon, 27 Nov 2023 05:25:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PDp3067084; Mon, 27 Nov 2023 05:25:13 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:13 GMT Message-Id: <202311270525.3AR5PDp3067084@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: d2ec42ca5751 - main - cdefs: Remove __GNUCLIKE_CTOR_SECTION_HANDLING, it's unused List-Id: Commit messages for the main 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: d2ec42ca575132e5af70d8991c64157a291982e9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ec42ca575132e5af70d8991c64157a291982e9 commit d2ec42ca575132e5af70d8991c64157a291982e9 Author: Warner Losh AuthorDate: 2023-11-20 22:40:55 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:02 +0000 cdefs: Remove __GNUCLIKE_CTOR_SECTION_HANDLING, it's unused __GNUCLIKE_CTOR_SECTION_HANDLING is unused, remove it. Also remove it from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 2 -- tests/sys/opencrypto/cryptodevh.py | 1 - 2 files changed, 3 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 10eb0d6ede5f..2d29466b91e3 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -74,8 +74,6 @@ #if defined(__GNUC__) -#define __GNUCLIKE_CTOR_SECTION_HANDLING 1 - #define __GNUCLIKE_BUILTIN_CONSTANT_P 1 #if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index 8f8b384305ce..1169980b1ebc 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -23,7 +23,6 @@ def __has_include(x): return 0 def __has_builtin(x): return 0 -__GNUCLIKE_CTOR_SECTION_HANDLING = 1 __GNUCLIKE_BUILTIN_CONSTANT_P = 1 __GNUCLIKE_BUILTIN_VARARGS = 1 __GNUCLIKE_BUILTIN_STDARG = 1 From nobody Mon Nov 27 05:25:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDW0rQzz51hT6; Mon, 27 Nov 2023 05:25: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 4SdvDV52CWz4Xpp; Mon, 27 Nov 2023 05:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CAUF1qucC/2qRmmm8uZ9ep/haWnG/s1BaChRjnU+0P4=; b=JnWy2/T9V15VQaeGn5zMfV5ynMbCYCIJfhNQBzbjp5SlD59VlJlc40o/t2NuKB+siBav7r 3Uw0hSfpwZMwVagAvIknVjZPAu6OBVD9Mf631pktGAuMm7lAWCvblCk5x0rm0ND3MSel8y p0Us3XIBYD7GY0ZN7PhzLpCHJiLtXcMofY0U+ANQZL9l2wC8kUzZlPRjaQHnooKX0J4wma wSZUyJXxPfZ5434oXx7BQuFyvwACB6/9Xq62praz+D6CyhelR6bLrb+QTpddnMovIySlTh OM5yDYozF2LvgYbDEkAemFjPlqDdfzNR95TzyW1DVB4GksctNhgVeAmYrrf8ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CAUF1qucC/2qRmmm8uZ9ep/haWnG/s1BaChRjnU+0P4=; b=M1bLyOPZbwArhOyyl/ZUaYMVUKHZTQ9qIaYFAGsNHbZlkBulsePuj2rWNxa7s/7nSyjav0 r/AefCclASV1bQVdtjGWU+bM6LkyGPJswvESyW4Pquwrjq8KRMXUeLz/qw2jan8Xsczoo8 C/10ndLbFpml7TJiAuMFlE2I4Z84VZATbDWbsk/cffGmnvIN7ZJ60tDtU8iAIuoDfpp5ye HLAwAE3hVP6TGJjq5VaHbGJJN77/zuFx0ZXOrbLpmTcPLt7oQgvDO7fS0C6uteETB6/aJj oty8uUBF/kLLKd7xNC6g+y+MYT/03xpfoWmS5uBJVnlqMe5+6X9JS6DomjJPKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062714; a=rsa-sha256; cv=none; b=bTN2YlqJuV7v0dzH5sSYpXhjw1YQv6U2Y2HobXCD0x71l/4WNXWBH0ClnKXjQX+6chcXdM sdYl1ogWd0WlMNkdUXGlnpvuK+ZEUx533hgqJPbq0FcuPTYwlKD+5ual8vtXZ3llxfovAP UodiSeAnWoIMexhwy8sk20nla2469q5Cgv/KucbVH003hqK+n7ixa0PVmbhbscDKkB8g1X zugLd7ARmLcSOapB1anjM5woqCd4XcssUEjo2UkbNE5yenKVOPhawY0ytl+IiYNeGuQ/Fq 9ukc09lm818lGsPC6LW33TYwSt6KlH/Ba+GBKSR5P6qWspKFqtNQRg25eF0eDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDV3w4QzB56; Mon, 27 Nov 2023 05:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR5PEsh067129; Mon, 27 Nov 2023 05:25:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PEQ7067126; Mon, 27 Nov 2023 05:25:14 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:14 GMT Message-Id: <202311270525.3AR5PEQ7067126@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: eaaa7ca0c38c - main - cdefs: Remove __GNUCLIKE_BUILTIN_CONSTANT_P, it's unused List-Id: Commit messages for the main 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: eaaa7ca0c38c014f2f2c0a06b82f83baa03b2d60 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=eaaa7ca0c38c014f2f2c0a06b82f83baa03b2d60 commit eaaa7ca0c38c014f2f2c0a06b82f83baa03b2d60 Author: Warner Losh AuthorDate: 2023-11-20 22:40:55 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:02 +0000 cdefs: Remove __GNUCLIKE_BUILTIN_CONSTANT_P, it's unused __GNUCLIKE_BUILTIN_CONSTANT_P is unused, remove it. Also remove it from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 2 -- tests/sys/opencrypto/cryptodevh.py | 1 - 2 files changed, 3 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 2d29466b91e3..3d6eb5a27c77 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -74,8 +74,6 @@ #if defined(__GNUC__) -#define __GNUCLIKE_BUILTIN_CONSTANT_P 1 - #if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) #define __GNUCLIKE_BUILTIN_VARARGS 1 #define __GNUCLIKE_BUILTIN_STDARG 1 diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index 1169980b1ebc..551486e67fa4 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -23,7 +23,6 @@ def __has_include(x): return 0 def __has_builtin(x): return 0 -__GNUCLIKE_BUILTIN_CONSTANT_P = 1 __GNUCLIKE_BUILTIN_VARARGS = 1 __GNUCLIKE_BUILTIN_STDARG = 1 __GNUCLIKE_BUILTIN_VAALIST = 1 From nobody Mon Nov 27 05:25:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDX0437z51hYT; Mon, 27 Nov 2023 05:25: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 4SdvDW5M2rz4Xkl; Mon, 27 Nov 2023 05:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+9uMYMFTOHlcxB3xV5O298V36KD7KIXMs8Lp2bZ/jjc=; b=o8L/ewaVC1qaN3jpR2V/7PjovgaW1tT/mCUqlrJ907X4EEwtxkhocpuKAnOjOieRfNFBeU JgsRg1kDrsV4LPIFnF9xYGWvLsUM6lCq8Mbe9XSG8RwsUOAM9yOn3olHnfyzR+aUXwmBNu yc89x8Km63Y5GMi1dadiyp/DVX2gJfUth2deUXbjUILcIQxtc9vbYct5CgDd0g7RPFXq95 YT/y9PBn/RhU7VsoJ4314lbuLy/Ppzmmws0BEwwR9a60Os1xNSMNvv2JRLK/o+EjOwvWbJ 19o77YkVzCrYPADIsFuTna6MHZkrGcJjVjBIZRAtPQMOJI30LEMXRiCEIxIVag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+9uMYMFTOHlcxB3xV5O298V36KD7KIXMs8Lp2bZ/jjc=; b=uz3RAGr+xzFePPgnQd07kNkGURtk3yjRW6z9YGrZxqYfuXsj+umJfyuIcFscSTBIQXNB4t Q9kTU0C+TWx/IAQMAt1jXAFx2kftL4VkyJ7zKclu8z3mRGHm4RQRE6kz5FKb8EVcJEtBNg txh9+yqyiM3VPNLsFKhbFXGsg9epyK0GrnTATYkjJIi98U7XSiYGSc9xxV66U12gC+3sfY iyO+FgBBrl30xuuY7TU0caLHhxs3cpbZFJyYfOTh7bH+7czJNICweM7GgAjrxXzPGAFIL5 EleWBS37O0oJvb6ejmjGVWWKQFzh3sgpduq3uybnVQR7nsYtLfPlz8Fasm1q/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062715; a=rsa-sha256; cv=none; b=xxthOhxDejbHlrjpWRszbIPQQLoAqq/IfRrgjbJoXb/IrmvZL7eYzIcr43xrfvPzD4bN7f qzWjwiO0AIyw1c9ALqHhk362H4OsTDu3R/H8ju50laX33XmmSlMv+/QYkz1rRQuao0UA0h M668ynC6Kfv2G5SJik786BHW397oC978/qK88qKPyyE6x2WSAPRvydf7/KP2eoxGeLhZfk XQtpjxaRxx3CZBrH6WwdhEWXmjf+ouIVuTY4lpeTPBWoUQ6F6pKK8UjOl5vH7JhqFNaEQf V4Snstv9IL2vTtrD7zYvKOHCgRMsSVBjzvZNk9BAxl44Khr3m/b1NIFS9yrgjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDW4SqnzBB0; Mon, 27 Nov 2023 05:25: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 3AR5PFkO067187; Mon, 27 Nov 2023 05:25:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PFmU067184; Mon, 27 Nov 2023 05:25:15 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:15 GMT Message-Id: <202311270525.3AR5PFmU067184@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: 9e5555220848 - main - cdefs: Remove vararg related defines, they are unused. List-Id: Commit messages for the main 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: 9e555522084871b341e81269fa599c707133ae58 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9e555522084871b341e81269fa599c707133ae58 commit 9e555522084871b341e81269fa599c707133ae58 Author: Warner Losh AuthorDate: 2023-11-20 22:40:55 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:02 +0000 cdefs: Remove vararg related defines, they are unused. Remove __GNUCLIKE_BUILTIN_VARARGS, __GNUCLIKE_BUILTIN_STDARG, __GNUCLIKE_BUILTIN_VAALIST, __GNUC_VA_LIST_COMPATIBILITY: they are unused. Also remove them from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 8 -------- tests/sys/opencrypto/cryptodevh.py | 4 ---- 2 files changed, 12 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 3d6eb5a27c77..f93a70245e5e 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -74,14 +74,6 @@ #if defined(__GNUC__) -#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) -#define __GNUCLIKE_BUILTIN_VARARGS 1 -#define __GNUCLIKE_BUILTIN_STDARG 1 -#define __GNUCLIKE_BUILTIN_VAALIST 1 -#endif - -#define __GNUC_VA_LIST_COMPATIBILITY 1 - /* * Compiler memory barriers, specific to gcc and clang. */ diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index 551486e67fa4..79af275ce340 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -23,10 +23,6 @@ def __has_include(x): return 0 def __has_builtin(x): return 0 -__GNUCLIKE_BUILTIN_VARARGS = 1 -__GNUCLIKE_BUILTIN_STDARG = 1 -__GNUCLIKE_BUILTIN_VAALIST = 1 -__GNUC_VA_LIST_COMPATIBILITY = 1 __GNUCLIKE_BUILTIN_NEXT_ARG = 1 __GNUCLIKE_BUILTIN_MEMCPY = 1 __CC_SUPPORTS_INLINE = 1 From nobody Mon Nov 27 05:25:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDY0hjbz51hYZ; Mon, 27 Nov 2023 05:25: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 4SdvDX74W1z4XxR; Mon, 27 Nov 2023 05:25:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tH4oKEIFCd7bHXrIv8KxN+MJ3zDl7PW4jULG2WLkZsE=; b=Ucr3Ym7/JcPgXBu77NK+kDEQTr8yaLBgu8gvwN0Fa3SYY0OPNuC0DwtEaikd9SUbbe2KmS noTfej1Ld3G5VPOAGSw4xW1WOasc7KH9W9fqV+xkIKuAkyhLYBuD5IDIQT4IwSHtPYd48u RvyHiIIEklVfzsOvnwJEmuRvMz1WG2A1tRtCYrrPDn1cqPgZdpmBAB1kmm9+vZX4fZfYRb gXiGyM1x8nrPjwVn2kqv4gDvwj4OZr2VkQvsiAhRSOjN0l8tioTgjJTyC6t65Q3jOwHQx9 alrdBiY43wgvUYnAlgeM7bk4leB6uN8ooUVqrs2jY5i46BB9WTdLyu1Lis++QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tH4oKEIFCd7bHXrIv8KxN+MJ3zDl7PW4jULG2WLkZsE=; b=lV3Kus/n0iA/kkrJxpsYHe6UQXwPziDnD1ZbJfhFscjwRKQp0AYDhe4mnzD36kCkv73+xY nFQbq5rh8W0jGnqa9dnwWnOb6OCH3tuJfA5lvfmPO6XZ9EPP2D8Mfz9er4i/G1NqxlS+tL bebq5Z6Jiee1RtXiEDlBt+2lC7o0YzPvhO6dnq/43wnDh7p4PQ8ckHzvwNadJeUm2cBSzO H6U3oZO/cQzHPQtlU94Zu07iY2lOpbWhf8sae0lANNSc8139dzgb/EDt/fo7d4fZGpZEKV rhBleEKqADFKorV/dlB7YjkoJa58l6RK9VeLvl/R2PoJ4VqHE9vLCvchS8IMhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062717; a=rsa-sha256; cv=none; b=QDMLKrzRIefJW77jOhC7M3W+RonGIEDwHxHjIgl8iA0s9rb/LDyHUJc+a3AwtZLBW2MMim 15ZoAFNEW+wvae8oZGjt23VuS0ESfpFMjFe2/UdShOhIkIupUgZqGICqWAWaIlntUHiSaL H7q9TFBqFwDXzgVMqcDCe7rX7K84FeFyW79mAx8xVHcm/okyQKzzkYre7VjWWjY/iGhsCI 2vFB5EykRjpQrXD1d67SDcnU2I9QUIABv14GbGQM4TrKIdKLo01aZ6LOJfqdH4alDf7rUT 983CAA0E6OrXap6k+JaDXJ3Ig3FCOW5nf7iusxjAS1Imme72oIK6a6E2r6TKNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDX5VBzzBB1; Mon, 27 Nov 2023 05:25: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 3AR5PGPt067240; Mon, 27 Nov 2023 05:25:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PGxq067237; Mon, 27 Nov 2023 05:25:16 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:16 GMT Message-Id: <202311270525.3AR5PGxq067237@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: a83d4fe9cbc5 - main - cdefs: Remove some builtin defines, they are unused List-Id: Commit messages for the main 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: a83d4fe9cbc51adcefb8a1070374186f3399fef4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a83d4fe9cbc51adcefb8a1070374186f3399fef4 commit a83d4fe9cbc51adcefb8a1070374186f3399fef4 Author: Warner Losh AuthorDate: 2023-11-20 22:40:55 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:02 +0000 cdefs: Remove some builtin defines, they are unused Remove __GNUCLIKE_BUILTIN_NEXT_ARG, __GNUCLIKE_MATH_BUILTIN_RELOPS, __GNUCLIKE_BUILTIN_MEMCPY: they are unused. Also remove them from the generated cryptodevh.py script. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 5 ----- tests/sys/opencrypto/cryptodevh.py | 2 -- 2 files changed, 7 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index f93a70245e5e..5782735187c5 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -79,11 +79,6 @@ */ #define __compiler_membar() __asm __volatile(" " : : : "memory") -#define __GNUCLIKE_BUILTIN_NEXT_ARG 1 -#define __GNUCLIKE_MATH_BUILTIN_RELOPS - -#define __GNUCLIKE_BUILTIN_MEMCPY 1 - /* XXX: if __GNUC__ >= 2: not tested everywhere originally, where replaced */ #define __CC_SUPPORTS_INLINE 1 #define __CC_SUPPORTS___INLINE 1 diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index 79af275ce340..d6982c26f1cf 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -23,8 +23,6 @@ def __has_include(x): return 0 def __has_builtin(x): return 0 -__GNUCLIKE_BUILTIN_NEXT_ARG = 1 -__GNUCLIKE_BUILTIN_MEMCPY = 1 __CC_SUPPORTS_INLINE = 1 __CC_SUPPORTS___INLINE = 1 __CC_SUPPORTS___INLINE__ = 1 From nobody Mon Nov 27 05:25:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDZ1DkZz51hXC; Mon, 27 Nov 2023 05:25: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 4SdvDZ0dFCz4Y3V; Mon, 27 Nov 2023 05:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PNYyoUmTkSefH1RXl/w80lYnuVMifrzidpnvo1kEOBs=; b=GcX11W/3vMP1haWKE0xhiIMIlLYD35YVS7wqRceabSYyG5XXOSwRr4GVAw25B9ezEjD6gY ufXJE8yLlKlBIEeny/+aY5DL/GG5aWF4YTcvAl7HYyQ0Gw4Bsi57uICqjnJ9QbdKezQfzo Km7AwncxROlzVI7BX6WLDYgOgQhPLy1Jm2sht0mh8/StF8pd8w7X8wkU6ZgON6gOb4fc5k Z/lWPqFd1kBMLm8Vm2be4Mw2EisFD+f7zu3xS6iej4PprkNyVd+SoKqf1NcPA5r3IGklDC rh5fpeJjDrmVqyP+xqsNzcYKK833G7WgTUeywCLww3BX0lSFjakz8kjj2IUpVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PNYyoUmTkSefH1RXl/w80lYnuVMifrzidpnvo1kEOBs=; b=eWjf76kWsb9k7WOZJh90QmFb7RXjzW3bSMynnnUojj1wkEhaqGBAJC9FkY7+NUe3BMgsOM 1O0xU3X8lucELVoMltB1tx/y/HyjRcPEVBT+48oFvzM/Yp9fKlK6h5iWldLRp0L1NJ80NB h6Yld1MHIxmPsL/+qIJj9YJ2jTsxdmFWdoHk2JVtDhHr0/Y20yEG5rTu8yBfK+G3nqqNIX C/Voh+z+yoHGv+a9Wm67kmZRD1b7ShwEbeL3FqEvGTGNeMLshv8r7q0MiwIJX/9oDFDIq8 7HLXEzg0B1V3kasbIRw5EPrz4vM0xy9Lo1/6fSIUY/oK2EU7ycD51Qi9mul9xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062718; a=rsa-sha256; cv=none; b=qbqxY0IJAchoBHDE70HhYcbI0w9j4xw2xO9oB+cOMtdtGSs1SdFDukZLqsrMDJCybD7X8J DwlrF/ecqQviagM/jgfxrl/DCP6UCt18Y8Jycsj46yKOMCrm+w+Y6+Vm5RDiaXmUzS0UxX GoLP7HIsYRr5S43D9kk80F38GIOtFfLalAS05Ps+IoSNBy6NVVdbpTA/fPTZSu+mWDPG7i CgizxMgdPpud/d9MEkR3H8Ni9OiA0YQyPUhCp83w9Uohsl5aI7Yo/GdcWOiXfCzVt4H+qf /TLOZhT7dK2dyJqVZSI788pjJt/wBVN5oPt1AVvYTv8gZ7pY7tt89gieaRZGCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDY6VdWz9lx; Mon, 27 Nov 2023 05:25: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 3AR5PHoG067288; Mon, 27 Nov 2023 05:25:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PHQ2067285; Mon, 27 Nov 2023 05:25:17 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:17 GMT Message-Id: <202311270525.3AR5PHQ2067285@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: b88ca6ee167d - main - cdefs: Remove CC_SUPPORTS macros, they are unused List-Id: Commit messages for the main 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: b88ca6ee167d079c965dfe123bbe296d3a945c0a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b88ca6ee167d079c965dfe123bbe296d3a945c0a commit b88ca6ee167d079c965dfe123bbe296d3a945c0a Author: Warner Losh AuthorDate: 2023-11-20 22:40:55 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:02 +0000 cdefs: Remove CC_SUPPORTS macros, they are unused Remove __CC_SUPPORTS_INLINE, __CC_SUPPORTS___INLINE__, __CC_SUPPORTS___FUNC__, __CC_SUPPORTS_WARNING, __CC_SUPPORTS_VARADIC_XXX, __CC_SUPPORTS_DYNAMIC_ARRAY_INIT: they are unused. Also remove them from the generated cryptodevh.py script. Retain, for the moment, __CC_SUPPORTS___INLINE, since it's used in this file. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 10 ---------- tests/sys/opencrypto/cryptodevh.py | 7 ------- 2 files changed, 17 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 5782735187c5..7f3efc9300c9 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -79,17 +79,7 @@ */ #define __compiler_membar() __asm __volatile(" " : : : "memory") -/* XXX: if __GNUC__ >= 2: not tested everywhere originally, where replaced */ -#define __CC_SUPPORTS_INLINE 1 #define __CC_SUPPORTS___INLINE 1 -#define __CC_SUPPORTS___INLINE__ 1 - -#define __CC_SUPPORTS___FUNC__ 1 -#define __CC_SUPPORTS_WARNING 1 - -#define __CC_SUPPORTS_VARADIC_XXX 1 /* see varargs.h */ - -#define __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1 #endif /* __GNUC__ */ diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index d6982c26f1cf..9607bcd4d115 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -23,13 +23,6 @@ def __has_include(x): return 0 def __has_builtin(x): return 0 -__CC_SUPPORTS_INLINE = 1 -__CC_SUPPORTS___INLINE = 1 -__CC_SUPPORTS___INLINE__ = 1 -__CC_SUPPORTS___FUNC__ = 1 -__CC_SUPPORTS_WARNING = 1 -__CC_SUPPORTS_VARADIC_XXX = 1 -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1 def __P(protos): return protos def __STRING(x): return #x From nobody Mon Nov 27 05:25:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDb4pftz51hR3; Mon, 27 Nov 2023 05:25: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 4SdvDb1PZCz4Y3f; Mon, 27 Nov 2023 05:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2yV+5412wPxV2wORS2HMjehI0VmWprxTPCyUGhQ+6U=; b=wL/aY/9qyZDs01Mjl/23y113WqOm3exJg/CThMyfL3Xn7KmFQ009TQ5NRR+BxGIjA4zGxm Bds7kgmtQ5UevJ0KXQIRqK0G4djRbGAprPYe7B1K3EiRNgFc6MA7n8fqXX+EB6JMxHihoz P0YCRJjsbHNacDxdjYHSP/XeWm8WmG+dAuiCCm3Ry/7aOuUjXA+ys1f5u5/gBdr19OkCy6 z7q5XpP8+LwFSyLhiIKGmnQBSriK25N/KENqS9qQXLjkx8mB4ts30dSvRnKuNv+6ylHh31 5XsiKwnFsJofO9+RlafSfLtF7zRuToI+zP92lY3OtDOTTOwrRWa2FAcH73AOZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2yV+5412wPxV2wORS2HMjehI0VmWprxTPCyUGhQ+6U=; b=Jg6yShzBQt26v0ywW7KE3vFCvBYoge3Sv+XH4wdKLJBfg2HbS1Axq9PxFv90Oe1okzbN33 09cNAYwfqZwNGjxqJpN5aausZaCn3f9Flen5dZ0CeptW4/VY1y8ZKtXuR57BZfNr2Ohgna 5r6iTvDTceegI02M+Rw9irgSEQE8i9/Pc0lTCN143V73wuYwsk02esewA75rJPsUag7Rbc MBoeBOpxFxk3cVe8FSp3ksFK3E/Y+fp8q6NYAbQZMmfXtXa4wNfHn8Rq5uKp3//+Rlmk+F sKLbuU86p9rMfVmDtGnWRu1inIe7Ws7W7NV00yh8Qq9l5WjsF7DdQ+gXFtunCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062719; a=rsa-sha256; cv=none; b=biYGLaJEKtq8Qlj7gZCDNxhKA8Ak93egqtHlfiwQCA3hrQBmTc5fulR7WlxiWwSxLGgKJX P3DFxJKaX/OXfDvAPX9x7rHucXMYmx+WUUBAtNsGARUc3wNAJMM8yRj0YoyeKSflXu86as Sa5ztLV1Inxlwns6DM0R9Vfze9Vl7i1VLxrmaUeooV+uhgYdBFRGUS3sQmigmdowAqQv7j Xb+ydmyK5VY71RwmaP1EXLEMoTYsH3mPIPFP9PCWnyyr3l0fV3etZzgROnIKTm2sNNDK6L 6YkAuOlIFcX2d3n+wMh0ZG0tfgxzHwlXpw/VqICq/l/bsOtC4m8dHs1N43K6aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDb0ShQzBJx; Mon, 27 Nov 2023 05:25: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 3AR5PIEY067336; Mon, 27 Nov 2023 05:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PIvb067333; Mon, 27 Nov 2023 05:25:18 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:18 GMT Message-Id: <202311270525.3AR5PIvb067333@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: 042f0f00c24b - main - cdefs: Move GNUC_PREREQ to top of 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: 042f0f00c24b62dcd432a4ca2980467f2adef65e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=042f0f00c24b62dcd432a4ca2980467f2adef65e commit 042f0f00c24b62dcd432a4ca2980467f2adef65e Author: Warner Losh AuthorDate: 2023-11-20 23:09:55 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:02 +0000 cdefs: Move GNUC_PREREQ to top of file It really should be closer to the the top of the file, so move it to the start of the compiler specific section. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 7f3efc9300c9..c5b6190077b3 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -72,6 +72,16 @@ * having a compiler-agnostic source tree. */ +/* + * Macro to test if we're using a specific version of gcc or later. + */ +#if defined(__GNUC__) +#define __GNUC_PREREQ__(ma, mi) \ + (__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi)) +#else +#define __GNUC_PREREQ__(ma, mi) 0 +#endif + #if defined(__GNUC__) /* @@ -83,16 +93,6 @@ #endif /* __GNUC__ */ -/* - * Macro to test if we're using a specific version of gcc or later. - */ -#if defined(__GNUC__) -#define __GNUC_PREREQ__(ma, mi) \ - (__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi)) -#else -#define __GNUC_PREREQ__(ma, mi) 0 -#endif - /* * The __CONCAT macro is used to concatenate parts of symbol names, e.g. * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. From nobody Mon Nov 27 05:25:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDc4mVTz51hYy; Mon, 27 Nov 2023 05:25: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 4SdvDc2QPYz4XtM; Mon, 27 Nov 2023 05:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3td4B/x0nf7vs07MxtdHhlDG2sD3FOj9LJy7AUWRAW4=; b=BuJp09yGZF5W4s+3llF6qM01uX5NNl4zDBkA0sVTMlKl2r5xat+3hD/uSAhvHIXrMLBymt IQQbG9ApEV+rLBkFwqAcaa4wDHF1NZMSwteGB0mFn9Sxowetm4WCdU1lbS2BhWRRIUq1Va 2Kxwuc0y0z1b4xBPepr6siVW67P1WyiH5T6b9wYMX4c+tUDM87s94wgWjxpXerQost2qjv lQempGeMNbz/y7DyNpKU/igyQQvsZPdqGzvYQ8atzqnPzcMgxleU8p4P0DHOUGsu4MmsC1 LGfM0GzD3DxCJNzlmymZw12fCFthfQcji17Ya5X+tSpBZm8nLquRsH28wK+LqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3td4B/x0nf7vs07MxtdHhlDG2sD3FOj9LJy7AUWRAW4=; b=NttS7ZFxKksDVKN76avMGSvJbYYFETt8M/pSiE3H1SpM+coxRT6w5RjTE8Wib5yS0hDVYV VQdtZ7Mqz8KENYYOjnh7XRIjTaG17oSGTDpP+jDptx62yumyCpT5Rztt8xWmeFGpqXCdhy YsXIaMCqQaCJhTEQq8HTw35I76u8wphXt5G3SB9JJKZoT+8hagFzCGvkSHd7cSWmgOECJX fLhd6oxFiugD0XjC7752UKwqRKQ9xCOotuO2CtuuGvm2IimpEwI1rC21/ZCwCxByb2aVwp n0wQxH6a4yCMLbHmKz8Fx6o7C1JC7JWxisPkZJuaYa2T7t2wtM2IDl+hEuRwBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062720; a=rsa-sha256; cv=none; b=Bh+fkLR4VdHZ/ffY2wDhsmiLGjNPqrY1/OjS1Z/sWTu3CwW55H8FmaZ5NVQU9wKQBGtA8v nUtaGsySq8vbyH6wl8mnwUATdqJ7fpZoPhdzV05wgyWbdfJJQf8U0lb6HpeKWcbg0ZmV7Y 86RtGyL3825EH3cocnYi8uM8n98sLkJxNc9q13Q6lzCkPcgv5s1w90ZLJ/oW69vEK+UAL0 84LdcI5DQzSxKC4vUqJeG+bYwKhuKxZGWcCaclLOBEOdWqnGssvOmgP6/tJxs7Ftv9b7fh tB0yKZgdD7ll8Cg4bEQjylbBt4HkcUtN/4Epg7UU3pkFpaFbYQGJTu4CyWeuog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDc188dz9nN; Mon, 27 Nov 2023 05:25: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 3AR5PKNG067375; Mon, 27 Nov 2023 05:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PK1V067372; Mon, 27 Nov 2023 05:25:20 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:20 GMT Message-Id: <202311270525.3AR5PK1V067372@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: 17a238a15fbe - main - cdefs: Remove __func__ define List-Id: Commit messages for the main 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: 17a238a15fbed01477fbc54744d35cbccdb65871 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=17a238a15fbed01477fbc54744d35cbccdb65871 commit 17a238a15fbed01477fbc54744d35cbccdb65871 Author: Warner Losh AuthorDate: 2023-11-20 23:34:22 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:02 +0000 cdefs: Remove __func__ define We require an ANSI-C compiler to build the base system. It's required that __func__ work. Remove this define since the only known problem compilers are ancient history (gcc 2.6 from 1994, almost pre-dating the project). 3rd party code that used this define will now need to provide it via some other means when using non-ansi-c compilers. PR: 275221 (exp-run) Sponsored by: Netflix --- sys/sys/cdefs.h | 40 ++------------------------------------ tests/sys/opencrypto/cryptodevh.py | 4 ---- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index c5b6190077b3..bcbf418f9323 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -96,14 +96,9 @@ /* * The __CONCAT macro is used to concatenate parts of symbol names, e.g. * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. - * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI - * mode -- there must be no spaces between its arguments, and for nested - * __CONCAT's, all the __CONCAT's must be at the left. __CONCAT can also - * concatenate double-quoted strings produced by the __STRING macro, but - * this only works with ANSI C. * * __XSTRING is like __STRING, but it expands any macros in its argument - * first. It is only available with ANSI C. + * first. */ #if defined(__STDC__) || defined(__cplusplus) #define __P(protos) protos /* full-blown ANSI C */ @@ -122,33 +117,7 @@ #define __inline /* delete GCC keyword */ #endif /* ! __CC_SUPPORTS___INLINE */ #endif /* !__cplusplus */ - -#else /* !(__STDC__ || __cplusplus) */ -#define __P(protos) () /* traditional C preprocessor */ -#define __CONCAT(x,y) x/**/y -#define __STRING(x) "x" - -#if !defined(__CC_SUPPORTS___INLINE) -#define __const /* delete pseudo-ANSI C keywords */ -#define __inline -#define __signed -#define __volatile -/* - * In non-ANSI C environments, new programs will want ANSI-only C keywords - * deleted from the program and old programs will want them left alone. - * When using a compiler other than gcc, programs using the ANSI C keywords - * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS. - * When using "gcc -traditional", we assume that this is the intent; if - * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone. - */ -#ifndef NO_ANSI_KEYWORDS -#define const /* delete ANSI C keywords */ -#define inline -#define signed -#define volatile -#endif /* !NO_ANSI_KEYWORDS */ -#endif /* !__CC_SUPPORTS___INLINE */ -#endif /* !(__STDC__ || __cplusplus) */ +#endif /* __STDC__ || __cplusplus */ /* * Compiler-dependent macros to help declare dead (non-returning) and @@ -343,11 +312,6 @@ #define __unreachable() ((void)0) #endif -/* XXX: should use `#if __STDC_VERSION__ < 199901'. */ -#if !__GNUC_PREREQ__(2, 7) -#define __func__ NULL -#endif - #if (defined(__GNUC__) && __GNUC__ >= 2) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901 #define __LONG_LONG_SUPPORTED #endif diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index 9607bcd4d115..2d723999abc7 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -29,10 +29,6 @@ def __STRING(x): return #x def __XSTRING(x): return __STRING(x) -def __P(protos): return () - -def __STRING(x): return "x" - def __aligned(x): return __attribute__((__aligned__(x))) def __section(x): return __attribute__((__section__(x))) From nobody Mon Nov 27 05:25:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SdvDd4pDGz51hXN; Mon, 27 Nov 2023 05:25: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 4SdvDd3kqYz4Xtc; Mon, 27 Nov 2023 05:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xYDVrw5+HwiEwdWxK+aRJKVFqOMi7+wcv8fHRLxgSHk=; b=qgSasB5WwTqmxqBX0IrltZ3aOJYX9hD7FfZGpRvUAHj4YPxPefQagSGPG+AAMZcdQpX4aV OW3cku4yj5ZsIo8yhwlEyLaVE6LJKWHqWlGJ5J4fhNBbFQBEG1VhSM4mjRyEXTipLZ0Pgr qOMIHTZ2Q2c8Ro1nj8kpd1cmwCsqrOp5vSFgtpN1zaGTXxBG+277l7x4Gc78L10YaQq/9J 4I92CzFRIsjVUut6q5M/9/wCLoZJPIOjIc8B597UoPz/M3fG/eMIfSSdvlcuMmFq/5oIGp mYJBoZat+IZs2NwBDAkfdZH2E8CYuJOnd4BS5McdfYcc74IvZG3e6IQXcAr7Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xYDVrw5+HwiEwdWxK+aRJKVFqOMi7+wcv8fHRLxgSHk=; b=IMEliYpFqUkJRKujFwkJrxnINu+aMyLvoJ+fGafhBnKYqGJ1WVG6OVk+NyA56XnpzkuY7d gqbmNdubacpgbMjEpJ5V3zFEdcwStqGUxo4dRerQ5h7HbTvutYlGaJmAufx7Sv3cW0UHwD R/4Xl0vXtBvWMbQKoEKN7Vfqc38GtapdgXao46ariRZkUeNG2QSMEzHCqvka/OmF8As4kB gm/Id+8MmTpwaLSC8FHQ1JQuRocxCmQF24pE/NtvnfukaG+wiU1HIm9p365MuBrKKqaitV gp0uwCAyT0VrHhtmBH72Kvoxq7Jji3J03dk5TLwjplBZdh8ytDctiUFoO7fYJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062721; a=rsa-sha256; cv=none; b=rVbPZf2WBWdErAnP54yP8dJZiYshxibP5KFmJbuK3RI9Jt3uZyBByeFrYVCzUUooW4tscD 4v808Me1prrA3vnltZyQeUeWpa48jLqz7SOorPqSP9uEWzPpLSaWAoq3BykB4hTUAxt27O ll+f/A3DDxL09E/wwQEyLlFhuLxHNj3bOvWk6CH+F2S71qsExV3qmf1ungOYNlWgm9Ukj2 ws6aOeEIdp989TLGoKi5uDuGOmS9neBF2xG1uosswsdO/Dw4aGN6rflxSKmfzTWdF7iHpP P1r3fIg07qsRXGNePYBuBaf5Oi9DNBgYNLLugjpupLL9GIB/gBZ9PET3wFu2zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SdvDd23dGz9ly; Mon, 27 Nov 2023 05:25: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 3AR5PLk8067423; Mon, 27 Nov 2023 05:25:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PLw6067420; Mon, 27 Nov 2023 05:25:21 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:21 GMT Message-Id: <202311270525.3AR5PLw6067420@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: 21fce617d1de - main - param.h: Bump FreeBSD_version to 1500005 List-Id: Commit messages for the main 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: 21fce617d1de231a30833cdd9819ef61277b08d8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=21fce617d1de231a30833cdd9819ef61277b08d8 commit 21fce617d1de231a30833cdd9819ef61277b08d8 Author: Warner Losh AuthorDate: 2023-11-27 05:18:56 +0000 Commit: Warner Losh CommitDate: 2023-11-27 05:24:03 +0000 param.h: Bump FreeBSD_version to 1500005 String of mechancial changes to the tree: sccs id removed, if 0'd copyright strings removed, mechanical style fix after htis churn and some macros removes from sys/cdefs.h. None of these should need a bump, but bump anyway out of an abundance of caution (and everything is going to rebuild anyway). Sponsored by: Netflix --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 71698ab686ca..107b86707c9e 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500004 +#define __FreeBSD_version 1500005 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Mon Nov 27 15:26:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sf8ZT2yTxz52qt8; Mon, 27 Nov 2023 15:26: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 4Sf8ZT2Ty4z4Ngb; Mon, 27 Nov 2023 15:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gi+iI5ZIMsx0TyQpKojvQDR0Ds5wcPX62KlvS9gHuKI=; b=l4Bv6HqzkD6Sj46iYO9acnf+M1vw+KNs+7WaZQpdq42sx/UnqIgoWMLOYBNZ06uBz048OG LfuJALzkuZpQaYPS5Cw13a10IvBqfY3MJksZjFH6iTC3rOuvEqDsaCfoSOHrFinT1pBvzd Bc9uHkmT+hro7Or7JQKByGxe/sXD/rvC+5lhUz1mA+Ls0NCNNbloo3AFElLW5tSO2eKQVg CUOYOn2YIn8toMgr45d8hUUCINioVHIuWR6uKFukrU64fpiTifdsdh6eJ2/rldN/NsVE0w te6xySIBhVtMTTynJmg5OU2Y3ybEwgAGBI0QzvWAO1c8EA3bW/azfhVvVT8wGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701098801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gi+iI5ZIMsx0TyQpKojvQDR0Ds5wcPX62KlvS9gHuKI=; b=c0qqPjzKbIovlkr3dq0/BV68rWvz5o/RAyT6E+6et9XJuXxNZ4nPMxUtIDESANKHWHQipq xUOM3D+HgSxSmSiZ/RqdWhg+9d1CzNTIxVswqkj3Zhn/ZTSfm6G39kvvyyQmvwIBol0cyA STZ6Wyap/SzvQId6LFWgvzVH8qKGXwRvxJuCqsjE+wTZoZyRtXNltfJPHNhj+dR6rLERFc fFOn1wji+wzHBOtUyVQ58xuonLylcVo4E5ssxc9/+zKt3Op4Joa1UZv2MCenct/xds1iSM lBmfEYpiQJxuGjbktOyf6t4HIgY9SpqD10KXYJUCI/M5VIQcTwaH0Jc0gC+ctw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701098801; a=rsa-sha256; cv=none; b=He1HSt3L7kRc+3BIR/7QY3nPOBKbHYXqP8zZr644pfHCEjIIOdi2/sQk+JJCcgfpkUxi88 sxYrPfNv8qNqJ1qWjBlevfY+a9akjeqfEQOLKcfaCZU5zqTV0UxiXA/MM/OKaqfsmG90FJ CZ89LlivB+vEzWNklgK6ZI2nIsW8L9k9U/GCg4M/5Ku0CeOZkjWh1M3fvjIuXLg2SRiMrU eWil7eAgelIcfmV48r/zc+NjGDKMRRaOqyMbqrzc0bJzvTjY6ZSBkKv91n0P1TXFUObIu1 h3PJ+mHB/9GeoDbmptHGo974Dd7kReNZeJkW6qsAyePXe/fCDW+sCXQRdBL+IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sf8ZT1YhbzkFx; Mon, 27 Nov 2023 15:26: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 3ARFQf2Q097469; Mon, 27 Nov 2023 15:26:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARFQfDi097466; Mon, 27 Nov 2023 15:26:41 GMT (envelope-from git) Date: Mon, 27 Nov 2023 15:26:41 GMT Message-Id: <202311271526.3ARFQfDi097466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 789ffce39294 - main - ig4: Add PCI IDs for Intel Ice Lake I2C 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 789ffce392946d2f71a51bbac60db16dcdea2928 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=789ffce392946d2f71a51bbac60db16dcdea2928 commit 789ffce392946d2f71a51bbac60db16dcdea2928 Author: Vladimir Kondratyev AuthorDate: 2023-11-27 15:25:48 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-11-27 15:25:48 +0000 ig4: Add PCI IDs for Intel Ice Lake I2C controller. PR: 275115 Tested by: Sam MFC after: 2 weeks --- sys/dev/ichiic/ig4_pci.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/dev/ichiic/ig4_pci.c b/sys/dev/ichiic/ig4_pci.c index bb4b75c0c6d1..9f12e713cdeb 100644 --- a/sys/dev/ichiic/ig4_pci.c +++ b/sys/dev/ichiic/ig4_pci.c @@ -119,6 +119,12 @@ static int ig4iic_pci_detach(device_t dev); #define PCI_CHIP_COMETLAKE_V_I2C_1 0xa3e18086 #define PCI_CHIP_COMETLAKE_V_I2C_2 0xa3e28086 #define PCI_CHIP_COMETLAKE_V_I2C_3 0xa3e38086 +#define PCI_CHIP_ICELAKE_LP_I2C_0 0x34e88086 +#define PCI_CHIP_ICELAKE_LP_I2C_1 0x34e98086 +#define PCI_CHIP_ICELAKE_LP_I2C_2 0x34ea8086 +#define PCI_CHIP_ICELAKE_LP_I2C_3 0x34eb8086 +#define PCI_CHIP_ICELAKE_LP_I2C_4 0x34c58086 +#define PCI_CHIP_ICELAKE_LP_I2C_5 0x34c68086 #define PCI_CHIP_TIGERLAKE_H_I2C_0 0x43d88086 #define PCI_CHIP_TIGERLAKE_H_I2C_1 0x43e88086 #define PCI_CHIP_TIGERLAKE_H_I2C_2 0x43e98086 @@ -225,6 +231,12 @@ static struct ig4iic_pci_device ig4iic_pci_devices[] = { { PCI_CHIP_COMETLAKE_V_I2C_1, "Intel Comet Lake-V I2C Controller-1", IG4_CANNONLAKE}, { PCI_CHIP_COMETLAKE_V_I2C_2, "Intel Comet Lake-V I2C Controller-2", IG4_CANNONLAKE}, { PCI_CHIP_COMETLAKE_V_I2C_3, "Intel Comet Lake-V I2C Controller-3", IG4_CANNONLAKE}, + { PCI_CHIP_ICELAKE_LP_I2C_0, "Intel Ice Lake-LP I2C Controller-0", IG4_TIGERLAKE}, + { PCI_CHIP_ICELAKE_LP_I2C_1, "Intel Ice Lake-LP I2C Controller-1", IG4_TIGERLAKE}, + { PCI_CHIP_ICELAKE_LP_I2C_2, "Intel Ice Lake-LP I2C Controller-2", IG4_TIGERLAKE}, + { PCI_CHIP_ICELAKE_LP_I2C_3, "Intel Ice Lake-LP I2C Controller-3", IG4_TIGERLAKE}, + { PCI_CHIP_ICELAKE_LP_I2C_4, "Intel Ice Lake-LP I2C Controller-4", IG4_TIGERLAKE}, + { PCI_CHIP_ICELAKE_LP_I2C_5, "Intel Ice Lake-LP I2C Controller-5", IG4_TIGERLAKE}, { PCI_CHIP_TIGERLAKE_H_I2C_0, "Intel Tiger Lake-H I2C Controller-0", IG4_TIGERLAKE}, { PCI_CHIP_TIGERLAKE_H_I2C_1, "Intel Tiger Lake-H I2C Controller-1", IG4_TIGERLAKE}, { PCI_CHIP_TIGERLAKE_H_I2C_2, "Intel Tiger Lake-H I2C Controller-2", IG4_TIGERLAKE}, From nobody Mon Nov 27 16:48:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfBPG319Hz52d7q; Mon, 27 Nov 2023 16:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfBPG2bphz3M4F; Mon, 27 Nov 2023 16:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWCC+oJwRTmf++uXknpiyZhA4hXmKrx0a3c9JcDRIfU=; b=hcKbkH8gXc7tROg5nbsb67f4oVag7+7QCVM9DsiAF1Z1I4lKwc+nHSPpvcbleK7/6uPTsb kh1Piu0MXJCiJxJvgFFD3D6eRtqSkr2L91kngV2XCGtImQ3ZI2Aw97QrM/IXKWhDsFCZMO LZuyxmr3Xc9BRNWMwBdJLS8MfHVAdikaDn00LQBmibNCz4CJQnzPm2brJXIMVx+eCK8nOO 3kkLD6ssCjY+0PrIUZHnx3AnqFeOR63+feJExdXQZ6iLp3Au2lPOiLclnCmxBx9wcO0+8l DTixM+WQUw/ld1LqlHG9ugxOXuDbN6bCIXd+mdZy667UixHvFxsdDL2p0Lk97w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWCC+oJwRTmf++uXknpiyZhA4hXmKrx0a3c9JcDRIfU=; b=jHE8TKyNhSdFE7Y8GABNJIwTYwODKddS/Z6SfTFdQfXnGiChdt4KPvI+XUhb4bkzBi0WXu dOuMX91SIupGdJ0wa7oDNkeuJQcYBmBG2SZtrB8j3HS74W8ZdwVawqgkFLItjvBxINXYO0 B4JpqctlygINu+JVD0eP3C/rGc6m3tUsmV1XZ0LXZpWes292mqiNe8+8DrTsb2ObPmYEyI b2ZSh6s9OVllaUbY8p3F5jr7viBAGIWxIb9AmKLtxjmVFGLsn5Q+wPIlspeSNC9/J5XzK6 q/GNtzul5EQri0c4EGl0dAYAtvEn0vaf5aPZ4xmLDfvyz0z2kKp4ZUgwuxIZCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701103730; a=rsa-sha256; cv=none; b=DTZ7uDKA89gy47pdKNl/5N5vdsOpvE2Puu1WjaR7OjoYPT3KdOIMFW3JCaCFOkvvzU8jmw jUf8GOMu1K1O6vGuojopgHsYDTNrcIDn6dXAQuak5gC5viIbahHm8XYKirlt6bAKG2OriM Wa0QSSBADqHdWQOV8cwudqw+VXpougJhNvfDNHQDyjk7FW6Xi0dt3/oQYAmz9dTuP91gkT ntuycQkmEZUChWSw7JGV73e45jBHepWe0i3pbA0zZ8g/areuNt1o2jwdaV/Na+F9U2Y6ZE xqmxGp424VZsfU7/kwirVCsr3bvo/8yLdE1Vfftj+Q1ucc85Pt0hSfk4cTlFCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfBPG1h9qzm6p; Mon, 27 Nov 2023 16:48: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 3ARGmoXZ030465; Mon, 27 Nov 2023 16:48:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARGmogj030463; Mon, 27 Nov 2023 16:48:50 GMT (envelope-from git) Date: Mon, 27 Nov 2023 16:48:50 GMT Message-Id: <202311271648.3ARGmogj030463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ae477ca7da55 - main - bzip2: remove locally added __FBSDID List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae477ca7da55f76d28859e1bd01cd1051e36f28f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ae477ca7da55f76d28859e1bd01cd1051e36f28f commit ae477ca7da55f76d28859e1bd01cd1051e36f28f Author: Brooks Davis AuthorDate: 2023-11-27 16:47:22 +0000 Commit: Brooks Davis CommitDate: 2023-11-27 16:47:22 +0000 bzip2: remove locally added __FBSDID Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42700 --- contrib/bzip2/bzlib.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/bzip2/bzlib.c b/contrib/bzip2/bzlib.c index 9496d5abc951..2574a87b2932 100644 --- a/contrib/bzip2/bzlib.c +++ b/contrib/bzip2/bzlib.c @@ -28,9 +28,6 @@ bzBuffToBuffDecompress. Fixed. */ -#include -__FBSDID("$FreeBSD$"); - #include "bzlib_private.h" #ifndef BZ_NO_COMPRESS From nobody Mon Nov 27 16:48:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfBPH4jD7z52cwT; Mon, 27 Nov 2023 16:48: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 4SfBPH3rm0z3MN0; Mon, 27 Nov 2023 16:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ujCh0DIjpo9691bXQKccX+1AjXI5kNA1ndGkZnCAN4=; b=FrP8T9CbCOf4V3ZRIMUlVFtAqiVAYU8sXPbmTI/D6xB4SIYMH6vjupR+spHv4QUlwYTD8e Nawmt7OdgOXCXMVZ1QZfBRs2XfT9qxYbDoB7XyxtVB7bAUnSDeCfuDimo+48zGtJ+ZAdxu 6ao22ZjPOaf9bOhOA3lfPXCINdIZDjN/zODI8QiXYX+JJyv68KaP51a5fJYLkiYPpzGRSl buQR10hnvIHuxW6R29/pUmImlmZRgVfpKz3OTYcdTgitKyiyfvLOiVQe13EfFPfmlVySnI 7l4Q96PPeaFUktGDMQuYGQyNtLbYA1smVub9i1NTAx9t6dxUsEUAzWjSIcZZCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ujCh0DIjpo9691bXQKccX+1AjXI5kNA1ndGkZnCAN4=; b=IC5le9SpnrENCV3duHM30Qsds3h+IxZaUELPe0XHVg7/SLDf7JI2LiaaG2OzruBPr4K8x8 vy8a1Wskz3mN24JvTUhEaSK6jO2KCJOoJXnyV9CSr0IMa+Kx2km8H6k+m0SWcujhtSa2Hy dw227jFBhjLTalJ3FY+ByiUhjYLksMtgzmC0hOUJok8Rx7WIq5DvdJLN9Alpnklt7xBeDh KxUHkqkbnZKcBGLEkAjyKN8OGX7n2YEqVdC24ob1F2I7Obs1lVMFnhbEWQXNH51ah6nE9h mTKsmZOWtsDEjG0fOZsBpcRDlActpLb6yhoSR15JRIjWDFV5PiotVjiishzwvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701103731; a=rsa-sha256; cv=none; b=r3a88D4PQdLyJ2wlieewZQEU4UVW98Dw6x90LEvhFsfEcGMXDbioRiQJVgRFfv3Wa3ATfV WWIgRdWYNperu+bi1xYPSIRFwewGx1CSJHE8Cdgc98+pUS+1gXiXeqEcK/TEv6f7zynbwY sCMhMvg3LVQQ3dGuZc3qYd/mYfeZxuquL0iCPemHM0dGt7Vo+Yd/cyUCgPK5OHlICqQVwj iJqxQt9KwbrfFLayCrnlwTZ9nWxCMeDVo/WNJyAGYjPmNN5xJNL51Myf+iEnqFyYrvzA8u WjpFMgpsXwWxjWAXBZd0WcBnmvwRIMK0c/0403biUjWUjBbsfJ6UUazY34bB4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfBPH2g7RzmPB; Mon, 27 Nov 2023 16:48: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 3ARGmpbQ030507; Mon, 27 Nov 2023 16:48:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARGmpAN030504; Mon, 27 Nov 2023 16:48:51 GMT (envelope-from git) Date: Mon, 27 Nov 2023 16:48:51 GMT Message-Id: <202311271648.3ARGmpAN030504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3f944f3bb75f - main - ee: remove locally added __FBSDID List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f944f3bb75fe6eae6000511ad19799d90da54ba Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3f944f3bb75fe6eae6000511ad19799d90da54ba commit 3f944f3bb75fe6eae6000511ad19799d90da54ba Author: Brooks Davis AuthorDate: 2023-11-27 16:47:26 +0000 Commit: Brooks Davis CommitDate: 2023-11-27 16:47:26 +0000 ee: remove locally added __FBSDID Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42701 --- contrib/ee/ee.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/ee/ee.c b/contrib/ee/ee.c index 21523ece9c70..072d26519f4c 100644 --- a/contrib/ee/ee.c +++ b/contrib/ee/ee.c @@ -54,9 +54,6 @@ | */ -#include -__FBSDID("$FreeBSD$"); - char *ee_copyright_message = "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon "; From nobody Mon Nov 27 16:48:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfBPJ52ZGz52d1L; Mon, 27 Nov 2023 16:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfBPJ4K6Mz3MK0; Mon, 27 Nov 2023 16:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZgOXg+VhZ6ZxqXObQM/ubIFY4e2VKxcMNxFgVLeYeo=; b=DNzT2ixX40M9gA/3mZoSngtnX9cCoaa/IOLa6w1YDZ9OXxbWeJJ/BAeUGcGe3pMit87350 VZFz6zdUwOLIG8dpqD+1gRcRyrKkT9NOXEonvWNA7ljttT4LglI7FvK9YqWAQ5HBuzv7lo 0O1uQkx2HtoBn0KGpI64SmkKt3m5elJpDOdgHMYo1m4IFeHEWRO7oQ4Od0FVWBwg4EjmTh AthCQQ59PxccP2AB1oTvkCWdiYy0pitY6YRgayLI6WmuhOa/GFnScHD+51VLoWPjOCPW6n KPp/gmcVCcvrW3mWw5ezR2RR3Lrx+BpfkUixMKgVIK++h3uVgeIKB8kvHqU5KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZgOXg+VhZ6ZxqXObQM/ubIFY4e2VKxcMNxFgVLeYeo=; b=Xb0lef8H/5v+hKAIpaS9/UifI21Ke/r6rCuhCA8/k0rV6JcT1iJzCZ4ySRO2LRWHiScfeH bpnjYvvTZq36nCWpGNkgBp9NnFvf+Mbbao8aK7bZhA6D5oijR2a3JS6ytlLhcEV0+H5NeN IPHC5TrrrvkyyuX5UoHVsm9C+H7d1p8RYMGJJ7IDHApPDYmD6B4phjvxcWsN76opI+WKo4 EQS9/sS9QJus4CyvDniwo6xIbkGWsmfDmzlIazpSA6WVd7zolhMMipmG/TNmtWLFc0D8w8 3QzMe3m1tnCkAll3k7IJgD5hQu12NsucXx9tYNv7fCN4CdS6cOTv0+Ld3YfN7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701103732; a=rsa-sha256; cv=none; b=Red9oa7wJ2IaGZfXkptt6RjZMJ2Gh4wcITUOY3ltdbF8xgxYJNHppE075pQF7YL5yKLvfe ZuO6QUQV2RSD48Gjh3niDb3LBTPTtkq46uxHmSWlLOc4IfK/xjzJZAS07+TInGo8hlU7Cj 36VfWeirMR7nozJ9WM+HYoPn07hRPkhdCoDr9I+M4l9Xyj0bJnlSIAA4+0Lzzm/kvF+p1O oO4mcibjWF4390HxfTZzoPa/DLv70Q0sEJAt0mWP85PDf+46lBK1mbR0+wRxWsXSbcnbPb kkOQYi9RvpMW9ChyN3IczNgfkOgXBWFBJp9tiyVRMZyCBfdazj/4nKYxGY2m1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfBPJ3QdmzmXH; Mon, 27 Nov 2023 16:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARGmqCg030549; Mon, 27 Nov 2023 16:48:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARGmq1F030546; Mon, 27 Nov 2023 16:48:52 GMT (envelope-from git) Date: Mon, 27 Nov 2023 16:48:52 GMT Message-Id: <202311271648.3ARGmq1F030546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 78e6a1bd0638 - main - pnpinfo: remove locally added __FBSDID List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78e6a1bd063884ae2c42256bcaee6824efbcfbc8 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=78e6a1bd063884ae2c42256bcaee6824efbcfbc8 commit 78e6a1bd063884ae2c42256bcaee6824efbcfbc8 Author: Brooks Davis AuthorDate: 2023-11-27 16:47:30 +0000 Commit: Brooks Davis CommitDate: 2023-11-27 16:47:30 +0000 pnpinfo: remove locally added __FBSDID Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42702 --- contrib/pnpinfo/pnpinfo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/pnpinfo/pnpinfo.c b/contrib/pnpinfo/pnpinfo.c index 4ec99b3b27e1..4a91006cebff 100644 --- a/contrib/pnpinfo/pnpinfo.c +++ b/contrib/pnpinfo/pnpinfo.c @@ -24,9 +24,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #include #include From nobody Mon Nov 27 16:48:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfBPL0k98z52d66; Mon, 27 Nov 2023 16:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfBPK5cxrz3Mcq; Mon, 27 Nov 2023 16:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OG2TrzQ2tD4YKeaWDoAJrXy3N0tK0WHkQezsNnCj1hk=; b=SPU+enD/mtDZo3e2LmVdl2cl+IZcaNS6hg/eUq3FrRMOpcyDW8Muc5rM7zUxryi3MRVuBF r3Z/qz/IsGMEaic5cgo5YvduA/3tu++jtH3O6IySH3p7fHxQ62wAsFCtda+o7hn4pNcNmX Q6RqFAlcy6Cd55AFhl9H6BneGb1XTAzOUgFVwFWCxhMAvuZtQrIIyvle+28WVkhiYb96Wa pP3LQqJfCvQvUc7UTvgvCeOAEmP4Ogjl+7eve02erIZRR7wmAc4xnpRbuIo+PllRtHTJen SHFZVqareAPSsaNHkDL4UJy3ulcGQhhpYuNVtqzYsny4ADhuN/ulAE7W1EVjjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OG2TrzQ2tD4YKeaWDoAJrXy3N0tK0WHkQezsNnCj1hk=; b=pS4vTtQrF/Q0tmKeADre92EO6e5B5c6aaQEDj4MkZy/42ee3r6d2BaAxelQedznGwMBeGs 0bjYFjMRFennkJTYMshMGtZyx/xnQsv5wQoUhU7PgrrbNWpV+cpbk57EJaxKJqemvhpHvA HxhStprUwzyYdNRqsAAvbigwUir6Pveqq3vASJZQc6CZ7JVwzrvgg71tQhjdZXYX/txqru KdboOwPsi/xV4UtGgNKe2Hd5EK+Z9LnCaoJroeFoCMFFHcN43FwenAnBg/EcLfyXrVe/zk FTK20/Y4dkSsKnuldVzMTEUIuj6uqS5Vr8ZSQtCvD3MRoQnCP1cFhYnpzs21/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701103733; a=rsa-sha256; cv=none; b=vYGyp1PS3W0U0Z+RJoikybxReAVdwDZRlVHlJGIt2NWbLvFTAhYHm62NtvW0DEgvMv1TKE M2wGxwE+NQDOq1e/WV7VHYJydoF97eFmzIkiqCzPPQVyf7UqL+EgN/fJvuPpw9FuYpF6Mc woKlzmxAS+KSat/nlkMmAgT8CU2XkDfejX+XMFkLLK2off9tLdtnK9VtjyWT3fNf9rWMBu 183ocVo1//v+kec1tUrAyONn6a+ZvwffybIRAIs7T07q4ZGy3UHTS+tV+xrQBOXGNG2K05 g1YpjVWy1pXLxjzPvxxDIsRnMGlcjcpw55o8CRW/x4M75dswPwdhHnVBSZ0H1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfBPK4gwdzmZm; Mon, 27 Nov 2023 16:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARGmroT030591; Mon, 27 Nov 2023 16:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARGmrZW030588; Mon, 27 Nov 2023 16:48:53 GMT (envelope-from git) Date: Mon, 27 Nov 2023 16:48:53 GMT Message-Id: <202311271648.3ARGmrZW030588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a159b74a5d86 - main - smbfs: remove locally added __FBSDID List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a159b74a5d86e89eb86dcb5df3ec402e662012a6 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a159b74a5d86e89eb86dcb5df3ec402e662012a6 commit a159b74a5d86e89eb86dcb5df3ec402e662012a6 Author: Brooks Davis AuthorDate: 2023-11-27 16:47:33 +0000 Commit: Brooks Davis CommitDate: 2023-11-27 16:47:33 +0000 smbfs: remove locally added __FBSDID Differential Revision: https://reviews.freebsd.org/D42703 --- contrib/smbfs/lib/smb/mbuf.c | 3 --- contrib/smbfs/lib/smb/nb_name.c | 3 --- contrib/smbfs/lib/smb/nls.c | 3 --- contrib/smbfs/lib/smb/rcfile.c | 3 --- 4 files changed, 12 deletions(-) diff --git a/contrib/smbfs/lib/smb/mbuf.c b/contrib/smbfs/lib/smb/mbuf.c index 729b5c53d11e..ac3b94524683 100644 --- a/contrib/smbfs/lib/smb/mbuf.c +++ b/contrib/smbfs/lib/smb/mbuf.c @@ -32,9 +32,6 @@ * $Id: mbuf.c,v 1.6 2001/02/24 15:56:04 bp Exp $ */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/contrib/smbfs/lib/smb/nb_name.c b/contrib/smbfs/lib/smb/nb_name.c index a953ce0a0a9c..319d3c353b01 100644 --- a/contrib/smbfs/lib/smb/nb_name.c +++ b/contrib/smbfs/lib/smb/nb_name.c @@ -32,9 +32,6 @@ * $Id: nb_name.c,v 1.2 2001/08/22 03:31:36 bp Exp $ */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/contrib/smbfs/lib/smb/nls.c b/contrib/smbfs/lib/smb/nls.c index b79d49c29c58..99693f3aba84 100644 --- a/contrib/smbfs/lib/smb/nls.c +++ b/contrib/smbfs/lib/smb/nls.c @@ -32,9 +32,6 @@ * $Id: nls.c,v 1.10 2002/07/22 08:33:59 bp Exp $ */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include diff --git a/contrib/smbfs/lib/smb/rcfile.c b/contrib/smbfs/lib/smb/rcfile.c index 26a31d6f37ee..f97cb5abbf35 100644 --- a/contrib/smbfs/lib/smb/rcfile.c +++ b/contrib/smbfs/lib/smb/rcfile.c @@ -32,9 +32,6 @@ * $Id: rcfile.c,v 1.5 2001/04/16 12:46:46 bp Exp $ */ -#include -__FBSDID("$FreeBSD$"); - #include #include #include From nobody Mon Nov 27 16:48:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfBPM55Q3z52d44; Mon, 27 Nov 2023 16:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfBPL6S4Kz3MVW; Mon, 27 Nov 2023 16:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tM6pEmxrUZlATedHyEcZhd5fKGHCK7YQQM3cmluMIKU=; b=l6JmvLB4MVJlJrWPD2t83D4f5OTQXg7UQXE9gh4iWZlpyBOvogR38lgp5PbOi6on9fUAvk Z5UG+QDmMOWOil3THfVXUgb2/NNB0dGXbVEUlvVmvANqI/AUn0Bs9DslJzNFZxASOK4ttI gc7LKmwjXlou98qzvG0pluxbMhUiBtrUlhodwY7pmLBrpWv4DOJZMhd7avjjru7eRkNWwe Rt/9voFPijRq138sn2AGGfiF0fq+x05bzOSS35HY+48ARDtI5WflzAD9olke0AFVtut5kR p5EntEUen/nVGVsAjlTGUPGCHvv+R4NYpmQKNi03zuKcrHPKKovAeojx7pXmQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tM6pEmxrUZlATedHyEcZhd5fKGHCK7YQQM3cmluMIKU=; b=bPNvRdu0KR4GPv49VYg3Cc+V3kjmv9bw5CLGuxYSSYMVCfsP6fLFGvBUQUfwAdLNr3+ISw xDlxkDqVgDYsjptfq8NeRwxgcD2lyw/g6+wNGzIMPfPjD7+15mt/FCBARlsm8P1D5U6YY+ ElqPMbCU4qVL3srBXw3eoR4287N4nNC9O1JA+WwfRLf7lc16gC+mZdmF6jOujmrVPhtJip KSgmXlO9t1SSvS7dbCLkQcVlBlaXcasM4x38FZplkJO/oVWOEK80PKFJlIYr1r6h2/ZmNI KdeduXtpw9zZ+zOIMuEwHs78Nxf8yJBY3VEB2VPN9Jc7oikj6MSnAzmtirJJ+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701103734; a=rsa-sha256; cv=none; b=Jizssi1nCOFbR+rZJdgHYZYeWcMUtldeWxUEXht0IFScl6iOBxNxcIAM6Bj1Lfq2j65rCo xsVKUJki+KD0e0FznPLEHt4Ded2l6Ysa1GCxcoq8v1jrne66QcTt5VCWmo/j3xcfANazcl KoPu0f8N6C3DL6WWUxHObNb2nckXMro6WSSg9Fpms8SvTT/Qt9kqiuOA+3R13cMMdAR3gK GV0n1/lqQeT6HgvC69KzmZETozhXn3pJ949iiPSb8inARfe2hkXBwrBoe3lXLS5ENxfA3H finVAzpMWHODrfRQi77K/dCfc6sXhKxP8IE+Amgpcj/2TUBY8u5v7suspH66Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfBPL5XF6zm6q; Mon, 27 Nov 2023 16:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARGmsbN030637; Mon, 27 Nov 2023 16:48:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARGmsEZ030634; Mon, 27 Nov 2023 16:48:54 GMT (envelope-from git) Date: Mon, 27 Nov 2023 16:48:54 GMT Message-Id: <202311271648.3ARGmsEZ030634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a3c858005cae - main - telnet: remove locally added __FBSDID List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3c858005cae175e277f6f6735ca9eaea7eaf3c3 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a3c858005cae175e277f6f6735ca9eaea7eaf3c3 commit a3c858005cae175e277f6f6735ca9eaea7eaf3c3 Author: Brooks Davis AuthorDate: 2023-11-27 16:47:37 +0000 Commit: Brooks Davis CommitDate: 2023-11-27 16:47:37 +0000 telnet: remove locally added __FBSDID This partially reverts 77b7cdf1999ee965ad494fddd184b18f532ac91a. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42704 --- contrib/telnet/libtelnet/auth.c | 3 --- contrib/telnet/libtelnet/enc_des.c | 2 -- contrib/telnet/libtelnet/encrypt.c | 4 ---- contrib/telnet/libtelnet/genget.c | 4 ---- contrib/telnet/libtelnet/getent.c | 4 ---- contrib/telnet/libtelnet/kerberos.c | 4 ---- contrib/telnet/libtelnet/kerberos5.c | 4 ---- contrib/telnet/libtelnet/krb4encpwd.c | 4 ---- contrib/telnet/libtelnet/misc.c | 4 ---- contrib/telnet/libtelnet/pk.c | 4 ---- contrib/telnet/libtelnet/read_password.c | 4 ---- contrib/telnet/libtelnet/rsaencpwd.c | 4 ---- contrib/telnet/libtelnet/sra.c | 4 ---- contrib/telnet/telnet/authenc.c | 2 -- contrib/telnet/telnet/commands.c | 2 -- contrib/telnet/telnet/main.c | 2 -- contrib/telnet/telnet/network.c | 2 -- contrib/telnet/telnet/ring.c | 2 -- contrib/telnet/telnet/sys_bsd.c | 2 -- contrib/telnet/telnet/telnet.c | 2 -- contrib/telnet/telnet/terminal.c | 2 -- contrib/telnet/telnet/utilities.c | 2 -- 22 files changed, 67 deletions(-) diff --git a/contrib/telnet/libtelnet/auth.c b/contrib/telnet/libtelnet/auth.c index 3488edd84b1c..fa1cfdc52869 100644 --- a/contrib/telnet/libtelnet/auth.c +++ b/contrib/telnet/libtelnet/auth.c @@ -33,9 +33,6 @@ static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ #endif -#include -__FBSDID("$FreeBSD$"); - /* * Copyright (C) 1990 by the Massachusetts Institute of Technology diff --git a/contrib/telnet/libtelnet/enc_des.c b/contrib/telnet/libtelnet/enc_des.c index 2c12ad5e0cf2..0cd9cb44ce05 100644 --- a/contrib/telnet/libtelnet/enc_des.c +++ b/contrib/telnet/libtelnet/enc_des.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ #endif -#include -__FBSDID("$FreeBSD$"); #ifdef ENCRYPTION # ifdef AUTHENTICATION diff --git a/contrib/telnet/libtelnet/encrypt.c b/contrib/telnet/libtelnet/encrypt.c index 398c7321510c..3c4a2ab1abc1 100644 --- a/contrib/telnet/libtelnet/encrypt.c +++ b/contrib/telnet/libtelnet/encrypt.c @@ -27,10 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #ifndef lint #if 0 static const char sccsid[] = "@(#)encrypt.c 8.2 (Berkeley) 5/30/95"; diff --git a/contrib/telnet/libtelnet/genget.c b/contrib/telnet/libtelnet/genget.c index e7b48f6b2af0..4bb119315746 100644 --- a/contrib/telnet/libtelnet/genget.c +++ b/contrib/telnet/libtelnet/genget.c @@ -27,10 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #ifndef lint #if 0 static const char sccsid[] = "@(#)genget.c 8.2 (Berkeley) 5/30/95"; diff --git a/contrib/telnet/libtelnet/getent.c b/contrib/telnet/libtelnet/getent.c index 3df81409a7d8..3be745e96c0b 100644 --- a/contrib/telnet/libtelnet/getent.c +++ b/contrib/telnet/libtelnet/getent.c @@ -27,10 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #ifndef lint #if 0 static char sccsid[] = "@(#)getent.c 8.2 (Berkeley) 12/15/93"; diff --git a/contrib/telnet/libtelnet/kerberos.c b/contrib/telnet/libtelnet/kerberos.c index 5f00fd40187f..a5dc774d54ca 100644 --- a/contrib/telnet/libtelnet/kerberos.c +++ b/contrib/telnet/libtelnet/kerberos.c @@ -27,10 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #ifndef lint static const char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ diff --git a/contrib/telnet/libtelnet/kerberos5.c b/contrib/telnet/libtelnet/kerberos5.c index 63f515310f9b..bc90ec9cfa6a 100644 --- a/contrib/telnet/libtelnet/kerberos5.c +++ b/contrib/telnet/libtelnet/kerberos5.c @@ -47,10 +47,6 @@ * or implied warranty. */ -#include - -__FBSDID("$FreeBSD$"); - #ifdef KRB5 #include diff --git a/contrib/telnet/libtelnet/krb4encpwd.c b/contrib/telnet/libtelnet/krb4encpwd.c index e87b5c41272e..345e24317228 100644 --- a/contrib/telnet/libtelnet/krb4encpwd.c +++ b/contrib/telnet/libtelnet/krb4encpwd.c @@ -27,10 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #ifndef lint static char sccsid[] = "@(#)krb4encpwd.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ diff --git a/contrib/telnet/libtelnet/misc.c b/contrib/telnet/libtelnet/misc.c index ef5de4ee45e7..a514376e2b69 100644 --- a/contrib/telnet/libtelnet/misc.c +++ b/contrib/telnet/libtelnet/misc.c @@ -27,10 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #ifndef lint #if 0 static const char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93"; diff --git a/contrib/telnet/libtelnet/pk.c b/contrib/telnet/libtelnet/pk.c index a3d17f396c64..a36733c4e73d 100644 --- a/contrib/telnet/libtelnet/pk.c +++ b/contrib/telnet/libtelnet/pk.c @@ -28,10 +28,6 @@ * */ -#include - -__FBSDID("$FreeBSD$"); - /* public key routines */ /* functions: genkeys(char *public, char *secret) diff --git a/contrib/telnet/libtelnet/read_password.c b/contrib/telnet/libtelnet/read_password.c index 0faaa09c57d5..37baf92e288d 100644 --- a/contrib/telnet/libtelnet/read_password.c +++ b/contrib/telnet/libtelnet/read_password.c @@ -27,10 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #ifndef lint #if 0 static char sccsid[] = "@(#)read_password.c 8.3 (Berkeley) 5/30/95"; diff --git a/contrib/telnet/libtelnet/rsaencpwd.c b/contrib/telnet/libtelnet/rsaencpwd.c index 9dcf4a658cf6..10225ac0070b 100644 --- a/contrib/telnet/libtelnet/rsaencpwd.c +++ b/contrib/telnet/libtelnet/rsaencpwd.c @@ -27,10 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #ifndef lint static char sccsid[] = "@(#)rsaencpwd.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ diff --git a/contrib/telnet/libtelnet/sra.c b/contrib/telnet/libtelnet/sra.c index 4a759685ca42..abacda12b495 100644 --- a/contrib/telnet/libtelnet/sra.c +++ b/contrib/telnet/libtelnet/sra.c @@ -28,10 +28,6 @@ * */ -#include - -__FBSDID("$FreeBSD$"); - #ifdef SRA #ifdef ENCRYPTION #include diff --git a/contrib/telnet/telnet/authenc.c b/contrib/telnet/telnet/authenc.c index 593d061d125d..6fd4b9f4dd85 100644 --- a/contrib/telnet/telnet/authenc.c +++ b/contrib/telnet/telnet/authenc.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; #endif #endif -#include -__FBSDID("$FreeBSD$"); #ifdef AUTHENTICATION #ifdef ENCRYPTION diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c index dbc06a10b9c6..ca3460e455ad 100644 --- a/contrib/telnet/telnet/commands.c +++ b/contrib/telnet/telnet/commands.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif #endif -#include -__FBSDID("$FreeBSD$"); #include #include diff --git a/contrib/telnet/telnet/main.c b/contrib/telnet/telnet/main.c index 8ebcc0a86259..973e2b09a58f 100644 --- a/contrib/telnet/telnet/main.c +++ b/contrib/telnet/telnet/main.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif #endif -#include -__FBSDID("$FreeBSD$"); #include #include diff --git a/contrib/telnet/telnet/network.c b/contrib/telnet/telnet/network.c index 9a62e8a94fab..438673ce3e0e 100644 --- a/contrib/telnet/telnet/network.c +++ b/contrib/telnet/telnet/network.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif #endif -#include -__FBSDID("$FreeBSD$"); #include #include diff --git a/contrib/telnet/telnet/ring.c b/contrib/telnet/telnet/ring.c index 138e3c661045..d0e194c7d413 100644 --- a/contrib/telnet/telnet/ring.c +++ b/contrib/telnet/telnet/ring.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif #endif -#include -__FBSDID("$FreeBSD$"); /* * This defines a structure for a ring buffer. diff --git a/contrib/telnet/telnet/sys_bsd.c b/contrib/telnet/telnet/sys_bsd.c index fd57df7a88a3..01209782cdbb 100644 --- a/contrib/telnet/telnet/sys_bsd.c +++ b/contrib/telnet/telnet/sys_bsd.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif #endif -#include -__FBSDID("$FreeBSD$"); /* * The following routines try to encapsulate what is system dependent diff --git a/contrib/telnet/telnet/telnet.c b/contrib/telnet/telnet/telnet.c index b6b2432ef3ec..a35ea40c4cd8 100644 --- a/contrib/telnet/telnet/telnet.c +++ b/contrib/telnet/telnet/telnet.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif #endif -#include -__FBSDID("$FreeBSD$"); #include diff --git a/contrib/telnet/telnet/terminal.c b/contrib/telnet/telnet/terminal.c index b42f861c6f30..dccfab410998 100644 --- a/contrib/telnet/telnet/terminal.c +++ b/contrib/telnet/telnet/terminal.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif #endif -#include -__FBSDID("$FreeBSD$"); #include #include diff --git a/contrib/telnet/telnet/utilities.c b/contrib/telnet/telnet/utilities.c index 36432e6a32f0..516c1e5e538a 100644 --- a/contrib/telnet/telnet/utilities.c +++ b/contrib/telnet/telnet/utilities.c @@ -32,8 +32,6 @@ static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif #endif -#include -__FBSDID("$FreeBSD$"); #define TELOPTS #define TELCMDS From nobody Mon Nov 27 16:48:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfBPN1vq2z52dBy; Mon, 27 Nov 2023 16:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfBPN09kKz3MPZ; Mon, 27 Nov 2023 16:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PNXJXG8CPiyhfOJHZ4O60hwnvzAFqR2gTrnDcyOvopg=; b=NBjnuB3ztAJdg4eiMdxS59reTU8ukP4Rrm2i1crP81BxW09RvuGNOzz+wKPMJx09hCudte 6EeupDMiupjMIec2SX/30KYpdjEXamRvS5rWSUXTG2P8zLr40HqXIfEyDHx2yMGvUDknTr 9FVr3JFR/TM9fFssTHJsTGqwK0UGSKes/cdil99Ciylr1FP2Enr1Nesari1jJGiLh8dxo/ x+TUTdx/XyMCDo/Gnu7scAqaHRce3QoGdpG7x+VXj2hsGoryPLVMyGC7U80AVXx2T1DB/G KXvwBAPKoNMWmpiNLImJee6oTmebmyVyoxSDk8p5NteL4Tcyid3pl8lXIfxKbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701103736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PNXJXG8CPiyhfOJHZ4O60hwnvzAFqR2gTrnDcyOvopg=; b=UnPGHqm9qnwzTIEK8AaHYNGBYd8h4wxJ2aD0ayqqoryEp2r3Kyyi3DpR/LiZ/Zn7bzRauE dVajYjdcAFCpWO+Shc5urp5Cj6K0L96dCXle08XVtso8F9ey3Fmegv5/7uuKPl00vgHH+g 4FQh9YhhtAQVr7lXidB1q+FF+Z8cceXFVLEBKA8yYR1NuQZyMc6oi3iLuKKZnQSKnnU8bQ 7gxKnIzEEZuCLmDibznph6FbOtulZXiO0Y15drxhpRFqjErDcbWwxZUX30KYDCZ60QRJaz ZHh6o92qQ2S1IJNOE6qyldYeQQJ2bDsApmtGNV+63MwKmDexDsNraKgCFRnsVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701103736; a=rsa-sha256; cv=none; b=IwbFECDOXpnVUmnldY1Is96WEe1WOhquD2Kdxeeqdy5Bw3rnB3KzFTBsEv4v98zO2o1084 bWeUj/UrQy+SbZbR3rpgm/bkeyaTnFhBFQ20HokYmO0WA5fcQpq+utmxATmMII/rDunkvF rfT6RDLmmzJh1Vewmy6QZwSF4qtDjb+TLEPeN9nmjtg3EEG5BfJEYTISz0RT7FbZnNRAIz gxYJPPzQcrYI7IRvCuhLdo9U4aAdzu4+izy9HOrIwoM/XRKuFyDMRRl/1CPJQAaMeFgF30 NVtBPVKypTg/2KBhG0KkEIyZSASfpAsNbB1YCTQhNVpMEFvD5To37bJ0dYSL0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfBPM6PHJzmXJ; Mon, 27 Nov 2023 16:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARGmter030685; Mon, 27 Nov 2023 16:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARGmtqN030682; Mon, 27 Nov 2023 16:48:55 GMT (envelope-from git) Date: Mon, 27 Nov 2023 16:48:55 GMT Message-Id: <202311271648.3ARGmtqN030682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 3faba3002f46 - main - x86emu: remove localy added __FBSDID List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3faba3002f466e1bdad4767c55257e04433ee96b Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3faba3002f466e1bdad4767c55257e04433ee96b commit 3faba3002f466e1bdad4767c55257e04433ee96b Author: Brooks Davis AuthorDate: 2023-11-27 16:47:41 +0000 Commit: Brooks Davis CommitDate: 2023-11-27 16:47:41 +0000 x86emu: remove localy added __FBSDID This partially reverts 0a2e9846fdf3f3d42a9ee65d0d8669f6be11c879. Reviewed by: imp, delphij Differential Revision: https://reviews.freebsd.org/D42705 --- sys/contrib/x86emu/x86emu.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/contrib/x86emu/x86emu.c b/sys/contrib/x86emu/x86emu.c index 60a154952f27..44c322849754 100644 --- a/sys/contrib/x86emu/x86emu.c +++ b/sys/contrib/x86emu/x86emu.c @@ -32,9 +32,6 @@ * */ -#include -__FBSDID("$FreeBSD$"); - #include #include From nobody Mon Nov 27 16:59:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfBf771qBz52k46; Mon, 27 Nov 2023 16:59: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 4SfBf76YRBz3Rpb; Mon, 27 Nov 2023 16:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701104399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WaGGM/OTLLE/CAQ6HwR0TRM9/Buchxq3VhEqv4ABowY=; b=yZli6qqfuunuX69c3fBp5NK8VQVam649YnEY+S8JUH+ZfU7svCINsG4ZchoUfhTSWvxt8b m8Jna7onsOw2SEhJoSTnRrCNMIaa1Fq+nQriCG19Ek7SCcYBhNPeHTUuUn9xqiVWAQY4Bx ppOXdJTXCVPf646gQY7pR/D32hUBrrh8rzzv5z1jmmCx9t2b6gfcAiRor79eg1QDdo4FU9 JbaHzoskC0d/+2wKMJkl5ftyzD7u6LD3GPkGfgn/dHikpqJs97tLRmhoc2vCvfZFO42x91 9JkAkIytJhX+elVNetqA8xFVmRhK905kpk3RyACHxEWzFzqEjAqPQ8AzzGln+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701104399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WaGGM/OTLLE/CAQ6HwR0TRM9/Buchxq3VhEqv4ABowY=; b=e5iLlpytlagtcd6iIovHoPvCuVzVTHy33XGhLak2Kq1xh1Ch+QfwxM/l5oTHjQO0XpRki9 zPeSz9AlQeON+2v+CgbPOVDWSYvft1iJTtUTmlg4EjuUbNCb5AxAT5sw4rHs2Qqz56gUIW BmhzzciKT0xBq3ckzQxhvtR4nqtqXXycvHCRlLPrOeqivqE0KFvnSrvRTdO91v+2cWve8R YYZHWvWqYG9VfeEgSOBCPKcnkYHKiDZua7yt3Ri93iO1Qyb40HSW0jiS+MdVFZgF5hJf4T Nu9UPzyT5CA90z0ATIDRjpNJP6caM65jet5EU6ebGhqP45qdO5A29OlBNuBrEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701104399; a=rsa-sha256; cv=none; b=K9E+CfwYnwATucYhdH+8q5UtF5c9dUW+4d/GD2TaDK1hevyoGG9SJgLOrj98LSVJcWJmHE HXLLxBJOMC4hJ8jjY3/bpxNpp+5EQumsxggnVSIPEFekQzZCCX75eQjCR7VZFle5SHMyZf zaE6s+UFuKJwoHB1m33Aql4FXtnEU2EWYJ4kXZu9WcOXvZsOxMvn1t1fjGsJTsHkhlhPHD qUUa3l6TSoZWr+ikOZUmFNMb0ycC9aKJTTeN3Dbp+Lddk+1mUv7qyh8vxRnyYMC22mXR/c ueyx7v1nQo/5JBVtQBQzqbB97zB4MB3EU5U9bgxDdKbSeoRkCPk1JO9hUT5gEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfBf75cKFzmbb; Mon, 27 Nov 2023 16:59: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 3ARGxxrH047403; Mon, 27 Nov 2023 16:59:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARGxx8k047400; Mon, 27 Nov 2023 16:59:59 GMT (envelope-from git) Date: Mon, 27 Nov 2023 16:59:59 GMT Message-Id: <202311271659.3ARGxx8k047400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 1a7c9e1585dd - main - pwait.1: add missing prompt and command in examples List-Id: Commit messages for the main 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a7c9e1585dd3ae14b03226e359d434c10066bfb Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=1a7c9e1585dd3ae14b03226e359d434c10066bfb commit 1a7c9e1585dd3ae14b03226e359d434c10066bfb Author: Mike Karels AuthorDate: 2023-11-27 16:55:11 +0000 Commit: Mike Karels CommitDate: 2023-11-27 16:59:52 +0000 pwait.1: add missing prompt and command in examples Two examples showed '$?' alone on a line, which should be '$ echo $?'. The third example got it right. Fix the first two. --- bin/pwait/pwait.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/pwait/pwait.1 b/bin/pwait/pwait.1 index 9310b74d5683..83ac8bcef317 100644 --- a/bin/pwait/pwait.1 +++ b/bin/pwait/pwait.1 @@ -97,7 +97,7 @@ $ sleep 30 & sleep 3600 & [1] 1646 [2] 1647 $ pwait -o -t5 1646 1647 -$? +$ echo $? 124 .Ed .Pp @@ -111,7 +111,7 @@ $ sleep 30 & sleep 3600 & [2] 1653 $ pwait -v -t 5 1652 1653 timeout -$? +$ echo $? 124 .Ed .Pp From nobody Mon Nov 27 17:49:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfClr3Psyz52BTg; Mon, 27 Nov 2023 17:50:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfClr2RGFz4GXs; Mon, 27 Nov 2023 17:50:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107400; h=from:from:reply-to:subject: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=xu2kcrDzDhzFPx2OsBTeKTodYWlwv1DcemkxrMx60CM=; b=sK0Mnr/3ZxuTxncCyLhvO63wN7tW9gtZh9JdskDkrDk5VCRM6biZrQasJgFkgT8LeO7KuX +e/1ngmtDIzPLwAqfqZ1bpdyLe2gBH1ham1i/k0SVsygsKfpfmWVYTF87OdC7iqIMIATPP i0zzX6SR9Ao3tkcv2SCL4v4qs+xVrKNG9ln0Li1HRYp/8d2GvY8xQOvh+rvKomMoBUWjVS mERk9mokZssiWRSZ7zCbCkV1TXq1G7f8Svf+S52KJ3dy6MdWIY5orS10xrt37HWWQVYDnN 82Rj5iY3KG+TJZzDDjNfjGo+JdIuNR6pyXBvLwC6qBThkjaEmIYYhXVbieLXZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107400; h=from:from:reply-to:subject: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=xu2kcrDzDhzFPx2OsBTeKTodYWlwv1DcemkxrMx60CM=; b=mLuuATpL58r2pArpnEv5B49CuXSgiZgJxwJRsFuSZfIf5R8KZwN8LX48gbAzF8sGN88LlL Hdskb5nuYsqChHB1Khm1dzfLWGKatiR2zlXYxfvtEYHVH2WHcGYZU+VPfEg/02MJprFpbu ZcOIN2Pkbl4/4aMfP2n8vmjdat8z+nDiXNny+XtUzrWOnppVjHEqcfTVKzkO9zKV2636Cu 63x9e5bjK7+xpMdR/3FH4OioUA9kk/S4atO9bcpk8NOJPFBdGZpRiV0nbNn02zTyGAVpjJ iniy9QukCAXL7QXKNu4GrYzsvWFkOlwpSRICNsnTIlHRSeCZtA+y5qvC8ETePw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701107400; a=rsa-sha256; cv=none; b=lK2wzroFLRTrjLtmR2jCjGZlKGnadRdKiEk143uqi8NoayY4A+wJRMVyVGftCDgncv1gJS xXeAInA3uantjMRQu7M+z8VoxjRH4TPUWc3u6wrinEKRCeqgPCQSW7sJPIBBoTbuH2/qji Ddv8FbfGFEYI8OG9yKD0F+UEOdlnUo1eDI5XHaLKfLlKNe7YfRpcJ4ZQ6z+8vGr2BPd6B6 xUCoejh8Blnl37nCVoRbAeE9utKOSWusUxgBgyMYNsOhkQtSwwlGHOJCierF6w5DbjxuR3 EurLicGzjvc6teNl1qRs6SCuBKoO2d0TrCSaMdBBeZC+2JadOwa9G1r+YIcYpw== Received: from [IPV6:2601:648:8384:fd00:bc78:e4e1:3e17:3e10] (unknown [IPv6:2601:648:8384:fd00:bc78:e4e1:3e17:3e10]) (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 4SfClq5PVyzxc7; Mon, 27 Nov 2023 17:49:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <40aa8c4e-69c1-4549-b822-51187c3eb154@FreeBSD.org> Date: Mon, 27 Nov 2023 09:49:58 -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: 29363fb44637 - main - sys: Remove ancient SCCS tags. Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202311270524.3AR5Onom066066@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202311270524.3AR5Onom066066@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/26/23 9:24 PM, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=29363fb446372cb3f10bc98664e9767c53fbb457 > > commit 29363fb446372cb3f10bc98664e9767c53fbb457 > Author: Warner Losh > AuthorDate: 2023-11-23 17:21:37 +0000 > Commit: Warner Losh > CommitDate: 2023-11-27 05:23:30 +0000 > > sys: Remove ancient SCCS tags. > > Remove ancient SCCS tags from the tree, automated scripting, with two > minor fixup to keep things compiling. All the common forms in the tree > were removed with a perl script. > > Sponsored by: Netflix > --- > diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c > index 378cf2f011f6..e5285586b928 100644 > --- a/sys/amd64/amd64/mem.c > +++ b/sys/amd64/amd64/mem.c > @@ -35,7 +35,6 @@ > * SUCH DAMAGE. > * > * from: Utah $Hdr: mem.c 1.13 89/10/08$ > - * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 > */ > > #include Do we want to axe the Utah $Hdr lines as well? Those are even older than UCB. > diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c > index 27bf3f67ca25..6173aabd97f5 100644 > --- a/sys/amd64/amd64/vm_machdep.c > +++ b/sys/amd64/amd64/vm_machdep.c > @@ -37,8 +37,6 @@ > * 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. > - * > - * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 > * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ > */ > This looks to be a bug in the script as it didn't leave a blank line before the Utah hdr. I'm fine if the fix is to can the Utah headers. -- John Baldwin From nobody Mon Nov 27 17:50:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfCm732d7z52BjX; Mon, 27 Nov 2023 17:50:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfCm670fQz4GgJ; Mon, 27 Nov 2023 17:50:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107415; h=from:from:reply-to:subject: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=EqfXvT7kSEnmJ/CjEEaxo2YIvFSxg5fjTAk7cgYIirQ=; b=om6kPsULrV7x6kNZZw1bAXEGzvG7PdQxVlde6qBO9PG/v/iAB7gwSqDGWLXCDBSgr3r7ZI WUYm5JgO3692ZVhjlce5fy9Bva4JAk8yTmYbzHY4xHXcBOucSZKIhHWIGHzOrb1lUYd5B7 H6ftGX/9Xab+RC2K8lRGaBVGPQDEAO5iFwBJMPN8ofb2UfKse8UbluSee+zu2065MmOGCx UGLeDdrjVz+p+Vwu+MJWVY7MFlVKTzBKDGOny7vUnS4W3qrH63RniKWvUm3QkSGcLcooFJ H3Epi/sCKtkdCCQMNr3n11wl4k+0EeqwRJSkcXb6m+e5NHvRMjoUkZsM3XrIDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107415; h=from:from:reply-to:subject: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=EqfXvT7kSEnmJ/CjEEaxo2YIvFSxg5fjTAk7cgYIirQ=; b=yvq+xo+1muMvlUSi6soluXpZUm99mMp3OdcC5wHqG0W5ycbTsl2roR75twc+7XrQpPSXrC wqiXg6usZ3XoDxYE/YnfLBLniO2mul1wdcqBMtPQeV0PjG+evnafTFOisiqFErhuLJHUKl 9g2VdxzwYLOddKf5BUUdI9LYHCOOgB/7f2Pqzl2aMYU6z0V6Ii7ExqhJ1f3+RGgON8ZGIm 1VoLBs01CeL3ewHWejiYxCglb/cI2o0p26z45iyYrGWxUO2r76GFd7tJFLQjsa97XNL5Nw eVANuNu3sbN1zgdyeUNNpZK9LjBP+wFfl3umkqbKy6e5tKi5Si7J0EyXVF74nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701107415; a=rsa-sha256; cv=none; b=aoRUZZHoGJ031rfeX7CdtaG+F/cA/PP3CCSdX7IcxpK/h8plA3CUb4U9XCQw2DKthGHVZh dvwZ/B+yQcmOsf+2tEW1J4t3OlFD2gfCfAzJ7qx2hU7C+MseiUWYdCWPOP2HcshmQ4Wy4G GPE91XTC8+NBBTFaEQZ1bb35LlBb7Pnf8j7VdFrpzFmKShnPC5gNQ/BRzJhj3nyGicfOA0 OHRXgBV+dwgSRb5+jsKDq94bYn13NEqdC/1SWO5BVKDtj/chWyMj6tQuLeQXkM/KVIPhrz TZVFKxAkCx8K5vy++2d4tVfumu703UUSqeYCb6GSEwqP4sKAg3kyEZnbViY3gA== Received: from [IPV6:2601:648:8384:fd00:bc78:e4e1:3e17:3e10] (unknown [IPv6:2601:648:8384:fd00:bc78:e4e1:3e17:3e10]) (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 4SfCm63253zxGc; Mon, 27 Nov 2023 17:50:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <8d51e8f9-37a0-4f28-bf05-2a58514fddb0@FreeBSD.org> Date: Mon, 27 Nov 2023 09:50:14 -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: b88ca6ee167d - main - cdefs: Remove CC_SUPPORTS macros, they are unused Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202311270525.3AR5PHQ2067285@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202311270525.3AR5PHQ2067285@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/26/23 9:25 PM, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b88ca6ee167d079c965dfe123bbe296d3a945c0a > > commit b88ca6ee167d079c965dfe123bbe296d3a945c0a > Author: Warner Losh > AuthorDate: 2023-11-20 22:40:55 +0000 > Commit: Warner Losh > CommitDate: 2023-11-27 05:24:02 +0000 > > cdefs: Remove CC_SUPPORTS macros, they are unused > > Remove __CC_SUPPORTS_INLINE, __CC_SUPPORTS___INLINE__, > __CC_SUPPORTS___FUNC__, __CC_SUPPORTS_WARNING, > __CC_SUPPORTS_VARADIC_XXX, __CC_SUPPORTS_DYNAMIC_ARRAY_INIT: they are > unused. Also remove them from the generated cryptodevh.py script. > > Retain, for the moment, __CC_SUPPORTS___INLINE, since it's used in this > file. > > PR: 275221 (exp-run) > Sponsored by: Netflix > --- > sys/sys/cdefs.h | 10 ---------- > tests/sys/opencrypto/cryptodevh.py | 7 ------- > 2 files changed, 17 deletions(-) > > diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h > index 5782735187c5..7f3efc9300c9 100644 > --- a/sys/sys/cdefs.h > +++ b/sys/sys/cdefs.h > @@ -79,17 +79,7 @@ > */ > #define __compiler_membar() __asm __volatile(" " : : : "memory") > > -/* XXX: if __GNUC__ >= 2: not tested everywhere originally, where replaced */ > -#define __CC_SUPPORTS_INLINE 1 > #define __CC_SUPPORTS___INLINE 1 > -#define __CC_SUPPORTS___INLINE__ 1 > - > -#define __CC_SUPPORTS___FUNC__ 1 > -#define __CC_SUPPORTS_WARNING 1 > - > -#define __CC_SUPPORTS_VARADIC_XXX 1 /* see varargs.h */ > - > -#define __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1 > > #endif /* __GNUC__ */ > > diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py > index d6982c26f1cf..9607bcd4d115 100644 > --- a/tests/sys/opencrypto/cryptodevh.py > +++ b/tests/sys/opencrypto/cryptodevh.py > @@ -23,13 +23,6 @@ def __has_include(x): return 0 > > def __has_builtin(x): return 0 > > -__CC_SUPPORTS_INLINE = 1 > -__CC_SUPPORTS___INLINE = 1 > -__CC_SUPPORTS___INLINE__ = 1 > -__CC_SUPPORTS___FUNC__ = 1 > -__CC_SUPPORTS_WARNING = 1 > -__CC_SUPPORTS_VARADIC_XXX = 1 > -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT = 1 > def __P(protos): return protos > > def __STRING(x): return #x It doesn't really matter, but you accidentally removed __CC_SUPPORTS___INLINE from the python version but not cdefs.h. I wonder how hard it would be to just regenerate cryptodevh.py rather than updating it manually as I'm sure it is missing some other updates. -- John Baldwin From nobody Mon Nov 27 17:50:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfCmC4TKJz52Bqy; Mon, 27 Nov 2023 17:50:19 +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 4SfCmC2zG9z4HB0; Mon, 27 Nov 2023 17:50:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107419; h=from:from:reply-to:subject: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=sedSWZfHdt22DC4uzejXwAm5fHYrashBPdRbqMfr83Y=; b=HTB0SJvGAgEwHdBXol7dPgO8hKIUj1cYn78Z4XxdN+EUciDIvNrNV0Bk5Oh5OAgqRdYCNh LjUgKZLkYbF8/vkCrVZdQy8/sey0Ep+SzsssmiTVC34amhjVyEtWH7aiOtMQC6VOLwZGUZ 8SuFT5DmIdkRmHafLkA05a4l3tVAdfAuG/OglEdoRs6k9oHZ5JUB9MiZwWDVAaurCvKFPU RMUKqewTnbEcDCQHI0uz+UPpFY57bygCoTVsuKkv7BmWFInCl68Zq9TC7DnugyOPGsRNkH 3BLf/FRujhet9KS76TNsZGweKSz8pnxvKWSuwv+DGjyiKi12LA4Koz4w/Ojrkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107419; h=from:from:reply-to:subject: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=sedSWZfHdt22DC4uzejXwAm5fHYrashBPdRbqMfr83Y=; b=iW9NpHGOdKgtU5zAZ/gY9UCyCQNp0ohTiIJ6/N8WtqG6DOYq1XeCekd4/MnXC349gyc7In LBFAvSUpDxQ8u6UMvlf4RSHDAbokq3J1uMQ2nrffVeGvLhcKsn9QzMx6WL+wwI0BYHB/VV ELY4L2/DcC7/F1MVrzuIgPOPpX+W6S3/nMZIZyNEY/QUXFMg9ZJ4ouKvLXjzffYmkMLtKI x5N+uHNyk5diPsfbK8wQYlG70xKiACuMoiEN/2U5nuPYAi6Ul2rpulYULdpG6GxVCekii/ Sup5TAgKfVslLjFYyCuFI+9qO9hbo3QdQGAZzMu+bDCSovWLNykENUBrFnTQiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701107419; a=rsa-sha256; cv=none; b=vdwTsHO4kRv1XTnhRhFXahtuM1qtQz76S6cv/Aw3FvSL223vriLHW9MsriHS5vdDRNSXwG 40eT+SIIQAwTZrjI9kcSXCCwcNTwaD6Q2m5CPfDyEqIQnvFC957U2vNXEsxyZbsRY6z25s MOJcDw6MHflsF4BKebvMDl+IOXXzskIszT7D+pd9QEa4JrH5YmNI6DxeQ0SE8K2VgzOV0I w9kqMo5rCrDpCazZ/H8tP+wPbtiFpkbA9Q5CyqqD2o13a2AFQavDYv0yThBVQ89k6UAW15 tndkYFrsx8LKfrIutOhb3AWEDbMgXBuv1FrTJM2whEtDevJDQRDwOWjqTQcd4Q== Received: from [IPV6:2601:648:8384:fd00:bc78:e4e1:3e17:3e10] (unknown [IPv6:2601:648:8384:fd00:bc78:e4e1:3e17:3e10]) (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 4SfCmB60gJzy5S; Mon, 27 Nov 2023 17:50:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <136388c6-424f-427f-8584-fededcf1cede@FreeBSD.org> Date: Mon, 27 Nov 2023 09:50:18 -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: 17a238a15fbe - main - cdefs: Remove __func__ define Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202311270525.3AR5PK1V067372@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202311270525.3AR5PK1V067372@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/26/23 9:25 PM, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=17a238a15fbed01477fbc54744d35cbccdb65871 > > commit 17a238a15fbed01477fbc54744d35cbccdb65871 > Author: Warner Losh > AuthorDate: 2023-11-20 23:34:22 +0000 > Commit: Warner Losh > CommitDate: 2023-11-27 05:24:02 +0000 > > cdefs: Remove __func__ define > > We require an ANSI-C compiler to build the base system. It's required > that __func__ work. Remove this define since the only known problem > compilers are ancient history (gcc 2.6 from 1994, almost pre-dating the > project). 3rd party code that used this define will now need to provide > it via some other means when using non-ansi-c compilers. > > PR: 275221 (exp-run) > Sponsored by: Netflix > --- > sys/sys/cdefs.h | 40 ++------------------------------------ > tests/sys/opencrypto/cryptodevh.py | 4 ---- > 2 files changed, 2 insertions(+), 42 deletions(-) > > diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h > index c5b6190077b3..bcbf418f9323 100644 > --- a/sys/sys/cdefs.h > +++ b/sys/sys/cdefs.h > @@ -96,14 +96,9 @@ > /* > * The __CONCAT macro is used to concatenate parts of symbol names, e.g. > * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. > - * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI > - * mode -- there must be no spaces between its arguments, and for nested > - * __CONCAT's, all the __CONCAT's must be at the left. __CONCAT can also > - * concatenate double-quoted strings produced by the __STRING macro, but > - * this only works with ANSI C. > * > * __XSTRING is like __STRING, but it expands any macros in its argument > - * first. It is only available with ANSI C. > + * first. > */ > #if defined(__STDC__) || defined(__cplusplus) > #define __P(protos) protos /* full-blown ANSI C */ > @@ -122,33 +117,7 @@ > #define __inline /* delete GCC keyword */ > #endif /* ! __CC_SUPPORTS___INLINE */ > #endif /* !__cplusplus */ > - > -#else /* !(__STDC__ || __cplusplus) */ > -#define __P(protos) () /* traditional C preprocessor */ > -#define __CONCAT(x,y) x/**/y > -#define __STRING(x) "x" > - > -#if !defined(__CC_SUPPORTS___INLINE) > -#define __const /* delete pseudo-ANSI C keywords */ > -#define __inline > -#define __signed > -#define __volatile > -/* > - * In non-ANSI C environments, new programs will want ANSI-only C keywords > - * deleted from the program and old programs will want them left alone. > - * When using a compiler other than gcc, programs using the ANSI C keywords > - * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS. > - * When using "gcc -traditional", we assume that this is the intent; if > - * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone. > - */ > -#ifndef NO_ANSI_KEYWORDS > -#define const /* delete ANSI C keywords */ > -#define inline > -#define signed > -#define volatile > -#endif /* !NO_ANSI_KEYWORDS */ > -#endif /* !__CC_SUPPORTS___INLINE */ > -#endif /* !(__STDC__ || __cplusplus) */ > +#endif /* __STDC__ || __cplusplus */ > > /* > * Compiler-dependent macros to help declare dead (non-returning) and > @@ -343,11 +312,6 @@ > #define __unreachable() ((void)0) > #endif > > -/* XXX: should use `#if __STDC_VERSION__ < 199901'. */ > -#if !__GNUC_PREREQ__(2, 7) > -#define __func__ NULL > -#endif > - > #if (defined(__GNUC__) && __GNUC__ >= 2) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901 > #define __LONG_LONG_SUPPORTED > #endif This removed a lot more than just __func__? -- John Baldwin From nobody Mon Nov 27 18:07:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfD866QSXz52M8Y for ; Mon, 27 Nov 2023 18:07:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 4SfD8661QCz4N9H for ; Mon, 27 Nov 2023 18:07:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-5482df11e73so6019559a12.0 for ; Mon, 27 Nov 2023 10:07:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701108453; x=1701713253; 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=6E6RHfd/qwhVsf8jO2apJz4Tb0Bb5/z1X9DjrJuARsY=; b=ExRYdePaOp4F0GappD/TlwEi3LJpHLWhWi51H4CxbK2XAml6Sag7yr6r+hEO3aviu/ 8RvLNwiV0aeQINHSWgy3l+si0UT012vueKi5aTSqeFtJrIe0Rvp7kfhrcZIRTod05VGG VUCMOWzluv01oINB1VaePmdTQ1vM2Ay9uh0nFHAq4nVV3L4ZxKGyDspw9nLQK5d6qbxv ro94WwqkcDVO2yDLD6In2C2NxQulw3W9gTLSoBotCC7ps8C8LmUkAzZqCe3WMupKpXqk PSKn2Wv4TRzHNJZKx4bJFxnv6xQDe4iIj6zsD3vv+jh9nU0cyFKnYKSqmDTzAv7eC3CI Xa4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701108453; x=1701713253; 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=6E6RHfd/qwhVsf8jO2apJz4Tb0Bb5/z1X9DjrJuARsY=; b=lrh5b+A6VRWqa/FQe0/TmeJB6RaTGmWtOxYwHqWAxElXzUj6rR5kLqqrOWvF0zS1F0 qMHvym8ElU28J/9k6l1zjAFpNNWQxvyRryC/VHbBd+6kXgqbZA76Jk7Efw5pq2XtdAdj N9IAjHzmiiE7PK3wfrnu5pGkzZmVgxmWXsOPq2MzPC7PgZ+F1Q9RlrnjP+BQiUGyWrO0 4gg8oIxqXV0MSFTNn149oyGpBZq97BQtijUBm1c59HdAykuF8xl6Zf7Rcl+Oh8pgimW6 qf5y0jkX7Z/fRnDXzYAHNyI+AFVV3+QvtE9WLyc1/vaWKfImGz0Y3Y5T1o0Mflxce1KG EJsA== X-Gm-Message-State: AOJu0Yy0VzrZuZ4gLFSuAz+TCCLYQ9fizcMdabC+eulv1X1gyv/jD0+3 PNT6/qRNq10B4lmDuyJgYgcE/Bn25Z9qM3ypHHcTuA== X-Google-Smtp-Source: AGHT+IGdcUfkJQwNgqcKJbhMtCmRqh6582LMK8C9kz/6hr81nwrmpp4VTrwtKd7/kgfTDfvdqHMMfQZSn82CjHW6RMc= X-Received: by 2002:a05:6402:2207:b0:54b:25e8:c010 with SMTP id cq7-20020a056402220700b0054b25e8c010mr4868750edb.32.1701108453332; Mon, 27 Nov 2023 10:07:33 -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: <202311270524.3AR5Onom066066@gitrepo.freebsd.org> <40aa8c4e-69c1-4549-b822-51187c3eb154@FreeBSD.org> In-Reply-To: <40aa8c4e-69c1-4549-b822-51187c3eb154@FreeBSD.org> From: Warner Losh Date: Mon, 27 Nov 2023 11:07:22 -0700 Message-ID: Subject: Re: git: 29363fb44637 - main - sys: Remove ancient SCCS tags. To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000015e839060b262da8" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4SfD8661QCz4N9H --00000000000015e839060b262da8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Nov 27, 2023 at 10:50=E2=80=AFAM John Baldwin wro= te: > On 11/26/23 9:24 PM, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D29363fb446372cb3f10bc98664e9767= c53fbb457 > > > > commit 29363fb446372cb3f10bc98664e9767c53fbb457 > > Author: Warner Losh > > AuthorDate: 2023-11-23 17:21:37 +0000 > > Commit: Warner Losh > > CommitDate: 2023-11-27 05:23:30 +0000 > > > > sys: Remove ancient SCCS tags. > > > > Remove ancient SCCS tags from the tree, automated scripting, with > two > > minor fixup to keep things compiling. All the common forms in the > tree > > were removed with a perl script. > > > > Sponsored by: Netflix > > --- > > diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c > > index 378cf2f011f6..e5285586b928 100644 > > --- a/sys/amd64/amd64/mem.c > > +++ b/sys/amd64/amd64/mem.c > > @@ -35,7 +35,6 @@ > > * SUCH DAMAGE. > > * > > * from: Utah $Hdr: mem.c 1.13 89/10/08$ > > - * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 > > */ > > > > #include > > Do we want to axe the Utah $Hdr lines as well? Those are even older than > UCB. > I think so. > > diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.= c > > index 27bf3f67ca25..6173aabd97f5 100644 > > --- a/sys/amd64/amd64/vm_machdep.c > > +++ b/sys/amd64/amd64/vm_machdep.c > > @@ -37,8 +37,6 @@ > > * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN > ANY WAY > > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILIT= Y > OF > > * SUCH DAMAGE. > > - * > > - * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 > > * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ > > */ > > > > This looks to be a bug in the script as it didn't leave a blank line > before the Utah hdr. > > I'm fine if the fix is to can the Utah headers. > Ah, I hadn't even noticed the Utah headers there. There's a number of other places in the tree that have $Id$ or similar things as well. There are likely others that we'll find. With tens of thousands of these in the tree, it's easy to miss a few (I think I missed about 100 $FreeBSD$'s that were spelled various ways that were a bit different than the scripts expected. Warner --00000000000015e839060b262da8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Nov 27, 2023 at 10:50=E2=80= =AFAM John Baldwin <jhb@freebsd.org> wrote:
On= 11/26/23 9:24 PM, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D29363fb446372cb3f10bc98664e9767c53fbb457<= /a>
>
> commit 29363fb446372cb3f10bc98664e9767c53fbb457
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2023-11-23 17:21:37 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-11-27 05:23:30 +0000
>
>=C2=A0 =C2=A0 =C2=A0 sys: Remove ancient SCCS tags.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Remove ancient SCCS tags from the tree, automated = scripting, with two
>=C2=A0 =C2=A0 =C2=A0 minor fixup to keep things compiling. All the comm= on forms in the tree
>=C2=A0 =C2=A0 =C2=A0 were removed with a perl script.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix
> ---
> diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
> index 378cf2f011f6..e5285586b928 100644
> --- a/sys/amd64/amd64/mem.c
> +++ b/sys/amd64/amd64/mem.c
> @@ -35,7 +35,6 @@
>=C2=A0 =C2=A0 * SUCH DAMAGE.
>=C2=A0 =C2=A0 *
>=C2=A0 =C2=A0 *=C2=A0 from: Utah $Hdr: mem.c 1.13 89/10/08$
> - *=C2=A0 =C2=A0from: @(#)mem.c 7.2 (Berkeley) 5/9/91
>=C2=A0 =C2=A0 */
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0#include <sys/cdefs.h>

Do we want to axe the Utah $Hdr lines as well?=C2=A0 Those are even older t= han UCB.

=C2=A0
> diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep= .c
> index 27bf3f67ca25..6173aabd97f5 100644
> --- a/sys/amd64/amd64/vm_machdep.c
> +++ b/sys/amd64/amd64/vm_machdep.c
> @@ -37,8 +37,6 @@
>=C2=A0 =C2=A0 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) = ARISING IN ANY WAY
>=C2=A0 =C2=A0 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE= POSSIBILITY OF
>=C2=A0 =C2=A0 * SUCH DAMAGE.
> - *
> - *=C2=A0 =C2=A0from: @(#)vm_machdep.c=C2=A0 7.3 (Berkeley) 5/13/91 >=C2=A0 =C2=A0 *=C2=A0 Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
>=C2=A0 =C2=A0 */
>=C2=A0 =C2=A0

This looks to be a bug in the script as it didn't leave a blank line be= fore the Utah hdr.

I'm fine if the fix is to can the Utah headers.
Ah, I hadn't even noticed the Utah headers there. There= 9;s a number of other
places in the tree that have $Id$ or simila= r things as well. There are likely others
that we'll find. Wi= th tens of thousands of these in the tree, it's easy to miss a few (I
think I missed about 100 $FreeBSD$'s that were spelled various= ways that were a
bit different than the scripts expected.
<= div>
Warner
--00000000000015e839060b262da8-- From nobody Mon Nov 27 18:12:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfDFr4qPQz52Pq0 for ; Mon, 27 Nov 2023 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfDFr2kH2z4Wht for ; Mon, 27 Nov 2023 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-54af1daf6a9so6209784a12.1 for ; Mon, 27 Nov 2023 10:12:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701108751; x=1701713551; 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=LQqplNbJ7iWc6bJ6OO4mBchEkosXa2y+GVVd5F/YWtY=; b=2GCzzoRnYbNBe1OV3g5lmPUjHnRbDnYOwoxuXpj6ascgSnw8iUabmfBW0QWkAtCniW //1MdGa1OenkdUIM2UfKGubtu2zb+VcjfXrK0AvK0a4vckQbiqK1boLWLSd+gMMEBCkB Xl0tq1lNQhW1HRfGgmDux1ddzVrViSkh9B+1l1/qNCY/h+yeowziEuIUQ8oAEcVSuCkk hpV9lRHYqtwt15W2HmAbvQFh9jW+7AF1dvA3IV1M1lQuHfoJDF73owq2Zvqz9nUKcf1q iNrdG4eDYsFwxwzqCqEwV8ZoMT2Wx1qTqqz5pZDWsG2N8aGuaVWmEZRdX5qYKiRcb1h7 T85A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701108751; x=1701713551; 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=LQqplNbJ7iWc6bJ6OO4mBchEkosXa2y+GVVd5F/YWtY=; b=gUxpAEOO93KpO7nRMcCiFg4EerSW5MRisVPTkpk0JKY+TXVPIqZ77aBm/NOtfd5DXB 5yjxK/Ov/t52xe+mv3APGXnU4HvnFYzL6zl6QG0yRHuua1voL96cT0tNa0KB2r0MJfif zw/cz27oUrmRCxfrISMKj65TS+sHvSUou8ugBIbyMRYFE2Qnq2FBpwzaS7suonryYTnX cErNyJQyJqYMtW70KG+/B2he9X6aRrOglmd1ZrsiYfQxgCDt3t/6x7+VtcVat8jltKru rbC+Oaw9BrPqmpz8fjmqvEIgf+Aa180DQT3W28VIS0oL8lmD5A10+BXJ6abf7rSjEih7 nTQQ== X-Gm-Message-State: AOJu0YxTUg7L44DVfTjA5CnJ5AUwjIw6fZgdpks7mg1FzTdGoUyDtC1P KUTxyYY1wpURrPTd9L+X4ocVY5gXZg7WLaTa9ve/bgTdOtGGcm55 X-Google-Smtp-Source: AGHT+IGL4wJnnrz1NaFrFqramJKX56eu7mcAZBEvDcyTQc7fmipvyUolOBN0hSQUNGEcYKebJCSIifItfETKEFP7NfM= X-Received: by 2002:aa7:c045:0:b0:54b:5007:9a12 with SMTP id k5-20020aa7c045000000b0054b50079a12mr4439270edo.10.1701108750715; Mon, 27 Nov 2023 10:12:30 -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: <202311270525.3AR5PHQ2067285@gitrepo.freebsd.org> <8d51e8f9-37a0-4f28-bf05-2a58514fddb0@FreeBSD.org> In-Reply-To: <8d51e8f9-37a0-4f28-bf05-2a58514fddb0@FreeBSD.org> From: Warner Losh Date: Mon, 27 Nov 2023 11:12:19 -0700 Message-ID: Subject: Re: git: b88ca6ee167d - main - cdefs: Remove CC_SUPPORTS macros, they are unused To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000cfa970060b263e79" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4SfDFr2kH2z4Wht --000000000000cfa970060b263e79 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Nov 27, 2023 at 10:50=E2=80=AFAM John Baldwin wro= te: > On 11/26/23 9:25 PM, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Db88ca6ee167d079c965dfe123bbe296= d3a945c0a > > > > commit b88ca6ee167d079c965dfe123bbe296d3a945c0a > > Author: Warner Losh > > AuthorDate: 2023-11-20 22:40:55 +0000 > > Commit: Warner Losh > > CommitDate: 2023-11-27 05:24:02 +0000 > > > > cdefs: Remove CC_SUPPORTS macros, they are unused > > > > Remove __CC_SUPPORTS_INLINE, __CC_SUPPORTS___INLINE__, > > __CC_SUPPORTS___FUNC__, __CC_SUPPORTS_WARNING, > > __CC_SUPPORTS_VARADIC_XXX, __CC_SUPPORTS_DYNAMIC_ARRAY_INIT: they > are > > unused. Also remove them from the generated cryptodevh.py script. > > > > Retain, for the moment, __CC_SUPPORTS___INLINE, since it's used in > this > > file. > > > > PR: 275221 (exp-run) > > Sponsored by: Netflix > > --- > > sys/sys/cdefs.h | 10 ---------- > > tests/sys/opencrypto/cryptodevh.py | 7 ------- > > 2 files changed, 17 deletions(-) > > > > diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h > > index 5782735187c5..7f3efc9300c9 100644 > > --- a/sys/sys/cdefs.h > > +++ b/sys/sys/cdefs.h > > @@ -79,17 +79,7 @@ > > */ > > #define __compiler_membar() __asm __volatile(" " : : : > "memory") > > > > -/* XXX: if __GNUC__ >=3D 2: not tested everywhere originally, where > replaced */ > > -#define __CC_SUPPORTS_INLINE 1 > > #define __CC_SUPPORTS___INLINE 1 > > -#define __CC_SUPPORTS___INLINE__ 1 > > - > > -#define __CC_SUPPORTS___FUNC__ 1 > > -#define __CC_SUPPORTS_WARNING 1 > > - > > -#define __CC_SUPPORTS_VARADIC_XXX 1 /* see varargs.h */ > > - > > -#define __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1 > > > > #endif /* __GNUC__ */ > > > > diff --git a/tests/sys/opencrypto/cryptodevh.py > b/tests/sys/opencrypto/cryptodevh.py > > index d6982c26f1cf..9607bcd4d115 100644 > > --- a/tests/sys/opencrypto/cryptodevh.py > > +++ b/tests/sys/opencrypto/cryptodevh.py > > @@ -23,13 +23,6 @@ def __has_include(x): return 0 > > > > def __has_builtin(x): return 0 > > > > -__CC_SUPPORTS_INLINE =3D 1 > > -__CC_SUPPORTS___INLINE =3D 1 > > -__CC_SUPPORTS___INLINE__ =3D 1 > > -__CC_SUPPORTS___FUNC__ =3D 1 > > -__CC_SUPPORTS_WARNING =3D 1 > > -__CC_SUPPORTS_VARADIC_XXX =3D 1 > > -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT =3D 1 > > def __P(protos): return protos > > > > def __STRING(x): return #x > > It doesn't really matter, but you accidentally removed > __CC_SUPPORTS___INLINE from > the python version but not cdefs.h. I wonder how hard it would be to jus= t > regenerate > cryptodevh.py rather than updating it manually as I'm sure it is missing > some other > updates. > Yea, I'm not at all sure how it was generated in the first place. And I removed it there when I removed it in cdefs.h, but then I failed to add it back when I concluded that I had to add it back to cdefs.h.... I think I have plans to remove it in 2024q1 cdefs.h cleaning where I'll go farther: kill K&R support macros we have in there (so one couldn't use a pure K&R compiler on FreeBSD with the system headers... though doing that is already impossible because of all the prototypes). I also plan on eliminating all support for gcc prior to 4.2. There's only one port in the tree that uses an older gcc (2.8 for hp48x cross compiler) and it's i386 only. And I've not installed it to see if it uses the system headers or not (if it doesn't, then my changes won't affect it at all). I also have tcc (aka tinyc) working after a fashion (I've fixed the compile issues we have with it) just to make sure my future cleanups don't break other compilers (though this is the only other one I know works and uses system headers). Warner --000000000000cfa970060b263e79 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Nov 27, 2023 at 10:50=E2=80= =AFAM John Baldwin <jhb@freebsd.org> wrote:
On= 11/26/23 9:25 PM, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Db88ca6ee167d079c965dfe123bbe296d3a945c0a<= /a>
>
> commit b88ca6ee167d079c965dfe123bbe296d3a945c0a
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2023-11-20 22:40:55 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-11-27 05:24:02 +0000
>
>=C2=A0 =C2=A0 =C2=A0 cdefs: Remove CC_SUPPORTS macros, they are unused<= br> >=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Remove __CC_SUPPORTS_INLINE, __CC_SUPPORTS___INLIN= E__,
>=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS___FUNC__, __CC_SUPPORTS_WARNING,
>=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_VARADIC_XXX, __CC_SUPPORTS_DYNAMIC_A= RRAY_INIT: they are
>=C2=A0 =C2=A0 =C2=A0 unused. Also remove them from the generated crypto= devh.py script.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Retain, for the moment, __CC_SUPPORTS___INLINE, si= nce it's used in this
>=C2=A0 =C2=A0 =C2=A0 file.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 PR: 275221 (exp-run)
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix
> ---
>=C2=A0 =C2=A0sys/sys/cdefs.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 10 ----------
>=C2=A0 =C2=A0tests/sys/opencrypto/cryptodevh.py |=C2=A0 7 -------
>=C2=A0 =C2=A02 files changed, 17 deletions(-)
>
> diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
> index 5782735187c5..7f3efc9300c9 100644
> --- a/sys/sys/cdefs.h
> +++ b/sys/sys/cdefs.h
> @@ -79,17 +79,7 @@
>=C2=A0 =C2=A0 */
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0__compiler_membar()=C2=A0 =C2= =A0 =C2=A0__asm __volatile(" " : : : "memory")
>=C2=A0 =C2=A0
> -/* XXX: if __GNUC__ >=3D 2: not tested everywhere originally, wher= e replaced */
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_INLINE 1
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0__CC_SUPPORTS___INLINE 1
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS___INLINE__ 1
> -
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS___FUNC__ 1
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_WARNING 1
> -
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_VARADIC_XXX 1 /* see vararg= s.h */
> -
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0#endif /* __GNUC__ */
>=C2=A0 =C2=A0
> diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto= /cryptodevh.py
> index d6982c26f1cf..9607bcd4d115 100644
> --- a/tests/sys/opencrypto/cryptodevh.py
> +++ b/tests/sys/opencrypto/cryptodevh.py
> @@ -23,13 +23,6 @@ def __has_include(x): return 0
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0def __has_builtin(x): return 0
>=C2=A0 =C2=A0
> -__CC_SUPPORTS_INLINE =3D 1
> -__CC_SUPPORTS___INLINE =3D 1
> -__CC_SUPPORTS___INLINE__ =3D 1
> -__CC_SUPPORTS___FUNC__ =3D 1
> -__CC_SUPPORTS_WARNING =3D 1
> -__CC_SUPPORTS_VARADIC_XXX =3D 1
> -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT =3D 1
>=C2=A0 =C2=A0def __P(protos): return protos=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0def __STRING(x): return #x=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0

It doesn't really matter, but you accidentally removed __CC_SUPPORTS___= INLINE from
the python version but not cdefs.h.=C2=A0 I wonder how hard it would be to = just regenerate
cryptodevh.py rather than updating it manually as I'm sure it is missin= g some other
updates.

--000000000000cfa970060b263e79-- From nobody Mon Nov 27 18:13:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfDH91nDsz52Q3B for ; Mon, 27 Nov 2023 18:13:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) (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 4SfDH873lrz4XJH for ; Mon, 27 Nov 2023 18:13:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-507e85ebf50so6156977e87.1 for ; Mon, 27 Nov 2023 10:13:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701108819; x=1701713619; 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=cMr54PiDt/h8giHJPJtKasGw4wtpiystx4Gt6bjE/S4=; b=sKkBVCgrkdER9VMatngHOPr1fD08GntDkiUWwonDufviO/2iN26WmYfz5Sih8uomjw 7PlGFBxY/b7Dl81lQHmWx1Ui/kqIv/vXKsIr+fSAJo9WSclakod5u1uJX7WZAV/NPw+i qoyu725to/Sg8JBLerHH781A7xqxiZ+69ZLzeOlFDq/0n6W6QSIJtcCApoPTuOfL0Cup Vp5Td0xcZZWh4uySmicot2t1st+8zIJLMArcZfZartTUpt/vLx6ViSpsFdztv2JAkkDR r7vjUerqbcvy4+ofiKkwt4iPz0N4jSxxkvpcgdTF/OUtJp7v0crShrxmHZhAF3UGSR23 qXwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701108819; x=1701713619; 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=cMr54PiDt/h8giHJPJtKasGw4wtpiystx4Gt6bjE/S4=; b=OjyK86uVWBnXrVZz53ZcyRAaMxJYVlBPZ9ojbA8fXF6MXPe+kfM54p8wG6e236IMLi XZaFBHp7E4GzSDQ/ecJ1y2S29oVMZdjKwlh/n3Rcz6jSSjIKc1H3ypCc1mUJTZ7QEcat lSd1HLdzsVaoVBO5g8zK7leFdhlVkmGHfgDEEM9WlGt7sKh3+cu79eKAkhVLCnN31kSr 0NfzW+sKYs1OBWmjAAc9L5o2VEovt54vFR7aoMv0w1kGW0/zQEMtLC0og1DGBdStWe6E dSGJrhHNzzW+WepmDYTpaBV54inwwwgs4t1xLD6UU7sgAXfr+274Zs6Jxo6xDoCCQ1LC BFfg== X-Gm-Message-State: AOJu0YwsEdJ3HfhJbNGnSPeKD9ogO5W4j9MDHwtjSwdhGXe6gpW0LZiU DPvc0If/lRxgmD1Cab/OknabMFI9MsVAbxM2S9UGZA== X-Google-Smtp-Source: AGHT+IF+JsjrIqhKFrpi8r9t3r6ArnSvtpTa6KezVhlQF15Vpa7+VoGJfxBGYqqh4br1H7I9RbtkIftwn/+BA0pm6n0= X-Received: by 2002:a05:6512:280e:b0:507:b17a:709e with SMTP id cf14-20020a056512280e00b00507b17a709emr10310634lfb.1.1701108819048; Mon, 27 Nov 2023 10:13:39 -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: <202311270525.3AR5PK1V067372@gitrepo.freebsd.org> <136388c6-424f-427f-8584-fededcf1cede@FreeBSD.org> In-Reply-To: <136388c6-424f-427f-8584-fededcf1cede@FreeBSD.org> From: Warner Losh Date: Mon, 27 Nov 2023 11:13:27 -0700 Message-ID: Subject: Re: git: 17a238a15fbe - main - cdefs: Remove __func__ define To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000e2515f060b264230" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4SfDH873lrz4XJH --000000000000e2515f060b264230 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Nov 27, 2023 at 10:50=E2=80=AFAM John Baldwin wro= te: > On 11/26/23 9:25 PM, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D17a238a15fbed01477fbc54744d35cb= ccdb65871 > > > > commit 17a238a15fbed01477fbc54744d35cbccdb65871 > > Author: Warner Losh > > AuthorDate: 2023-11-20 23:34:22 +0000 > > Commit: Warner Losh > > CommitDate: 2023-11-27 05:24:02 +0000 > > > > cdefs: Remove __func__ define > > > > We require an ANSI-C compiler to build the base system. It's > required > > that __func__ work. Remove this define since the only known proble= m > > compilers are ancient history (gcc 2.6 from 1994, almost pre-datin= g > the > > project). 3rd party code that used this define will now need to > provide > > it via some other means when using non-ansi-c compilers. > > > > PR: 275221 (exp-run) > > Sponsored by: Netflix > > --- > > sys/sys/cdefs.h | 40 > ++------------------------------------ > > tests/sys/opencrypto/cryptodevh.py | 4 ---- > > 2 files changed, 2 insertions(+), 42 deletions(-) > > > > diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h > > index c5b6190077b3..bcbf418f9323 100644 > > --- a/sys/sys/cdefs.h > > +++ b/sys/sys/cdefs.h > > @@ -96,14 +96,9 @@ > > /* > > * The __CONCAT macro is used to concatenate parts of symbol names, > e.g. > > * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfo= o. > > - * The __CONCAT macro is a bit tricky to use if it must work in non-AN= SI > > - * mode -- there must be no spaces between its arguments, and for nest= ed > > - * __CONCAT's, all the __CONCAT's must be at the left. __CONCAT can > also > > - * concatenate double-quoted strings produced by the __STRING macro, b= ut > > - * this only works with ANSI C. > > * > > * __XSTRING is like __STRING, but it expands any macros in its > argument > > - * first. It is only available with ANSI C. > > + * first. > > */ > > #if defined(__STDC__) || defined(__cplusplus) > > #define __P(protos) protos /* full-blown ANSI C */ > > @@ -122,33 +117,7 @@ > > #define __inline /* delete GCC keyword */ > > #endif /* ! __CC_SUPPORTS___INLINE */ > > #endif /* !__cplusplus */ > > - > > -#else /* !(__STDC__ || __cplusplus) */ > > -#define __P(protos) () /* traditional C > preprocessor */ > > -#define __CONCAT(x,y) x/**/y > > -#define __STRING(x) "x" > > - > > -#if !defined(__CC_SUPPORTS___INLINE) > > -#define __const /* delete pseudo-ANSI C > keywords */ > > -#define __inline > > -#define __signed > > -#define __volatile > > -/* > > - * In non-ANSI C environments, new programs will want ANSI-only C > keywords > > - * deleted from the program and old programs will want them left alone= . > > - * When using a compiler other than gcc, programs using the ANSI C > keywords > > - * const, inline etc. as normal identifiers should define > -DNO_ANSI_KEYWORDS. > > - * When using "gcc -traditional", we assume that this is the intent; i= f > > - * __GNUC__ is defined but __STDC__ is not, we leave the new keywords > alone. > > - */ > > -#ifndef NO_ANSI_KEYWORDS > > -#define const /* delete ANSI C keywords > */ > > -#define inline > > -#define signed > > -#define volatile > > -#endif /* !NO_ANSI_KEYWORDS */ > > -#endif /* !__CC_SUPPORTS___INLINE */ > > -#endif /* !(__STDC__ || __cplusplus) */ > > +#endif /* __STDC__ || __cplusplus */ > > > > /* > > * Compiler-dependent macros to help declare dead (non-returning) and > > @@ -343,11 +312,6 @@ > > #define __unreachable() ((void)0) > > #endif > > > > -/* XXX: should use `#if __STDC_VERSION__ < 199901'. */ > > -#if !__GNUC_PREREQ__(2, 7) > > -#define __func__ NULL > > -#endif > > - > > #if (defined(__GNUC__) && __GNUC__ >=3D 2) && !defined(__STRICT_ANSI_= _) > || __STDC_VERSION__ >=3D 199901 > > #define __LONG_LONG_SUPPORTED > > #endif > > This removed a lot more than just __func__? > Damn. It looks like future work got folded in here by accident... This is the 'remove support for pure K&R compilers' stuff I've talked about elsewhere. I'll revert and fix. Warner --000000000000e2515f060b264230 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Nov 27, 2023 at 10:50=E2=80= =AFAM John Baldwin <jhb@freebsd.org> wrote:
On= 11/26/23 9:25 PM, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D17a238a15fbed01477fbc54744d35cbccdb65871<= /a>
>
> commit 17a238a15fbed01477fbc54744d35cbccdb65871
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2023-11-20 23:34:22 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-11-27 05:24:02 +0000
>
>=C2=A0 =C2=A0 =C2=A0 cdefs: Remove __func__ define
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 We require an ANSI-C compiler to build the base sy= stem. It's required
>=C2=A0 =C2=A0 =C2=A0 that __func__ work. Remove this define since the o= nly known problem
>=C2=A0 =C2=A0 =C2=A0 compilers are ancient history (gcc 2.6 from 1994, = almost pre-dating the
>=C2=A0 =C2=A0 =C2=A0 project). 3rd party code that used this define wil= l now need to provide
>=C2=A0 =C2=A0 =C2=A0 it via some other means when using non-ansi-c comp= ilers.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 PR: 275221 (exp-run)
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix
> ---
>=C2=A0 =C2=A0sys/sys/cdefs.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 40 ++------------------------------------
>=C2=A0 =C2=A0tests/sys/opencrypto/cryptodevh.py |=C2=A0 4 ----
>=C2=A0 =C2=A02 files changed, 2 insertions(+), 42 deletions(-)
>
> diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
> index c5b6190077b3..bcbf418f9323 100644
> --- a/sys/sys/cdefs.h
> +++ b/sys/sys/cdefs.h
> @@ -96,14 +96,9 @@
>=C2=A0 =C2=A0/*
>=C2=A0 =C2=A0 * The __CONCAT macro is used to concatenate parts of symb= ol names, e.g.
>=C2=A0 =C2=A0 * with "#define OLD(foo) __CONCAT(old,foo)", OL= D(foo) produces oldfoo.
> - * The __CONCAT macro is a bit tricky to use if it must work in non-A= NSI
> - * mode -- there must be no spaces between its arguments, and for nes= ted
> - * __CONCAT's, all the __CONCAT's must be at the left.=C2=A0 = __CONCAT can also
> - * concatenate double-quoted strings produced by the __STRING macro, = but
> - * this only works with ANSI C.
>=C2=A0 =C2=A0 *
>=C2=A0 =C2=A0 * __XSTRING is like __STRING, but it expands any macros i= n its argument
> - * first.=C2=A0 It is only available with ANSI C.
> + * first.
>=C2=A0 =C2=A0 */
>=C2=A0 =C2=A0#if defined(__STDC__) || defined(__cplusplus)
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0__P(protos)=C2=A0 =C2=A0 =C2=A0= protos=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* full-blown ANSI C */
> @@ -122,33 +117,7 @@
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0__inline=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* delete GC= C keyword */
>=C2=A0 =C2=A0#endif /* ! __CC_SUPPORTS___INLINE */
>=C2=A0 =C2=A0#endif /* !__cplusplus */
> -
> -#else=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* !(__STDC__ || __cplusplus) */
> -#define=C2=A0 =C2=A0 =C2=A0 __P(protos)=C2=A0 =C2=A0 =C2=A0()=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* traditional C preprocessor */<= br> > -#define=C2=A0 =C2=A0 =C2=A0 __CONCAT(x,y)=C2=A0 =C2=A0x/**/y
> -#define=C2=A0 =C2=A0 =C2=A0 __STRING(x)=C2=A0 =C2=A0 =C2=A0"x&qu= ot;
> -
> -#if !defined(__CC_SUPPORTS___INLINE)
> -#define=C2=A0 =C2=A0 =C2=A0 __const=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* delete pseudo-AN= SI C keywords */
> -#define=C2=A0 =C2=A0 =C2=A0 __inline
> -#define=C2=A0 =C2=A0 =C2=A0 __signed
> -#define=C2=A0 =C2=A0 =C2=A0 __volatile
> -/*
> - * In non-ANSI C environments, new programs will want ANSI-only C key= words
> - * deleted from the program and old programs will want them left alon= e.
> - * When using a compiler other than gcc, programs using the ANSI C ke= ywords
> - * const, inline etc. as normal identifiers should define -DNO_ANSI_K= EYWORDS.
> - * When using "gcc -traditional", we assume that this is th= e intent; if
> - * __GNUC__ is defined but __STDC__ is not, we leave the new keywords= alone.
> - */
> -#ifndef=C2=A0 =C2=A0 =C2=A0 NO_ANSI_KEYWORDS
> -#define=C2=A0 =C2=A0 =C2=A0 const=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* delete ANS= I C keywords */
> -#define=C2=A0 =C2=A0 =C2=A0 inline
> -#define=C2=A0 =C2=A0 =C2=A0 signed
> -#define=C2=A0 =C2=A0 =C2=A0 volatile
> -#endif=C2=A0 =C2=A0 =C2=A0 =C2=A0/* !NO_ANSI_KEYWORDS */
> -#endif=C2=A0 =C2=A0 =C2=A0 =C2=A0/* !__CC_SUPPORTS___INLINE */
> -#endif=C2=A0 =C2=A0 =C2=A0 =C2=A0/* !(__STDC__ || __cplusplus) */
> +#endif=C2=A0 =C2=A0 =C2=A0 =C2=A0/* __STDC__ || __cplusplus */
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0/*
>=C2=A0 =C2=A0 * Compiler-dependent macros to help declare dead (non-ret= urning) and
> @@ -343,11 +312,6 @@
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0__unreachable() ((void)0)
>=C2=A0 =C2=A0#endif
>=C2=A0 =C2=A0
> -/* XXX: should use `#if __STDC_VERSION__ < 199901'. */
> -#if !__GNUC_PREREQ__(2, 7)
> -#define=C2=A0 =C2=A0 =C2=A0 __func__=C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL<= br> > -#endif
> -
>=C2=A0 =C2=A0#if (defined(__GNUC__) && __GNUC__ >=3D 2) &= ;& !defined(__STRICT_ANSI__) || __STDC_VERSION__ >=3D 199901
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0__LONG_LONG_SUPPORTED
>=C2=A0 =C2=A0#endif

This removed a lot more than just __func__?

=
Damn. It looks like future work got folded in here by accident...=C2= =A0 This is the 'remove support for
pure K&R compilers= 9; stuff I've talked about elsewhere. I'll revert and fix.

--000000000000e2515f060b264230-- From nobody Mon Nov 27 19:39:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfGB63c85z52CJ8; Mon, 27 Nov 2023 19:39: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 4SfGB638NRz3TrG; Mon, 27 Nov 2023 19:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701113966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j1eVdOG0dtaa4y8OWfCyJWNjedxYslNDouKwC+OQJTI=; b=LKqT0a5cSeDO3PXLOEbxna86qOZXyNUWuVRAoBo3iGdQK0BMxvcvgArOMl55t+xiPDUxeC l2ssSCgIzvtouAdqtD/t24kDAwct7UFdIQwa6VywvNYsGDRsC2W2BgMdK77o37/UevKqmW imCZXaiRQObDO/5n5u1SDriSaX9SItOe/OW5d0chs7LrOFCLhDXIHWyRvsRUsBPGjpoML+ bNK4aVTl7uYGrlihMbME8jG8lOORDOi/BxInJm+I5VIauZAkKZuCrfoE1m3US2Dv/OsYas nj7HMThE3SW5k0yxytXiCV8+ObvHCedQLUyP1zirUjO3G3h6BHceVIgwVpMllQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701113966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j1eVdOG0dtaa4y8OWfCyJWNjedxYslNDouKwC+OQJTI=; b=mW7DHuP/sz5YYOHN5uxnfgPSu1YAENwhMLJgZd0dJnPVHuR1OZnp8TkLuCZUNrU0khWLX3 N8Veorhwd6dqPYSKCBvpOe4hEk9K6wVrij6baTxfc6qRX0nDjdFfcPFah+RFnt7LjPmQSC MD4azqViwXNvrR7pmxTsOOWXhNLGvqMaGgiYuGj16VFpM6p72q+/3YtndCoaIKCHXHeN3b AWRUo2zjG/3WcHHWDqTLqys6a0ysf50hwXqOYRdRM0OlEzKijqyLTwRHDEkahiWNM/eqi6 bPUKhUNCafw1Asp08xj23/gMkWKKFOj6TFJUpUTA4qT7ZxeaPb5uQuaUKnc+ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701113966; a=rsa-sha256; cv=none; b=gzD5lwDlfwuwSX/odwC+9UDVpCbeBng7eNPraLeDjVeAIErMLGad4wpPGyLb4SOqPXh3Nn McfJ0EeFH8MSZLUouHWBTN9vF1OmcS553k3fnfGovLVvTOU58u4rNRUnTRXWmrZ+H+tpQq spYbN+M3xNqwP+UIl67431f46nUmkLBsCzDB914fP+SSJV1Cbo6Tpok99U7jTOlbPxzC7J nrJBzSHbGqvk/78A27Vhew+W0/bGYHV6P7ySFiL7g/jPzlEnXc7sB+mpWbero/3aDGaXDU Bl3aZt4JuS6Os45zIvoq6QVai61htGkH78rEVEgerFW6j7vlPnqIS3h/3pqIHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfGB62F25zrjR; Mon, 27 Nov 2023 19:39: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 3ARJdQEn020169; Mon, 27 Nov 2023 19:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARJdQJK020166; Mon, 27 Nov 2023 19:39:26 GMT (envelope-from git) Date: Mon, 27 Nov 2023 19:39:26 GMT Message-Id: <202311271939.3ARJdQJK020166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 6a79e48076bc - main - Fix two latent bugs in hpts. One where a static is put on a local variable, the other an initialization bug where we should be setting tv.tv_sec to 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: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a79e48076bcce3e902323e62689eacb98faa180 Auto-Submitted: auto-generated The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=6a79e48076bcce3e902323e62689eacb98faa180 commit 6a79e48076bcce3e902323e62689eacb98faa180 Author: Randall Stewart AuthorDate: 2023-11-27 19:38:06 +0000 Commit: Randall Stewart CommitDate: 2023-11-27 19:38:06 +0000 Fix two latent bugs in hpts. One where a static is put on a local variable, the other an initialization bug where we should be setting tv.tv_sec to 0. PR: 275482 --- sys/netinet/tcp_hpts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index 92b2f69c9e58..d673ccbe4a73 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1519,6 +1519,7 @@ __tcp_run_hpts(struct tcp_hpts_entry *hpts) hpts->p_mysleep.tv_usec = dynamic_min_sleep; /* Reschedule with new to value */ tcp_hpts_set_max_sleep(hpts, 0); + tv.tv_sec = 0; tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT; /* Validate its in the right ranges */ if (tv.tv_usec < hpts->p_mysleep.tv_usec) { @@ -1600,7 +1601,7 @@ tcp_choose_hpts_to_run(void) void tcp_run_hpts(void) { - static struct tcp_hpts_entry *hpts; + struct tcp_hpts_entry *hpts; struct epoch_tracker et; NET_EPOCH_ENTER(et); From nobody Mon Nov 27 19:51:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfGRY0Jrrz52K91; Mon, 27 Nov 2023 19:51:05 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4SfGRW6XSrz3YfP; Mon, 27 Nov 2023 19:51:03 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 162.251.186.162 is neither permitted nor denied by domain of glebius@freebsd.org) smtp.mailfrom=glebius@freebsd.org; dmarc=none Received: by glebi.us (Postfix, from userid 1000) id 52ECC6D56F; Mon, 27 Nov 2023 11:51:03 -0800 (PST) Date: Mon, 27 Nov 2023 11:51:03 -0800 From: Gleb Smirnoff To: John Baldwin Cc: Emmanuel Vadot , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a35f3cdf63d - main - sys/mutex.h: Include sys/lock.h instead of sys/_lock.h Message-ID: References: <202311240950.3AO9oSeH089169@gitrepo.freebsd.org> <79e6e3a1-96a5-4d3e-9c48-a89bcbd6303d@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: <79e6e3a1-96a5-4d3e-9c48-a89bcbd6303d@FreeBSD.org> X-Spamd-Result: default: False [0.60 / 15.00]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-1.00)[-0.996]; ONCE_RECEIVED(0.10)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; R_SPF_SOFTFAIL(0.00)[~all:c]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[glebius]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4SfGRW6XSrz3YfP X-Spamd-Bar: / On Fri, Nov 24, 2023 at 09:27:39AM -0800, John Baldwin wrote: J> > commit 2a35f3cdf63d1f9b1ea5ab0174adabb631757210 J> > Author: Emmanuel Vadot J> > AuthorDate: 2022-10-27 09:43:19 +0000 J> > Commit: Emmanuel Vadot J> > CommitDate: 2023-11-24 09:49:58 +0000 J> > J> > sys/mutex.h: Include sys/lock.h instead of sys/_lock.h J> > It uses the LA_ defines when INVARIANTS is set. J> > This unbreak dpaa2 with FDT only kernel (like ALLWINNER or ROCKCHIP) as J> > the driver only include sys/lock.h via header polution for ACPI kernels. J> > Sponsored by: Beckhoff Automation GmbH & Co. KG J> > Differential Revision: https://reviews.freebsd.org/D37145 J> > Reviewed by: kib, mjg J> J> Avoiding the nested include here was originally an intentional design decision. J> It was supposed to be a compile error if you didn't include lock.h first, and J> callers are always supposed to include both (up until now). However, I'm fine J> with changing this, but we should be consistent and change all the other lock J> headers at once including sys/rwlock.h, sys/sx.h, and sys/lockmgr.h. J> J> You will also need to patch all of these headers to remove the #error if J> LOCK_DEBUG or LOCK_FILE isn't defined (including sys/mutex.h which you missed J> in this commit). J> J> You will also need to update all the relevant manpages (mutex.9, sx.9, rwlock.9, J> and lockmgr.9) to remove the #include . J> J> For MFC purposes I would suggest to also fix dpaa2 to #include J> explicitly as it was supposed to do previously. I'd rather recommend to revert this commit and fix dpaa2 properly. This module has a long history of incorrect include usage, which we were able to handle properly: d6eabdac2ef444b62aba186c793fbd5d4226b157 7fb975c8fb970b35fc34561ed30a0fe220346cb6 b0484678d405722f40278e93cdebe95829c71f3b We should not modify system headers to satisfy dpaa2 or any other driver. -- Gleb Smirnoff From nobody Mon Nov 27 20:37:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfHSj2D8jz52lrD; Mon, 27 Nov 2023 20:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfHSj0HSrz4Jwd; Mon, 27 Nov 2023 20:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LmSv3VeaqR0pdL5CV79IC/SN/yndivyXr7J6NXn+pqU=; b=Ee1lJOz2k+dHGLXh+MUmbeBpg0kpz/mXU0JQX9eIk7IIaFBKY83yB4xjxA2PgCVpcLTruU PeDBF47RM+tvVN4PXxvEC4CEeMBQo3LqYbSI7Yrp93l9L71VBL1UEI+Drh92xCn9yqSdGu +0B5RT4XsHeuGa8ihZktQ29rQiX6LCc4HfJtG3IfozGYSSYH15xrG0FEEww/uFwPv/XAx2 Y2CEh8LK4UWu5h0aRCqzgUKfISqjp0+MGU/1OEj3Gfe/Xd+kIalitBCF5mZsr2KuxCWfq0 nMCvjUGizInvryI3TBFGDbk+CJUTa1QbeLCHn/yWliFyTLK1imdjJRaylvYewA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LmSv3VeaqR0pdL5CV79IC/SN/yndivyXr7J6NXn+pqU=; b=oElwOzCxqwl6RQEEpr6C5QFmrC9E6cSCSKH6Pi5AGw5brlH7Yqd7loZjoTtwziQ1UIgh+G WCgDc2r/6ZX4EErtt1dkFUOVSObjXyheZvHIk8jn4PdTFXS7jhq+ePEjTVPaLWiWiSu0LI u2ZIpoCIhi6kNN8e2vh8hfqY/eW3Sdb+769QbXcKKFUbg7Y+H0iOCki7DttJwFZkKErQ6N oDHIiuT2DgfpF6QvbukHVnhstit4N+pxoX+p0/MeBuyVrxn0gghmngGLvNW+FJoBEZsErI ZlGWD67nIpA3PRxOR49e7gYGDj5eCkMHNItu4hhfDnoZL8HAspyhQl6XtUF+dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701117429; a=rsa-sha256; cv=none; b=tfTcY07Jx2nd7g1N6zRX4hp6QGwEPov6Zal7b/poc8qiSh8YiudelNRt8vXlMsmBG432Ob evPrLLj7tmRg14Rvv0oQXrC7ptpzoAvFTQ6DPo7C0BKBVOa2CWAOuGzGXRUTmj1g4Nls2M qtWvTu9dSh1Hx1NactBJ6vqCfEsu36hjRSCVk9aeOP7NgmywsDsmUuFLFmCzCMpzaxWD6r 1BtcdysncHHFPhp2n21Ks8THyo9Ir9Di8rMhEW56D9cuS9cvvRPFeP6OKJ8YFCnAjjkI8M 5k/C1LxPMXYgeEqKnJoppYZF+T84VAdHJogLwSWdG1cnt5SkdIC7SsW2qLTh3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfHSh6NY3zsqL; Mon, 27 Nov 2023 20:37: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 3ARKb8h9019689; Mon, 27 Nov 2023 20:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARKb8vg019686; Mon, 27 Nov 2023 20:37:08 GMT (envelope-from git) Date: Mon, 27 Nov 2023 20:37:08 GMT Message-Id: <202311272037.3ARKb8vg019686@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: 47a0b59379c3 - main - pfctl: use libpfctl instead of DIOCGETRULES directly List-Id: Commit messages for the main 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: 47a0b59379c3bec547e7c829eb12de8276227dff Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=47a0b59379c3bec547e7c829eb12de8276227dff commit 47a0b59379c3bec547e7c829eb12de8276227dff Author: Kristof Provost AuthorDate: 2023-11-24 23:43:48 +0000 Commit: Kristof Provost CommitDate: 2023-11-27 20:36:48 +0000 pfctl: use libpfctl instead of DIOCGETRULES directly MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_optimize.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index aefd7b6471e5..95292999c50a 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -877,24 +877,23 @@ block_feedback(struct pfctl *pf, struct superblock *block) int load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) { + char anchor_call[MAXPATHLEN] = ""; struct superblock *block, *blockcur; struct superblocks prof_superblocks; struct pf_opt_rule *por; struct pf_opt_queue queue; - struct pfioc_rule pr; + struct pfctl_rules_info rules; struct pfctl_rule a, b, rule; int nr, mnr; TAILQ_INIT(&queue); TAILQ_INIT(&prof_superblocks); - memset(&pr, 0, sizeof(pr)); - pr.rule.action = PF_PASS; - if (ioctl(pf->dev, DIOCGETRULES, &pr)) { + if (pfctl_get_rules_info(pf->dev, &rules, PF_PASS, "")) { warn("DIOCGETRULES"); return (1); } - mnr = pr.nr; + mnr = rules.nr; DEBUG("Loading %d active rules for a feedback profile", mnr); for (nr = 0; nr < mnr; ++nr) { @@ -903,15 +902,14 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) warn("calloc"); return (1); } - pr.nr = nr; - if (pfctl_get_rule(pf->dev, nr, pr.ticket, "", PF_PASS, - &rule, pr.anchor_call)) { + if (pfctl_get_rule(pf->dev, nr, rules.ticket, "", PF_PASS, + &rule, anchor_call)) { warn("DIOCGETRULENV"); return (1); } memcpy(&por->por_rule, &rule, sizeof(por->por_rule)); - rs = pf_find_or_create_ruleset(pr.anchor_call); + rs = pf_find_or_create_ruleset(anchor_call); por->por_rule.anchor = rs->anchor; if (TAILQ_EMPTY(&por->por_rule.rpool.list)) memset(&por->por_rule.rpool, 0, From nobody Mon Nov 27 20:37:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfHSk2Sbwz52lm2; Mon, 27 Nov 2023 20:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfHSk14fbz4KCw; Mon, 27 Nov 2023 20:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOK+rKKIdCckX32FjKXuJeT3+soSPMpwsYEeob4sgyw=; b=WwIAdiZbGgpz/Sg0qwltKyiYDJ18a+68+zn4obMb4oGPif+lsGv3cEwlOdrqXHW7Ou5ByM 3faddy36xaJ2H9wXPyEbLAYpVCVtu7KfJuCbXE+eS5RgljAau4iIu9FGu9YtRnKdLJpHQ9 dBJTV5vOwrTtzZRe/5qg1H/+hwDpkoh9jOs9mcyx+Hr/8PiSBEGKYnQDNj9hczfjwsJTV8 Kv+jKro3bhd7jq5ygVCfdLWilRpUf7yQ9wLAUAWfPX9J5qg1IpVtrOAyHms63bzHiUwqaI 3CJRf1YzJ6SkdtC8Z8+aaxtNRAJtvdy2VVbZBg+3AXqgVRKIARlAVBn2GHu/Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOK+rKKIdCckX32FjKXuJeT3+soSPMpwsYEeob4sgyw=; b=Is1ryCuGlv7hUBLVyi2u4pWFvFizkUFQHuzrowjWNLV8wbBVH00n1JIJVMUZdgqva4g4UC hkLscFT0+5mevEDzxrHNQp4l5Lpqu/kLQoKKhgk36uj5Ypq9rWBlDzPEj1pcxO4RIWF0aB 938aLiBNG3FXT+RyAEjcb9z3q/Jh/lnCzGMm7AI4wovn41Ng1aX5I7yJOq9T+oT3tP2y1b eKPJ0rSRRfvzpXI8W44tDKLQ8gHXC7YL08coRGV/oRXxWhIXFYOrTvVlxrWsAGQPUJ7wGx GXEgFQUtvRDdPoRRj6Q9uoruR0+PwkxXF19SYVwUiEw8kZxQZD7l8mc3JIriEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701117430; a=rsa-sha256; cv=none; b=MserVYhIR/pm0GTymfLS0BFWPaU+wVpbQ0QZrwouN0xhO3MzDxkGznBvxEtacC+gVjP1b8 lHdlfJW6rT7cHLzqGxD2R2cxOeDOy2Mveb3aZc08yk2byx4OWbDDiGFc5lYr4vy1evrzV4 q+BWXQLqeRppFrA+hAOiyD83i3ZuubmlYD3zzKlAM+iQpppwpduWspA+HTFH+EtUIpowwm eNL1igzrRYY2eYi94GT0MDIJ1+ran2wde4w/YiQOqxQ9alMKehR8O2yag8H2OS4+bSdTxq RlX5FBuw/uZMm9hY5b/n2EwQX2lMF6r/Fmru6uOIxiUUssuNZA0vVRAJIMtjJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfHSk09Lgzt3d; Mon, 27 Nov 2023 20:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARKb9Nr019737; Mon, 27 Nov 2023 20:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARKb9nS019734; Mon, 27 Nov 2023 20:37:09 GMT (envelope-from git) Date: Mon, 27 Nov 2023 20:37:09 GMT Message-Id: <202311272037.3ARKb9nS019734@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: 2905d10b3927 - main - snmp_pf: use libpfctl's pfctl_get_rules_info() rather than DIOCGETRULES List-Id: Commit messages for the main 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: 2905d10b392766faf0e0ce8070864132d8ab66c3 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2905d10b392766faf0e0ce8070864132d8ab66c3 commit 2905d10b392766faf0e0ce8070864132d8ab66c3 Author: Kristof Provost AuthorDate: 2023-11-27 16:48:33 +0000 Commit: Kristof Provost CommitDate: 2023-11-27 20:36:48 +0000 snmp_pf: use libpfctl's pfctl_get_rules_info() rather than DIOCGETRULES Prefer libpfctl functions over direct access to the ioctl whenever possible. Sponsored by: Rubicon Communications, LLC ("Netgate") --- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index a5786007d3f4..bb064dd549d2 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1513,24 +1513,21 @@ err2: static int pfl_scan_ruleset(const char *path) { - struct pfioc_rule pr; + struct pfctl_rules_info rules; struct pfctl_rule rule; + char anchor_call[MAXPATHLEN] = ""; struct pfl_entry *e; u_int32_t nr, i; - bzero(&pr, sizeof(pr)); - strlcpy(pr.anchor, path, sizeof(pr.anchor)); - pr.rule.action = PF_PASS; - if (ioctl(dev, DIOCGETRULES, &pr)) { + if (pfctl_get_rules_info(dev, &rules, PF_PASS, path)) { syslog(LOG_ERR, "pfl_scan_ruleset: ioctl(DIOCGETRULES): %s", strerror(errno)); goto err; } - for (nr = pr.nr, i = 0; i < nr; i++) { - pr.nr = i; - if (pfctl_get_rule(dev, pr.nr, pr.ticket, pr.anchor, - PF_PASS, &rule, pr.anchor_call)) { + for (nr = rules.nr, i = 0; i < nr; i++) { + if (pfctl_get_rule(dev, i, rules.ticket, path, + PF_PASS, &rule, anchor_call)) { syslog(LOG_ERR, "pfl_scan_ruleset: ioctl(DIOCGETRULE):" " %s", strerror(errno)); goto err; From nobody Mon Nov 27 20:37:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfHSl3PpCz52ljf; Mon, 27 Nov 2023 20:37: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 4SfHSl2DVZz4K7l; Mon, 27 Nov 2023 20:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cySsdPrlZcxp1CcYZpSV1eMpAxhTgxx9qcgKpfK9Vh0=; b=MbvdtviLpyMcHaP8/a6W9HdojkcA8LPEMPZi5gPl7db0qRb4vhRdvsD6BabtOg2EhfF4uz 11oTuLF8KQMvvACLjAKocYHh4E0A5OUe4b2wogHvoHIZKHuVx+fYXKeoEWoaIGp8JLCGwH se7g0Ya1GPQwjmGW00Y9v6F9o8E+7CE23QsFk/T3M0JP9uWPtzLRjj1rHb6/ovl0Gr7knK Ll7sgWqpSe+js/hKQnfkIft3jeIoPE9U2dgo4wa6kUDLUCn5fXuoGeN1zn/RNgtbR22jPs d9Ugyn/gQULHDvDPmVc3yM4dbfYneLu8WHiXWBT2IJscIyORyXt9Bxh5yb6KDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cySsdPrlZcxp1CcYZpSV1eMpAxhTgxx9qcgKpfK9Vh0=; b=GlqizXIdePnjXDbbf1hWAmcF0DCn6FD+OoVSGwVeOUpcw8YaAxm4jHkVwAnlgWJ8L04Uf6 TdkpjcXteGHUtLGCPJySMgm5Cn0b5G2cE2KI/jX/4ftdnxOmOmSt9bLVW/cT2OPrlSWTq2 jMd1f3NLabsqsuouvYlDJrDLmGy22nzGoLvK2Z3HSq7Un83vnbhTcJtlxpGcLI9zGA83S+ c06AGnASSlqrItqaiwokCf+5TCgiactHEQvZcniXWR8Gav89MNe5XyPCG+NeZH0lLXOLod kiDYM+gp6M2nJFjjq+IKViAKmWcJXwdJsjsG2hup0tuWP8GkNI4vrCjGjGgf4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701117431; a=rsa-sha256; cv=none; b=M+tHRd3evgaxSiLUg/TsPVBzqlxM5SONgY5iOVum7tkUy8CP6wJ1d5hL0hh2dNWvEPI/wm Sh+ZtZVHLeaHBMLku6FnpleYpZrWoaJe196avoEYOisK2acI5ePZneYVeFSToIy+E5xhri Q6wGyPvr3PwdHHvNEMDNRXwRNIZqsnwTDXGLvppeXRvxyJNdnw0dvFlLFjcw2DQqwb/0jH csAABopAXsQIj1xaWPYPfxa2H029dOL9Z/PyLONqTYSPXFvDVqqkTBv2WYOLmv8PfxluB2 Na3e6mqWmwr83y+vnR0gB91wNJwlUM6kj97HRiPrRgjnQhDArggfckWSPWdIsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfHSl1GjYzt64; Mon, 27 Nov 2023 20:37: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 3ARKbBLp019779; Mon, 27 Nov 2023 20:37:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARKbBKa019776; Mon, 27 Nov 2023 20:37:11 GMT (envelope-from git) Date: Mon, 27 Nov 2023 20:37:11 GMT Message-Id: <202311272037.3ARKbBKa019776@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: 44f323ecdec0 - main - pf: implement DIOCGETRULES via netlink List-Id: Commit messages for the main 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: 44f323ecdec02dc947c34d08c34b881fe2da1ba6 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=44f323ecdec02dc947c34d08c34b881fe2da1ba6 commit 44f323ecdec02dc947c34d08c34b881fe2da1ba6 Author: Kristof Provost AuthorDate: 2023-11-24 23:42:44 +0000 Commit: Kristof Provost CommitDate: 2023-11-27 20:36:49 +0000 pf: implement DIOCGETRULES via netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 57 ++++++++++++++++++++++++++++++---------- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf_ioctl.c | 56 +++++++++++++++++++++++----------------- sys/netpfil/pf/pf_nl.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-- sys/netpfil/pf/pf_nl.h | 9 +++++++ 5 files changed, 149 insertions(+), 40 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index a600031ec0a9..513d2d0f01be 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1119,26 +1119,55 @@ pfctl_add_rule(int dev __unused, const struct pfctl_rule *r, const char *anchor, return (e.error); } +#define _IN(_field) offsetof(struct genlmsghdr, _field) +#define _OUT(_field) offsetof(struct pfctl_rules_info, _field) +static struct snl_attr_parser ap_getrules[] = { + { .type = PF_GR_NR, .off = _OUT(nr), .cb = snl_attr_get_uint32 }, + { .type = PF_GR_TICKET, .off = _OUT(ticket), .cb = snl_attr_get_uint32 }, +}; +static struct snl_field_parser fp_getrules[] = { +}; +#undef _IN +#undef _OUT +SNL_DECLARE_PARSER(getrules_parser, struct genlmsghdr, fp_getrules, ap_getrules); + int -pfctl_get_rules_info(int dev, struct pfctl_rules_info *rules, uint32_t ruleset, +pfctl_get_rules_info(int dev __unused, struct pfctl_rules_info *rules, uint32_t ruleset, const char *path) { - struct pfioc_rule pr; - int ret; + struct snl_state ss = {}; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + struct snl_writer nw; + uint32_t seq_id; + int family_id; - bzero(&pr, sizeof(pr)); - if (strlcpy(pr.anchor, path, sizeof(pr.anchor)) >= sizeof(pr.anchor)) - return (E2BIG); + snl_init(&ss, NETLINK_GENERIC); + family_id = snl_get_genl_family(&ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); - pr.rule.action = ruleset; - ret = ioctl(dev, DIOCGETRULES, &pr); - if (ret != 0) - return (ret); + snl_init_writer(&ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETRULES); + hdr->nlmsg_flags |= NLM_F_DUMP; - rules->nr = pr.nr; - rules->ticket = pr.ticket; + snl_add_msg_attr_string(&nw, PF_GR_ANCHOR, path); + snl_add_msg_attr_u8(&nw, PF_GR_ACTION, ruleset); - return (0); + hdr = snl_finalize_msg(&nw); + if (hdr == NULL) + return (ENOMEM); + + seq_id = hdr->nlmsg_seq; + if (! snl_send_message(&ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&ss, seq_id, &e)) != NULL) { + if (! snl_parse_nlmsg(&ss, hdr, &getrules_parser, rules)) + continue; + } + + return (e.error); } int @@ -1368,7 +1397,7 @@ SNL_DECLARE_PARSER(state_parser, struct genlmsghdr, fp_state, ap_state); static const struct snl_hdr_parser *all_parsers[] = { &state_parser, &skey_parser, &speer_parser, - &creator_parser, + &creator_parser, &getrules_parser }; static int diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 4b10190bf9ea..48162b786a86 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2473,6 +2473,7 @@ int pf_keth_anchor_nvcopyout( struct pf_keth_ruleset *pf_find_or_create_keth_ruleset(const char *); void pf_keth_anchor_remove(struct pf_keth_rule *); +int pf_ioctl_getrules(struct pfioc_rule *); int pf_ioctl_addrule(struct pf_krule *, uint32_t, uint32_t, const char *, const char *, uid_t uid, pid_t); diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 1598939c2375..ec55d43d3800 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2021,6 +2021,36 @@ pf_rule_to_krule(const struct pf_rule *rule, struct pf_krule *krule) return (0); } +int +pf_ioctl_getrules(struct pfioc_rule *pr) +{ + struct pf_kruleset *ruleset; + struct pf_krule *tail; + int rs_num; + + PF_RULES_WLOCK(); + ruleset = pf_find_kruleset(pr->anchor); + if (ruleset == NULL) { + PF_RULES_WUNLOCK(); + return (EINVAL); + } + rs_num = pf_get_ruleset_number(pr->rule.action); + if (rs_num >= PF_RULESET_MAX) { + PF_RULES_WUNLOCK(); + return (EINVAL); + } + tail = TAILQ_LAST(ruleset->rules[rs_num].active.ptr, + pf_krulequeue); + if (tail) + pr->nr = tail->nr + 1; + else + pr->nr = 0; + pr->ticket = ruleset->rules[rs_num].active.ticket; + PF_RULES_WUNLOCK(); + + return (0); +} + int pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, uint32_t pool_ticket, const char *anchor, const char *anchor_call, @@ -3117,33 +3147,11 @@ DIOCADDRULENV_error: case DIOCGETRULES: { struct pfioc_rule *pr = (struct pfioc_rule *)addr; - struct pf_kruleset *ruleset; - struct pf_krule *tail; - int rs_num; pr->anchor[sizeof(pr->anchor) - 1] = 0; - PF_RULES_WLOCK(); - ruleset = pf_find_kruleset(pr->anchor); - if (ruleset == NULL) { - PF_RULES_WUNLOCK(); - error = EINVAL; - break; - } - rs_num = pf_get_ruleset_number(pr->rule.action); - if (rs_num >= PF_RULESET_MAX) { - PF_RULES_WUNLOCK(); - error = EINVAL; - break; - } - tail = TAILQ_LAST(ruleset->rules[rs_num].active.ptr, - pf_krulequeue); - if (tail) - pr->nr = tail->nr + 1; - else - pr->nr = 0; - pr->ticket = ruleset->rules[rs_num].active.ticket; - PF_RULES_WUNLOCK(); + error = pf_ioctl_getrules(pr); + break; } diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index fe5ded0e86a4..86cc5ba9cc91 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -635,7 +635,64 @@ pf_handle_addrule(struct nlmsghdr *hdr, struct nl_pstate *npt) return (error); } -static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser }; +struct nl_parsed_getrules { + char *anchor; + uint8_t action; +}; +#define _IN(_field) offsetof(struct genlmsghdr, _field) +#define _OUT(_field) offsetof(struct pfioc_rule, _field) +static const struct nlattr_parser nla_p_getrules[] = { + { .type = PF_GR_ANCHOR, .off = _OUT(anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, + { .type = PF_GR_ACTION, .off = _OUT(rule.action), .cb = nlattr_get_uint8 }, +}; +static const struct nlfield_parser nlf_p_getrules[] = { +}; +NL_DECLARE_PARSER(getrules_parser, struct genlmsghdr, nlf_p_getrules, nla_p_getrules); + +static int +pf_handle_getrules(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct pfioc_rule attrs = {}; + int error; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + + error = nl_parse_nlmsg(hdr, &getrules_parser, npt, &attrs); + if (error != 0) + return (error); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_GETRULES; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + error = pf_ioctl_getrules(&attrs); + if (error != 0) + goto out; + + nlattr_add_u32(nw, PF_GR_NR, attrs.nr); + nlattr_add_u32(nw, PF_GR_TICKET, attrs.ticket); + + if (!nlmsg_end(nw)) { + error = ENOMEM; + goto out; + } + + return (0); + +out: + nlmsg_abort(nw); + return (error); +} + +static const struct nlhdr_parser *all_parsers[] = { + &state_parser, + &addrule_parser, + &getrules_parser +}; static int family_id; @@ -670,7 +727,12 @@ static const struct genl_cmd pf_cmds[] = { .cmd_cb = pf_handle_addrule, .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, }, - + { + .cmd_num = PFNL_CMD_GETRULES, + .cmd_name = "GETRULES", + .cmd_cb = pf_handle_getrules, + .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 8265ae1d1bfa..3ae77ffd3790 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -41,6 +41,7 @@ enum { PFNL_CMD_START = 3, PFNL_CMD_STOP = 4, PFNL_CMD_ADDRULE = 5, + PFNL_CMD_GETRULES = 6, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -232,6 +233,14 @@ enum pf_addrule_type_t { PF_ART_RULE = 5, /* nested, pfrule_type_t */ }; +enum pf_getrules_type_t { + PF_GR_UNSPEC, + PF_GR_ANCHOR = 1, /* string */ + PF_GR_ACTION = 2, /* u8 */ + PF_GR_NR = 3, /* u32 */ + PF_GR_TICKET = 4, /* u32 */ +}; + #ifdef _KERNEL void pf_nl_register(void); From nobody Mon Nov 27 20:38:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfHTp5K0nz52m7d; Mon, 27 Nov 2023 20:38: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 4SfHTn5RTqz4LGF; Mon, 27 Nov 2023 20:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9YIa/YMJqt+Qnxz7sBUo/K/Uiu7lTbUKKFSiPxShB4=; b=c6Nci8VPQgi+XQS9FuLCJdKy7YaExe+hhmeKZXcVSbSUimtDmL0BiQLsUtIoBIC/Knbh6B xyaxQfAW/WqgIeRFpq+Ilry4RN2Z5QVgIcijZM4R5N2Ko5zMRU35aSg5YadM4G/iDLktUf oGSuba+aTMAbyWwVAsym9eKY/cqYfVyC/YFw89gSkJFT0hbpSJmy2dA4PIbAA820bmoCec /5ZxRIxBJV/jbd81pkGaFExzlDo/gW4Ms9zuv0uDNVBz/MXb/12JaN0TY3SnytZ8GEQhgG e8INnIwN4kxu9pVuBVeg5GihEAMZEFNCqcsOtt8iBAoKDo1sEaYrHsnh+4cXOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9YIa/YMJqt+Qnxz7sBUo/K/Uiu7lTbUKKFSiPxShB4=; b=JofFovwL8rVGREFYR9azy+UsL5ttpsozNK6UIL6khKsQVyCmzHGDZ7m/a+UKmQZ/czIWaw zeFrEL6vHMWb56u8VHq06evuN1HWbrhei39cjQxw7URcRDLCiN8kB94lYJzdkG2xazocir VVaqjLpuvbFKiLihJvuKESwCdDEFqSSCzchgf76a5hZ6MPXyvzZjKCD3CBq6M2LjwsIAoW x5vvCAXxPwzlcdz3skt/Oa8G1aPW+1pYKuXgQk/liPBSLiEMVH+ewdtov8J1KP/lSPLLkl vsIW4cB4Vc2W4Q5MQyxVL7dcM3mUaUTEGXXImb7uXncDm4gmfqbntksir7PKzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701117485; a=rsa-sha256; cv=none; b=EtWia5zQwVC0q8HxTJ0ERoxV6NRV644jOAstkGM2OlTmhykn8y6c+q9irDzuPwYqWYm/aE GRB6t9YPldLCp6JcyKt9UnYm6JxPHq1QX5v9hSdCWNeW36eLFTb3cRLFPW1bdQwcmQqiTb VQuo2Sj23oZrV0nPX35ZDEdHCo6q7LnctQ4793ep1+SE5YZ6yKOosavI7Y1lSV+86D6mwQ AOZqZx9jjxwWUUNlhrdU8/INZSriP4zITyxtotVgxlCTExwpJEIM/NIWRFmnLKGRro65Tp Ldj9h4QbMC7W/MXsMEdFdprS+JPNWi+rjDHREvx6jF10MPXJnJKLmMSJQl+pHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfHTn4QHpzt1D; Mon, 27 Nov 2023 20:38: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 3ARKc5gA020060; Mon, 27 Nov 2023 20:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARKc5s0020057; Mon, 27 Nov 2023 20:38:05 GMT (envelope-from git) Date: Mon, 27 Nov 2023 20:38:05 GMT Message-Id: <202311272038.3ARKc5s0020057@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: 0187875a6c0b - main - pfctl: Fix recursive printing of anchor labels List-Id: Commit messages for the main 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: 0187875a6c0b68a8026be174f8a0f968fc8ab6ed Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0187875a6c0b68a8026be174f8a0f968fc8ab6ed commit 0187875a6c0b68a8026be174f8a0f968fc8ab6ed Author: Luiz Amaral AuthorDate: 2023-11-27 15:53:27 +0000 Commit: Kristof Provost CommitDate: 2023-11-27 20:37:33 +0000 pfctl: Fix recursive printing of anchor labels We recently noticed that the recursive printing of labels wasn't working like the recursive printing of rules. When running pfctl -sr -a* we get a listing of all rules, including the ones inside anchors. On the other hand, when running pfctl -sl -a*, it would only print the labels in the root level, just like without the -a* argument. As in our use-case we are interested on labels only and our labels are unique even between anchors, we didn't add indentation or hierarchy to the printing. Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42728 --- sbin/pfctl/pfctl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index b752d87e63c6..2702c701f9cc 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1367,6 +1367,14 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, (unsigned long long)rule.bytes[1], (uintmax_t)rule.states_tot); } + + if (anchor_call[0] && + (((p = strrchr(anchor_call, '/')) ? + p[1] == '_' : anchor_call[0] == '_') || + opts & PF_OPT_RECURSE)) { + pfctl_show_rules(dev, npath, opts, format, + anchor_call, depth, rule.anchor_wildcard); + } break; } case PFCTL_SHOW_RULES: From nobody Mon Nov 27 20:38:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfHTq0PTJz52lsR; Mon, 27 Nov 2023 20:38: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 4SfHTp6hsRz4LCZ; Mon, 27 Nov 2023 20:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zBbNIN/3gTaKbY6lYKS6cGW4IocVbxbEmonX2KPPApA=; b=Xy0td5BYFDXOqP50cULcSuo4w26KU8qCq2xwzBXcOQZotW2Du8iRMWIljI3kVQNN+/V4Qi odXlkM1zK6Yd0HKuxxhnJY7M4p0jR3//XjVKSfdeWC9ni9j4VshrC6THvEF3VJh5EhZj8t EgassvwCFASzD0HnxivlCOh+UIIxHZIuEaBtQw/YJkmPliikgGBWn05yTZEhpwfkeFj0cF xXVdIxaHtWQoMVklKG5k2e54Dis31E4Sawe3x/l9JPeytLXJqJR0QpKA6P9mqU/UPJn/yF Ztudko10Mfnnlg8gttPr53pJDcKX4rf4UdRKRMRqTTQT7QJE6YVZCoJlIzXAzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zBbNIN/3gTaKbY6lYKS6cGW4IocVbxbEmonX2KPPApA=; b=WnbfTQHFlvKPk8HC251Se4FMv+vmcjcJgx4bueYIdUH1PjGiXK8b5Cl4CcOKQp9SYERIC9 Y2Ncc18K0+/W4IGX8i94CLJy6MtSxp+YfWuSjiSQOWfIvTKR5tOjMB3scIOv/ixEYLeRLr qN6/ckuj6BclnT6S1x4JmaLCAAzewk/0okoSdBqLinxTJMuAbVXvGIvmgmBNch6q5IX2EZ iJ2yHqthqq5JxOdFJRVSwZqESBe3jAP4xixPponJiBAXURMxwpNd5alkEoMFDUpdQq7AWa 9J0Rkr2uAyzkm9rdjdbelyVEF1Dxek1gCcS5w3JRLsTjeNAIvTuUSAwLNupQ+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701117486; a=rsa-sha256; cv=none; b=dP/huGzxYmetJKmo90QDl4bQd9ZkmJZaUsAt3/Tdp30+YNuQspNovwDnC2lD7Nz2tQ0DVu lGGBkUpYdujQfhUwz4klCItQ9K+d/Pc58dFXpwK9547Az5Gb+y3xKBF7WTU8LuXvpjRqTb t2Di69eXuDjvJ/b1mOuYmGy/Qk1jvP5qzHDjEOhSn6rjnNc0Ojn3Anurl1Ay8S+J6ymuO+ khDq+pZQpnPMBd79WqH4iDBEwafoe18Y8XEAR9qgXuWn2HXCUGGyDkuKaBHgJTkxSr1YIz XXLbnON4FhL/a6WoslKYKJD62HiwJl7DV1hCopzuHPEDt/0IhpIHG51VkPRUxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfHTp589KztHm; Mon, 27 Nov 2023 20:38: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 3ARKc61A020111; Mon, 27 Nov 2023 20:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARKc6sG020108; Mon, 27 Nov 2023 20:38:06 GMT (envelope-from git) Date: Mon, 27 Nov 2023 20:38:06 GMT Message-Id: <202311272038.3ARKc6sG020108@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: 1d723c1e565e - main - pf tests: test recursive printing of labels List-Id: Commit messages for the main 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: 1d723c1e565e714e4192883d813ef81e97220f27 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d723c1e565e714e4192883d813ef81e97220f27 commit 1d723c1e565e714e4192883d813ef81e97220f27 Author: Kristof Provost AuthorDate: 2023-11-27 15:47:36 +0000 Commit: Kristof Provost CommitDate: 2023-11-27 20:37:33 +0000 pf tests: test recursive printing of labels Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/anchor.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh index cf6da8740003..b1faa5f6c57e 100644 --- a/tests/sys/netpfil/pf/anchor.sh +++ b/tests/sys/netpfil/pf/anchor.sh @@ -130,9 +130,44 @@ wildcard_cleanup() pft_cleanup } +atf_test_case "nested_label" "cleanup" +nested_label_head() +{ + atf_set descr "Test recursive listing of labels" + atf_set require.user root +} + +nested_label_body() +{ + pft_init + + vnet_mkjail alcatraz + + pft_set_rules alcatraz \ + "anchor \"foo\" { \n\ + pass in quick proto icmp label \"passicmp\"\n\ + anchor \"bar\" { \n\ + pass in proto tcp label \"passtcp\"\n\ + } \n\ + }" \ + "pass quick from any to any label \"anytoany\"" + + atf_check -s exit:0 \ + -o inline:"passicmp 0 0 0 0 0 0 0 0 +passtcp 0 0 0 0 0 0 0 0 +anytoany 0 0 0 0 0 0 0 0 +" jexec alcatraz pfctl -sl -a* +} + +nested_label_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "pr183198" atf_add_test_case "nested_anchor" atf_add_test_case "wildcard" + atf_add_test_case "nested_label" } From nobody Mon Nov 27 21:16:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfJLJ6BVWz535pV; Mon, 27 Nov 2023 21:16: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 4SfJLJ5xlbz4YbN; Mon, 27 Nov 2023 21:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701119800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YnGP9KHVmr+ot/NuNag8O5GRaT8tyyejLw5NOQgMyLs=; b=pxQMP7vbIlhCWQ5Mc2xC/avUfUKMvBVOqaJKnvHmt1CKSijJnTrgHTk0NqLjSjVXeEN9F+ m8i+JXBLJz5OtlJRRApidJK1dz8TRiglfSx2rWDWKSXIMg30kZVAyqvHbFaSDQ1ZSNoXSo gMeAueCXh1pe6gg1lBZFYBV+kTRWR0SdDgqKMzX+2hOc6/KjusnYlsnEIWHK+XLtf0tXya Tthqkgp4vo728cqXelM9JHDr3RZ2aQWudiuWf9zkBEm0zlZt1aBdBtCgvzeWyqOjnmv19/ Mz1sLPxG92R26YCbtbRtbP2wF/2EXwOQqoiFMRCiQpAhnV7olmf9Rahc/gROwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701119800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YnGP9KHVmr+ot/NuNag8O5GRaT8tyyejLw5NOQgMyLs=; b=apaePBm3NzYg1b272Y7BNo+sQZb8omDo7MIABonlnz3v5nuxybc6ex2IrHEna2Iz5BPClg 2BRP1VQGZWCpWu1ESD/6rsBK5Pk/EwqGsvhi4Kdqc9+1TtSwVlXxAaT3WpnvVuxdADEFNy i0rKb+LeqyejbRCVzfBPTiM3n1zoyli4Ze+NSgDWbspT3G+lrkEor/EfFhd5biWzDQjXUY MZ7k23puEEJPI9bt2J9i5s7JDiZPMPKaKfy7CupiCbb3sL3bLoTOnloi/+Zf7s6qE6uSfg H32yUfamiVsBmSlx3EWKyyRqrm+9GxXmNMKvwtCG4tlqHp5DJEcXJVESuvZI5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701119800; a=rsa-sha256; cv=none; b=dki/RDf8diYWnFdwAfnzj5zntpHlGelb60VE33UTCa5fvGoGv9UMyTEgbQxkvlC4Yy4wfN d5IZUNak4hxXbOPlh/fyV9PMeHsrUJSuerRWC2+JWm6jCloUB4Aq/+Vav2hImP99hlkkcv HWQKtu7DJyBe7dn+uSj6FbjHjRPKJfrWR7S141mDXegFVMbAChptelQIBNx5y3wt0NUt04 bOx/0XqhfRb009Oj9VSt60JVTaGUaw7vxX2E1VjttgANPrrfP08x1HiN0dRkEEqD+xXLk/ PdMuOhrX43G2i28tSxKoH80/INZP07qMvZxVZHlwY9bHTg2rcU5Z2h5gCp2tmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfJLJ518hztx3; Mon, 27 Nov 2023 21:16: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 3ARLGe97087670; Mon, 27 Nov 2023 21:16:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARLGepW087667; Mon, 27 Nov 2023 21:16:40 GMT (envelope-from git) Date: Mon, 27 Nov 2023 21:16:40 GMT Message-Id: <202311272116.3ARLGepW087667@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: 96950419f155 - main - tests: don't run atf_* in a subshell List-Id: Commit messages for the main 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: 96950419f15510287080c557174e0d8409f06956 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=96950419f15510287080c557174e0d8409f06956 commit 96950419f15510287080c557174e0d8409f06956 Author: Gleb Smirnoff AuthorDate: 2023-11-27 21:15:58 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-27 21:15:59 +0000 tests: don't run atf_* in a subshell Shell limitation is that a classic function call via $() is a subshell and atf-sh(3) commands won't work as epxected there. Subsequently, atf_skip inside a function won't skip a test. The test will fail later. A working approach is to pass desired variable name as argument to a function and don't run subshell. Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D42646 Fixes: ea82362219ee715cfbb195b2114e73fdc8599fa5 --- tests/sys/geom/class/concat/1_test.sh | 6 ++-- tests/sys/geom/class/concat/2_test.sh | 6 ++-- tests/sys/geom/class/concat/append1.sh | 6 ++-- tests/sys/geom/class/concat/append2.sh | 12 ++++---- tests/sys/geom/class/eli/attach_test.sh | 12 ++++---- tests/sys/geom/class/eli/conf.sh | 16 ++++++----- tests/sys/geom/class/eli/configure_test.sh | 2 +- tests/sys/geom/class/eli/delkey_test.sh | 4 +-- tests/sys/geom/class/eli/detach_test.sh | 2 +- tests/sys/geom/class/eli/init_test.sh | 10 +++---- tests/sys/geom/class/eli/kill_test.sh | 4 +-- tests/sys/geom/class/eli/misc_test.sh | 4 +-- tests/sys/geom/class/eli/onetime_test.sh | 4 +-- tests/sys/geom/class/eli/online_resize_test.sh | 2 +- tests/sys/geom/class/eli/resize_test.sh | 2 +- tests/sys/geom/class/eli/setkey_test.sh | 8 +++--- tests/sys/geom/class/geom_subr.sh | 10 ++++--- tests/sys/geom/class/mirror/10_test.sh | 8 +++--- tests/sys/geom/class/mirror/11_test.sh | 8 +++--- tests/sys/geom/class/mirror/12_test.sh | 8 +++--- tests/sys/geom/class/mirror/13_test.sh | 8 +++--- tests/sys/geom/class/mirror/1_test.sh | 6 ++-- tests/sys/geom/class/mirror/2_test.sh | 6 ++-- tests/sys/geom/class/mirror/3_test.sh | 6 ++-- tests/sys/geom/class/mirror/4_test.sh | 6 ++-- tests/sys/geom/class/mirror/5_test.sh | 6 ++-- tests/sys/geom/class/mirror/6_test.sh | 6 ++-- tests/sys/geom/class/mirror/7_test.sh | 6 ++-- tests/sys/geom/class/mirror/8_test.sh | 4 +-- tests/sys/geom/class/mirror/9_test.sh | 6 ++-- tests/sys/geom/class/mirror/component_selection.sh | 6 ++-- tests/sys/geom/class/mirror/sync_error.sh | 10 +++---- tests/sys/geom/class/raid3/10_test.sh | 6 ++-- tests/sys/geom/class/raid3/11_test.sh | 6 ++-- tests/sys/geom/class/raid3/12_test.sh | 6 ++-- tests/sys/geom/class/raid3/1_test.sh | 6 ++-- tests/sys/geom/class/raid3/2_test.sh | 6 ++-- tests/sys/geom/class/raid3/3_test.sh | 6 ++-- tests/sys/geom/class/raid3/4_test.sh | 6 ++-- tests/sys/geom/class/raid3/5_test.sh | 6 ++-- tests/sys/geom/class/raid3/6_test.sh | 6 ++-- tests/sys/geom/class/raid3/7_test.sh | 6 ++-- tests/sys/geom/class/raid3/8_test.sh | 6 ++-- tests/sys/geom/class/raid3/9_test.sh | 6 ++-- tests/sys/geom/class/shsec/1_test.sh | 6 ++-- tests/sys/geom/class/shsec/2_test.sh | 6 ++-- tests/sys/geom/class/stripe/1_test.sh | 6 ++-- tests/sys/geom/class/stripe/2_test.sh | 6 ++-- tests/sys/geom/class/union/union_test.sh | 32 +++++++++++----------- tests/sys/geom/class/uzip/1_test.sh | 2 +- tests/sys/kern/sendfile_test.sh | 14 +++++----- 51 files changed, 179 insertions(+), 175 deletions(-) diff --git a/tests/sys/geom/class/concat/1_test.sh b/tests/sys/geom/class/concat/1_test.sh index a35b015e9c24..126768370140 100644 --- a/tests/sys/geom/class/concat/1_test.sh +++ b/tests/sys/geom/class/concat/1_test.sh @@ -4,9 +4,9 @@ echo '1..1' -us0=$(attach_md -t malloc -s 1M) || exit 1 -us1=$(attach_md -t malloc -s 2M) || exit 1 -us2=$(attach_md -t malloc -s 3M) || exit 1 +attach_md us0 -t malloc -s 1M || exit 1 +attach_md us1 -t malloc -s 2M || exit 1 +attach_md us2 -t malloc -s 3M || exit 1 gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait diff --git a/tests/sys/geom/class/concat/2_test.sh b/tests/sys/geom/class/concat/2_test.sh index 7b41932f054a..63e545f12297 100644 --- a/tests/sys/geom/class/concat/2_test.sh +++ b/tests/sys/geom/class/concat/2_test.sh @@ -8,9 +8,9 @@ tsize=6 src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s 1M) || exit 1 -us1=$(attach_md -t malloc -s 2M) || exit 1 -us2=$(attach_md -t malloc -s 3M) || exit 1 +attach_md us0 -t malloc -s 1M || exit 1 +attach_md us1 -t malloc -s 2M || exit 1 +attach_md us2 -t malloc -s 3M || exit 1 dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 diff --git a/tests/sys/geom/class/concat/append1.sh b/tests/sys/geom/class/concat/append1.sh index 08d6250fd190..b6ac3772022b 100644 --- a/tests/sys/geom/class/concat/append1.sh +++ b/tests/sys/geom/class/concat/append1.sh @@ -22,9 +22,9 @@ gconcat_check_size() echo '1..3' -us0=$(attach_md -t malloc -s 1M) || exit 1 -us1=$(attach_md -t malloc -s 1M) || exit 1 -us2=$(attach_md -t malloc -s 1M) || exit 1 +attach_md us0 -t malloc -s 1M || exit 1 +attach_md us1 -t malloc -s 1M || exit 1 +attach_md us2 -t malloc -s 1M || exit 1 gconcat create $name /dev/$us0 /dev/$us1 || exit 1 devwait diff --git a/tests/sys/geom/class/concat/append2.sh b/tests/sys/geom/class/concat/append2.sh index 84a1f12350ba..d008e976cf57 100644 --- a/tests/sys/geom/class/concat/append2.sh +++ b/tests/sys/geom/class/concat/append2.sh @@ -31,9 +31,9 @@ truncate -s $((1024 * 1024 + $ss)) $f2 f3=$(mktemp) || exit 1 truncate -s $((1024 * 1024 + $ss)) $f3 -us0=$(attach_md -f $f1 -S $ss) || exit 1 -us1=$(attach_md -f $f2 -S $ss) || exit 1 -us2=$(attach_md -f $f3 -S $ss) || exit 1 +attach_md us0 -f $f1 -S $ss || exit 1 +attach_md us1 -f $f2 -S $ss || exit 1 +attach_md us2 -f $f3 -S $ss || exit 1 gconcat label $name /dev/$us0 /dev/$us1 || exit 1 devwait @@ -57,9 +57,9 @@ detach_md $us2 # Re-create the providers and verify that the concat device comes # back and that the data is still there. -us0=$(attach_md -f $f1 -S $ss) || exit 1 -us1=$(attach_md -f $f2 -S $ss) || exit 1 -us2=$(attach_md -f $f3 -S $ss) || exit 1 +attach_md us0 -f $f1 -S $ss || exit 1 +attach_md us1 -f $f2 -S $ss || exit 1 +attach_md us2 -f $f3 -S $ss || exit 1 devwait diff --git a/tests/sys/geom/class/eli/attach_test.sh b/tests/sys/geom/class/eli/attach_test.sh index bdb39a806fca..eb59234f014b 100644 --- a/tests/sys/geom/class/eli/attach_test.sh +++ b/tests/sys/geom/class/eli/attach_test.sh @@ -12,7 +12,7 @@ attach_d_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none @@ -50,7 +50,7 @@ attach_r_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none atf_check geli init -B none -P -K keyfile ${md} @@ -78,9 +78,9 @@ attach_multiple_body() geli_test_setup sectors=100 - md0=$(attach_md -t malloc -s `expr $sectors + 1`) - md1=$(attach_md -t malloc -s `expr $sectors + 1`) - md2=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md0 -t malloc -s `expr $sectors + 1` + attach_md md1 -t malloc -s `expr $sectors + 1` + attach_md md2 -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none atf_check geli init -B none -P -K keyfile ${md0} @@ -108,7 +108,7 @@ nokey_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none atf_check geli init -B none -P -K keyfile ${md} diff --git a/tests/sys/geom/class/eli/conf.sh b/tests/sys/geom/class/eli/conf.sh index a21e645f1637..05ee4e9bb550 100644 --- a/tests/sys/geom/class/eli/conf.sh +++ b/tests/sys/geom/class/eli/conf.sh @@ -6,12 +6,14 @@ MAX_SECSIZE=8192 attach_md() { - local test_md + local _md + local rv=$1 + shift [ -c /dev/mdctl ] || atf_skip "no /dev/mdctl to create md devices" - test_md=$(mdconfig -a "$@") || atf_fail "failed to allocate md(4)" - echo $test_md >> $TEST_MDS_FILE || exit - echo $test_md + _md=$(mdconfig -a "$@") || atf_fail "failed to allocate md(4)" + echo $_md >> $TEST_MDS_FILE || exit + eval "${rv}='${_md}'" } # Execute `func` for each combination of cipher, sectorsize, and hmac algo @@ -30,9 +32,9 @@ for_each_geli_config() { # Use a file-backed md(4) device, so we can deliberatly corrupt # it without detaching the geli device first. truncate -s $bytes backing_file - md=$(attach_md -t vnode -f backing_file) + attach_md md -t vnode -f backing_file else - md=$(attach_md -t malloc -s $bytes) + attach_md md -t malloc -s $bytes fi for cipher in aes-xts:128 aes-xts:256 \ @@ -58,7 +60,7 @@ for_each_geli_config_nointegrity() { # geli needs 512B for the label. bytes=`expr $MAX_SECSIZE \* $sectors + 512`b - md=$(attach_md -t malloc -s $bytes) + attach_md md -t malloc -s $bytes for cipher in aes-xts:128 aes-xts:256 \ aes-cbc:128 aes-cbc:192 aes-cbc:256 \ camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do diff --git a/tests/sys/geom/class/eli/configure_test.sh b/tests/sys/geom/class/eli/configure_test.sh index 6814fde1c301..4185b68c13ec 100644 --- a/tests/sys/geom/class/eli/configure_test.sh +++ b/tests/sys/geom/class/eli/configure_test.sh @@ -12,7 +12,7 @@ configure_b_B_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check geli init -B none -P -K /dev/null ${md} diff --git a/tests/sys/geom/class/eli/delkey_test.sh b/tests/sys/geom/class/eli/delkey_test.sh index 374e14740580..2d03a6555ab3 100644 --- a/tests/sys/geom/class/eli/delkey_test.sh +++ b/tests/sys/geom/class/eli/delkey_test.sh @@ -13,7 +13,7 @@ delkey_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile1 bs=512 count=16 status=none atf_check dd if=/dev/random of=keyfile2 bs=512 count=16 status=none @@ -91,7 +91,7 @@ delkey_readonly_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none atf_check geli init -B none -P -K keyfile ${md} diff --git a/tests/sys/geom/class/eli/detach_test.sh b/tests/sys/geom/class/eli/detach_test.sh index c8952a0c739f..6acae8dea732 100644 --- a/tests/sys/geom/class/eli/detach_test.sh +++ b/tests/sys/geom/class/eli/detach_test.sh @@ -12,7 +12,7 @@ detach_l_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none diff --git a/tests/sys/geom/class/eli/init_test.sh b/tests/sys/geom/class/eli/init_test.sh index 8d4e9363ea05..534fc724d05d 100644 --- a/tests/sys/geom/class/eli/init_test.sh +++ b/tests/sys/geom/class/eli/init_test.sh @@ -68,7 +68,7 @@ init_B_body() atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none - md=$(attach_md -t malloc -s $sectors) + attach_md md -t malloc -s $sectors # -B none rm -f /var/backups/${md}.eli @@ -118,7 +118,7 @@ init_J_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile0 bs=512 count=16 status=none atf_check dd if=/dev/random of=keyfile1 bs=512 count=16 status=none @@ -303,7 +303,7 @@ init_alias_body() { geli_test_setup - md=$(attach_md -t malloc -s 1024k) + attach_md md -t malloc -s 1024k atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none for spec in aes:0:AES-XTS:128 aes:128:AES-XTS:128 aes:256:AES-XTS:256 \ @@ -334,7 +334,7 @@ init_i_P_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none @@ -357,7 +357,7 @@ nokey_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check -s not-exit:0 -e match:"No key components given" \ geli init -B none -P ${md} diff --git a/tests/sys/geom/class/eli/kill_test.sh b/tests/sys/geom/class/eli/kill_test.sh index 422627f1f70c..eeaa440f11a9 100644 --- a/tests/sys/geom/class/eli/kill_test.sh +++ b/tests/sys/geom/class/eli/kill_test.sh @@ -12,7 +12,7 @@ kill_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile1 bs=512 count=16 status=none atf_check dd if=/dev/random of=keyfile2 bs=512 count=16 status=none @@ -76,7 +76,7 @@ kill_readonly_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none atf_check geli init -B none -P -K keyfile ${md} diff --git a/tests/sys/geom/class/eli/misc_test.sh b/tests/sys/geom/class/eli/misc_test.sh index 2e1b1936f3a0..1cbeb0491ffd 100644 --- a/tests/sys/geom/class/eli/misc_test.sh +++ b/tests/sys/geom/class/eli/misc_test.sh @@ -37,7 +37,7 @@ preserve_props_body() { geli_test_setup - md=$(attach_md -s1m) + attach_md md -s1m atf_check geli onetime /dev/${md} md_secsize=$(diskinfo ${md} | cut -wf 2) md_stripesize=$(diskinfo ${md} | cut -wf 5) @@ -103,7 +103,7 @@ physpath_body() atf_skip "$error_message" fi - md=$(attach_md -s1m) + attach_md md -s1m # If the underlying device has no physical path, then geli should not # create one. atf_check -o empty -e ignore diskinfo -p $md diff --git a/tests/sys/geom/class/eli/onetime_test.sh b/tests/sys/geom/class/eli/onetime_test.sh index 214533e1cb91..65306840384a 100644 --- a/tests/sys/geom/class/eli/onetime_test.sh +++ b/tests/sys/geom/class/eli/onetime_test.sh @@ -103,7 +103,7 @@ onetime_d_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s $sectors) + attach_md md -t malloc -s $sectors atf_check geli onetime -d ${md} if [ ! -c /dev/${md}.eli ]; then @@ -147,7 +147,7 @@ onetime_null_body() ealgo=${cipher%%:*} keylen=${cipher##*:} - md=$(attach_md -t malloc -s 100k) + attach_md md -t malloc -s 100k atf_check -s exit:0 -o ignore -e ignore \ geli onetime -e null -s ${secsize} ${md} diff --git a/tests/sys/geom/class/eli/online_resize_test.sh b/tests/sys/geom/class/eli/online_resize_test.sh index e137a7305122..ef6fe85c63d0 100755 --- a/tests/sys/geom/class/eli/online_resize_test.sh +++ b/tests/sys/geom/class/eli/online_resize_test.sh @@ -42,7 +42,7 @@ online_resize_body() psize30="33776997205278720" fi - md=$(attach_md -t malloc -s40${prefix}) + attach_md md -t malloc -s40${prefix} # Initialise atf_check -s exit:0 -o ignore gpart create -s GPT ${md} diff --git a/tests/sys/geom/class/eli/resize_test.sh b/tests/sys/geom/class/eli/resize_test.sh index c6f9e459e934..832bfeee5c92 100644 --- a/tests/sys/geom/class/eli/resize_test.sh +++ b/tests/sys/geom/class/eli/resize_test.sh @@ -15,7 +15,7 @@ resize_body() BLK=512 BLKS_PER_MB=2048 - md=$(attach_md -t malloc -s40m) + attach_md md -t malloc -s40m # Initialise atf_check -s exit:0 -o ignore gpart create -s BSD ${md} diff --git a/tests/sys/geom/class/eli/setkey_test.sh b/tests/sys/geom/class/eli/setkey_test.sh index 34fb8221ab04..92387a8a8ab6 100644 --- a/tests/sys/geom/class/eli/setkey_test.sh +++ b/tests/sys/geom/class/eli/setkey_test.sh @@ -13,7 +13,7 @@ setkey_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=rnd bs=512 count=${sectors} status=none hash1=`dd if=rnd bs=512 count=${sectors} status=none | md5` @@ -103,7 +103,7 @@ setkey_passphrase_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=rnd bs=512 count=${sectors} status=none hash1=`dd if=rnd bs=512 count=${sectors} status=none | md5` @@ -161,7 +161,7 @@ setkey_readonly_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none atf_check geli init -B none -P -K keyfile ${md} @@ -186,7 +186,7 @@ nokey_body() geli_test_setup sectors=100 - md=$(attach_md -t malloc -s `expr $sectors + 1`) + attach_md md -t malloc -s `expr $sectors + 1` atf_check dd if=/dev/random of=keyfile1 bs=512 count=16 status=none atf_check dd if=/dev/random of=keyfile2 bs=512 count=16 status=none diff --git a/tests/sys/geom/class/geom_subr.sh b/tests/sys/geom/class/geom_subr.sh index f8eca4c6b220..8e3b12d5f620 100644 --- a/tests/sys/geom/class/geom_subr.sh +++ b/tests/sys/geom/class/geom_subr.sh @@ -14,12 +14,14 @@ devwait() attach_md() { - local test_md + local _md + local rv=$1 + shift [ -c /dev/mdctl ] || atf_skip "no /dev/mdctl to create md devices" - test_md=$(mdconfig -a "$@") || exit - echo $test_md >> $TEST_MDS_FILE || exit - echo $test_md + _md=$(mdconfig -a "$@") || exit + echo $_md >> $TEST_MDS_FILE || exit + eval "${rv}='${_md}'" } detach_md() diff --git a/tests/sys/geom/class/mirror/10_test.sh b/tests/sys/geom/class/mirror/10_test.sh index 775eb7f99591..351689d1e185 100644 --- a/tests/sys/geom/class/mirror/10_test.sh +++ b/tests/sys/geom/class/mirror/10_test.sh @@ -16,8 +16,8 @@ m2=$(mktemp $base.XXXXXX) dd if=/dev/random of=$m1 bs=$ddbs count=1024 >/dev/null 2>&1 dd if=/dev/zero of=$m2 bs=$ddbs count=1024 >/dev/null 2>&1 -us0=$(attach_md -t vnode -f $m1) -us1=$(attach_md -t vnode -f $m2) +attach_md us0 -t vnode -f $m1 +attach_md us1 -t vnode -f $m2 gmirror label $name /dev/$us0 gmirror insert $name /dev/$us1 @@ -52,10 +52,10 @@ fi # Force a retaste of the disconnected component. if [ $(gmirror status -s $name | awk '{print $3}') = $us0 ]; then detach_md $us1 - us1=$(attach_md -t vnode -f $m2) + attach_md us1 -t vnode -f $m2 else detach_md $us0 - us0=$(attach_md -t vnode -f $m1) + attach_md us0 -t vnode -f $m1 fi # Make sure that the component wasn't re-added to the gmirror. diff --git a/tests/sys/geom/class/mirror/11_test.sh b/tests/sys/geom/class/mirror/11_test.sh index 7d4324e383e9..0e498ae03d15 100644 --- a/tests/sys/geom/class/mirror/11_test.sh +++ b/tests/sys/geom/class/mirror/11_test.sh @@ -16,8 +16,8 @@ m2=$(mktemp $base.XXXXXX) dd if=/dev/random of=$m1 bs=$ddbs count=1024 >/dev/null 2>&1 dd if=/dev/zero of=$m2 bs=$ddbs count=1024 >/dev/null 2>&1 -us0=$(attach_md -t vnode -f $m1) -us1=$(attach_md -t vnode -f $m2) +attach_md us0 -t vnode -f $m1 +attach_md us1 -t vnode -f $m2 gmirror label $name /dev/$us0 gmirror insert $name /dev/$us1 @@ -65,10 +65,10 @@ fi # Force a retaste of the disconnected component. if [ $(gmirror status -s $name | awk '{print $3}') = $us0 ]; then detach_md $us1 - us1=$(attach_md -t vnode -f $m2) + attach_md us1 -t vnode -f $m2 else detach_md $us0 - us0=$(attach_md -t vnode -f $m1) + attach_md us0 -t vnode -f $m1 fi # Make sure that the retaste caused the mirror to automatically be re-added. diff --git a/tests/sys/geom/class/mirror/12_test.sh b/tests/sys/geom/class/mirror/12_test.sh index 36132269bc81..4f24dd081fef 100644 --- a/tests/sys/geom/class/mirror/12_test.sh +++ b/tests/sys/geom/class/mirror/12_test.sh @@ -16,8 +16,8 @@ m2=$(mktemp $base.XXXXXX) dd if=/dev/zero of=$m1 bs=$ddbs count=1024 >/dev/null 2>&1 dd if=/dev/zero of=$m2 bs=$ddbs count=1024 >/dev/null 2>&1 -us0=$(attach_md -t vnode -f $m1) -us1=$(attach_md -t vnode -f $m2) +attach_md us0 -t vnode -f $m1 +attach_md us1 -t vnode -f $m2 gmirror label $name /dev/$us0 /dev/$us1 devwait @@ -51,10 +51,10 @@ fi # Force a retaste of the disconnected component. if [ $(gmirror status -s $name | awk '{print $3}') = $us0 ]; then detach_md $us1 - us1=$(attach_md -t vnode -f $m2) + attach_md us1 -t vnode -f $m2 else detach_md $us0 - us0=$(attach_md -t vnode -f $m1) + attach_md us0 -t vnode -f $m1 fi # Make sure that the component wasn't re-added to the gmirror. diff --git a/tests/sys/geom/class/mirror/13_test.sh b/tests/sys/geom/class/mirror/13_test.sh index 1ff004e3ba54..c312a1b7a795 100644 --- a/tests/sys/geom/class/mirror/13_test.sh +++ b/tests/sys/geom/class/mirror/13_test.sh @@ -16,8 +16,8 @@ m2=$(mktemp $base.XXXXXX) dd if=/dev/random of=$m1 bs=$ddbs count=1024 >/dev/null 2>&1 dd if=/dev/zero of=$m2 bs=$ddbs count=1024 >/dev/null 2>&1 -us0=$(attach_md -t vnode -f $m1) -us1=$(attach_md -t vnode -f $m2) +attach_md us0 -t vnode -f $m1 +attach_md us1 -t vnode -f $m2 gmirror label $name /dev/$us0 /dev/$us1 devwait @@ -62,10 +62,10 @@ fi # Force a retaste of the disconnected component. if [ $(gmirror status -s $name | awk '{print $3}') = $us0 ]; then detach_md $us1 - us1=$(attach_md -t vnode -f $m2) + attach_md us1 -t vnode -f $m2 else detach_md $us0 - us0=$(attach_md -t vnode -f $m1) + attach_md us0 -t vnode -f $m1 fi # Make sure that the retaste caused the mirror to automatically be re-added. diff --git a/tests/sys/geom/class/mirror/1_test.sh b/tests/sys/geom/class/mirror/1_test.sh index bcd903e0d3f8..929aa1c6ddcf 100644 --- a/tests/sys/geom/class/mirror/1_test.sh +++ b/tests/sys/geom/class/mirror/1_test.sh @@ -4,9 +4,9 @@ echo "1..1" -us0=$(attach_md -t malloc -s 1M) || exit 1 -us1=$(attach_md -t malloc -s 2M) || exit 1 -us2=$(attach_md -t malloc -s 3M) || exit 1 +attach_md us0 -t malloc -s 1M || exit 1 +attach_md us1 -t malloc -s 2M || exit 1 +attach_md us2 -t malloc -s 3M || exit 1 gmirror label $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait diff --git a/tests/sys/geom/class/mirror/2_test.sh b/tests/sys/geom/class/mirror/2_test.sh index 7bb813502047..31bb426d05d7 100644 --- a/tests/sys/geom/class/mirror/2_test.sh +++ b/tests/sys/geom/class/mirror/2_test.sh @@ -13,9 +13,9 @@ dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +attach_md us0 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us1 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us2 -t malloc -s `expr $nblocks1 + 1` || exit 1 gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait diff --git a/tests/sys/geom/class/mirror/3_test.sh b/tests/sys/geom/class/mirror/3_test.sh index 83993d32df2f..dd2ca8f028fd 100644 --- a/tests/sys/geom/class/mirror/3_test.sh +++ b/tests/sys/geom/class/mirror/3_test.sh @@ -13,9 +13,9 @@ dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +attach_md us0 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us1 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us2 -t malloc -s `expr $nblocks1 + 1` || exit 1 gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait diff --git a/tests/sys/geom/class/mirror/4_test.sh b/tests/sys/geom/class/mirror/4_test.sh index 46222fbecb2c..a5f469a2d95e 100644 --- a/tests/sys/geom/class/mirror/4_test.sh +++ b/tests/sys/geom/class/mirror/4_test.sh @@ -13,9 +13,9 @@ dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +attach_md us0 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us1 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us2 -t malloc -s `expr $nblocks1 + 1` || exit 1 gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait diff --git a/tests/sys/geom/class/mirror/5_test.sh b/tests/sys/geom/class/mirror/5_test.sh index 7bdb122255e4..43062dc1feea 100644 --- a/tests/sys/geom/class/mirror/5_test.sh +++ b/tests/sys/geom/class/mirror/5_test.sh @@ -13,9 +13,9 @@ dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +attach_md us0 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us1 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us2 -t malloc -s `expr $nblocks1 + 1` || exit 1 gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait diff --git a/tests/sys/geom/class/mirror/6_test.sh b/tests/sys/geom/class/mirror/6_test.sh index 0baa511d0689..f37a45404642 100644 --- a/tests/sys/geom/class/mirror/6_test.sh +++ b/tests/sys/geom/class/mirror/6_test.sh @@ -13,9 +13,9 @@ dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +attach_md us0 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us1 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us2 -t malloc -s `expr $nblocks1 + 1` || exit 1 gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/${us0} /dev/${us1} || exit 1 devwait diff --git a/tests/sys/geom/class/mirror/7_test.sh b/tests/sys/geom/class/mirror/7_test.sh index 2eded509a337..5f93f2fc4943 100644 --- a/tests/sys/geom/class/mirror/7_test.sh +++ b/tests/sys/geom/class/mirror/7_test.sh @@ -13,9 +13,9 @@ dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +attach_md us0 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us1 -t malloc -s `expr $nblocks1 + 1` || exit 1 +attach_md us2 -t malloc -s `expr $nblocks1 + 1` || exit 1 gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait diff --git a/tests/sys/geom/class/mirror/8_test.sh b/tests/sys/geom/class/mirror/8_test.sh index 5b3e5c3543a1..baea157a0ba8 100644 --- a/tests/sys/geom/class/mirror/8_test.sh +++ b/tests/sys/geom/class/mirror/8_test.sh @@ -34,11 +34,11 @@ mdconfig -d -u ${us1#md} -o force || exit 1 exec 9>&- dd if=/dev/random of=$m1 bs=$ddbs count=1 conv=notrunc >/dev/null 2>&1 -us0=$(attach_md -t vnode -f $m1) || exit 1 +attach_md us0 -t vnode -f $m1 || exit 1 devwait # This will take kern.geom.mirror.timeout seconds. # Re-attach the second mirror and wait for it to synchronize. -us1=$(attach_md -t vnode -f $m2) || exit 1 +attach_md us1 -t vnode -f $m2 || exit 1 syncwait # Verify the two mirrors are identical. Destroy the gmirror first so that diff --git a/tests/sys/geom/class/mirror/9_test.sh b/tests/sys/geom/class/mirror/9_test.sh index a350ce9dfe3a..6bcb26860615 100644 --- a/tests/sys/geom/class/mirror/9_test.sh +++ b/tests/sys/geom/class/mirror/9_test.sh @@ -15,9 +15,9 @@ dd if=/dev/zero of=$m1 bs=$ddbs count=1024 >/dev/null 2>&1 dd if=/dev/zero of=$m2 bs=$ddbs count=1024 >/dev/null 2>&1 dd if=/dev/zero of=$m3 bs=$ddbs count=1024 >/dev/null 2>&1 -us0=$(attach_md -t vnode -f $m1) || exit 1 -us1=$(attach_md -t vnode -f $m2) || exit 1 -us2=$(attach_md -t vnode -f $m3) || exit 1 +attach_md us0 -t vnode -f $m1 || exit 1 +attach_md us1 -t vnode -f $m2 || exit 1 +attach_md us2 -t vnode -f $m3 || exit 1 gmirror label $name /dev/$us0 /dev/$us1 || exit 1 devwait diff --git a/tests/sys/geom/class/mirror/component_selection.sh b/tests/sys/geom/class/mirror/component_selection.sh index 7c7020eb6e6b..b5c8cec78c61 100755 --- a/tests/sys/geom/class/mirror/component_selection.sh +++ b/tests/sys/geom/class/mirror/component_selection.sh @@ -29,9 +29,9 @@ run_latest_genid_body() dd if=/dev/urandom bs=512 count=1 of="$rnd1" dd if=/dev/urandom bs=512 count=1 of="$rnd2" - md1=$(attach_md -t vnode -f ${f1}) - md2=$(attach_md -t vnode -f ${f2}) - md3=$(attach_md -t vnode -f ${f3}) + attach_md md1 -t vnode -f ${f1} + attach_md md2 -t vnode -f ${f2} + attach_md md3 -t vnode -f ${f3} # Use a gnop for md1 just for consistency; it's not used for anything. atf_check gnop create $md1 diff --git a/tests/sys/geom/class/mirror/sync_error.sh b/tests/sys/geom/class/mirror/sync_error.sh index 6b59dbe4fd4c..c51418151f0a 100644 --- a/tests/sys/geom/class/mirror/sync_error.sh +++ b/tests/sys/geom/class/mirror/sync_error.sh @@ -21,8 +21,8 @@ sync_read_error_2_disks_body() atf_check dd if=/dev/zero bs=1M count=32 of=$f1 status=none atf_check truncate -s 32M $f2 - md1=$(attach_md -t vnode -f ${f1}) - md2=$(attach_md -t vnode -f ${f2}) + attach_md md1 -t vnode -f ${f1} + attach_md md2 -t vnode -f ${f2} atf_check gmirror label $name $md1 devwait @@ -64,9 +64,9 @@ sync_read_error_3_disks_body() atf_check truncate -s 32M $f2 atf_check truncate -s 32M $f3 - md1=$(attach_md -t vnode -f ${f1}) - md2=$(attach_md -t vnode -f ${f2}) - md3=$(attach_md -t vnode -f ${f3}) + attach_md md1 -t vnode -f ${f1} + attach_md md2 -t vnode -f ${f2} + attach_md md3 -t vnode -f ${f3} atf_check gmirror label $name $md1 devwait diff --git a/tests/sys/geom/class/raid3/10_test.sh b/tests/sys/geom/class/raid3/10_test.sh index da141c5992ae..ec7c47253465 100644 --- a/tests/sys/geom/class/raid3/10_test.sh +++ b/tests/sys/geom/class/raid3/10_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +attach_md us0 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us1 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us2 -t malloc -s $(expr $nblocks1 + 1) || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/11_test.sh b/tests/sys/geom/class/raid3/11_test.sh index 56a126a91cb4..73aa1cc7f982 100644 --- a/tests/sys/geom/class/raid3/11_test.sh +++ b/tests/sys/geom/class/raid3/11_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +attach_md us0 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us1 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us2 -t malloc -s $(expr $nblocks1 + 1) || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/12_test.sh b/tests/sys/geom/class/raid3/12_test.sh index 5224521223a8..4284ac616ac1 100644 --- a/tests/sys/geom/class/raid3/12_test.sh +++ b/tests/sys/geom/class/raid3/12_test.sh @@ -8,9 +8,9 @@ nblocks1=9 nblocks2=`expr $nblocks1 - 1` nblocks3=`expr $nblocks2 / 2` -us0=$(attach_md -t malloc -s $nblocks1) || exit 1 -us1=$(attach_md -t malloc -s $nblocks1) || exit 1 -us2=$(attach_md -t malloc -s $nblocks1) || exit 1 +attach_md us0 -t malloc -s $nblocks1 || exit 1 +attach_md us1 -t malloc -s $nblocks1 || exit 1 +attach_md us2 -t malloc -s $nblocks1 || exit 1 dd if=/dev/random of=/dev/${us0} count=$nblocks1 >/dev/null 2>&1 dd if=/dev/random of=/dev/${us1} count=$nblocks1 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/1_test.sh b/tests/sys/geom/class/raid3/1_test.sh index 638439c9ab9f..1df627114135 100644 --- a/tests/sys/geom/class/raid3/1_test.sh +++ b/tests/sys/geom/class/raid3/1_test.sh @@ -4,9 +4,9 @@ echo "1..2" -us0=$(attach_md -t malloc -s 1M) || exit 1 -us1=$(attach_md -t malloc -s 2M) || exit 1 -us2=$(attach_md -t malloc -s 3M) || exit 1 +attach_md us0 -t malloc -s 1M || exit 1 +attach_md us1 -t malloc -s 2M || exit 1 +attach_md us2 -t malloc -s 3M || exit 1 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} 2>/dev/null || exit 1 devwait diff --git a/tests/sys/geom/class/raid3/2_test.sh b/tests/sys/geom/class/raid3/2_test.sh index f8642160c6fc..db16542f77ed 100644 --- a/tests/sys/geom/class/raid3/2_test.sh +++ b/tests/sys/geom/class/raid3/2_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +attach_md us0 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us1 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us2 -t malloc -s $(expr $nblocks1 + 1) || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/3_test.sh b/tests/sys/geom/class/raid3/3_test.sh index 656a9ad04328..64d7d5caaaf3 100644 --- a/tests/sys/geom/class/raid3/3_test.sh +++ b/tests/sys/geom/class/raid3/3_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +attach_md us0 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us1 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us2 -t malloc -s $(expr $nblocks1 + 1) || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/4_test.sh b/tests/sys/geom/class/raid3/4_test.sh index 698044f0c425..749729407368 100644 --- a/tests/sys/geom/class/raid3/4_test.sh +++ b/tests/sys/geom/class/raid3/4_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +attach_md us0 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us1 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us2 -t malloc -s $(expr $nblocks1 + 1) || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/5_test.sh b/tests/sys/geom/class/raid3/5_test.sh index 66cfa9e58b8b..76d90cb60754 100644 --- a/tests/sys/geom/class/raid3/5_test.sh +++ b/tests/sys/geom/class/raid3/5_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +attach_md us0 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us1 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us2 -t malloc -s $(expr $nblocks1 + 1) || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/6_test.sh b/tests/sys/geom/class/raid3/6_test.sh index 562c6f021e88..4c1d3288b82b 100644 --- a/tests/sys/geom/class/raid3/6_test.sh +++ b/tests/sys/geom/class/raid3/6_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +attach_md us0 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us1 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us2 -t malloc -s $(expr $nblocks1 + 1) || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/7_test.sh b/tests/sys/geom/class/raid3/7_test.sh index e2aeb783890f..53933c96cd99 100644 --- a/tests/sys/geom/class/raid3/7_test.sh +++ b/tests/sys/geom/class/raid3/7_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 -us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +attach_md us0 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us1 -t malloc -s $(expr $nblocks1 + 1) || exit 1 +attach_md us2 -t malloc -s $(expr $nblocks1 + 1) || exit 1 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 diff --git a/tests/sys/geom/class/raid3/8_test.sh b/tests/sys/geom/class/raid3/8_test.sh index bd3463a465f2..4c31ec0d4b1c 100644 --- a/tests/sys/geom/class/raid3/8_test.sh +++ b/tests/sys/geom/class/raid3/8_test.sh @@ -10,9 +10,9 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` src=`mktemp $base.XXXXXX` || exit 1 dst=`mktemp $base.XXXXXX` || exit 1 *** 247 LINES SKIPPED *** From nobody Mon Nov 27 21:35:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfJmK55HDz53GP4; Mon, 27 Nov 2023 21:35: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 4SfJmK4FG4z4f9w; Mon, 27 Nov 2023 21:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701120945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQhHgtfPmGijvQzG6uE/B6JcKn3qE07R0xKE1TnX/ss=; b=JVtgjaIE/AAsQwUnpgc64DyZdK6MypzO+uZgK/PwmCqbmqpltg+m58GuBfu7YRFFCK0JnY 6zhnGgdDmazvwubEn5raOcBN/rkszlYhiBJk3Pl7Dbe3Xho7mdeyKQkuaQq2jNQ8Tk5mr3 sVUe/5vaWqS95MuiLdh2EHLdvVOi587pAlHcjjds/bTaMFczA6JcJyX85nxFy7dF4Tn9oa 3UcxTZwvnW+aNyvkhVIYSjBKjroxwxv6JLW7B5aD4YYWIBDPphE9dqdPseylLztQ+hOs1d M0Hl+bYptyv2VUeRzGbDT511+z9yo6QYoSk9cxLI3S9xkfkkZ++u8/+te76Z1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701120945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SQhHgtfPmGijvQzG6uE/B6JcKn3qE07R0xKE1TnX/ss=; b=JqPmz9jwdpNRpw9fymvQR5g4XMt49m4sWCfPYPW5FoeK92+hae0yhgYYImEjm1hKeBxCp6 P8jgD1TCdrztasE8QdiZ0q66pqL/rylWurYYhxV95Gz5/VpV1uK2OvpjoTU+iQ/ihovvSK lJu4OoU029i4KwpfoaguELUvfQ4uK9A4yBL8KHHQqfaaw8oxLrdDOgJFrMhFifcv2YNAfy pBt6zutp0eeNhXPtvO7JFbhDfgZ70jzU0g4bjUIba8JDyDxdEjayxmhIY1f2MMSJqJsUtl UQ1MBE0M9xTXimFpt/dARNkzb2d0BsbZrHef4/xy4UP/ByxLt5Luv8ArelfvYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701120945; a=rsa-sha256; cv=none; b=xoWUnXXS+Fn2zrYgf7YlnsJqOpttLQ/8l7LeOJgo4UViCUftdEcHwM2F5r+MDFoUBha9zn eL+LSBiK728a6zyiD4Xc3BpSD5UeNXfq+9rPEiYHENF7yDt3I7LeODZMgJHSQMGWsyv6r7 He+o/uxiOExH6LYQ4Zx/vvehDFM8gdwwqS2FEtO99EXf0P7Eif4k0S4/3Czcz7YCkeqRU1 eZgeGSB9QMs46R2kKaHdnlUGySZMyWLk2UNXxSkTaG34o0RZ6PbBl+W4tFVKnHCo+ei+Fv lCwbd24AncLB7fkv/fRSyWBP8ascmIWFPnZX9lBfxlIQQY4CmmMWcTijk01tXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfJmK3J5Nzv7J; Mon, 27 Nov 2023 21:35: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 3ARLZjrL020488; Mon, 27 Nov 2023 21:35:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARLZjCw020485; Mon, 27 Nov 2023 21:35:45 GMT (envelope-from git) Date: Mon, 27 Nov 2023 21:35:45 GMT Message-Id: <202311272135.3ARLZjCw020485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 97bd53ef4d20 - main - Makefile.vm: Fix duplicate rc.conf 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97bd53ef4d20b7d15e0b0976e885af9438f5637e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=97bd53ef4d20b7d15e0b0976e885af9438f5637e commit 97bd53ef4d20b7d15e0b0976e885af9438f5637e Author: Colin Percival AuthorDate: 2023-11-27 21:29:05 +0000 Commit: Colin Percival CommitDate: 2023-11-27 21:35:41 +0000 Makefile.vm: Fix duplicate rc.conf files Two bugs in Makefile.vm resulted in disk images being "built" multiple times, resulting in lines added to /etc/rc.conf being duplicated: 1. The vm-image target reused the same "staging tree" directory for all of its builds (multiple disk image types and multiple filesystem types). 2. The cw-type-flavour-fs target depends on emulator-portinstall, which did not have a 'touch ${.TARGET}' and thus re-ran every time -- and caused the cw-type-flavour-fs target to be re-run. This was triggered by release builds running `make cloudware-release` (creating the disk images) followed by `make ec2amis` (which re-created the disk images prior to uploading them). MFC After: 1 week Sponsored by: https://www.patreon.com/cperciva --- release/Makefile.vm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 1a58a548b9f4..a7624775d48c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -81,6 +81,7 @@ emulator-portinstall: env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif + touch ${.TARGET} QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static .endif @@ -137,10 +138,11 @@ vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} - mkdir -p ${.OBJDIR}/${.TARGET} + mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${FS} \ + -C ${.CURDIR}/tools/vmimage.subr \ + -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} . endfor From nobody Mon Nov 27 22:00:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfKKB1vWjz52Gkl; Mon, 27 Nov 2023 22:00: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 4SfKKB1QG9z3H8S; Mon, 27 Nov 2023 22:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701122446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=686CDhSZ8g3Mi4GD5y3r2EsdGyPq3VyKcwCu2Xk07rk=; b=Sn9HaBasoxUavayqsUyQ1Xj9o5MEokQLKQogwoeAyrkXdLzBtmQx60qp1cD9NSTMmz3+EJ qNcS0kAbtvRI3z03AW3QaOphyBq9ovHnQolhV/RRMRK6MTFHTQTPQIOeRZkBWih6xkpriG +eTc6d6lsshZxWmDPGk1b0T+JZ6dNVcz3zXHte3pxkkqbCN4f5krMlmOyrhOBCwq9f4Iry yaDX3VD9gvxcM2ajwmhYpHaEJifZP1YngOTNk+rgh20JmyK3vTlH2ptR9qdztO5I7hL5R8 ukjEi9w1t1KAbetF0eLy22VKq437dSMHyion3PRxPWQHh12OpfTLl77NM9PWbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701122446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=686CDhSZ8g3Mi4GD5y3r2EsdGyPq3VyKcwCu2Xk07rk=; b=s90Ja7A4iu5Wx1XbDd0TgnunktP8xoTQlCoaPh5UOz22bX3SOtHjyNKERu9hpL1RuZyoOt O6qpVeTWMvBy3zImGYzFJ4CQmey6eAku5ikJfQDd+di3Ldnw8gGTGtnf2qKlqrGMdHrVzG /ReyygOxFnkwj1g051+SSTaZUD5h0M8XnoOU1EFX+aYHDMsScaQCpoRL9pbfDjYlkkrToI yfXEUvWNaR2Ccbfeguv8yfRpqB40EF55OWILiG9IChPz/XBJiUDHdEaHWVDJVd5veDI1nG q+5JBFm/VydJ/bkjPHkbPOIsmLq1gFEfnexffhKqkJtaCOcNVs1mQvJOrH2Dlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701122446; a=rsa-sha256; cv=none; b=iGW0Tn7v+w1UbjHg8NAj2A3OED40JIu4FYPhMiMzgf5gZ5/dEk7EC/U+r918eT/ZxYuHEM ywzYvUT3ikumlOhM13N7U1mZHsk/Fpp1vpbMm83fkg5gTEUvhnvnZqtzQZC10Ky9gAtcqC DHj0tvAhqfjJpV2nEuOsJr51dFItLYsxvGhla0cgWU5GWCCwcCbDgo2MQ3H5oE6j08F7pc OxEfKas8ENEjTEDS86iET0qAlVUvip3MNmnHMI6mBl77JUPK2wuk4KMYz0cpq0XtfJh0No As+wKgOoTdNxUi29qjv+JTDpDipy22DVNF0kWZGR6eTCbWs0T20OAFmmGktxRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfKKB0TfJzwCl; Mon, 27 Nov 2023 22:00: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 3ARM0k4G063801; Mon, 27 Nov 2023 22:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARM0khR063798; Mon, 27 Nov 2023 22:00:46 GMT (envelope-from git) Date: Mon, 27 Nov 2023 22:00:46 GMT Message-Id: <202311272200.3ARM0khR063798@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: 8b923102f957 - main - Revert "cdefs: Remove __func__ define" List-Id: Commit messages for the main 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: 8b923102f957e72c686d41075ce040f61e64fe6f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8b923102f957e72c686d41075ce040f61e64fe6f commit 8b923102f957e72c686d41075ce040f61e64fe6f Author: Warner Losh AuthorDate: 2023-11-27 18:47:21 +0000 Commit: Warner Losh CommitDate: 2023-11-27 21:59:54 +0000 Revert "cdefs: Remove __func__ define" This reverts commit 17a238a15fbed01477fbc54744d35cbccdb65871. There were too many other changes accidentally mixed in. Sponsored by: Netflix --- sys/sys/cdefs.h | 40 ++++++++++++++++++++++++++++++++++++-- tests/sys/opencrypto/cryptodevh.py | 4 ++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index bcbf418f9323..c5b6190077b3 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -96,9 +96,14 @@ /* * The __CONCAT macro is used to concatenate parts of symbol names, e.g. * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. + * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI + * mode -- there must be no spaces between its arguments, and for nested + * __CONCAT's, all the __CONCAT's must be at the left. __CONCAT can also + * concatenate double-quoted strings produced by the __STRING macro, but + * this only works with ANSI C. * * __XSTRING is like __STRING, but it expands any macros in its argument - * first. + * first. It is only available with ANSI C. */ #if defined(__STDC__) || defined(__cplusplus) #define __P(protos) protos /* full-blown ANSI C */ @@ -117,7 +122,33 @@ #define __inline /* delete GCC keyword */ #endif /* ! __CC_SUPPORTS___INLINE */ #endif /* !__cplusplus */ -#endif /* __STDC__ || __cplusplus */ + +#else /* !(__STDC__ || __cplusplus) */ +#define __P(protos) () /* traditional C preprocessor */ +#define __CONCAT(x,y) x/**/y +#define __STRING(x) "x" + +#if !defined(__CC_SUPPORTS___INLINE) +#define __const /* delete pseudo-ANSI C keywords */ +#define __inline +#define __signed +#define __volatile +/* + * In non-ANSI C environments, new programs will want ANSI-only C keywords + * deleted from the program and old programs will want them left alone. + * When using a compiler other than gcc, programs using the ANSI C keywords + * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS. + * When using "gcc -traditional", we assume that this is the intent; if + * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone. + */ +#ifndef NO_ANSI_KEYWORDS +#define const /* delete ANSI C keywords */ +#define inline +#define signed +#define volatile +#endif /* !NO_ANSI_KEYWORDS */ +#endif /* !__CC_SUPPORTS___INLINE */ +#endif /* !(__STDC__ || __cplusplus) */ /* * Compiler-dependent macros to help declare dead (non-returning) and @@ -312,6 +343,11 @@ #define __unreachable() ((void)0) #endif +/* XXX: should use `#if __STDC_VERSION__ < 199901'. */ +#if !__GNUC_PREREQ__(2, 7) +#define __func__ NULL +#endif + #if (defined(__GNUC__) && __GNUC__ >= 2) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901 #define __LONG_LONG_SUPPORTED #endif diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index 2d723999abc7..9607bcd4d115 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -29,6 +29,10 @@ def __STRING(x): return #x def __XSTRING(x): return __STRING(x) +def __P(protos): return () + +def __STRING(x): return "x" + def __aligned(x): return __attribute__((__aligned__(x))) def __section(x): return __attribute__((__section__(x))) From nobody Mon Nov 27 22:00:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfKKC3X1Lz52GhW; Mon, 27 Nov 2023 22:00: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 4SfKKC2l3qz3HNd; Mon, 27 Nov 2023 22:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701122447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sigVMGuHPMBAdglrXboW5CDekjvdTatxRhD+8SphILU=; b=wTgP/QWpLen1V6zabRGMgAF3fTQyX4gMP5vTNpUo5riHXoapMPQ57qN81UxxzYjoUf+vNO 26kZRA0GEMXuYrLGKGJzPrqVqaR5bFq84euAcvyedKdk8RNz1JTymHIVmSMhcIxOyrDPWM 0fLd3FT7AY1qV81rbHFUR5ysyvuWvZh+UO6DkHv6aIeo3xPTVeLRUydmXtyPutq641e723 0kztbwD1yeAnspls6aX3krageFYtz6dZ4xvCFnwB4yk1T/+RuYeoCDkiubd0WrDHn44S2U /utQyb2+kmIUzVW3X3LDOvkEzhXylBYtuHt2WHdwmc3gPaEP/8BuQs3FNuqxgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701122447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sigVMGuHPMBAdglrXboW5CDekjvdTatxRhD+8SphILU=; b=EwJlb23qD1nvTf7wxstbiXhDKmHb3vqHiV4JMgDw0ahfvLkNdPIiwaOyUdZ1KA8Q0kDKR4 DmepYmV7zIiYIjecZ5Lasy4GcQ9Pu7gAdUdvBTzMmed7tzkskU0f4llEzgBw3xt9AWXZlh uC1Yr60J4/WcP+ZY/9k/a7vCxGPNOYcVMPO6lvuxttcCN3t1rQ4gQFaubIjeGWha5mcPT6 4zRokvuVtY3wKntx30wCG8J/u8VmxscEU/HwstS2n6N0pideXfCOedqpCaRVZEtGzmHGhT VvR4P3GAkgoRvV8ilIbSnbxksTcQnOroQgwRcvMnCaKLhANQA+NExrtERdcdFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701122447; a=rsa-sha256; cv=none; b=SeuXORGDNh8ntWAaTec8QdgKR5Pi6ECEEBdfVE8XXIzfJOamKtZee7uLJ94NOfa7WIov4I Jiy1RpqswERmW6bYIGFRIDK7Y06bb7ZfhDNROPWOmbvRobZZk4inQ89FGn1phin4DZ1S+3 ayOXywtmm7H8x48miDVjVN2b8F/eoJzPbZEdJzfapSJuNU6hVh2m4ADLMqyGE2OXv3Es1K pOzqXaOywYug7zUlMmHiMq/uv1siCIcwLmAmEgjqZVRUlcyiAjP2NQ6geMnuEincdnh2id R6xlHtkwCJq8OzebhFjYj2+bgdghS5tzvUV6uTBw3IMyGfrOv7mYZVw2bNvNXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfKKC1k6bzvvF; Mon, 27 Nov 2023 22:00: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 3ARM0lDI063840; Mon, 27 Nov 2023 22:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARM0l2l063837; Mon, 27 Nov 2023 22:00:47 GMT (envelope-from git) Date: Mon, 27 Nov 2023 22:00:47 GMT Message-Id: <202311272200.3ARM0l2l063837@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: a5c27819344b - main - cdefs: Remove __func__ stub. List-Id: Commit messages for the main 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: a5c27819344bfcbdf5ae6a430af9c6ca98b0a249 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a5c27819344bfcbdf5ae6a430af9c6ca98b0a249 commit a5c27819344bfcbdf5ae6a430af9c6ca98b0a249 Author: Warner Losh AuthorDate: 2023-11-27 18:48:39 +0000 Commit: Warner Losh CommitDate: 2023-11-27 21:59:54 +0000 cdefs: Remove __func__ stub. Redo 17a238a15fbe. Remove the __func__ crutch for gcc 2.95 and earlier. We don't need it today to build the tree (since gcc < 12 is unlikely to work). And it's not used in any system header that's part of the standard interfaces today (so we don't need it for compatibility). And we have other issues that make gcc < 4.2 unlikely to work today with system headers. Sponsored by: Netflix --- sys/sys/cdefs.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index c5b6190077b3..fcc90b4d8aee 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -343,11 +343,6 @@ #define __unreachable() ((void)0) #endif -/* XXX: should use `#if __STDC_VERSION__ < 199901'. */ -#if !__GNUC_PREREQ__(2, 7) -#define __func__ NULL -#endif - #if (defined(__GNUC__) && __GNUC__ >= 2) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901 #define __LONG_LONG_SUPPORTED #endif From nobody Mon Nov 27 22:46:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfLKq57Cyz52jJK; Mon, 27 Nov 2023 22:46: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 4SfLKq4K45z3Vgb; Mon, 27 Nov 2023 22:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701125183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4b9G3i8oAjqp49PAQsmy5G8Zulbv03uCx9ejd2+hgQw=; b=NY33YQQMHPizCu2lq935A5yKb57PrnR0AdIZBCRVl3oNVn0GhD2jiK5Mvmaclj4MS58Cmz MMtL3erGBpwQ5LpPT66MLuH4MZLKGZy03+fadRyGukESm+02bTA1GbcjUXNQ/LoIn34Fwq MTwMsUUFdRv19Btg/b9OC86nNiXz1xliGH1NEkJuZBtXeT5M9HSI/02xo4FHFLHJe2I5Pz Aft6e7ntPJRmfarUxsu2NHrxr7cbe2ZtqOtELVs+D8CE56ONkVKQe7EIfHf4eeBLya8FTg yOhsGl4nOf4s8Im/e4D/PtSp8vFTSi4KSNl0zFFxasSu4HqIduDW+abfxmcdlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701125183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4b9G3i8oAjqp49PAQsmy5G8Zulbv03uCx9ejd2+hgQw=; b=hngwfvBPsiOGE0n7arcDWrYVKDOIN0xNZz/n/Msfj/5KSh8YMI4PyVXiaA1rFgVYuZlLJ3 WJUlqs+S/BUmYmqtd/+/qYJMntjNPet2wR5fvgCisASEACw3pjMJQ4P17QJu4yQVWP5cSQ X/dcHL5zACi15BZ/hPx4ILx2uUTMdKSgMp82BCvahu3AlNlW92RCe4zufxDmNd8Xa6PQfi 1MdPXf/hTaBT7ErH1DG8+u6LlxeACSdVZz6ug2kN00quI6rDAt1TccLkjqSXRaw9V332vd M0fU751doZUSNHTdKfLpwq7aSjKbFHZLYXfxvieH+6qdi1Y9zae3oVAMIqYJlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701125183; a=rsa-sha256; cv=none; b=HREYrXENnZ1IpEEj2LtKv/dpOYeU1ZKEhESZP7Qi+bNp92rGQ0DAKOJdAkGiAGdiLGM6a6 X+ComIAoJhDQZ+osQxtr9rLFTBVtkbOmr+0AoKTjY8iuftkXpZZbupzBhzG/HHSAcUbcY7 JTKce+hSAiF/Hi1izKcHM03puf0R4ytyHlcom68lTulKNFpLiK7Syr7PhmlNNXJCJGJjek 7trWTe4z3NIFHnpdT7MnpzwzSF0KPe+9iryj+m4hSuSmFgOj1M20ROqtkKhOr/ArX01IoA OqrG5nxuDzxLL6avJYHZGXhzXa6RJbwNa4RxpZPxSsBJIu2hm4S8IljLbW2d5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfLKq3BjDzwss; Mon, 27 Nov 2023 22:46: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 3ARMkN2n037270; Mon, 27 Nov 2023 22:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARMkNS1037267; Mon, 27 Nov 2023 22:46:23 GMT (envelope-from git) Date: Mon, 27 Nov 2023 22:46:23 GMT Message-Id: <202311272246.3ARMkNS1037267@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: c596126a5d3d - main - pmbr: Only load the first 545k rather than error out List-Id: Commit messages for the main 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: c596126a5d3d2ee015ee6807b4041efa5b9d9b07 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c596126a5d3d2ee015ee6807b4041efa5b9d9b07 commit c596126a5d3d2ee015ee6807b4041efa5b9d9b07 Author: Warner Losh AuthorDate: 2023-11-27 22:40:40 +0000 Commit: Warner Losh CommitDate: 2023-11-27 22:45:56 +0000 pmbr: Only load the first 545k rather than error out It would be nice to have larger boot partitions for ESPs to live in one day. It's trivial to carve out 5M 10M or 200M when provisioning, but logistical issues may make it hard to do it after the fact. So only warn when the partition is > 545k. If we ever grow the boot loader larger than that, then it will be responsible for loading the rest anyway. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D42774 --- stand/i386/pmbr/pmbr.S | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/stand/i386/pmbr/pmbr.S b/stand/i386/pmbr/pmbr.S index c61acbe261bd..60b26df15720 100644 --- a/stand/i386/pmbr/pmbr.S +++ b/stand/i386/pmbr/pmbr.S @@ -155,8 +155,10 @@ next_boot: addl $1,(%si) # Next LBA mov %es,%ax # Adjust segment for next addw $SECSIZE/16,%ax # sector cmp $0x9000,%ax # Don't load past 0x90000, - jae err_big # 545k should be enough for - mov %ax,%es # any boot code. :) + jb sz_ok # 545k should be enough for + call err_big # any boot code, but warn + mov $0x9000-SECSIZE/16,%ax # and truncate +sz_ok: mov %ax,%es jmp load_boot # # Move to the next partition. If we walk off the end of the sector, load @@ -203,17 +205,21 @@ getdrvparams: # # Various error message entry points. # -err_big: movw $msg_big,%si # "Boot loader too - jmp putstr # large" +err_big: movw $msg_big,%si # "Truncated + call putstr # to 545k" + ret err_pt: movw $msg_pt,%si # "Invalid partition - jmp putstr # table" + call putstr # table" +err_pt.1: jmp err_pt.1 # Await reset err_rd: movw $msg_rd,%si # "I/O error loading - jmp putstr # boot loader" + call putstr # boot loader" + jmp err_pt.1 err_noboot: movw $msg_noboot,%si # "Missing boot - jmp putstr # loader" + call putstr # loader" + jmp err_pt.1 # # Output an ASCIZ string to the console via the BIOS. # @@ -223,9 +229,9 @@ putstr.0: movw $0x7,%bx # Page:attribute putstr: lodsb # Get character testb %al,%al # End of string? jnz putstr.0 # No -putstr.1: jmp putstr.1 # Await reset + ret -msg_big: .asciz "Boot loader too large" +msg_big: .asciz "Loaded only 545k" msg_pt: .asciz "Invalid partition table" msg_rd: .asciz "I/O error loading boot loader" msg_noboot: .asciz "Missing boot loader" From nobody Tue Nov 28 04:12:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfTZJ3lYhz52cxj; Tue, 28 Nov 2023 04:12: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 4SfTZJ3Bp1z4RB3; Tue, 28 Nov 2023 04:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701144760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+iZQqfe+GrXxrd9NhomEs2DMCdg+hYukzZ9f1XWsNHQ=; b=e8rOtwGjbuCtxoaSIZ2+ZZtjZp94icaEow1AiYiy8+4BVqTvWwfmRJkZ410IxsXKZmLgoY HiOoqSVDF1Lr5NBiAYrrT2hOmBcrAoZ4hhWA97bKKWJ9xDgBeL20xHzqQBRGgVGlP09VNu KJ6zbkXAccvxFHBZ7XMgx8+TCKOJIpEqJF42KQKv/y93eRT3c3n7KrbuHeKxFhhilYbpDI tZoFvxysw5P1lnmEVSwrvMfvp69IQpeYGiFhf30DTbkuSPh+7gl//Hm0D1yLYU6JBlya1h KNhWA1t+DvOpb9rCsOFIUmnJ3/s3oont5YVCiKd78POEKC4qmTumI9+YApqLfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701144760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+iZQqfe+GrXxrd9NhomEs2DMCdg+hYukzZ9f1XWsNHQ=; b=wK7K2N5BxS3RKdKSkZHY44CFmUbUnydu2+ztJuKs8gCps2PVSxuEFPfGxZd+4SoAr/2kaP 9wzlezcs7uQ63TITbWD5wAcxeqfqxztWBTim0yRpmojgUOUyiVgHgmu/Xla21Iy2HQ/6y2 NX91CD5H1sw0YUOJUbSH1tTjLtjXPijs8PTvRFnyBEnH9eGaYSytwdq+pNnFhlo2+LNlkE jFgihQO8bockzdYZq17Fs479EMGBpvLnTe05d9IROaKvzxBt9nFBmfL8m1bmz+7SQhioaN ErZRyXOo49UT/BwJJ05eWR5jyQ5cqmQZ+/EQu+vGRg6uowdrWFNVlo0dYlf5Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701144760; a=rsa-sha256; cv=none; b=H2DQskr8sxqhoOJwGi0qF4POush31z90a0kAF7BtDnR5v29GLmyUlF6m9DLD9hEw9mP1fI +Fu5m0vrju7oD+xpem/6OBCf1Ed0ACDwyut90e5+jKw1Dyl56+tfM9dkZqm0fTItRvt3AX 6Yv7C+Nf+noA3E/D+9utxvI0+ERlONaptEKvttHwUTU9wubvrbHT+jKnoYhK/9tL7Rusw6 Y6q6jUSABa5Ezu1r/kLc2vFN2UuBP/aJQu9/zP8bMfh2Vz0p7IWPmXzdxMogHyBXzIzADv rRu6iyu2T/2DRF/kT0Ff3y9P7Zl+TkkxNu2yrwt0rLBRTeYA5HcPXXkakKylcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfTZJ2GM5z167s; Tue, 28 Nov 2023 04:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AS4Ce1K087211; Tue, 28 Nov 2023 04:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS4Ce5a087208; Tue, 28 Nov 2023 04:12:40 GMT (envelope-from git) Date: Tue, 28 Nov 2023 04:12:40 GMT Message-Id: <202311280412.3AS4Ce5a087208@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: 4064a1108b51 - main - netgraph: increase size of sockaddr_ng to match maximum node name List-Id: Commit messages for the main 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: 4064a1108b51b24903c8d67db21e8dbaf89b475f Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4064a1108b51b24903c8d67db21e8dbaf89b475f commit 4064a1108b51b24903c8d67db21e8dbaf89b475f Author: Gleb Smirnoff AuthorDate: 2023-11-28 04:10:52 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-28 04:10:52 +0000 netgraph: increase size of sockaddr_ng to match maximum node name The ng_socket(4) node already writes more than declared size of the struct at least in the in ng_getsockaddr(). Make size match size of a node name. The value is pasted instead of including ng_message.h into ng_socket.h. This is external API and we want to keep it stable even if NG_NODESIZ is redefined in a kernel build. Reviewed by: afedorov Differential Revision: https://reviews.freebsd.org/D42690 --- sys/netgraph/ng_message.h | 5 ++++- sys/netgraph/ng_socket.h | 2 +- tests/sys/netgraph/socket.c | 5 ----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h index 46659bc4cec5..45556ecc609c 100644 --- a/sys/netgraph/ng_message.h +++ b/sys/netgraph/ng_message.h @@ -42,7 +42,10 @@ #ifndef _NETGRAPH_NG_MESSAGE_H_ #define _NETGRAPH_NG_MESSAGE_H_ -/* ASCII string size limits */ +/* + * ASCII string size limits + * Check with struct sockaddr_ng if changing. + */ #define NG_TYPESIZ 32 /* max type name len (including null) */ #define NG_HOOKSIZ 32 /* max hook name len (including null) */ #define NG_NODESIZ 32 /* max node name len (including null) */ diff --git a/sys/netgraph/ng_socket.h b/sys/netgraph/ng_socket.h index 7556ec645f3d..9b537a52814a 100644 --- a/sys/netgraph/ng_socket.h +++ b/sys/netgraph/ng_socket.h @@ -60,7 +60,7 @@ enum { struct sockaddr_ng { unsigned char sg_len; /* total length */ sa_family_t sg_family; /* address family */ - char sg_data[14]; /* actually longer; address value */ + char sg_data[32]; /* see NG_NODESIZ in ng_message.h */ }; #endif /* _NETGRAPH_NG_SOCKET_H_ */ diff --git a/tests/sys/netgraph/socket.c b/tests/sys/netgraph/socket.c index b5216dcc2c39..bd40e4358866 100644 --- a/tests/sys/netgraph/socket.c +++ b/tests/sys/netgraph/socket.c @@ -53,12 +53,7 @@ ATF_TC_BODY(getsockname, tc) /* Named node. */ ATF_REQUIRE(NgMkSockNode(name, &cs, NULL) == 0); ATF_REQUIRE(getsockname(cs, (struct sockaddr *)&sg, &len) == 0); -#if 0 - /* sockaddr_ng truncates name now. */ ATF_REQUIRE(strcmp(sg.sg_data, NAME) == 0); -#else - ATF_REQUIRE(strncmp(sg.sg_data, NAME, sizeof(sg.sg_data)) == 0); -#endif } ATF_TP_ADD_TCS(tp) From nobody Tue Nov 28 04:12:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfTZK4txVz52d8Q; Tue, 28 Nov 2023 04:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfTZK4M95z4RBZ; Tue, 28 Nov 2023 04:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701144761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UE1NJ0ghlMIcwOsMZGJm7Ct5Ma6aCmxe0IgXKDTQEs=; b=K+fkDPjprKh4G8xkRdc6ocwo7S3uNSGpybeJrbKOA1vPcb7rhLlq8xkBRpngxKTCFgKk/h JEyerfJ61UFSTmapFL4iWyePM3fMFQLNvkoqd/xMZ7+Z6pAprL2/olLX+c9nEDZq4ajYEh GUnVm6DgnVY3BO2GhcwYW2BDDkI2g1TIlAjzALl+t+F3k+GQVkezxQ2Ou59h4BDBxBkI/3 lumRvxJswhA1bloz9xBpfPHv4e2kXaPTIe6zK+y74P79OehM1d0wfkheNKVspuDRzI+oU4 qU5E+A5Ts7uI3Y8LmDR+QwATjlMzqVQ+OS1AL1zA6Zzla0HHZp+5lIfmr+ZmSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701144761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UE1NJ0ghlMIcwOsMZGJm7Ct5Ma6aCmxe0IgXKDTQEs=; b=lqTzPRxxJ6vgpo2wpGC6tPs54yjtBwp21LgE7Wlf4zkbALxkuJww9B6NyRxJzVTLQBIXYJ Apy9xlz9mIFjlaDhnSPlJjQZimk/jaUTRhaOM+jOLHHyT984zAyGS2nRzuITxLhd+u/VZj VK0s5Bt/PnZHMt+4Us1QbxtMPsHJ2iuDiIoArgH8lhd64pzWhOK17jIzn/oENBEJ5xXzTp 5FAP4+0JUepYZMO3OY+2DD6y9DD2HUAiG30xIae5mA6vXkFYJdQ52SRbXuB9WOP+9ZqI8J HsDu1RMQlievFTI4+qK9B+gPPWTEgSuSrnPsmDZODooN7LLdCIBXS/ZpDXE/Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701144761; a=rsa-sha256; cv=none; b=Fz8FpZqlwK948HcikDQqKsfQGLQ5koubNQdhsJWeT9YXlWxP2FYKqDgOe7Xk8DRBGJEtXm PPNLxQZHCrxNwZFF5xDGxq42m70U8OcvEAHrK2IjQ2jx6zuqy6lap7w9Uvvy2b15A/5f+a uJyZliJ2T6ohDLyjq6urHvG6zvRMSz1AtXooB8Xj+k72M6BEMB5B1NH3AbWHFp5atfhThS 4JiWzO0rV6lJwM+6zOhSOc3H2u2AsNyu/Nk8JZZLdfb9uERJ3ZUxaIwskS9ksYe/aNXlLd rufS0Do528GrIVFxlETsKWLnlN44wGH3mbHCVMZlPAs6geOjnOSBSv5fPnbXzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfTZK3NpXz15rp; Tue, 28 Nov 2023 04:12: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 3AS4CfJK087267; Tue, 28 Nov 2023 04:12:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS4CfUE087264; Tue, 28 Nov 2023 04:12:41 GMT (envelope-from git) Date: Tue, 28 Nov 2023 04:12:41 GMT Message-Id: <202311280412.3AS4CfUE087264@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: d2de66a90d01 - main - ng_socket: with getsockname() return node ID for unnamed node List-Id: Commit messages for the main 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: d2de66a90d01810b1869b7dcac290267f05e4b1d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d2de66a90d01810b1869b7dcac290267f05e4b1d commit d2de66a90d01810b1869b7dcac290267f05e4b1d Author: Gleb Smirnoff AuthorDate: 2023-11-28 04:11:38 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-28 04:11:38 +0000 ng_socket: with getsockname() return node ID for unnamed node Reviewed by: afedorov Differential Revision: https://reviews.freebsd.org/D42691 --- sys/netgraph/ng_socket.c | 3 +++ tests/sys/netgraph/socket.c | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 4afa46c3d0f0..8a8f127ee39b 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -523,6 +523,9 @@ ng_getsockaddr(struct socket *so, struct sockaddr **addr) if (NG_NODE_HAS_NAME(node)) bcopy(NG_NODE_NAME(node), sg->sg_data, strlen(NG_NODE_NAME(node))); + else + snprintf(sg->sg_data, sizeof(sg->sg_data), "[%x]", + ng_node2ID(node)); mtx_unlock(&pcbp->sockdata->mtx); sg->sg_len = sg_len; diff --git a/tests/sys/netgraph/socket.c b/tests/sys/netgraph/socket.c index bd40e4358866..1e5d68e1d21f 100644 --- a/tests/sys/netgraph/socket.c +++ b/tests/sys/netgraph/socket.c @@ -42,13 +42,12 @@ ATF_TC_BODY(getsockname, tc) char name[NG_NODESIZ] = NAME; int cs; -#if 0 - /* Unnamed node. */ + /* Unnamed node returns its ID as name. */ ATF_REQUIRE(NgMkSockNode(NULL, &cs, NULL) == 0); ATF_REQUIRE(getsockname(cs, (struct sockaddr *)&sg, &len) == 0); + ATF_REQUIRE(strspn(sg.sg_data, "[0123456789abcdef]") >= 3 && + sg.sg_data[strspn(sg.sg_data, "[0123456789abcdef]")] == '\0'); close(cs); - /* Unnamed node doesn't return any name/ID now. */ -#endif /* Named node. */ ATF_REQUIRE(NgMkSockNode(name, &cs, NULL) == 0); From nobody Tue Nov 28 08:40:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfbWc1fZ8z52NcB; Tue, 28 Nov 2023 08:40: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 4SfbWc1Bcrz3K7K; Tue, 28 Nov 2023 08:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701160844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tToVrFnw33FxrR8TVgC3Lk2LyGsTXhjwKKmEKipZu/E=; b=j78TdSgSCaYXZpv0suiw9uyxAXX7PjD2F6SUNpZQfMjiqJQLh3v+E66L+fYFCO1pm63OwM To/8UGedwBAwOMuLdmBYgRsNklaHBvDNKRGzMow88OcyMa11v55UjvWSJc2s3Pwe6wPUVF LcrkBVbIb7xGOh6r720WOJwmoazZgEeqnQXl/z3UfYSuslIH5WecBlvsRbht6+iUqKwWoA sGn+0CLXUh4LAAUjKffOgrTH3oJW/NO0XOtOVyOX0+LZQuzY9CMkCtNJyFto0z6qXqIieX A022BUTtWI0N5J4CjYWRXkJiFg9lK8aRXSTJRAxwemn9BJE7x0iTpqbMhtvDXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701160844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tToVrFnw33FxrR8TVgC3Lk2LyGsTXhjwKKmEKipZu/E=; b=N/rKylrTFmBkjFCAVB4BpBCGJlBI5tW9lsvTYbSVGeHkeXzu9e8A+DxUPBEpRTL+ypfEw9 spbrCDHkSl/zdv4CS4gbNv2ve1G3KNHgs5aKt7toxXfRj48JBaMcprP/5Vvf6VjYV+gU4q frYqyTZhyAonpZTSRB1vIuqfMYZUD5Wm9Z86zlXtiVe4K1ER3BV9z6MQ5HEfmuXKU0WxFB J+4cnkRUvrdNMzOKK7mIeMXaotsTjjiB1KPnZ9PkuojFCXf06cnsS1RFNV7lnLe9+IjpkF qB6EGWL4i1ycDSnxfbmhY0IiyyMHELk1GSzeJajTABAJxXZp8e9bUAKMTnYH3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701160844; a=rsa-sha256; cv=none; b=HjlxpyPfhkslkRwBtZTyAJMBV6focgr0HQmGbCy62dbhepQQ0NTm+a4E2RNIOdwao+fe5B ZDK2hojmGlmOIQJMxThLIHwQgAeKd4/ImyhqXm1gNLdvgzNUWg/SkJAy7zedy3MGdP4MsD tvofTCvEsBx1Gh6Y2M3/isJMgXPs8qePOda03mrhCos03w37wvRx1G8KllHcCfUmrijSJw sZPIPILW6KmJVkE+18uiA0ht8hdaaJFzOnW9T9fJVvTphpNxfKVFbCMlaIJ39rfL+sGyZD OAU33ACl/wZasXiua2R63vZRt8Xx0ncYgtdWcUYpruQGFjmJ224wSD4xc+cxyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfbWc0G9GzVn; Tue, 28 Nov 2023 08:40: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 3AS8ehkI030267; Tue, 28 Nov 2023 08:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS8ehGN030264; Tue, 28 Nov 2023 08:40:43 GMT (envelope-from git) Date: Tue, 28 Nov 2023 08:40:43 GMT Message-Id: <202311280840.3AS8ehGN030264@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: 7b4b05d88920 - main - Revert "sys/mutex.h: Reorder includes" List-Id: Commit messages for the main 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: 7b4b05d8892080ce6614512b598c89009bcdaf08 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7b4b05d8892080ce6614512b598c89009bcdaf08 commit 7b4b05d8892080ce6614512b598c89009bcdaf08 Author: Emmanuel Vadot AuthorDate: 2023-11-28 08:39:53 +0000 Commit: Emmanuel Vadot CommitDate: 2023-11-28 08:39:53 +0000 Revert "sys/mutex.h: Reorder includes" This reverts commit 50335b1ae4e48712f831e85ddfa7b00da0af382c. --- sys/sys/mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index 9fd6663ed75d..750a5e99679a 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -34,8 +34,8 @@ #define _SYS_MUTEX_H_ #include -#include #include +#include #ifdef _KERNEL #include From nobody Tue Nov 28 08:40:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfbWd2nsYz52Nft; Tue, 28 Nov 2023 08:40: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 4SfbWd27wmz3KB4; Tue, 28 Nov 2023 08:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701160845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4QJ/u4cO0ygZJvrfM0XEcFl103cXTw4xqUHVulXvSvY=; b=buShfGUjudER7niouvIFslg+HIjH+cF4XbnByN068qoNCb9WHyxlonThHerVjb05Gbm0kc WvnyvWSBKRYeJiUkaz/H8yiqAU0H9KJJfsSkzJYO5QDhHY1wQdCtYH9fAFN00u5n9Y2VZb ZGO5bzY9VS26GdKh2OiDAFqiKfVtKCBMVylXibWxN/RREw3rPmbkjZSvySMysqPzCYDvbj bILTXQGskLi6esfdopn6tVjQs/KTx8CykdDN1g3NEpY/0pFesoDYESgll/5cqDkq4lhzdy OU8YrLQxRf/r5uyXkWGh2YmlWCBxzG2BCdT6pgY0U+4V9Cdgx4OxgA063YWuug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701160845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4QJ/u4cO0ygZJvrfM0XEcFl103cXTw4xqUHVulXvSvY=; b=r90tp0072Fdxazzrp9GZ3E2CzSnTXODM/ArSN+It7cX/oxK6Ue8c+C7d7VvPO5bcy+tKuQ cSRPsD1f4Ex4Y5HoQLH7hYEsbm+yEzx4cERvilJf8hi1q11wM7CyUE3PqWopi74alRz8P6 3k1tf8ts9WHrMsMpqegbyPBEm5TnljhWxje1WpawE5VD2Xjl9eZ4N2AXLsZShDxcXRWdkP 6EBcEml/LGGiaRmL9S4mTMqfKHuiD/1Qo1k2IshAEUGgz2dsy98jHEQYyrU6fp7vfmhRGF 455g7/NdJG1V/MTB1PsBk/8EP3OGpL/wzzBsJwP4VWAeE/9+5aLQaqvpVe3HcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701160845; a=rsa-sha256; cv=none; b=j67Rh9av+gIwQXQ0D4dZuEO58Vmaib68gO0jMSI6wzOUZRgwq7eXduESwVlUC5h3xR/3Bo N/7FP/8PawgyZpZVojxb6qa25l82jiLjG09k/m7BNb8YZZZXozSXXqjlzWhIcsPPzany0k k9kDEkqiaIGCBw6BUJH455EZiSAKtafgvUTtuXbWAC2GIN00Il//C9WuAj4UFQrGsF8rjR azFOUR9SaiT9WYAykNq6Y3d0KCQnABPtVIV7ndl3fjMrPaPCqmdm8PV1UNfqCCyaWEijKy pDvDQuuyuFXtJ1/VdpwTgXpX4BLd8gYZZcdcKTeyxD/JZ5g+xIRWRwacG/yVGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfbWd1FzDzkV; Tue, 28 Nov 2023 08:40: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 3AS8ejqL030323; Tue, 28 Nov 2023 08:40:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS8ejuX030319; Tue, 28 Nov 2023 08:40:45 GMT (envelope-from git) Date: Tue, 28 Nov 2023 08:40:45 GMT Message-Id: <202311280840.3AS8ejuX030319@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: 1148518afe43 - main - Revert "sys/mutex.h: Include sys/lock.h instead of sys/_lock.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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1148518afe434d590c3a66aceb04ce509fe14708 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=1148518afe434d590c3a66aceb04ce509fe14708 commit 1148518afe434d590c3a66aceb04ce509fe14708 Author: Emmanuel Vadot AuthorDate: 2023-11-28 08:39:59 +0000 Commit: Emmanuel Vadot CommitDate: 2023-11-28 08:39:59 +0000 Revert "sys/mutex.h: Include sys/lock.h instead of sys/_lock.h" This reverts commit 2a35f3cdf63d1f9b1ea5ab0174adabb631757210. Doesn't appears to be needed anymore and if it is at some point I'll fix the driver. --- sys/sys/mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index 750a5e99679a..56c03a1b0be9 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -34,8 +34,8 @@ #define _SYS_MUTEX_H_ #include +#include #include -#include #ifdef _KERNEL #include From nobody Tue Nov 28 08:44:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfbcG4yB0z52R02; Tue, 28 Nov 2023 08:44:46 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfbcF5htSz3LgD; Tue, 28 Nov 2023 08:44:45 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1701161077; 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=vlBLd3giNfGVRzZEiGXZ3iw/XsHK/+hbYIgoTIT6OKU=; b=pqbouY1a5zyyCQ8pFyVs3NPSGNF8jkzIEpbT+jnIRuwyr6Szt9JwuZ2OrMceeDSMn6KS4j tKzMgEPKJqK/5H9ZPGUg+FO8JwUwGe9VjwbgtWZRBQ/+ICZ7SWb/kHTQjyU0ucz6zdR92u BKcn4QP/JUOKYQtfCCjlR8ZqolER1E8= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id d6353377 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 28 Nov 2023 08:44:37 +0000 (UTC) Date: Tue, 28 Nov 2023 09:44:32 +0100 From: Emmanuel Vadot To: Gleb Smirnoff Cc: John Baldwin , Emmanuel Vadot , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2a35f3cdf63d - main - sys/mutex.h: Include sys/lock.h instead of sys/_lock.h Message-Id: <20231128094432.decd3248611d3f1bf231dd23@bidouilliste.com> In-Reply-To: References: <202311240950.3AO9oSeH089169@gitrepo.freebsd.org> <79e6e3a1-96a5-4d3e-9c48-a89bcbd6303d@FreeBSD.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.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=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-Rspamd-Queue-Id: 4SfbcF5htSz3LgD On Mon, 27 Nov 2023 11:51:03 -0800 Gleb Smirnoff wrote: > On Fri, Nov 24, 2023 at 09:27:39AM -0800, John Baldwin wrote: > J> > commit 2a35f3cdf63d1f9b1ea5ab0174adabb631757210 > J> > Author: Emmanuel Vadot > J> > AuthorDate: 2022-10-27 09:43:19 +0000 > J> > Commit: Emmanuel Vadot > J> > CommitDate: 2023-11-24 09:49:58 +0000 > J> > > J> > sys/mutex.h: Include sys/lock.h instead of sys/_lock.h > J> > It uses the LA_ defines when INVARIANTS is set. > J> > This unbreak dpaa2 with FDT only kernel (like ALLWINNER or ROCKCHIP) as > J> > the driver only include sys/lock.h via header polution for ACPI kernels. > J> > Sponsored by: Beckhoff Automation GmbH & Co. KG > J> > Differential Revision: https://reviews.freebsd.org/D37145 > J> > Reviewed by: kib, mjg > J> > J> Avoiding the nested include here was originally an intentional design decision. > J> It was supposed to be a compile error if you didn't include lock.h first, and > J> callers are always supposed to include both (up until now). However, I'm fine > J> with changing this, but we should be consistent and change all the other lock > J> headers at once including sys/rwlock.h, sys/sx.h, and sys/lockmgr.h. > J> > J> You will also need to patch all of these headers to remove the #error if > J> LOCK_DEBUG or LOCK_FILE isn't defined (including sys/mutex.h which you missed > J> in this commit). > J> > J> You will also need to update all the relevant manpages (mutex.9, sx.9, rwlock.9, > J> and lockmgr.9) to remove the #include . > J> > J> For MFC purposes I would suggest to also fix dpaa2 to #include > J> explicitly as it was supposed to do previously. > > I'd rather recommend to revert this commit and fix dpaa2 properly. This module has > a long history of incorrect include usage, which we were able to handle properly: > > d6eabdac2ef444b62aba186c793fbd5d4226b157 > 7fb975c8fb970b35fc34561ed30a0fe220346cb6 > b0484678d405722f40278e93cdebe95829c71f3b > > We should not modify system headers to satisfy dpaa2 or any other driver. > > -- > Gleb Smirnoff Yes I've just reverted those commits. This was an old review that I cleaned up and it's not even needed anymore (also as you said the fix wasn't correct). Cheers, -- Emmanuel Vadot From nobody Tue Nov 28 13:38:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7D74N2z52GZq; Tue, 28 Nov 2023 13:38: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 4Sfk7D6yBCz4Tts; Tue, 28 Nov 2023 13:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tpsTimqz8rmTO9Kh298Yp37cqIW3tss9w13uWV30MDM=; b=NiU8A2MZ+B3EHqbBfqCmE0VdlQyki8ZB/3P7eAbGrQ5zJ6EzkcvZSKUNotHfq2/Y15GxKv jFjRrHFPGWc72TxM+uNEQLUEc+BWYpqPMObRXG/5dJXQpv2dPknF1ZJ26z3SvY+goryXX/ SHKlOTcNczGCSpaLwOuZAwBAWysaZZZQU5FxgtBD797lAQ4wgpBfWFL53unwehEtktDcjn yEvYPjdHI+IcEGR94nnM2mnD/x+ZTW8nZfhJYGTB/tSNMtdwHY/v/gSD4xoBfrICTyFLKr qChbQIETSvR4YmsnmNi76nN01c9ZyYJjRZzyNBKCg9UpAMQVyI1sbXQe1erCGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tpsTimqz8rmTO9Kh298Yp37cqIW3tss9w13uWV30MDM=; b=TV/rCFaTz9cyWSEgBYuO59gMAF1aKv6lSdgcrl/Ivl1ZZLHIJn6Wk2Nnh+7z4M5+fpQp37 C31YVGwibwXQuEejQAsYD2pVquxaaP1qUTSbDbSabeN1Qz47UZKwEngsxFaYoeqis0/HaF +WPperSOWj5a4EUxcbnE2O5xEtq7CCeUh8s0qjZlhBqmXIB9/BW143KcMAohkkKZ6EcQZY /vm09epR1i60CuJVdQgIJmE2GVIOQc4sUlmr0dj0quG5bh2uDgbp3vcVy3+748QsnzLTjJ FO0nhqdeTQbhJiHerdAVO01KjAuh0upzGieQjRxMcCxZfm2QCbezNyeYaczZVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178712; a=rsa-sha256; cv=none; b=mPQlwE5Y9bLSA1NqYoDVBiXT3EFliI6rdDIyKjdVZb/YCGqRTM5GkH5XYDZZyNdcckYk4S AgtyMJCT+AhpXULcfUu204I63j5hM0oHRVfmrTClxsOyO7hcvrm8118wIVSLlyL3PFJWX9 H8JU3KFB+HxnEFnh8yz56YtZ+v+CD7bh1gjfeke5TntxwS/8XVMc3vqGIm7GBo0dvpwTN0 fd8ycH33zChj9uOnupjgOe89C9xGJQQ8Jb99o7kr5kvz2QCXCelIWYkzRCBs7cI51GFnGB 4k6C5uWuKKoMpsbUa/jWN+w6WGSaFp8g5Kjn9RvKYWUAF3lfV7+vchWIl4gUaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7D5wL5z8S4; Tue, 28 Nov 2023 13:38: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 3ASDcWu0025210; Tue, 28 Nov 2023 13:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcWrZ025207; Tue, 28 Nov 2023 13:38:32 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:32 GMT Message-Id: <202311281338.3ASDcWrZ025207@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: b3195ed2a31f - main - xen: correct spacing in hypercall.h headers List-Id: Commit messages for the main 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: b3195ed2a31f5e6179db8ce96d4ef7dd3e87a537 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=b3195ed2a31f5e6179db8ce96d4ef7dd3e87a537 commit b3195ed2a31f5e6179db8ce96d4ef7dd3e87a537 Author: Elliott Mitchell AuthorDate: 2022-03-07 23:32:17 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 11:23:18 +0000 xen: correct spacing in hypercall.h headers A precursor to merging them. The spacing differs quite a bit between the i386 and amd64 hypercall headers, despite very similar content. Consistently use tabs instead of spaces. Reviewed by: royger --- sys/amd64/include/xen/hypercall.h | 56 ++++++------- sys/i386/include/xen/hypercall.h | 172 +++++++++++++++++++------------------- 2 files changed, 114 insertions(+), 114 deletions(-) diff --git a/sys/amd64/include/xen/hypercall.h b/sys/amd64/include/xen/hypercall.h index b09142af3f44..f62250679f0f 100644 --- a/sys/amd64/include/xen/hypercall.h +++ b/sys/amd64/include/xen/hypercall.h @@ -1,30 +1,30 @@ /****************************************************************************** * hypercall.h - * + * * FreeBSD-specific hypervisor handling. - * + * * Copyright (c) 2002-2004, K A Fraser - * + * * 64-bit updates: * Benjamin Liu * Jun Nakajima - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 * as published by the Free Software Foundation; or, when distributed * separately from the Linux kernel or incorporated into other * software packages, subject to the following license: - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this source file (the "Software"), to deal in the Software without * restriction, including without limitation the rights to use, copy, modify, * merge, publish, distribute, sublicense, and/or sell copies of the Software, * and to permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -52,22 +52,22 @@ extern char *hypercall_page; #define HYPERCALL_STR(name) \ "call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)" -#define _hypercall0(type, name) \ -({ \ - type __res; \ - __asm__ volatile ( \ - HYPERCALL_STR(name) \ - : "=a" (__res) \ - : \ - : "memory" ); \ - __res; \ +#define _hypercall0(type, name) \ +({ \ + type __res; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res) \ + : \ + : "memory" ); \ + __res; \ }) #define _hypercall1(type, name, a1) \ ({ \ type __res; \ long __ign1; \ - __asm__ volatile ( \ + __asm__ volatile ( \ HYPERCALL_STR(name) \ : "=a" (__res), "=D" (__ign1) \ : "1" ((long)(a1)) \ @@ -79,7 +79,7 @@ extern char *hypercall_page; ({ \ type __res; \ long __ign1, __ign2; \ - __asm__ volatile ( \ + __asm__ volatile ( \ HYPERCALL_STR(name) \ : "=a" (__res), "=D" (__ign1), "=S" (__ign2) \ : "1" ((long)(a1)), "2" ((long)(a2)) \ @@ -91,9 +91,9 @@ extern char *hypercall_page; ({ \ type __res; \ long __ign1, __ign2, __ign3; \ - __asm__ volatile ( \ + __asm__ volatile ( \ HYPERCALL_STR(name) \ - : "=a" (__res), "=D" (__ign1), "=S" (__ign2), \ + : "=a" (__res), "=D" (__ign1), "=S" (__ign2), \ "=d" (__ign3) \ : "1" ((long)(a1)), "2" ((long)(a2)), \ "3" ((long)(a3)) \ @@ -105,8 +105,8 @@ extern char *hypercall_page; ({ \ type __res; \ long __ign1, __ign2, __ign3; \ - register long __arg4 __asm__("r10") = (long)(a4); \ - __asm__ volatile ( \ + register long __arg4 __asm__("r10") = (long)(a4); \ + __asm__ volatile ( \ HYPERCALL_STR(name) \ : "=a" (__res), "=D" (__ign1), "=S" (__ign2), \ "=d" (__ign3), "+r" (__arg4) \ @@ -120,9 +120,9 @@ extern char *hypercall_page; ({ \ type __res; \ long __ign1, __ign2, __ign3; \ - register long __arg4 __asm__("r10") = (long)(a4); \ - register long __arg5 __asm__("r8") = (long)(a5); \ - __asm__ volatile ( \ + register long __arg4 __asm__("r10") = (long)(a4); \ + register long __arg5 __asm__("r8") = (long)(a5); \ + __asm__ volatile ( \ HYPERCALL_STR(name) \ : "=a" (__res), "=D" (__ign1), "=S" (__ign2), \ "=d" (__ign3), "+r" (__arg4), "+r" (__arg5) \ @@ -194,7 +194,7 @@ HYPERVISOR_stack_switch( static inline int __must_check HYPERVISOR_set_callbacks( - unsigned long event_address, unsigned long failsafe_address, + unsigned long event_address, unsigned long failsafe_address, unsigned long syscall_address) { return _hypercall3(int, set_callbacks, @@ -350,9 +350,9 @@ HYPERVISOR_suspend( static inline unsigned long __must_check HYPERVISOR_hvm_op( - int op, void *arg) + int op, void *arg) { - return _hypercall2(unsigned long, hvm_op, op, arg); + return _hypercall2(unsigned long, hvm_op, op, arg); } static inline int __must_check diff --git a/sys/i386/include/xen/hypercall.h b/sys/i386/include/xen/hypercall.h index ff96cb93157c..94bb42e38a39 100644 --- a/sys/i386/include/xen/hypercall.h +++ b/sys/i386/include/xen/hypercall.h @@ -1,23 +1,23 @@ /****************************************************************************** * hypercall.h - * + * * Linux-specific hypervisor handling. - * + * * Copyright (c) 2002-2004, K A Fraser - * + * * This file may be distributed separately from the Linux kernel, or * incorporated into other software packages, subject to the following license: - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this source file (the "Software"), to deal in the Software without * restriction, including without limitation the rights to use, copy, modify, * merge, publish, distribute, sublicense, and/or sell copies of the Software, * and to permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -39,81 +39,81 @@ extern char *hypercall_page; #define __STR(x) #x #define STR(x) __STR(x) -#define HYPERCALL_STR(name) \ - "call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)" - -#define _hypercall0(type, name) \ -({ \ - long __res; \ - __asm__ volatile ( \ - HYPERCALL_STR(name) \ - : "=a" (__res) \ - : \ - : "memory" ); \ - (type)__res; \ +#define HYPERCALL_STR(name) \ + "call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)" + +#define _hypercall0(type, name) \ +({ \ + long __res; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res) \ + : \ + : "memory" ); \ + (type)__res; \ }) -#define _hypercall1(type, name, a1) \ -({ \ - long __res, __ign1; \ - __asm__ volatile ( \ - HYPERCALL_STR(name) \ - : "=a" (__res), "=b" (__ign1) \ - : "1" ((long)(a1)) \ - : "memory" ); \ - (type)__res; \ +#define _hypercall1(type, name, a1) \ +({ \ + long __res, __ign1; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=b" (__ign1) \ + : "1" ((long)(a1)) \ + : "memory" ); \ + (type)__res; \ }) -#define _hypercall2(type, name, a1, a2) \ -({ \ - long __res, __ign1, __ign2; \ - __asm__ volatile ( \ - HYPERCALL_STR(name) \ - : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ - : "1" ((long)(a1)), "2" ((long)(a2)) \ - : "memory" ); \ - (type)__res; \ +#define _hypercall2(type, name, a1, a2) \ +({ \ + long __res, __ign1, __ign2; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ + : "1" ((long)(a1)), "2" ((long)(a2)) \ + : "memory" ); \ + (type)__res; \ }) -#define _hypercall3(type, name, a1, a2, a3) \ -({ \ - long __res, __ign1, __ign2, __ign3; \ - __asm__ volatile ( \ - HYPERCALL_STR(name) \ - : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ - "=d" (__ign3) \ - : "1" ((long)(a1)), "2" ((long)(a2)), \ - "3" ((long)(a3)) \ - : "memory" ); \ - (type)__res; \ +#define _hypercall3(type, name, a1, a2, a3) \ +({ \ + long __res, __ign1, __ign2, __ign3; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ + "=d" (__ign3) \ + : "1" ((long)(a1)), "2" ((long)(a2)), \ + "3" ((long)(a3)) \ + : "memory" ); \ + (type)__res; \ }) -#define _hypercall4(type, name, a1, a2, a3, a4) \ -({ \ - long __res, __ign1, __ign2, __ign3, __ign4; \ - __asm__ volatile ( \ - HYPERCALL_STR(name) \ - : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ - "=d" (__ign3), "=S" (__ign4) \ - : "1" ((long)(a1)), "2" ((long)(a2)), \ - "3" ((long)(a3)), "4" ((long)(a4)) \ - : "memory" ); \ - (type)__res; \ +#define _hypercall4(type, name, a1, a2, a3, a4) \ +({ \ + long __res, __ign1, __ign2, __ign3, __ign4; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ + "=d" (__ign3), "=S" (__ign4) \ + : "1" ((long)(a1)), "2" ((long)(a2)), \ + "3" ((long)(a3)), "4" ((long)(a4)) \ + : "memory" ); \ + (type)__res; \ }) -#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ -({ \ - long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ - __asm__ volatile ( \ - HYPERCALL_STR(name) \ - : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ - "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ - : "1" ((long)(a1)), "2" ((long)(a2)), \ - "3" ((long)(a3)), "4" ((long)(a4)), \ - "5" ((long)(a5)) \ - : "memory" ); \ - (type)__res; \ -}) +#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ +({ \ + long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ + __asm__ volatile ( \ + HYPERCALL_STR(name) \ + : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ + "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ + : "1" ((long)(a1)), "2" ((long)(a2)), \ + "3" ((long)(a3)), "4" ((long)(a4)), \ + "5" ((long)(a5)) \ + : "memory" ); \ + (type)__res; \ +}) static inline long privcmd_hypercall(long op, long a1, long a2, long a3, long a4, long a5) @@ -127,10 +127,10 @@ privcmd_hypercall(long op, long a1, long a2, long a3, long a4, long a5) __asm__ volatile ( "call *%[call]" : "=a" (__res), "=b" (__ign1), "=c" (__ign2), - "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) - : "1" ((long)(a1)), "2" ((long)(a2)), - "3" ((long)(a3)), "4" ((long)(a4)), - "5" ((long)(a5)), [call] "a" (__call) + "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) + : "1" ((long)(a1)), "2" ((long)(a2)), + "3" ((long)(a3)), "4" ((long)(a4)), + "5" ((long)(a5)), [call] "a" (__call) : "memory" ); return __res; @@ -206,10 +206,10 @@ HYPERVISOR_set_timer_op( static inline int HYPERVISOR_platform_op( - struct xen_platform_op *platform_op) + struct xen_platform_op *platform_op) { - platform_op->interface_version = XENPF_INTERFACE_VERSION; - return _hypercall1(int, platform_op, platform_op); + platform_op->interface_version = XENPF_INTERFACE_VERSION; + return _hypercall1(int, platform_op, platform_op); } static inline int @@ -336,30 +336,30 @@ HYPERVISOR_suspend( static inline int HYPERVISOR_callback_op( - int cmd, void *arg) + int cmd, void *arg) { - return _hypercall2(int, callback_op, cmd, arg); + return _hypercall2(int, callback_op, cmd, arg); } static inline unsigned long HYPERVISOR_hvm_op( - int op, void *arg) + int op, void *arg) { - return _hypercall2(unsigned long, hvm_op, op, arg); + return _hypercall2(unsigned long, hvm_op, op, arg); } static inline int HYPERVISOR_xenoprof_op( - int op, void *arg) + int op, void *arg) { - return _hypercall2(int, xenoprof_op, op, arg); + return _hypercall2(int, xenoprof_op, op, arg); } static inline int HYPERVISOR_kexec_op( - unsigned long op, void *args) + unsigned long op, void *args) { - return _hypercall2(int, kexec_op, op, args); + return _hypercall2(int, kexec_op, op, args); } static inline int From nobody Tue Nov 28 13:38:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7G29Y3z52GVq; Tue, 28 Nov 2023 13:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfk7G0k6bz4Tpj; Tue, 28 Nov 2023 13:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38dkqInRWuZYDomBIXzGLdqzRg+AvTDUosjl7Uf3nd8=; b=cs1zwQyNJ+WWlR7MjFVmd0IYC59UTC8JjYeC/HxgX+gpMszXuMj5GBRzOxV8wIvtWvGO0/ oT4DkGjAXuHFF8qa/HFFXz4lSc4wOwSEhP7Ng6Nalt739HOiPtKZemXVW1SAqrzp5vctTT q5QJVusNFOOePMT91/2OZIa1vaRjpe9vfz2yId0gd9y29zy8RmYdKkTeCzFGhWG1nzv8Vr Z8K8YAcp9OafTZYPu9F0AE/NL15ht4vkbCSo0pLyaqeb/R5D1ikJR/KcYBk69mRpWqF+Xc TavEwt5izawGRn4U/w4lFaQgWtbIHIDv/2Z+4khfTY0NlA1OeJDrDFhQHygROQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38dkqInRWuZYDomBIXzGLdqzRg+AvTDUosjl7Uf3nd8=; b=jf12HeoNv9AxFmE/Iyd0xflmujO997hOSC3ANRR/qPLBefcH6UxwL1Lt8xgkz2A4aGrtF5 8gthcpfT4XFv2oR8bXqMEEhY0NEGzUA+2kl2r7VAgBnpyl9ZeoZIpWKabrB15JidNmhYUE ivRZv6nOjlVxDVhRDfQhJ9gJWBG48bHHm/QvDo67mwU/obOz1eIbGYOGlGViQtz8NF1BmN oigSqZywmXaBH4AOP1/ZTdFzpiJQsdK8uAllUVD3TCnf8dEJhOY0OerFGCMnGidz4/OTXa YB2fTUGV9809Xn7Hw67JZShcJna1mpyhrvk0MH+B3Zr4iEqkW2EfDOTLCkCCVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178714; a=rsa-sha256; cv=none; b=NODjQ0sxEnUif9H74zaJ1elYrGsh/2JZtvAfs/1Srzpn7CRc1nnmFEivkTW+E/qV+mVnJM hQ4bJkVJv9ZOnZL5gZ2ALKpJBsp4sgo3VrnelgOzLImr0lqo9BRLz0YUTLW6QDTAGm4uya mY/rqE4LLGC4CitA2W4xljAWm9H5HclyUz2H+PfWag+Aaa7TAjoZ3Ys6mriedjFzM50PSi LzwbYL9BiWRswMTwsEWEVjNFmUNmNyXx3UlpTJk1Cb9mj/ts/3KemoQYj0gmccf7ZWlzRx e1NHAV9JN9vtg6DigwrURuBUHzVFpryE/VtchOWjiUoKQ0+Um/FNrxQel/7/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 4Sfk7F6W79z8BX; Tue, 28 Nov 2023 13:38: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 3ASDcXoO025267; Tue, 28 Nov 2023 13:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcXDw025264; Tue, 28 Nov 2023 13:38:33 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:33 GMT Message-Id: <202311281338.3ASDcXDw025264@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: c880f12f5ac6 - main - xen/intr: correct misuses of Xen handle pointer type List-Id: Commit messages for the main 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: c880f12f5ac6b1fe8b188e08862e8da829533fdb Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=c880f12f5ac6b1fe8b188e08862e8da829533fdb commit c880f12f5ac6b1fe8b188e08862e8da829533fdb Author: Elliott Mitchell AuthorDate: 2022-07-23 22:30:45 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 11:51:19 +0000 xen/intr: correct misuses of Xen handle pointer type Fix a few spots where handle pointers were incorrectly used. Luckily these appear rarely triggered given how long they've been lurking. Fixes: 76acc41fb7c7 ("Implement vector callback for PVHVM and unify event channel implementations") Fixes: 9f40021f288c ("Introduce a new, HVM compatible, paravirtualized timer driver for Xen.") MFC after: 2 weeks Reviewed by: royger --- sys/dev/xen/bus/xen_intr.c | 4 ++-- sys/dev/xen/timer/xen_timer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c index db166a625610..b70b0fa835b6 100644 --- a/sys/dev/xen/bus/xen_intr.c +++ b/sys/dev/xen/bus/xen_intr.c @@ -866,7 +866,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, if (error != 0) { evtchn_close_t close = { .port = bind_virq.port }; - xen_intr_unbind(*port_handlep); + xen_intr_unbind(port_handlep); if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)) panic("EVTCHNOP_close failed"); return (error); @@ -923,7 +923,7 @@ xen_intr_alloc_and_bind_ipi(u_int cpu, driver_filter_t filter, if (error != 0) { evtchn_close_t close = { .port = bind_ipi.port }; - xen_intr_unbind(*port_handlep); + xen_intr_unbind(port_handlep); if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)) panic("EVTCHNOP_close failed"); return (error); diff --git a/sys/dev/xen/timer/xen_timer.c b/sys/dev/xen/timer/xen_timer.c index 93cab090c596..f42ed5fd2525 100644 --- a/sys/dev/xen/timer/xen_timer.c +++ b/sys/dev/xen/timer/xen_timer.c @@ -84,7 +84,7 @@ struct xentimer_pcpu_data { uint64_t timer; uint64_t last_processed; - void *irq_handle; + xen_intr_handle_t irq_handle; }; DPCPU_DEFINE(struct xentimer_pcpu_data, xentimer_pcpu); From nobody Tue Nov 28 13:38:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7H2nSxz52GXs; Tue, 28 Nov 2023 13:38: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 4Sfk7H1Vkyz4Tml; Tue, 28 Nov 2023 13:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUB4IFg+GpAeL81HJMHcr2lRAmWWN9h4/BUVZXInb1o=; b=nPOVXgC/0HOQl4oPBiUpij7PrRwDmBRglhM5mQ712JzJLDNjzrntZgvK/pKxI14nl4BPhs k61DzYW3rRDvDxpthTrKuAaPlafMOWHhSXFMtb5Ef4CWFJQHYET+ELZYZSIOTaqBfAhWDY Tw8iZef/tz49DRsgJb97+oVsIn6+Zic3yaNSiL5ZFFFQPxzyWZcOXoFUpKcsVRPH8mavnX aTL5crCR2X8WUKgn+yCWC7MsFq/sGj1Xwdm4JMyzgXMlMP1vAlfHaCPny6GskMi2f2crAZ Km3PgXpa6uGdqdph+mYpBwJ/9+MfdRjaulW+QtHFB/Ffjd7ehiBxbta3HuVUDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUB4IFg+GpAeL81HJMHcr2lRAmWWN9h4/BUVZXInb1o=; b=Rr0kw1oJ+kKr9fznFnPJ7qDPvyhlrwa78OAlVhX2fJOQVM/MD2CupYpinx1V/KgUzNfEYI Ukr71bmJoVZG3z6H45pxbgkM4oq1UBRCMBeiJGsAWrNk+lwBryKBPlCdNaKEj2SZK+PJG0 GFlTp4VEx0V3E3m62Z02gYLKFXmnLqvJHCbFwlh/5lWuyy1YLLTgop1palRaCeb3SHg9eI PxItoIMejReVchW4VzrYwNyP+PWp7ALkcyEEhik4o89IRiW1/jPo/36xWwfHcP+ccNPsf2 4UVKlGaNNupxAcii7OiR8zYQOFCe1AmIBe0FEVynLEB/ngVddTZAzxpHE+kwDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178715; a=rsa-sha256; cv=none; b=o4/QptMXSfIYAO1rtdAQkgGONoUwHUH6SSMnis0/HMPZrgKgJ7r98ucX87vC/aTXSjZJMw ry61FA4Uhm2xu/u7IYwAIjYOQ1Ycm5UU3f8WHNe6X2mQJVvlM37ll7N5eb2wVnDct0ECcq UNOIpmi57PqIKqOzSHQ/y6Bw78YHo9fUkU92c1hsbD2kSLw/sQm3XqmLJMouPibFk4HX13 De6jBUxuO7F5OwusUEuzMdI+1BAG4qu3H63tJ87FSGgBz3AkKIwXWHc/d55C2L627WLQ1G lbOFIICtRq7pkMKNLGONwTnJrEF5cKjN+EWytN1tFt2x1XtqdY0m1erCI6zEuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7H0cfwz7rM; Tue, 28 Nov 2023 13:38: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 3ASDcYUD025327; Tue, 28 Nov 2023 13:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcYjd025324; Tue, 28 Nov 2023 13:38:34 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:34 GMT Message-Id: <202311281338.3ASDcYjd025324@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: 54a0b7203c30 - main - xen/apic: remove passing trapframe as argument List-Id: Commit messages for the main 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: 54a0b7203c30bfa5134ffc21f01c2e106f15e842 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=54a0b7203c30bfa5134ffc21f01c2e106f15e842 commit 54a0b7203c30bfa5134ffc21f01c2e106f15e842 Author: Elliott Mitchell AuthorDate: 2021-10-08 21:43:26 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 12:22:30 +0000 xen/apic: remove passing trapframe as argument While otherwise a handy potential approach, getting the trapframe via the argument isn't documented and isn't supposed to be used. While ipi_bitmap_handler() and ipi_swi_handler() need to be passed the trapframe as their arguments, the Xen functions can retrieve it from curthread->td_intr_frame, which is the proper way. Reviewed by: royger --- sys/x86/xen/xen_apic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c index db2358bffa81..4f2b03879227 100644 --- a/sys/x86/xen/xen_apic.c +++ b/sys/x86/xen/xen_apic.c @@ -216,10 +216,8 @@ xen_pv_lapic_ipi_vectored(u_int vector, int dest) static int xen_ipi_bitmap_handler(void *arg) { - struct trapframe *frame; - frame = arg; - ipi_bitmap_handler(*frame); + ipi_bitmap_handler(*curthread->td_intr_frame); return (FILTER_HANDLED); } @@ -297,9 +295,8 @@ xen_cpususpend_handler(void *arg) static int xen_ipi_swi_handler(void *arg) { - struct trapframe *frame = arg; - ipi_swi_handler(*frame); + ipi_swi_handler(*curthread->td_intr_frame); return (FILTER_HANDLED); } From nobody Tue Nov 28 13:38:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7J4ZStz52Gd9; Tue, 28 Nov 2023 13: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 4Sfk7J2zjbz4Tqh; Tue, 28 Nov 2023 13: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=1701178716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s6j95D7/YF2LgCZq/h9DVtKp7kUxuxetXa+cRFs4ecU=; b=swl0NIbXvYJwKPbEbLPcTWUIGyVCm7UhoybgnYQp90RwyHU+xnmv7JRoWCQdA8ioDiHSBz OyM12WUYgHqgMwZ7XiSLHA/0q4obxlwmKF1s1NOZbEUc6e7j3TQOU1OvNruxfCpQisXV3h z8mpXjMmTPbx1G8j1Gr7kG8Is40dOLBV8nf2+PAXYP9d2bM/kqA+Lu+rxFOjQe+qHwTXq3 CIsfMadsikf4kmCe/Sf3EQh85kYNdlws6p68StmoEIw+z3IZnDgZ9G86lGGVS+7hCHH4i6 PKSLqh4NKE0Y1sLDX7xfHjCj+BlQf6RltaFxhHRESKLmS883Wy5ptSuCtxcqAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s6j95D7/YF2LgCZq/h9DVtKp7kUxuxetXa+cRFs4ecU=; b=m7MphFRX97rhuBu4PNUCMzCbun0vSurUAaXUVETRkmTToJj7BGbsgqR0pOnMfIs12gfTC8 YdpN8OSVVpQMeXcX+9dAQshqZuokkFb9uESu3tC7odfIz1Tth0yiSz/2lnO/h11CGMNscB 39DLDWP69EsgjaT/KznARbtA6zT/9eQJ5GW15CB4smuPM9x9lb1y19u0lw4Iw9M1rgyAOl X8UCBU0836kMPhn9+Se4fy8qF7RZ55sV0KrLc40izWrd9xHJQu7v0XlMjE0zTG2q9KlE7o LKhherFgw71Sf5VPAW/UsFLAxCuwdSFVTFrfoZjeoDE6fdGFN0dyxjNZgGZhFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178716; a=rsa-sha256; cv=none; b=aoy6NKwnp9MUYEk0UWFvhJ7ee5/UWP4Opo9FDCgFfgO/Ljlfi9zTFrNAf8ZBoAxu7bhXIk k4ZD5dWmx1fdE/Ppv+9w8ZU4RgiJCTP+SBp0BVWfPZ6h20O+qopxIoxm7yH/6RBltaXJ1w I/uIS06GxgAU7qVA44Lxs6QjEki9LmZ65tfvlRykKmShxvbFKyZrskAHqstl99pU/1+9nC 8ZdQkdflXt6SFt3Zeb0ErKxYoOIPmBdazZRgQpusjdY1jpwxqLR5afW6F9VAdu8SxJJQFQ bXNOGjHc5kcdLMqpYMFC6PSMqAcWQMW/UAjqzfgu02kvuHDXdtznBJWwVSXDVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7J1VKXz8S5; Tue, 28 Nov 2023 13: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 3ASDcaRi025378; Tue, 28 Nov 2023 13:38:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcaxs025375; Tue, 28 Nov 2023 13:38:36 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:36 GMT Message-Id: <202311281338.3ASDcaxs025375@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: b37a180f0191 - main - xen: remove declaration of evtchn_device_upcall() List-Id: Commit messages for the main 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: b37a180f019161c8b3cb67423adf0a330828d380 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=b37a180f019161c8b3cb67423adf0a330828d380 commit b37a180f019161c8b3cb67423adf0a330828d380 Author: Elliott Mitchell AuthorDate: 2021-06-22 04:27:55 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 12:25:35 +0000 xen: remove declaration of evtchn_device_upcall() This function was removed at 5779d8ad577. Long past time to remove the declaration to ensure people aren't confused. Differential Revision: https://reviews.freebsd.org/D30865 Reviewed by: royger --- sys/xen/evtchn/evtchnvar.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/xen/evtchn/evtchnvar.h b/sys/xen/evtchn/evtchnvar.h index 1d285abf0c47..10eed8434ebe 100644 --- a/sys/xen/evtchn/evtchnvar.h +++ b/sys/xen/evtchn/evtchnvar.h @@ -36,9 +36,6 @@ #include #include -/** Submit a port notification for delivery to a userland evtchn consumer */ -void evtchn_device_upcall(evtchn_port_t port); - /* Macros for accessing event channel values */ #define EVTCHN_PTR(type, port) \ (HYPERVISOR_shared_info->evtchn_##type + ((port) / __LONG_BIT)) From nobody Tue Nov 28 13:38:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7K4n7Tz52GbD; Tue, 28 Nov 2023 13:38: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 4Sfk7K3c7vz4TrC; Tue, 28 Nov 2023 13:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r1P61tB8cw9/umFL3OADzknfm4lJkHDOwp5DCzUVGzU=; b=IF43vqVeGEfR8roed3VzndAtwtYldt7salmsvQism6xa97rtB7Ttn28StK9kJOFaQ+pX8o LvsLvx3SP+gAmVxFuM4u2uLWpm0l3u7wlSP2fbzoZTodF72Wm2L4sViXuk7hpubVrvyAoQ wtjM3ZRdIgy+d0nZyEA1zfSZ80Fbme/n7ibXxJpCRLOoUFnm5UJoZbiqvYdalTUyIqSeDo ry5wkPDThFKEypzwHtZ8WNtUmS6P9+jgIAKAoMXMfqBGrrINY8Wq9qFvMtj/SFdpDIrC8X Fr2bZARB3VROkLt+XLiD3wWHTmJt/09Zn0+03EJLfAxvfeR5LYHkPD+wzoRMlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r1P61tB8cw9/umFL3OADzknfm4lJkHDOwp5DCzUVGzU=; b=MVDcOsBxDO9V8KlK4qyBk+TDzyP7rmVD3kEpj6vFI+2IZnb7CM1LkTrkUt7dU48BNf9heO eoF00F0DuEmRJ2Lz9evPYzCMEVY97B62OnAZHKj2tM2CFL7hWmvxuJ2PATCHYSYP8yENGk 5LEYgskmxHCdrH1KyT3XAAoNk3gyfYTGEXzMsrKCtiVEcHT32yHtJXfp/Bhly4zcGCONIH wILNNICmEanupSCljerT3CIB4xiZMLJODj33HswFGoCQ7xlwQefC3CpZr2TkDYyv642Bdr /1c+7jKRyWBCwC/IDDuvCd7QG/Uu17hACUBmv6yE3JFse9LaFNA8TQm4h9ocdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178717; a=rsa-sha256; cv=none; b=Myy63htzAmrb4Zn4EhcPcQeY3MWUFtYJupwGhHD/KvdZHAXz8VGS2ICvtQNNZ8YIuah7ga WmvOnmDI6LRztxdT8ZZDgWtYNvh5U78+L1eecN5ULPpoCDkQLRlYo8kPH/myvgnbuqEfhw Og7KYrg7iw7oofYC7Vt5DvdnpMGRQ6oiseyVTM6AlOinJrNtHqahTKP23/n7hb3vYhR/wO pd/N5saoAuNE49nojDN8NskmPn3flSlce039vbIMqQ2OMfTy+VEHXcZVyvonVjzEPoWvTm hbHtmyJlq+EB3JEqJ4PY1ozi0dSLeGuC/BKCkY+GtmfgXLAKer8JaU2pRV+ZNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7K2VgYz8Mg; Tue, 28 Nov 2023 13:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASDcbMZ025423; Tue, 28 Nov 2023 13:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcbe0025420; Tue, 28 Nov 2023 13:38:37 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:37 GMT Message-Id: <202311281338.3ASDcbe0025420@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: 1b43b74963dd - main - xen/intr: remove xenpci headers List-Id: Commit messages for the main 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: 1b43b74963dd7f567f345f8a4a2670f64e460e27 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=1b43b74963dd7f567f345f8a4a2670f64e460e27 commit 1b43b74963dd7f567f345f8a4a2670f64e460e27 Author: Elliott Mitchell AuthorDate: 2021-11-10 01:18:37 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 12:26:29 +0000 xen/intr: remove xenpci headers These were needed in the past, since that time the interrupt code has been successfully isolated from the Xen/PCI code. As such a bit of straightforward cleanup. Differential Revision: https://reviews.freebsd.org/D32923 Reviewed by: royger --- sys/dev/xen/bus/xen_intr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c index b70b0fa835b6..75750aa5b0bf 100644 --- a/sys/dev/xen/bus/xen_intr.c +++ b/sys/dev/xen/bus/xen_intr.c @@ -57,8 +57,6 @@ #include #include -#include -#include #include #ifdef DDB From nobody Tue Nov 28 13:38:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7L63Yyz52GdP; Tue, 28 Nov 2023 13:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfk7L4mF7z4V8Z; Tue, 28 Nov 2023 13:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQXLqO4jVn197FuDZ1SdN8XZ5JBKBmneVNL7KQnnznA=; b=B2vsEX2G00hROibSGCve82yTantFQSo76w/CvErapw+MO1uvBhjAsKif4JYwnjfj0QPNaq NDY5h8zU6zflrkK4iOk6cLH7OgLdQDW1EEoT5MC8Z71ysuk6oRYlMc1ZwbS/0sygrzjsrX KZV318sLQemNx4T6i3+KicmnOTwxFe4U9+GaAFim1HeseKV6A6YYY8MjhAbmmlI6zYGLr+ nPtPhK3iuIQ/zTackWx6lpPkGLiY9P9dPgNJSmShFbp214FlmkU4OlWDmC6DdYVXaaf6Ms ANq9p/BesShB690KZZHuB9YTVJfkTrppk7XWvzQ+wPxbftzp0Tc3P+hvW+hTKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQXLqO4jVn197FuDZ1SdN8XZ5JBKBmneVNL7KQnnznA=; b=cUQ/p0CK2TNWOiUuBN5mSZWJumPkFKvDRs32+u4HVvyMhq+aTj1Yc0SFMcLpSt5bqUl8kk jMyajAKfwQa73dTVgMMrjBxw/grK8/7X3+R0QqkKKn1KuvAbPQhRX5HFmyb6MnbHUiOnxw 2cHyHJogAeG2CKP+e194T8IqiFT9Kq0DnBcws/2HBm089dVO5BETRlAkho9H04xwUUjH8d DQVT9nvE5T9mfbE+WVX117KHCf+8kd+kue0JHgNWpu/D+NwOM6iYlg0SIDlWdBBu3OEJlZ zxQIUAzX7uwt1S7I/fyYzYsH/HGa48ked0+yvAK8Jp9nnffuC+6kK/sapSNqag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178718; a=rsa-sha256; cv=none; b=pE2RrjOXrcjbc3zDCR+6pWPds3/kVrCkzZNePKhEfXR0GHaUp463KhJE95wtwTBfaefnQS N3+7N5X+4NvYPxGI0Y6TAZYJRytFt0gwVy0R16JcRsK0SnGLvTvWiG1zcVXMI/EQymtI1l ahMc80ZLH+d7Sz3dN+RhUfPpLOdTXLLKCrmd2LpC7TY4msxis2gy46k+IqQao7suweo/mE wOhtofXaVTiodihkGgWsqWy2lxDWEFTSmifkDOLVmJL7OzByz/c95dbx3y3u2LqeejYUrj Q4t/Jz64XI8vWwCe40sF8HMTkKZa7TyHv79ueA9sMFN4ijrpRX9BKYaLOHqSeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7L3Xwkz8Mh; Tue, 28 Nov 2023 13:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASDccKo025477; Tue, 28 Nov 2023 13:38:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcc34025474; Tue, 28 Nov 2023 13:38:38 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:38 GMT Message-Id: <202311281338.3ASDcc34025474@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: c5c26f15f868 - main - xen/x86: move x86-only variable out of common List-Id: Commit messages for the main 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: c5c26f15f86821c7e05d37456e05795b1b17747d Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=c5c26f15f86821c7e05d37456e05795b1b17747d commit c5c26f15f86821c7e05d37456e05795b1b17747d Author: Elliott Mitchell AuthorDate: 2021-02-14 06:46:09 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 12:30:40 +0000 xen/x86: move x86-only variable out of common Commit 27c36a12f15 is an x86-only feature. As such xen_evtchn_needs_ack should only exist on x86. Differential Revision: https://reviews.freebsd.org/D29913 Reviewed by: royger [royger]: adjust comment. --- sys/x86/include/xen/xen-os.h | 3 +++ sys/xen/hvm.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h index 1a32b9c9e3a5..6a3b82c0ba62 100644 --- a/sys/x86/include/xen/xen-os.h +++ b/sys/x86/include/xen/xen-os.h @@ -43,6 +43,9 @@ /* If non-zero, the hypervisor has been configured to use a direct vector */ extern int xen_vector_callback_enabled; +/* Signal whether the event channel vector requires EOI at the lapic */ +extern bool xen_evtchn_needs_ack; + /* tunable for disabling PV disks */ extern int xen_disable_pv_disks; diff --git a/sys/xen/hvm.h b/sys/xen/hvm.h index 01e409f026c4..3ff3ee3c51e6 100644 --- a/sys/xen/hvm.h +++ b/sys/xen/hvm.h @@ -102,6 +102,5 @@ void xen_hvm_suspend(void); void xen_hvm_resume(bool suspend_cancelled); extern uint32_t hvm_start_flags; -extern bool xen_evtchn_needs_ack; #endif /* __XEN_HVM_H__ */ From nobody Tue Nov 28 13:38:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7N5Svvz52GNF; Tue, 28 Nov 2023 13:38: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 4Sfk7M5ms8z4Twc; Tue, 28 Nov 2023 13:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a10ehYGckQjrS+CI/YzXq0jRGPBc2PIQlaKH4Ss+8mU=; b=sqWYSY4PP8w8Pr1FRT4rz0fBveb/6uNmyP8ztjvWv+c+tXfaSUWZ+pGS+ELqUvr6Gyb37e e16UfLn9nAaCOhXE5dothwQKE4JoS2zWm7IP7YvR/mtu1+Da6SVVKmqmkS9m7zOutkRkBS qt+JyWuIdzvK/intlxJItp9G7IW7zVlUqXkfGCz6BJPWj3kNBeZz2klM8ovwd2wJl5MNIx aAYWsJxZrnrwCUn5ePEdBfCGxm30C/knO2kG3BkEeR1AS5oNk383d26GTcvCt07iQUlDQL jU2f5x0vs+8UV86ReYHaDNMhxthYRPNknmsWTPR6x3u/iLTY5vmYuo/fvMZJ7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a10ehYGckQjrS+CI/YzXq0jRGPBc2PIQlaKH4Ss+8mU=; b=wXD2RJINmfaiNmxJHVqhmXsCVkqoq7v6Ur9ZMT2p2lTMx3RL3Mhv2efnOVIB/3Kpsq1MDj W4Lj1xi9azlUP8HfmLVoZyhXJ9h+i2Oj5ACHvNAUs9VY0zerKDIN+fSIMfbmbvUHFSJOKS VtZQkWLZOUBfhCg0MInrc4CnKU6sy/52GX/OZntcnp4Xla1Pw/l/FBeaxYP+C8HBbHwJy8 a39gexetvNy12mpGQvFLHrhiKF0xojjd96wsYkgC0TVu7ZtbwWkP7e2+nPik1AtOT3nXOX LvGhac1ovL1jj14On3Gh3m+yn3dk5azDBj+MqezneRMPDwoVkSlWs9lAzQLDYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178719; a=rsa-sha256; cv=none; b=UVHDec0kZZjZ1D6WJp/GdsOyocZJyLUFq6i0byPOhzq2oTuzROKAB8BUthb+ZCNB8H4HR2 vY4DuEGmnHrnZN57tFhPHMdWV7l4Xd4g1lE+h06WbFctiInzLlQLO7NKBjcrGMgLeAeOs8 wJCPjBoJk8yJwKtANyDtv0GYi1cIJlJ3TBVVB3mvpgfIFAmkgiI5Z+DluSozBB5Ank36N1 MvpZZHMbcXOdUm1nVOTNFRjvVKThYv45Ib5Sm2LDyggZzzpD9wnO1iGCBwhUEckRO7F36W LS2qMTzYdJskcBdHrgXgo8AfYJ65139q9XuTk5ZaeOH38RxnxXKv1wL3g7qicA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7M4gP5z8DL; Tue, 28 Nov 2023 13:38: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 3ASDcdOY025526; Tue, 28 Nov 2023 13:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcdkB025523; Tue, 28 Nov 2023 13:38:39 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:39 GMT Message-Id: <202311281338.3ASDcdkB025523@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: 3e5e0e2f1678 - main - xen/dev: switch to DEVMETHOD_END List-Id: Commit messages for the main 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: 3e5e0e2f16785210d796ea6ece4b69d35a03fe47 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=3e5e0e2f16785210d796ea6ece4b69d35a03fe47 commit 3e5e0e2f16785210d796ea6ece4b69d35a03fe47 Author: Elliott Mitchell AuthorDate: 2023-09-11 21:37:20 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 12:31:47 +0000 xen/dev: switch to DEVMETHOD_END Switch to the preferred end of the device method table. These hadn't been updated previously. Reviewed by: royger --- sys/dev/xen/blkback/blkback.c | 3 ++- sys/dev/xen/blkfront/blkfront.c | 2 +- sys/dev/xen/netback/netback.c | 3 ++- sys/dev/xen/xenpci/xenpci.c | 3 ++- sys/xen/xenbus/xenbusb_back.c | 3 ++- sys/xen/xenbus/xenbusb_front.c | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index 43d2134ca5b3..3717264256f3 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -3777,7 +3777,8 @@ static device_method_t xbb_methods[] = { /* Xenbus interface */ DEVMETHOD(xenbus_otherend_changed, xbb_frontend_changed), - { 0, 0 } + + DEVMETHOD_END }; static driver_t xbb_driver = { diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c index f1014d4e2a24..2c5862232b41 100644 --- a/sys/dev/xen/blkfront/blkfront.c +++ b/sys/dev/xen/blkfront/blkfront.c @@ -1633,7 +1633,7 @@ static device_method_t xbd_methods[] = { /* Xenbus interface */ DEVMETHOD(xenbus_otherend_changed, xbd_backend_changed), - { 0, 0 } + DEVMETHOD_END }; static driver_t xbd_driver = { diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c index 85e181e005f1..1d0795959efb 100644 --- a/sys/dev/xen/netback/netback.c +++ b/sys/dev/xen/netback/netback.c @@ -2485,7 +2485,8 @@ static device_method_t xnb_methods[] = { /* Xenbus interface */ DEVMETHOD(xenbus_otherend_changed, xnb_frontend_changed), - { 0, 0 } + + DEVMETHOD_END }; static driver_t xnb_driver = { diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c index ecf50e6a5d3d..b7a810bf9e15 100644 --- a/sys/dev/xen/xenpci/xenpci.c +++ b/sys/dev/xen/xenpci/xenpci.c @@ -212,7 +212,8 @@ static device_method_t xenpci_methods[] = { DEVMETHOD(device_attach, xenpci_attach), DEVMETHOD(device_detach, xenpci_detach), DEVMETHOD(device_resume, xenpci_resume), - { 0, 0 } + + DEVMETHOD_END }; static driver_t xenpci_driver = { diff --git a/sys/xen/xenbus/xenbusb_back.c b/sys/xen/xenbus/xenbusb_back.c index fad2da5d6fd8..7b0d7bd0c0a8 100644 --- a/sys/xen/xenbus/xenbusb_back.c +++ b/sys/xen/xenbus/xenbusb_back.c @@ -305,7 +305,8 @@ static device_method_t xenbusb_back_methods[] = { DEVMETHOD(xenbusb_get_otherend_node, xenbusb_back_get_otherend_node), DEVMETHOD(xenbusb_otherend_changed, xenbusb_back_otherend_changed), DEVMETHOD(xenbusb_localend_changed, xenbusb_back_localend_changed), - { 0, 0 } + + DEVMETHOD_END }; DEFINE_CLASS_0(xenbusb_back, xenbusb_back_driver, xenbusb_back_methods, diff --git a/sys/xen/xenbus/xenbusb_front.c b/sys/xen/xenbus/xenbusb_front.c index 5007c4509e4e..393d9ff87f25 100644 --- a/sys/xen/xenbus/xenbusb_front.c +++ b/sys/xen/xenbus/xenbusb_front.c @@ -182,7 +182,8 @@ static device_method_t xenbusb_front_methods[] = { /* XenBus Bus Interface */ DEVMETHOD(xenbusb_enumerate_type, xenbusb_front_enumerate_type), DEVMETHOD(xenbusb_get_otherend_node, xenbusb_front_get_otherend_node), - { 0, 0 } + + DEVMETHOD_END }; DEFINE_CLASS_0(xenbusb_front, xenbusb_front_driver, xenbusb_front_methods, From nobody Tue Nov 28 13:38:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7P2cp8z52GbY; Tue, 28 Nov 2023 13:38: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 4Sfk7N6fvwz4V42; Tue, 28 Nov 2023 13:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vdRWMxmF6oWXkjtWrZ5bLRkjhFLHVAmkfi5wwppQE/A=; b=vL4UTV+fKlTr8gS+jHgyBJnkdjw22A0K0qPO3WCsaHeh0dM0GwjP70EU7XqUHpVLx/1wzc v6SxQChpAJDNftxQnJX2BiFtN+qTXytnCtMya5I4PlcjdIoZIFXA6JFPlLuhA8JfH7BcSG tFYBv9zG/jVteUKWgKdZkka7rERmZsQJoh1n7NTxoaYxTAgLeVC945rQsLPYkIx5xB32Wf jY64Tltk1tWWDoHj5fqG9+4vk9mwsTiT02pwOEW9QnDXvBd9X3Wm659DMU55fSV0bQFLra y+B6ipK47uNertzUAl/J6cZr6Z70IMs6W/YMVKzc7se6P23I8BoE0+GihwamIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vdRWMxmF6oWXkjtWrZ5bLRkjhFLHVAmkfi5wwppQE/A=; b=WtnHzN7gFNzCAIjM3rSIiIyyltdO+/SX6l3CGa31ZPv/ECiyYX5NYQqZaa8P1OSV7NsS8v rUpLbZzIWSgOf+IOC96EXodZebIPE3jNnvRdgXtOdalNK3/G9ryX2zQxaZeB1Zfp0/3HtP S+L4RvwcLL7X/i4cwzSfpKMRQFbob7ZAsHhwUM5OHgJzN7M4m2CFlAeC5PS2mOsExVh79/ eTCm19AHhqwqJS14qBGhH9Gu+Au2+0gGwxE0yroAkUgmBmzJTA7EsDlW6M5GbtTzxE6ofx wfy/Krf0Xay0lFd3HG/iJiGsc+qrrafUG5DFbpypyxIDTjEl8oC/3khzZdazrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178721; a=rsa-sha256; cv=none; b=xcbJjAuLvBTUHJ0QWiEPc2x8MZ6JsVO6Dwh65ka0ZaF2FkLuyBfduM47NEkmAscZCoqsNh oQBek/I5zTvwPQtTMfqTIy5eo9df2I56oTL5269d12MZaXprjmx3zPaZ/d1gPdNu0yLc1X mDZzqk77SsCZbImlCBWI7OTttMcnCZp503CUphuKSx4MdMuQkhEZpdD1tPCrtaw6085W5I TlI6A4CXcJUhS2UjRmDqzGuoHUWC/zKjpQrxzjhWIq/ExSnPQPciKkqnhBjI7Swa6CFNEO 44ZaZoY4YdMHHzmXdv4oLc2lDhLHMHsJWUxDmiIIcZohPvWalBk1jPwekJ8N7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7N5gMsz8Mj; Tue, 28 Nov 2023 13:38: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 3ASDceJW025592; Tue, 28 Nov 2023 13:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcemX025589; Tue, 28 Nov 2023 13:38:40 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:40 GMT Message-Id: <202311281338.3ASDcemX025589@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: d48760ffe9ea - main - xen/dev: remove __unused from driver argument of identify 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d48760ffe9eaac809f8d31fb1b4e6b13ae52d59a Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=d48760ffe9eaac809f8d31fb1b4e6b13ae52d59a commit d48760ffe9eaac809f8d31fb1b4e6b13ae52d59a Author: Elliott Mitchell AuthorDate: 2023-09-27 05:39:22 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 12:32:57 +0000 xen/dev: remove __unused from driver argument of identify functions The driver argument is most certainly now used by these functions. When originally implemented it might have been unused, but not now. Reviewed by: royger --- sys/dev/xen/balloon/balloon.c | 2 +- sys/dev/xen/control/control.c | 2 +- sys/dev/xen/grant_table/grant_table.c | 2 +- sys/dev/xen/xenstore/xenstore_dev.c | 2 +- sys/dev/xen/xenstore/xenstored_dev.c | 2 +- sys/xen/xenbus/xenbusb.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/xen/balloon/balloon.c b/sys/dev/xen/balloon/balloon.c index 6db910e60dd3..c6ff8fc782c6 100644 --- a/sys/dev/xen/balloon/balloon.c +++ b/sys/dev/xen/balloon/balloon.c @@ -334,7 +334,7 @@ watch_target(struct xs_watch *watch, * \param parent The NewBus parent device for any devices this method adds. */ static void -xenballoon_identify(driver_t *driver __unused, device_t parent) +xenballoon_identify(driver_t *driver, device_t parent) { /* * A single device instance for our driver is always present diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 37b4bff709c7..1dc1df935b84 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -401,7 +401,7 @@ xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int len) * \param parent The NewBus parent device for any devices this method adds. */ static void -xctrl_identify(driver_t *driver __unused, device_t parent) +xctrl_identify(driver_t *driver, device_t parent) { /* * A single device instance for our driver is always present diff --git a/sys/dev/xen/grant_table/grant_table.c b/sys/dev/xen/grant_table/grant_table.c index c9d7d1e66af0..394d40c5d49c 100644 --- a/sys/dev/xen/grant_table/grant_table.c +++ b/sys/dev/xen/grant_table/grant_table.c @@ -569,7 +569,7 @@ MTX_SYSINIT(gnttab, &gnttab_list_lock, "GNTTAB LOCK", MTX_DEF | MTX_RECURSE); * \param parent The NewBus parent device for any devices this method adds. */ static void -granttable_identify(driver_t *driver __unused, device_t parent) +granttable_identify(driver_t *driver, device_t parent) { KASSERT(xen_domain(), diff --git a/sys/dev/xen/xenstore/xenstore_dev.c b/sys/dev/xen/xenstore/xenstore_dev.c index 65ca9d67ce4f..0dcf6938d5fb 100644 --- a/sys/dev/xen/xenstore/xenstore_dev.c +++ b/sys/dev/xen/xenstore/xenstore_dev.c @@ -474,7 +474,7 @@ static struct cdevsw xs_dev_cdevsw = { * \param parent The NewBus parent device for any devices this method adds. */ static void -xs_dev_identify(driver_t *driver __unused, device_t parent) +xs_dev_identify(driver_t *driver, device_t parent) { /* * A single device instance for our driver is always present diff --git a/sys/dev/xen/xenstore/xenstored_dev.c b/sys/dev/xen/xenstore/xenstored_dev.c index 13cc7c3b36d8..26ff3083e68c 100644 --- a/sys/dev/xen/xenstore/xenstored_dev.c +++ b/sys/dev/xen/xenstore/xenstored_dev.c @@ -95,7 +95,7 @@ xsd_dev_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, * \param parent The NewBus parent device for any devices this method adds. */ static void -xsd_dev_identify(driver_t *driver __unused, device_t parent) +xsd_dev_identify(driver_t *driver, device_t parent) { if (!xen_domain() || xs_initialized()) diff --git a/sys/xen/xenbus/xenbusb.c b/sys/xen/xenbus/xenbusb.c index 0e303fc83f15..12a921eab8b1 100644 --- a/sys/xen/xenbus/xenbusb.c +++ b/sys/xen/xenbus/xenbusb.c @@ -622,7 +622,7 @@ xenbusb_nop_confighook_cb(void *arg __unused) /*--------------------------- Public Functions -------------------------------*/ /*--------- API comments for these methods can be found in xenbusb.h ---------*/ void -xenbusb_identify(driver_t *driver __unused, device_t parent) +xenbusb_identify(driver_t *driver, device_t parent) { /* * A single instance of each bus type for which we have a driver From nobody Tue Nov 28 13:38:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7Q4tccz52GbZ; Tue, 28 Nov 2023 13:38: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 4Sfk7Q0TZwz4V0X; Tue, 28 Nov 2023 13:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwycVOra3WKTIpBMuFKjgQkOBJjtv34UVJGp+rPcNIE=; b=a4pMcPGJygPgn7QbPehFZkBy1IWqf6rxNqsOdnZDL4Kb8xYptUM4hWQgYK1X2ez+ZlIWKZ QtTfWBeGeRpz7WfqZMkPMbPLN5iwp3NMgq+V+ViOkoE5hnMiFAD/faqnqJ3AXhSR6VoVP/ 4iK6nrA85yFUAGkbxNUAUK2POgL3B2E9h1E3xsEgNJEpKvBKiouWXU4uBQcjxuBaud87SE OWKaZlBL3LwSjYL89+S+OyaY+xHhsm4Y09GU/BUyAkkVXfvExMtYgh43iRbRLu5mnjFtgC r/iVWso88ZD8DOquWLlMsot0OkHAiIyFeLyFfGMBzU4JJzuOQR3dwUFxdQmndQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwycVOra3WKTIpBMuFKjgQkOBJjtv34UVJGp+rPcNIE=; b=xbZ0QBjzFCH7j1LPjniU11Dfci+AzRUoKyA68Ot4Hj/67T7EXcgiWshQEvMa5hbz/NRO1N oUIHKHsSZ+pr01dYSfN2Rd0IXmRHTNif0SBOTFTCHXAHcDdJVdli1SEd3n7A9POXsqLkMF 0Fvf8dHQDqgQE2fPi/yGABO+8rdarl4v+v1ZcOShGjJ7DR28DuzoJDVG8ojchawtKg4lzH vhHzbUckjD9iVu9zDQ/3h+XBKOh3krjdzLvPK7bOLRMX+Fvo6725iJ7juh9c2gvzadB/ZW +E8J2pmD60SFjljI6T51qpt1YReKs8PzwcPrHh3O8sLeJpN+6paY6tpcb2KzXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178722; a=rsa-sha256; cv=none; b=Obg+lst4tYWmY1DWm+1+YSA0clxyBhVbq6/GQ35ZqR+gfr2wf7nC63rApXodAZ8aKFfcTy codkzuDoSSLTpkWwoBxCG7SXcVGw9uiKnyzHuY1GcXdBfLqTU6+MH8EjB0BBNcZnLxhUVa mTKj07MeCNlrqglpmi9x/cLPCFw/RhzWLvzPUuKQnBij0DyjPmE8e2DJf0EiUEo2ewqjpD 6rwkO/MpYtfUakZ6BWRbqikw5UMtpEpY7jnhLVWWdaulR+h2XfqX6jS9qSLPGROfbPwN/W kpjPi/ta8VMxga5FeQkbQMK48ra5n5wvKGB/UMsBlmr8KbBc4UX0gkBnNy3vjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7P6jCcz87B; Tue, 28 Nov 2023 13:38: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 3ASDcfoq025637; Tue, 28 Nov 2023 13:38:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcfb8025634; Tue, 28 Nov 2023 13:38:41 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:41 GMT Message-Id: <202311281338.3ASDcfb8025634@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: c7368ccb6801 - main - xen: remove xen_domain_type enum/variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: c7368ccb68018c318f2320de2ff3c2b15127c8d6 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=c7368ccb68018c318f2320de2ff3c2b15127c8d6 commit c7368ccb68018c318f2320de2ff3c2b15127c8d6 Author: Elliott Mitchell AuthorDate: 2022-08-06 16:02:03 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 12:40:19 +0000 xen: remove xen_domain_type enum/variable The vm_guest variable readily covers all uses of xen_domain_type, so merge them together. Since support for PV domains has been removed hard-core xen_pv_domain() to return false. Reviewed by: royger --- sys/x86/xen/hvm.c | 6 ++---- sys/x86/xen/pv.c | 1 - sys/xen/xen-os.h | 20 ++++++-------------- sys/xen/xen_common.c | 2 -- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 602e5396b620..e096559711a3 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -345,15 +345,13 @@ xen_hvm_init(enum xen_hvm_init_type init_type) return; /* - * If xen_domain_type is not set at this point + * If the Xen domain type is not set at this point * it means we are inside a (PV)HVM guest, because * for PVH the guest type is set much earlier * (see hammer_time_xen). */ - if (!xen_domain()) { - xen_domain_type = XEN_HVM_DOMAIN; + if (!xen_domain()) vm_guest = VM_GUEST_XEN; - } setup_xen_features(); #ifdef SMP diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index c9537d153820..9ea276caee81 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -165,7 +165,6 @@ hammer_time_xen(vm_paddr_t start_info_paddr) int rc; if (isxen()) { - xen_domain_type = XEN_HVM_DOMAIN; vm_guest = VM_GUEST_XEN; rc = xen_hvm_init_hypercall_stubs(XEN_HVM_INIT_EARLY); if (rc) { diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index 2cb45d5d438b..d009b1af11fa 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -79,30 +79,22 @@ extern shared_info_t *HYPERVISOR_shared_info; extern bool xen_suspend_cancelled; -enum xen_domain_type { - XEN_NATIVE, /* running on bare hardware */ - XEN_PV_DOMAIN, /* running in a PV domain */ - XEN_HVM_DOMAIN, /* running in a Xen hvm domain */ -}; - -extern enum xen_domain_type xen_domain_type; - -static inline int +static inline bool xen_domain(void) { - return (xen_domain_type != XEN_NATIVE); + return (vm_guest == VM_GUEST_XEN); } -static inline int +static inline bool xen_pv_domain(void) { - return (xen_domain_type == XEN_PV_DOMAIN); + return (false); } -static inline int +static inline bool xen_hvm_domain(void) { - return (xen_domain_type == XEN_HVM_DOMAIN); + return (vm_guest == VM_GUEST_XEN); } static inline bool diff --git a/sys/xen/xen_common.c b/sys/xen/xen_common.c index ae70a721477a..025f52cceee6 100644 --- a/sys/xen/xen_common.c +++ b/sys/xen/xen_common.c @@ -41,8 +41,6 @@ #include /*-------------------------------- Global Data -------------------------------*/ -enum xen_domain_type xen_domain_type = XEN_NATIVE; - /** * Start info flags. ATM this only used to store the initial domain flag for * PVHv2, and it's always empty for HVM guests. From nobody Tue Nov 28 13:44:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfkFx71nVz52KfK; Tue, 28 Nov 2023 13:44:21 +0000 (UTC) (envelope-from SRS0=3qmc=HJ=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 4SfkFx4qMmz4ZNW; Tue, 28 Nov 2023 13:44:21 +0000 (UTC) (envelope-from SRS0=3qmc=HJ=klop.ws=ronald-lists@realworks.nl) Authentication-Results: mx1.freebsd.org; none Date: Tue, 28 Nov 2023 14:44:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1701179053; 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=5C9tiD7o6W7OcTxSdwb/YhA4zfxFJ4vWcKYg7Uy4Qsc=; b=xGHMV8D0qZlCYQRys8sOX9L8plW52L5K3GapDcYKQl8LFfqm/0Y7mdLY3fy06rQatK4G4P Yv3X99qLOnK5b/n86QQiM80vhYk3IpskTBNLWKQxO5CZh+A51jon/cll97qBIbjwRM3M0Q dPTV71vVYygsc29f7t4kLGV18RkUa2zRRMUeIqePBh6tRSR2Yz4BnyzZnFcqC3E8ZArNdc n1IYKk3dtKJX45mklkaIPTjVibjCHSCJzBgc8oOndOVcVxuvGUuItu1sRJYQKIK7ACdByT JI6aWohh55UQWwHkW0Ftil1n1uZXM0RYogvPNDuJwc/K91KC8tXGGOvbKHL3yQ== From: Ronald Klop To: Randall Stewart Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <737498435.7036.1701179052815@localhost> In-Reply-To: <202311271939.3ARJdQJK020166@gitrepo.freebsd.org> References: <202311271939.3ARJdQJK020166@gitrepo.freebsd.org> Subject: Re: git: 6a79e48076bc - main - Fix two latent bugs in hpts. One where a static is put on a local variable, the other an initialization bug where we should be setting tv.tv_sec to 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: multipart/alternative; boundary="----=_Part_7035_2050740070.1701179052803" X-Mailer: Realworks (681.30) Importance: Normal X-Priority: 3 (Normal) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] X-Rspamd-Queue-Id: 4SfkFx4qMmz4ZNW ------=_Part_7035_2050740070.1701179052803 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit The PR you mention gives me the friendly message of " You must enter a valid bug number! " https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275482 Typo somewhere? A quick search gives me https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275382 which looks a lot like what you describe in the commit. Regards, Ronald. Van: Randall Stewart Datum: maandag, 27 november 2023 20:39 Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Onderwerp: git: 6a79e48076bc - main - Fix two latent bugs in hpts. One where a static is put on a local variable, the other an initialization bug where we should be setting tv.tv_sec to 0. > > The branch main has been updated by rrs: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6a79e48076bcce3e902323e62689eacb98faa180 > > commit 6a79e48076bcce3e902323e62689eacb98faa180 > Author: Randall Stewart > AuthorDate: 2023-11-27 19:38:06 +0000 > Commit: Randall Stewart > CommitDate: 2023-11-27 19:38:06 +0000 > > Fix two latent bugs in hpts. One where a static is put on > a local variable, the other an initialization bug where > we should be setting tv.tv_sec to 0. > > PR: 275482 > --- > sys/netinet/tcp_hpts.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c > index 92b2f69c9e58..d673ccbe4a73 100644 > --- a/sys/netinet/tcp_hpts.c > +++ b/sys/netinet/tcp_hpts.c > @@ -1519,6 +1519,7 @@ __tcp_run_hpts(struct tcp_hpts_entry *hpts) > hpts->p_mysleep.tv_usec = dynamic_min_sleep; > /* Reschedule with new to value */ > tcp_hpts_set_max_sleep(hpts, 0); > + tv.tv_sec = 0; > tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT; > /* Validate its in the right ranges */ > if (tv.tv_usec < hpts->p_mysleep.tv_usec) { > @@ -1600,7 +1601,7 @@ tcp_choose_hpts_to_run(void) > void > tcp_run_hpts(void) > { > - static struct tcp_hpts_entry *hpts; > + struct tcp_hpts_entry *hpts; > struct epoch_tracker et; > > NET_EPOCH_ENTER(et); > > > > ------=_Part_7035_2050740070.1701179052803 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 7bit
The PR you mention gives me the friendly message of

"
You must enter a valid bug number!

"


https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275482

Typo somewhere?

A quick search gives me https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275382 which looks a lot like what you describe in the commit.

Regards,
Ronald.

 

Van: Randall Stewart <rrs@FreeBSD.org>
Datum: maandag, 27 november 2023 20:39
Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: git: 6a79e48076bc - main - Fix two latent bugs in hpts. One where a static is put on a local variable, the other an initialization bug where we should be setting tv.tv_sec to 0.

The branch main has been updated by rrs:

URL: https://cgit.FreeBSD.org/src/commit/?id=6a79e48076bcce3e902323e62689eacb98faa180

commit 6a79e48076bcce3e902323e62689eacb98faa180
Author:     Randall Stewart <rrs@FreeBSD.org>
AuthorDate: 2023-11-27 19:38:06 +0000
Commit:     Randall Stewart <rrs@FreeBSD.org>
CommitDate: 2023-11-27 19:38:06 +0000

    Fix two latent bugs in hpts. One where a static is put on
    a local variable, the other an initialization bug where
    we should be setting tv.tv_sec to 0.
    
    PR:     275482
---
 sys/netinet/tcp_hpts.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c
index 92b2f69c9e58..d673ccbe4a73 100644
--- a/sys/netinet/tcp_hpts.c
+++ b/sys/netinet/tcp_hpts.c
@@ -1519,6 +1519,7 @@ __tcp_run_hpts(struct tcp_hpts_entry *hpts)
                hpts->p_mysleep.tv_usec = dynamic_min_sleep;
            /* Reschedule with new to value */
            tcp_hpts_set_max_sleep(hpts, 0);
+           tv.tv_sec = 0;
            tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT;
            /* Validate its in the right ranges */
            if (tv.tv_usec < hpts->p_mysleep.tv_usec) {
@@ -1600,7 +1601,7 @@ tcp_choose_hpts_to_run(void)
 void
 tcp_run_hpts(void)
 {
-   static struct tcp_hpts_entry *hpts;
+   struct tcp_hpts_entry *hpts;
    struct epoch_tracker et;
 
    NET_EPOCH_ENTER(et);
 

  ------=_Part_7035_2050740070.1701179052803-- From nobody Tue Nov 28 14:31:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SflKJ4J6lz52pJm; Tue, 28 Nov 2023 14:32:20 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from mx-out-01.fh-muenster.de (mx-out-01.fh-muenster.de [185.149.214.63]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mx.fh-muenster.de", Issuer "GEANT OV RSA CA 4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SflKJ200Pz4nmP; Tue, 28 Nov 2023 14:32:20 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Authentication-Results: mx1.freebsd.org; none Received: from mail-director-01.fh-muenster.de (mail-director-01.fh-muenster.de [185.149.215.227]) by mx-out-01.fh-muenster.de (Postfix) with ESMTPS id 0A57920A82; Tue, 28 Nov 2023 15:31:47 +0100 (CET) Received: from smtpclient.apple (unknown [217.92.3.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tuexen) by mail-director-01.fh-muenster.de (Postfix) with ESMTPSA id 4581B1A0064; Tue, 28 Nov 2023 15:31:46 +0100 (CET) Content-Type: multipart/signed; boundary="Apple-Mail=_B67B7394-5E27-4E51-91CA-A8F85D03A037"; 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.200.91.1.1\)) Subject: Re: git: 6a79e48076bc - main - Fix two latent bugs in hpts. One where a static is put on a local variable, the other an initialization bug where we should be setting tv.tv_sec to 0. From: tuexen@fh-muenster.de X-Priority: 3 (Normal) In-Reply-To: <737498435.7036.1701179052815@localhost> Date: Tue, 28 Nov 2023 15:31:45 +0100 Cc: Randall Stewart , "dev-commits-src-all@freebsd.org" , "src-committers@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <4A4E5230-E309-4CB0-9EE5-20DAD61BF255@fh-muenster.de> References: <202311271939.3ARJdQJK020166@gitrepo.freebsd.org> <737498435.7036.1701179052815@localhost> To: Ronald Klop X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:185.149.212.0/22, country:DE] X-Rspamd-Queue-Id: 4SflKJ200Pz4nmP --Apple-Mail=_B67B7394-5E27-4E51-91CA-A8F85D03A037 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Nov 28, 2023, at 14:44, Ronald Klop wrote: >=20 >=20 > The PR you mention gives me the friendly message of >=20 > "=20 > You must enter a valid bug number! > " >=20 > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D275482 >=20 > Typo somewhere? https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D275382 >=20 > A quick search gives me = https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D275382 which looks a = lot like what you describe in the commit. Yes that is it. Best regards Michael >=20 > Regards, > Ronald. >=20 > Van: Randall Stewart > Datum: maandag, 27 november 2023 20:39 > Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, = dev-commits-src-main@FreeBSD.org > Onderwerp: git: 6a79e48076bc - main - Fix two latent bugs in hpts. One = where a static is put on a local variable, the other an initialization = bug where we should be setting tv.tv_sec to 0. > The branch main has been updated by rrs: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D6a79e48076bcce3e902323e62689eacb= 98faa180 >=20 > commit 6a79e48076bcce3e902323e62689eacb98faa180 > Author: Randall Stewart > AuthorDate: 2023-11-27 19:38:06 +0000 > Commit: Randall Stewart > CommitDate: 2023-11-27 19:38:06 +0000 >=20 > Fix two latent bugs in hpts. One where a static is put on > a local variable, the other an initialization bug where > we should be setting tv.tv_sec to 0. > =20 > PR: 275482 > --- > sys/netinet/tcp_hpts.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c > index 92b2f69c9e58..d673ccbe4a73 100644 > --- a/sys/netinet/tcp_hpts.c > +++ b/sys/netinet/tcp_hpts.c > @@ -1519,6 +1519,7 @@ __tcp_run_hpts(struct tcp_hpts_entry *hpts) > hpts->p_mysleep.tv_usec =3D dynamic_min_sleep; > /* Reschedule with new to value */ > tcp_hpts_set_max_sleep(hpts, 0); > + tv.tv_sec =3D 0; > tv.tv_usec =3D hpts->p_hpts_sleep_time * = HPTS_TICKS_PER_SLOT; > /* Validate its in the right ranges */ > if (tv.tv_usec < hpts->p_mysleep.tv_usec) { > @@ -1600,7 +1601,7 @@ tcp_choose_hpts_to_run(void) > void > tcp_run_hpts(void) > { > - static struct tcp_hpts_entry *hpts; > + struct tcp_hpts_entry *hpts; > struct epoch_tracker et; > =20 > NET_EPOCH_ENTER(et); > =20 > =20 --Apple-Mail=_B67B7394-5E27-4E51-91CA-A8F85D03A037 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 CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIzMTEyODE0MzE0NVowLwYJ KoZIhvcNAQkEMSIEILiPVgtSiPSf57aBFkWg1AorD84kdAmQsAa80GNMT/7LMIGvBgkrBgEEAYI3 EAQxgaEwgZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZvZXJkZXJ1bmcg ZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsMB0RGTi1QS0kx JTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3rQdI3PzCBsQYL KoZIhvcNAQkQAgsxgaGggZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZv ZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsM B0RGTi1QS0kxJTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3r QdI3PzANBgkqhkiG9w0BAQsFAASCAgCs8g52iAPxDBjJtNSaTHUpA/xD/zc1tN1CcR6NMRI61URM 0QHQdeGBsTZ8DfSz7cpPSH8vxYAulgizE3T9dfnv0CE5ZD1Glw6L1YcIltgMdjldkF5BXRDehYPg pDTl8MqeOBDiV+Vv5wSr7m9xegLg2UcPyEqmu0knkx87n2Syk8e1cElEOC1yz3CoIlJPPXfoq5p+ vMBKTN5K7m6dDlhqWWwTzGW5NrHez0yHqQ0YGVTfSL8meA/UnA22Ptg3p93E4b+YFsw7Kk2x7ZAI s/F4wzsemr+Nqg0SzfUxK7hwSLB80Uy/HFUNt9JuzEV7wbUGvLTZPpIyt35Xf8Ixp2pU+Rjo8n6z oF2urZsa3fHHF9bD6s1A5FfOfmZwqqNVeXsHwefDxS0/ukhE40Co2ExHKyirt3LfyQJ92KjFn9/u eVkqVOXjuKcyXZ3WAphyRDA84GVmLyEU2h13bJZY6V6jDo5ALnOAtzTejC4SG3YpYKaD5BIUJ3fH AO1a5ZNwzlxR9fmLGvizF61NZEi5Mud7XUipLtxwi98n6udkNRh8ooMdb1kPMg0Mx8gjzQNg0mcp v79BBQBXPTlvywp2yYsZ0v+ZyVFHPtw7QycRKbePNKdd0bkE9nJQNjgQbVICFy0MgrG2SZFrZaog N06R+Zvl+vu4nUsmVbSI2WYvx3pL1AAAAAAAAA== --Apple-Mail=_B67B7394-5E27-4E51-91CA-A8F85D03A037-- From nobody Tue Nov 28 16:06:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfnQ20vYZz528dx; Tue, 28 Nov 2023 16:06:34 +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 4SfnQ20MVJz3Sfl; Tue, 28 Nov 2023 16:06:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701187594; h=from:from:reply-to:subject: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=2BoJAupxMhjJdja/I1tCD00z4IqxvVA0ODEavyPey6I=; b=NR01yAmeoutPSCU2NzyxsVvEYLwaiTrbNCwPe5Go5ex3isgx5X5jDwCx93aXPeKRyzFqmP Q+FbmGc1oVoNolbctoEEmRgI6YLlUW1hyDlVJtlmnfIIRueNlBRyZa0Ttb0fdiR44RvMg4 soE3SdR7DS7xd81DN/3SR6fhuIu5sa+i7G44RW57PBz3LLxtktWL891R7IiDaz04PxRIrE 2tZOkUnODkIWxseVPu5ClKA0eJ3HoOnEb1GkqVspfuwp4lbqNGh4gdXNILMF5dWwEs34w+ So0QGrh9Qov0RQHl/wpFYMkzqesS0UkppukPhuSWb6Yx5Oi92ZnH2x50nt33lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701187594; h=from:from:reply-to:subject: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=2BoJAupxMhjJdja/I1tCD00z4IqxvVA0ODEavyPey6I=; b=eFUy59r+bH7R/zykudcLwCtmgL5djRrFwrMZGlnYeRIcFv8AIB0z+dd6E3hrHc0KJgzJu2 +egaxPewvTa7MeMcVMKI3VB22MSCTfpJ9wp+dl3H2UVp1MPaAMNsI4++coPi+A5ARdBGIW j/Nm3Vf4GUdwNj4QB8piVk1K2GByGKRfjI8ScaJ1RxZy79bIxJLGR24CT1UswPr385mYUp l0B7qZJ5fGFBDk5rhkmbudc6HQ/idkf58s0wEbqRoo4PZr2915y0OYQsPREudoknwWmePs PfvaymxGKDn7wbT5xQE1u+oquWywjZeGghPELffTauPBEImgOMuYanDKHs3iCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701187594; a=rsa-sha256; cv=none; b=furKzYhhnc2z1b4ty0pz0ReVsaBvJrt78LzHBB+8OUGB0sk4MUEEIiKx2mKTP1hx1dViXh qAaddXMsRih5JzltAIx/XnGPMLXkvqO5JhUb4oLYqCZa4bDZ/qY07D0YgJIGwkXTKQKglP K/8XJB3e/wKZQYsMGxc0SEPJtlvkbz07abM8qcMbRdMtg5OX/Nbdv5za//piZpLDJDhV7N go/Uc4drXB20apTY2TNjb3oyvQZl+QjT+nibGUXUaKXdRjOpkPStxOu+NcPBtqSD+pBk/E vPMp1FjgY9omYIYZ2ugcuAhrn/0ReBSRy37sO6aIrwXMiCGYsBpv6dc46Y3dEw== Received: from [IPV6:2601:648:8384:fd00:51ff:8c8b:b16b:8ec9] (unknown [IPv6:2601:648:8384:fd00:51ff:8c8b:b16b:8ec9]) (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 4SfnQ13fzJz1P1Z; Tue, 28 Nov 2023 16:06:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <8fa6ed4d-c26b-4dd6-86f2-c3751f86d426@FreeBSD.org> Date: Tue, 28 Nov 2023 08:06:32 -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: c596126a5d3d - main - pmbr: Only load the first 545k rather than error out Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202311272246.3ARMkNS1037267@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202311272246.3ARMkNS1037267@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/27/23 2:46 PM, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c596126a5d3d2ee015ee6807b4041efa5b9d9b07 > > commit c596126a5d3d2ee015ee6807b4041efa5b9d9b07 > Author: Warner Losh > AuthorDate: 2023-11-27 22:40:40 +0000 > Commit: Warner Losh > CommitDate: 2023-11-27 22:45:56 +0000 > > pmbr: Only load the first 545k rather than error out > > It would be nice to have larger boot partitions for ESPs to live in one > day. It's trivial to carve out 5M 10M or 200M when provisioning, but > logistical issues may make it hard to do it after the fact. So only warn > when the partition is > 545k. If we ever grow the boot loader larger > than that, then it will be responsible for loading the rest anyway. > > Sponsored by: Netflix > Reviewed by: tsoome > Differential Revision: https://reviews.freebsd.org/D42774 > --- > stand/i386/pmbr/pmbr.S | 24 +++++++++++++++--------- > 1 file changed, 15 insertions(+), 9 deletions(-) > > diff --git a/stand/i386/pmbr/pmbr.S b/stand/i386/pmbr/pmbr.S > index c61acbe261bd..60b26df15720 100644 > --- a/stand/i386/pmbr/pmbr.S > +++ b/stand/i386/pmbr/pmbr.S > @@ -155,8 +155,10 @@ next_boot: addl $1,(%si) # Next LBA > mov %es,%ax # Adjust segment for next > addw $SECSIZE/16,%ax # sector > cmp $0x9000,%ax # Don't load past 0x90000, > - jae err_big # 545k should be enough for > - mov %ax,%es # any boot code. :) > + jb sz_ok # 545k should be enough for > + call err_big # any boot code, but warn > + mov $0x9000-SECSIZE/16,%ax # and truncate > +sz_ok: mov %ax,%es > jmp load_boot > # > # Move to the next partition. If we walk off the end of the sector, load > @@ -203,17 +205,21 @@ getdrvparams: > # > # Various error message entry points. > # > -err_big: movw $msg_big,%si # "Boot loader too > - jmp putstr # large" > +err_big: movw $msg_big,%si # "Truncated > + call putstr # to 545k" > + ret Hmm, the comment here and the text string don't match. > err_pt: movw $msg_pt,%si # "Invalid partition > - jmp putstr # table" > + call putstr # table" > +err_pt.1: jmp err_pt.1 # Await reset > > err_rd: movw $msg_rd,%si # "I/O error loading > - jmp putstr # boot loader" > + call putstr # boot loader" > + jmp err_pt.1 > > err_noboot: movw $msg_noboot,%si # "Missing boot > - jmp putstr # loader" > + call putstr # loader" > + jmp err_pt.1 > # > # Output an ASCIZ string to the console via the BIOS. > # > @@ -223,9 +229,9 @@ putstr.0: movw $0x7,%bx # Page:attribute > putstr: lodsb # Get character > testb %al,%al # End of string? > jnz putstr.0 # No > -putstr.1: jmp putstr.1 # Await reset > + ret > > -msg_big: .asciz "Boot loader too large" > +msg_big: .asciz "Loaded only 545k" > msg_pt: .asciz "Invalid partition table" > msg_rd: .asciz "I/O error loading boot loader" > msg_noboot: .asciz "Missing boot loader" I wonder if it would save a few bytes by having a common 'puterr' that does 'call putstr' and then the jmp to itself that the other err targets use rahter than adding the jmp to each one of those. But also, can't you just leave a gap in the partitions to leave room for a future ESP? It might not always be safe to load a full 545k depending on if the firmware has reserved some of memory just below 640k. 545k is an upper bound on how much can be loaded in terms of 640k - the load address, but the practical limit might be lower. It is probably safer as a general rule to keep the boot partition closer to the size of the boot loader and leave a gap in place instead. -- John Baldwin From nobody Tue Nov 28 16:35:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfp3c4Twpz52Bm0; Tue, 28 Nov 2023 16:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfp3c3rGCz3WGQ; Tue, 28 Nov 2023 16:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701189340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4LYlEunuO+EC3vUAa2qj0OIpOoDkxzvbRPsjAysjngE=; b=LmYHooWlOeG3bH/JYhd9epMrDh8DM0DddBwQev3Vrv8HggoXgzFubPLRmVXodhNztCdTSl 75tbp2exDqV1Mq60tqIkUQpnZsZAiDmLQafDbVBkQIIXUbktXUz61/107cnfK/MxlmvoN3 BJOJUoBWx/UfrdQeOhcOb3777IH5RAbKxq42zT9QjopTGoKuqk7hSCpLWnuMUsWBOlbC5x UNa81Mled4bS0vgqbSz6QMlD3hMAeY7VcW6NpzuVxK1tFZNwanA9F8Pft6lgSA0zTgQ2Pi M+5erCbIupLs97ovUInZDfta2EFdOEJZS0h9tTf8URl9i/xiJnBIQF0iLfU/JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701189340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4LYlEunuO+EC3vUAa2qj0OIpOoDkxzvbRPsjAysjngE=; b=dDVkCb3r7dHrzNRs4irLgV4/MYmDVaE9BPb9OKlp0Rk7TM5qMgqTpD7qFZD1bNpTxgkDje hebQ8ayN+V/I9nEKLT4j6CmnSe4aElBHUg2QWB8QoBNYlWuwQoK4myhTSQEPEwgTmRum5m mg0FDGvJPzaoVLyqI5b0mjD0sNMNFO4XxwnFmERltQqUzpwRd9aofOqBlhhFmPJ7N8t65y Ow3BmC0j0DL7gXjbZJE5VeArnQKp5oDKkT0Z1Q86l8GjmzhMG5Cy0EmahY8p8vOG6glcad DnuhPnmDUICYl/YlEuseVP7kszojAwCOCEXLFFnTdfHOT9ZsozsCna9I22iR1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701189340; a=rsa-sha256; cv=none; b=yfth/2160/Euk6b5//E+woOQAIisJ2JS35QEfgUNo3iqs8Uc4bZfbIw7Z5dE6Yv6mEfAXh J99BGeCQowHuoKdoQVuj+DzYNEgNJZyJeEEMuvpouOewYPSrIBZ+lJCXgxjZ2x7OFCa5z4 qqpGT8CEdDU1mTq2BLoxh3Msf/xsaxXt8Vz/aD1uzgrHmhqzj7zjPN//4xpv27DkAPq23T 7MWGjpuGFwSl+X8aKYNm9oh9C6H/CqqX1YqoYeKl0LlXhyuZdgzNbY2AQEOjHW1MWBv5rR 6npnhd+bvvVFQNu7npegkK2x+NBAhrxJy8SagzYviS6DOzKWDdeuSc+WsXONcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfp3c2bkszTsK; Tue, 28 Nov 2023 16:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASGZevk027694; Tue, 28 Nov 2023 16:35:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASGZeew027691; Tue, 28 Nov 2023 16:35:40 GMT (envelope-from git) Date: Tue, 28 Nov 2023 16:35:40 GMT Message-Id: <202311281635.3ASGZeew027691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: e1e847374bcc - main - Add DEBUG_POISON_POINTER List-Id: Commit messages for the main 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1e847374bcc287ca97e6cb16cb5e07a697cf055 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e1e847374bcc287ca97e6cb16cb5e07a697cf055 commit e1e847374bcc287ca97e6cb16cb5e07a697cf055 Author: Mateusz Guzik AuthorDate: 2023-11-28 15:23:25 +0000 Commit: Mateusz Guzik CommitDate: 2023-11-28 16:33:46 +0000 Add DEBUG_POISON_POINTER If you have a pointer which you know points to stale data, you can fill it with junk so that dereference later will trap Reviewed by: kib Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D40946 --- sys/kern/vfs_bio.c | 6 ++++++ sys/sys/kassert.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 31059f1c0a94..4e0832475c3e 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -159,6 +159,9 @@ nbufp(unsigned i) } caddr_t __read_mostly unmapped_buf; +#ifdef INVARIANTS +caddr_t poisoned_buf = (void *)-1; +#endif /* Used below and for softdep flushing threads in ufs/ffs/ffs_softdep.c */ struct proc *bufdaemonproc; @@ -1211,6 +1214,9 @@ bufinit(void) mtx_init(&bdirtylock, "dirty buf lock", NULL, MTX_DEF); unmapped_buf = (caddr_t)kva_alloc(maxphys); +#ifdef INVARIANTS + poisoned_buf = unmapped_buf; +#endif /* finally, initialize each buffer header and stick on empty q */ for (i = 0; i < nbuf; i++) { diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h index d7c1a21385f9..7b54ac6ae519 100644 --- a/sys/sys/kassert.h +++ b/sys/sys/kassert.h @@ -38,6 +38,37 @@ extern const char *panicstr; /* panic message */ extern bool panicked; #define KERNEL_PANICKED() __predict_false(panicked) +/* + * Trap accesses going through a pointer. Moreover if kasan is available trap + * reading the pointer itself. + * + * Sample usage: you have a struct with numerous fields and by API contract + * only some of them get populated, even if the implementation temporary writes + * to them. You can use DEBUG_POISON_POINTER so that the consumer which should + * no be looking at the field gets caught. + * + * DEBUG_POISON_POINTER(obj->ptr); + * .... + * if (obj->ptr != NULL) // traps with kasan, does not trap otherwise + * .... + * if (obj->ptr->field) // traps with and without kasan + */ +#ifdef INVARIANTS + +#include + +extern caddr_t poisoned_buf; +#define DEBUG_POISON_POINTER_VALUE poisoned_buf + +#define DEBUG_POISON_POINTER(x) ({ \ + x = (void *)(DEBUG_POISON_POINTER_VALUE); \ + kasan_mark(&x, 0, sizeof(x), KASAN_GENERIC_REDZONE); \ +}) + +#else +#define DEBUG_POISON_POINTER(x) +#endif + #ifdef INVARIANTS /* The option is always available */ #define VNASSERT(exp, vp, msg) do { \ if (__predict_false(!(exp))) { \ From nobody Tue Nov 28 16:56:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfpXC3tkdz52DTT; Tue, 28 Nov 2023 16:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfpXC38pMz3YMZ; Tue, 28 Nov 2023 16:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701190619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtBIZ+YtyQ9o9HvMFm2c154I42bVPXZKlk9vvJqPO8w=; b=j4KJN+A0cs5Nb2VSD4aSuTQvmBif6RXEiq8SnPqI56mzaUQ/rXbPVerhChXCgwc0Vh8spe O/fWRHXP0JTanGlwzxFgWBxRrniee9ZNqug3ue3j3JD9a8jJqjsfaL467T/kbtSmCWnV46 J5zF65ggvyWYoZiPPYtwecE9pQ+Oj8cTrbrApSSb1cUVnHubLWuImu+1j+S1cfr/0PQLfN sXLEdW5hPum7624CC0lNT7gw6lNZvk81QTMF12ikUXeKk3j+D9Eo0vxfE9udGWkXH+gxgb w1p4plpp6KbYWSk0V4xX7yxU24MagpALoSMjuK1Lu8trmN9nzMftBbvyndEgbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701190619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtBIZ+YtyQ9o9HvMFm2c154I42bVPXZKlk9vvJqPO8w=; b=nK8LTVZ02utdxMwEb/Z99ezzWAxQppe5W53cE2ZjfeYiudOtqmDtK/Avm1wytH196kWoAD gh9BytZ1YcpMKr29j56UKyQ/UGUxCssvyxf+CBVs1F1tPzNrhd8ROxBo3837ffab/SB1iy YJC72kGCVgfgtY+Rkc0IKPklfgPnZGKjgf37/WyXwCcIfBNsmv0r4ktsx+rohhkP7LGuZj UOlls/oxX7xdcylWksyvzMAAbAAoDGya9xgAF4wHqyrjMm+4DvicgD1rDIh56SsQ4dlREe M1YZ656eLir6Eb+Dc6ycnutgdHelEuXKbnflDDVOR3QLR6xSXLnmVO4XUshDww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701190619; a=rsa-sha256; cv=none; b=BLJrjWKrz8WyrGS3yUmv+PKoaJnRhtim13MGPsnn1YzT1L9ixNJ137L92dJZzLLjFSmqVT u9rKQK3Ya4ZiJf/UX5SZ+76RtLz7NGckbCllfrHqR6PUAmwILekTpR+omm1Ko7iRxwjKhf ej7lwe7G1krPx/ZadT5auPFvN/6lyM4VUlftap9zXWiGDf7Li9EGXSQrPckCbvCPfPFIkj D0CTZlaXYy5J1pbpnr2H51pxUhxMIDka88yCXxejZuECeqLyVb/z8b8ZrJI7crVwGLXI/Z h/2vUdOrNuJXXbqrh7g9ni7QtuwI2EumidjK7S4/GZoClSKuTI8TJN5wEpUwwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfpXC2DT0zVXQ; Tue, 28 Nov 2023 16:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASGuxTQ061404; Tue, 28 Nov 2023 16:56:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASGuxfK061401; Tue, 28 Nov 2023 16:56:59 GMT (envelope-from git) Date: Tue, 28 Nov 2023 16:56:59 GMT Message-Id: <202311281656.3ASGuxfK061401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 51c27021b281 - main - tail.1: Lint with mandoc(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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51c27021b2818cc626500d7723dc82291e3eecaa Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=51c27021b2818cc626500d7723dc82291e3eecaa commit 51c27021b2818cc626500d7723dc82291e3eecaa Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-11-28 16:10:12 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-11-28 16:55:58 +0000 tail.1: Lint with mandoc(1) MFC after: 3 days Sponsored by: Klara, Inc. --- usr.bin/tail/tail.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1 index 724c7221ef88..a888f6828bd1 100644 --- a/usr.bin/tail/tail.1 +++ b/usr.bin/tail/tail.1 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 12, 2022 +.Dd November 28, 2023 .Dt TAIL 1 .Os .Sh NAME @@ -113,7 +113,7 @@ option if reading from standard input rather than a file. The location is .Ar number lines. -.It Fl q, Fl -quiet, Fl -silent +.It Fl q , Fl -quiet , Fl -silent Suppresses printing of headers when multiple files are being examined. .It Fl r The @@ -132,7 +132,7 @@ from the beginning or end of the input from which to begin the display. The default for the .Fl r option is to display all of the input. -.It Fl v, Fl -verbose +.It Fl v , Fl -verbose Prepend each file with a header. .El .Pp From nobody Tue Nov 28 16:57:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfpXD4f2jz52DWc; Tue, 28 Nov 2023 16:57: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 4SfpXD3lk3z3YSZ; Tue, 28 Nov 2023 16:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701190620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YDNc7YgMbAfWfNCYOyFhOFJJi3viloeH01SnhE0IPVI=; b=RPnHmI0IEPMq/KZ/NtRGsRMjVzedIhnJUYk/5T9m55+YmEaZjrKu9NEI82Lf7aHUEh8WMK /qcE2SuHxmFqL8/gvSZyHhm1KuXyUYUU8ZXIJbhcNDwhPbSIL+1FiP5qo/TzE61DZ/wzVf 9Kbv7bIpWDv87EdjxotHM63k8qmXRFEDSnuBVy8lh/0SSEJ2ORg1oHel4bukpa/wOHGYuy +FyQrjSwnVWnypqwjSPl9KBhgP0fMeXo5vzPo83Zpdffiq5uGdkCfZyR2E9B75DvaAUeQc sHCpzBxCckIeJ0mtyhtvjBkg5YZomhD0RK+F1kbBuh9NmCq0d1K+XsEUyibcRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701190620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YDNc7YgMbAfWfNCYOyFhOFJJi3viloeH01SnhE0IPVI=; b=CC1Mdbtj9voIlrd5vGY08QgLV/zDfL5pHk5/l1KPpRZQp7BEcqnDdhgj7wrbSweIiv6MQj NVPhovA6V8E63aCIRsvk6wMlK0sisgDQU5cfp9gTeH68lJ5IdKSqHTgj3BAGSCY55P4S0D G1rvsuuV7Ie9vKAZct9p4VnXonMjFd4GPGgzpPLI+c71O44PgUR8nYmaUHgZJEfi5d95+5 Ee+vfe//pk/hcnQADtf0dYn8DX7jxYeQQAZAXmcJbPrgxoQgCVITUXFJnOpDoyb5Bsqw1q x3kgLvirFbJ5eBzw1GTY/PXLAmQ9zHOsQOifyPLD0VRpoDyWTUAoh8B66wBV8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701190620; a=rsa-sha256; cv=none; b=FERgV6+Q4v76qSK2UE0Wya/9mCY9P9yvTuBFXt2deIJn5Z2VRsDlvqsDr9cxlU6G+uVOBU E2I7KnglJ2U6Wzxkl/e3/fDT3zNCwQHERFGcRoa0OMg/BgZQ8SRLd6AMCOxd4umRaCx1mO VSZdhjP0mDwlm52IFuOX1Qc0AIrj1IStEeoEBTAYi8sflGmR6eDSaSA249I8rLZudXlkIl RPezfZzN/gaZZVr45BZmN04ADq5j7ak5830dnK+zrp4EfUdjy7mCDgjQBd7IBhLYI5T4DI LJ1m4ulMDEcMTVoAkjan/wRSOLPbJTjWdD3R1RE/rkt+L2MEEiJnD/k70zoMqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfpXD2lYgzVhC; Tue, 28 Nov 2023 16:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASGv0LM061461; Tue, 28 Nov 2023 16:57:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASGv0MY061458; Tue, 28 Nov 2023 16:57:00 GMT (envelope-from git) Date: Tue, 28 Nov 2023 16:57:00 GMT Message-Id: <202311281657.3ASGv0MY061458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 9f20787fe89e - main - tail.1: Add an example for +n 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f20787fe89e2a912a9e5dd2d3da56087722e8c2 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=9f20787fe89e2a912a9e5dd2d3da56087722e8c2 commit 9f20787fe89e2a912a9e5dd2d3da56087722e8c2 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-11-28 16:52:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-11-28 16:55:58 +0000 tail.1: Add an example for +n 1 MFC after: 3 days Sponsored by: Klara, Inc. --- usr.bin/tail/tail.1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1 index a888f6828bd1..9e13567e01e1 100644 --- a/usr.bin/tail/tail.1 +++ b/usr.bin/tail/tail.1 @@ -155,7 +155,7 @@ arguments may also be specified with size suffixes supported by .Sh EXIT STATUS .Ex -std .Sh EXAMPLES -To display the last 500 lines of the file +Display the last 500 lines of the file .Ar foo : .Pp .Dl $ tail -n 500 foo @@ -165,6 +165,12 @@ Keep open, displaying to the standard output anything appended to the file: .Pp .Dl $ tail -F /var/log/messages +.Pp +Read +.Pa /var/log/messages +from the beginning and then follow the file as usual: +.Pp +.Dl $ tail -F -n +1 /var/log/messages .Sh SEE ALSO .Xr cat 1 , .Xr head 1 , From nobody Tue Nov 28 17:07:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfpml4tWfz52F5Y for ; Tue, 28 Nov 2023 17:07:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 4Sfpml48t8z3c4S for ; Tue, 28 Nov 2023 17:07:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-54b7ef7f4d5so2889274a12.1 for ; Tue, 28 Nov 2023 09:07:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701191270; x=1701796070; 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=Xmu6lW92P0Xvcv5xiCgYuY6sUcaHCFlPigwe+KmHy0I=; b=eXZehRHItSJs3wWM4B7PUAVCv3CGY2vvirJ+zsBHaRf2ne6EpYWG6Xe2w+OqvxYgxs eftLwP2rnvMeAv7iZp02PMmhevKC06XclZl3LTbKWb1vukbW8NFTLpltkXKDxunKSves 54w2llVJBNVDFWmecnLpRe3305l+P5+0j9sWizDAcylDGJdliQPA7hw25EDsof0wwiSf sI7CfHqVeJzMk9SqU1rcPyMfy/TFLs8FP40Vz7IsHYaFRgpxJ3vPfiftvccY9bZDtRUf QE0wTfTfqXVwUjC6W2fkHjYpcDur49bLgEqdenOVwSGkdL4LxE4tOSuSTiRlN6av1IOY Xbwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701191270; x=1701796070; 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=Xmu6lW92P0Xvcv5xiCgYuY6sUcaHCFlPigwe+KmHy0I=; b=En/xim4jr1HX9P7o+leSiSL+d84zk1QqSnnnq1XFbozubvwYbwgdjgcRYKvMPn/uEt gqVFSNXWZSwTIbXGgEOsMea4195v7G8hLvpn9o/xslE00E31sSXG0tpLXPBOytCMeWns T+BMnfb4FOdiGgPG1wLi4g7ZqoFVQwdlHel1QrsKUkXIT7f5yg28g98Ksawo/ndCNTFD bE3/rUqu4kGvTFAOiyPCg8FA80Y5rdSZsYPpzcIstpN76JOl7uO731eAGnsLAkGStuim OEh9X//J6nTjsPLcZBKNUVdI7rasFDbXC4nzIAxS8g96QgdyuCisPbD6xuXm90jfjuiK edyg== X-Gm-Message-State: AOJu0Yw4GU8iYQCPmmyHqajXBtHCgSCcRwtLAGwo6A3GZ9M2wgeVeSdj sVXWMSL7ChAaWyVc5R/M3xX8PKndfBFuJoPsWduOeQ== X-Google-Smtp-Source: AGHT+IEwPjGuZNhIz6XUiaINklQMQYVIas8eLVbXwk4v5CSJ9QmguS7yzgohyxLQyi5fVL3bk38HW1/9YkLXr1PNY/E= X-Received: by 2002:a50:d681:0:b0:54b:24d6:de03 with SMTP id r1-20020a50d681000000b0054b24d6de03mr8123318edi.6.1701191270200; Tue, 28 Nov 2023 09:07:50 -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: <202311272246.3ARMkNS1037267@gitrepo.freebsd.org> <8fa6ed4d-c26b-4dd6-86f2-c3751f86d426@FreeBSD.org> In-Reply-To: <8fa6ed4d-c26b-4dd6-86f2-c3751f86d426@FreeBSD.org> From: Warner Losh Date: Tue, 28 Nov 2023 10:07:39 -0700 Message-ID: Subject: Re: git: c596126a5d3d - main - pmbr: Only load the first 545k rather than error out To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000005b0afd060b3975b2" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Sfpml48t8z3c4S --0000000000005b0afd060b3975b2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hey John, On Tue, Nov 28, 2023 at 9:06=E2=80=AFAM John Baldwin wrot= e: > On 11/27/23 2:46 PM, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dc596126a5d3d2ee015ee6807b4041ef= a5b9d9b07 > > > > commit c596126a5d3d2ee015ee6807b4041efa5b9d9b07 > > Author: Warner Losh > > AuthorDate: 2023-11-27 22:40:40 +0000 > > Commit: Warner Losh > > CommitDate: 2023-11-27 22:45:56 +0000 > > > > pmbr: Only load the first 545k rather than error out > > > > It would be nice to have larger boot partitions for ESPs to live i= n > one > > day. It's trivial to carve out 5M 10M or 200M when provisioning, b= ut > > logistical issues may make it hard to do it after the fact. So onl= y > warn > > when the partition is > 545k. If we ever grow the boot loader larg= er > > than that, then it will be responsible for loading the rest anyway= . > > > > Sponsored by: Netflix > > Reviewed by: tsoome > > Differential Revision: https://reviews.freebsd.org/D42774 > > --- > > stand/i386/pmbr/pmbr.S | 24 +++++++++++++++--------- > > 1 file changed, 15 insertions(+), 9 deletions(-) > > > > diff --git a/stand/i386/pmbr/pmbr.S b/stand/i386/pmbr/pmbr.S > > index c61acbe261bd..60b26df15720 100644 > > --- a/stand/i386/pmbr/pmbr.S > > +++ b/stand/i386/pmbr/pmbr.S > > @@ -155,8 +155,10 @@ next_boot: addl $1,(%si) # > Next LBA > > mov %es,%ax # Adjust segment for next > > addw $SECSIZE/16,%ax # sector > > cmp $0x9000,%ax # Don't load past 0x90000= , > > - jae err_big # 545k should be enough > for > > - mov %ax,%es # any boot code. :) > > + jb sz_ok # 545k should be enough > for > > + call err_big # any boot code, but war= n > > + mov $0x9000-SECSIZE/16,%ax # and truncate > > +sz_ok: mov %ax,%es > > jmp load_boot > > # > > # Move to the next partition. If we walk off the end of the sector, > load > > @@ -203,17 +205,21 @@ getdrvparams: > > # > > # Various error message entry points. > > # > > -err_big: movw $msg_big,%si # "Boot loader too > > - jmp putstr # large" > > +err_big: movw $msg_big,%si # "Truncated > > + call putstr # to 545k" > > + ret > > Hmm, the comment here and the text string don't match. > Yea, size related message churn. > > err_pt: movw $msg_pt,%si # "Invalid partition > > - jmp putstr # table" > > + call putstr # table" > > +err_pt.1: jmp err_pt.1 # Await reset > > > > err_rd: movw $msg_rd,%si # "I/O error loading > > - jmp putstr # boot loader" > > + call putstr # boot loader" > > + jmp err_pt.1 > > > > err_noboot: movw $msg_noboot,%si # "Missing boot > > - jmp putstr # loader" > > + call putstr # loader" > > + jmp err_pt.1 > > # > > # Output an ASCIZ string to the console via the BIOS. > > # > > @@ -223,9 +229,9 @@ putstr.0: movw $0x7,%bx # > Page:attribute > > putstr: lodsb # Get character > > testb %al,%al # End of string? > > jnz putstr.0 # No > > -putstr.1: jmp putstr.1 # Await reset > > + ret > > > > -msg_big: .asciz "Boot loader too large" > > +msg_big: .asciz "Loaded only 545k" > > msg_pt: .asciz "Invalid partition table" > > msg_rd: .asciz "I/O error loading boot loader" > > msg_noboot: .asciz "Missing boot loader" > > I wonder if it would save a few bytes by having a common 'puterr' > that does 'call putstr' and then the jmp to itself that the other err > targets use rahter than adding the jmp to each one of those. > Yea, I started to do that, but that's 12 bytes of possible savings at the cost of at least 8 bytes of new assembler, maybe more, so when I got another too full message I punted. > But also, can't you just leave a gap in the partitions to leave room > for a future ESP? It might not always be safe to load a full 545k > depending on if the firmware has reserved some of memory just below > 640k. 545k is an upper bound on how much can be loaded in terms of > 640k - the load address, but the practical limit might be lower. It is > probably safer as a general rule to keep the boot partition closer to > the size of the boot loader and leave a gap in place instead. > Today we load 512k always. This likely is a bad idea on some really bloated with BIOS data system (though they are rare). I'll concede that this may up the number of systems that conflict. It looks like there's a BTX header of sorts just after the gpt loader. In an ideal world, we'd load only the first sector of gptboot and it would load the rest, but that has a legacy problem. We could also enforce a different limit that's much smaller (say 256k or 200k) and just load up to that and force gptboot to cope if it's larger than that (smaller) size. pmbr then starts to be a little less generic, but freebsd-boot was always intended to boot gptboot or gptzfsboot (before they were unified). We can put that limit minus 30-50k into the build system to trigger an error so we at least have some warning before we hit it. Warner --0000000000005b0afd060b3975b2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hey John,

On Tue, Nov 28, 2023 at 9:06= =E2=80=AFAM John Baldwin <jhb@freebsd= .org> wrote:
On 11/27/23 2:46 PM, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Dc596126a5d3d2ee015ee6807b4041efa5b9d9b07<= /a>
>
> commit c596126a5d3d2ee015ee6807b4041efa5b9d9b07
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2023-11-27 22:40:40 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-11-27 22:45:56 +0000
>
>=C2=A0 =C2=A0 =C2=A0 pmbr: Only load the first 545k rather than error o= ut
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 It would be nice to have larger boot partitions fo= r ESPs to live in one
>=C2=A0 =C2=A0 =C2=A0 day. It's trivial to carve out 5M 10M or 200M = when provisioning, but
>=C2=A0 =C2=A0 =C2=A0 logistical issues may make it hard to do it after = the fact. So only warn
>=C2=A0 =C2=A0 =C2=A0 when the partition is > 545k. If we ever grow t= he boot loader larger
>=C2=A0 =C2=A0 =C2=A0 than that, then it will be responsible for loading= the rest anyway.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix
>=C2=A0 =C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 tsoome
>=C2=A0 =C2=A0 =C2=A0 Differential Revision:=C2=A0 https://revi= ews.freebsd.org/D42774
> ---
>=C2=A0 =C2=A0stand/i386/pmbr/pmbr.S | 24 +++++++++++++++---------
>=C2=A0 =C2=A01 file changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/stand/i386/pmbr/pmbr.S b/stand/i386/pmbr/pmbr.S
> index c61acbe261bd..60b26df15720 100644
> --- a/stand/i386/pmbr/pmbr.S
> +++ b/stand/i386/pmbr/pmbr.S
> @@ -155,8 +155,10 @@ next_boot:=C2=A0 =C2=A0 =C2=A0 =C2=A0addl $1,(%si= )=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# Nex= t LBA
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mov %es,%ax=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# = Adjust segment for next
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0addw $SECSIZE/16= ,%ax=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #=C2=A0 sector
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cmp $0x9000,%ax= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# Don't l= oad past 0x90000,
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jae err_big=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#=C2=A0 5= 45k should be enough for
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mov %ax,%es=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#=C2=A0 a= ny boot code. :)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jb sz_ok=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #=C2= =A0 545k should be enough for
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0call err_big=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #=C2=A0 any = boot code, but warn
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mov $0x9000-SECSIZE/1= 6,%ax=C2=A0 =C2=A0 =C2=A0 #=C2=A0 and truncate
> +sz_ok:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mov %ax,= %es
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jmp load_boot >=C2=A0 =C2=A0#
>=C2=A0 =C2=A0# Move to the next partition.=C2=A0 If we walk off the end= of the sector, load
> @@ -203,17 +205,21 @@ getdrvparams:
>=C2=A0 =C2=A0#
>=C2=A0 =C2=A0# Various error message entry points.
>=C2=A0 =C2=A0#
> -err_big:=C2=A0 =C2=A0 =C2=A0movw $msg_big,%si=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# "Boot loader too
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jmp putstr=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #=C2=A0 = large"
> +err_big:=C2=A0 =C2=A0 =C2=A0movw $msg_big,%si=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# "Truncated
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0call putstr=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#=C2=A0 t= o 545k"
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret

Hmm, the comment here and the text string don't match.
=

Yea, size related message churn.
=C2=A0
=
>=C2=A0 =C2=A0err_pt:=C2=A0 =C2=A0 =C2=A0movw $msg_pt,%si=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # "Invalid partition
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jmp putstr=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #=C2=A0 = table"
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0call putstr=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#=C2=A0 t= able"
> +err_pt.1:=C2=A0 =C2=A0 jmp err_pt.1=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Await reset
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0err_rd:=C2=A0 =C2=A0 =C2=A0movw $msg_rd,%si=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # "I/O error loading
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jmp putstr=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #=C2=A0 = boot loader"
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0call putstr=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#=C2=A0 b= oot loader"
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jmp err_pt.1
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0err_noboot:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0movw $msg_nob= oot,%si=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # "Missing boot
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jmp putstr=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 #=C2=A0 = loader"
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0call putstr=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#=C2=A0 l= oader"
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jmp err_pt.1
>=C2=A0 =C2=A0#
>=C2=A0 =C2=A0# Output an ASCIZ string to the console via the BIOS.
>=C2=A0 =C2=A0#
> @@ -223,9 +229,9 @@ putstr.0: movw $0x7,%bx=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# Page:attribute
>=C2=A0 =C2=A0putstr:=C2=A0 =C2=A0 =C2=A0lodsb=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# = Get character
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0testb %al,%al=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# End of = string?
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0jnz putstr.0=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # No
> -putstr.1:=C2=A0 =C2=A0 jmp putstr.1=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Await reset
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret
>=C2=A0 =C2=A0
> -msg_big:=C2=A0 =C2=A0 =C2=A0.asciz "Boot loader too large"<= br> > +msg_big:=C2=A0 =C2=A0 =C2=A0.asciz "Loaded only 545k"
>=C2=A0 =C2=A0msg_pt:=C2=A0 =C2=A0 =C2=A0.asciz "Invalid partition = table"
>=C2=A0 =C2=A0msg_rd:=C2=A0 =C2=A0 =C2=A0.asciz "I/O error loading = boot loader"
>=C2=A0 =C2=A0msg_noboot:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.asciz "= Missing boot loader"

I wonder if it would save a few bytes by having a common 'puterr' that does 'call putstr' and then the jmp to itself that the other e= rr
targets use rahter than adding the jmp to each one of those.

Yea, I started to do that, but that's 12 bytes of= possible savings at the cost of at least 8 bytes of new assembler, maybe m= ore, so when I got another too full message I punted.
=C2=A0
But also, can't you just leave a gap in the partitions to leave room for a future ESP?=C2=A0 It might not always be safe to load a full 545k
depending on if the firmware has reserved some of memory just below
640k.=C2=A0 545k is an upper bound on how much can be loaded in terms of 640k - the load address, but the practical limit might be lower.=C2=A0 It i= s
probably safer as a general rule to keep the boot partition closer to
the size of the=C2=A0 boot loader and leave a gap in place instead.

Today we load 512k always. This likely is a ba= d idea on some really bloated with BIOS data system (though they are rare).= I'll concede that this may up the number of systems that conflict.=C2= =A0 It looks like there's a BTX header of sorts just after the gpt load= er. In an ideal world, we'd load only the first sector of gptboot and i= t would load the rest, but that has a legacy problem. We could also enforce= a different limit that's much smaller (say 256k or 200k) and just load= up to that and force gptboot to cope if it's larger than that (smaller= ) size. pmbr then starts to be a little less generic, but freebsd-boot was = always intended to boot gptboot or gptzfsboot (before they were unified). W= e can put that limit minus 30-50k into the build system to trigger an error= so we at least have some warning before we hit it.

Warner
--0000000000005b0afd060b3975b2-- From nobody Tue Nov 28 17:11:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfprg0sqLz52FVk; Tue, 28 Nov 2023 17:11:15 +0000 (UTC) (envelope-from bapt@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 4Sfprf4h9hz3cCg; Tue, 28 Nov 2023 17:11:14 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191474; 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=4xnv3wz7DRi3BGbadl5L4omQBTTvXBHsLtg/3ypZ7AM=; b=Dn7lUdkIZBOiLfal1pX+toGujEExeR7DaIYGFBTPzQ6qWOlOCdnhsRO+u18qgkD+wcSVpo Ss9ZNLycLjLdJqESLiow/FKd78lZ+DSQB2jNSIMqpJDvnMEp1F/gWY0swkiWNacNoQ1yZp 8DzTeErIkuAdzJj1iz6OyE+hT8jsAKF8CBw8G61BFL4iQdPnkhHvBJjeslkcm7Ih28J3ra o5HzMfiO05y+M4F3f+JKhpn05gezlB/zb1Il1FKJzxY3XO6tKy+6hCsOozziRfE2dFz4zL 1c0in3Ty8FijqU0lxHXwkDZAkb13CKw9gxdVeONjSSEw8N2beijIX54n4IFb6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191474; 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=4xnv3wz7DRi3BGbadl5L4omQBTTvXBHsLtg/3ypZ7AM=; b=JgYcbnYgFqqTS3CsqWSkp0ut5EmdCWrLgClN9QJ3DhbEQ+U5HmBV0fhE73wCvDt72fmvB8 usjB5PwOGCRwzLndCCGrBKSXTAh7dIQNDUfgOSfOCn8BzvQC82XOtzwc1muY6p10ijNyWY Fi1ChQ8KfMvTBGv3DNg4Jtfl3gksjiYBjrIfK2OaL3Wg55cCsnBhPInAM5xGP+CXEycx3+ uiv4EURkJDqxFNEVduO+1Oipp+27hzXRHmQTDABNT3OwfyJ2A73MGtTwWn6TYvACiizkqp faIv1tGIq1f2VtR4fw5p0N7ATFCykzuV0kwxdwvUGmPxHKstDDv30AvOLB0DvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701191474; a=rsa-sha256; cv=none; b=vCzvxiuyRyAsAEdfLb5WDc0o+vOcuh2feMXlthbIhncSaQ3wEdyBECVGRkvTE1YgxRvQsG J6i9nqUZUna44BbACHWl7uKEpTito4x/L9UgQbxOOIBjRhvqf4wHTRSvH+K3LMk1clZZIa 8pGJ6ImaD+EvO6NfV1pwnbP3HCFiET2xqgKF/idEH2PAoQPU6sqIXcNgC7rXYfU9ce0Xy6 P43EZnl96Xl44cXMMHp0on8YWvFFqFEyNBGs9onq5Q3P/z3z5KIQqQg1/X7hNDE2xjYKvX BOB6AeXTKrrZl86Oqm+iWK/lU6QPAK4ikzOoYH3y03H2w6uDju/p9nkRp/g+iQ== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sfprf34gcz1QG1; Tue, 28 Nov 2023 17:11:14 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id C6F2E1BDFB; Tue, 28 Nov 2023 18:11:11 +0100 (CET) Date: Tue, 28 Nov 2023 18:11:11 +0100 From: Baptiste Daroussin To: Mitchell Horne Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ad34121518bb - main - Revert "pst: improve shutdown_post_sync handler" Message-ID: References: <202311231948.3ANJmwEC076780@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: i386 kernel is still broken :( /home/bapt/worktrees/main/sys/dev/pst/pst-raid.c:185:9: error: incomplete definition of type 'struct thread' Best regards, Bapt On Sat, Nov 25, 2023 at 08:51:36AM +0100, Baptiste Daroussin wrote: > Kernel building for i386 is broken now and pkgbase builders do complain, can > anyone have a look? > > Best regards, > Bapt > > On Thu, Nov 23, 2023 at 10:09:35PM +0100, Mateusz Guzik wrote: > > i386 kernel is going down, i suggest just dropping the patch > > > > On 11/23/23, Mitchell Horne wrote: > > > The branch main has been updated by mhorne: > > > > > > URL: > > > https://cgit.FreeBSD.org/src/commit/?id=ad34121518bb7e1a38d4a6b1ccf9ca6fe298dd0a > > > > > > commit ad34121518bb7e1a38d4a6b1ccf9ca6fe298dd0a > > > Author: Mitchell Horne > > > AuthorDate: 2023-11-23 19:46:28 +0000 > > > Commit: Mitchell Horne > > > CommitDate: 2023-11-23 19:48:44 +0000 > > > > > > Revert "pst: improve shutdown_post_sync handler" > > > > > > I did not realize this driver was i386-only, and the change fails to > > > compile. Revert so that I can fix it properly. > > > > > > This reverts commit 428ebb7cd9f51afb6809bf81cf21a05e0fd93ff4. > > > > > > Pointy hat to: mhorne > > > --- > > > sys/dev/pst/pst-iop.c | 2 +- > > > sys/dev/pst/pst-raid.c | 14 +++++--------- > > > 2 files changed, 6 insertions(+), 10 deletions(-) > > > > > > diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c > > > index 43ced2401d2c..f9921a564333 100644 > > > --- a/sys/dev/pst/pst-iop.c > > > +++ b/sys/dev/pst/pst-iop.c > > > @@ -432,7 +432,7 @@ iop_queue_wait_msg(struct iop_softc *sc, int mfa, struct > > > i2o_basic_message *msg) > > > int status, timeout = 10000; > > > > > > mtx_lock(&sc->mtx); > > > - if ((sc->reg->oqueue_intr_mask & I20_OUT_INTR_QUEUE) == 0) { > > > + if (!(sc->reg->oqueue_intr_mask & 0x08)) { > > > msg->transaction_context = (u_int32_t)&request; > > > msg->initiator_context = (u_int32_t)iop_done; > > > sc->reg->iqueue = mfa; > > > diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c > > > index 4f9279462ee8..4e9c4fb724bc 100644 > > > --- a/sys/dev/pst/pst-raid.c > > > +++ b/sys/dev/pst/pst-raid.c > > > @@ -73,7 +73,7 @@ struct pst_request { > > > static disk_strategy_t pststrategy; > > > static int pst_probe(device_t); > > > static int pst_attach(device_t); > > > -static void pst_shutdown_post_sync(device_t, int); > > > +static int pst_shutdown(device_t); > > > static void pst_start(struct pst_softc *); > > > static void pst_done(struct iop_softc *, u_int32_t, struct i2o_single_reply > > > *); > > > static int pst_rw(struct pst_request *); > > > @@ -170,23 +170,18 @@ pst_attach(device_t dev) > > > name, psc->info->capacity/(512*255*63), 255, 63, > > > device_get_nameunit(psc->iop->dev)); > > > > > > - EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown_post_sync, > > > + EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown, > > > dev, SHUTDOWN_PRI_FIRST); > > > return 0; > > > } > > > > > > -static void > > > -pst_shutdown_post_sync(device_t dev, int howto __unused) > > > +static int > > > +pst_shutdown(device_t dev) > > > { > > > struct pst_softc *psc = device_get_softc(dev); > > > struct i2o_bsa_cache_flush_message *msg; > > > int mfa; > > > > > > - if (SCHEDULER_STOPPED()) { > > > - /* Request polled shutdown. */ > > > - psc->reg->oqueue_intr_mask = 0xffffffff; > > > - } > > > - > > > mfa = iop_get_mfa(psc->iop); > > > msg = (struct i2o_bsa_cache_flush_message *)(psc->iop->ibase + mfa); > > > bzero(msg, sizeof(struct i2o_bsa_cache_flush_message)); > > > @@ -199,6 +194,7 @@ pst_shutdown_post_sync(device_t dev, int howto > > > __unused) > > > msg->control_flags = 0x0; /* 0x80 = post progress reports */ > > > if (iop_queue_wait_msg(psc->iop, mfa, (struct i2o_basic_message > > > *)msg)) > > > printf("pst: shutdown failed!\n"); > > > + return 0; > > > } > > > > > > static void > > > > > > > > > > > > -- > > Mateusz Guzik > > > From nobody Tue Nov 28 17:16:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfpyJ5wFxz52FtW; Tue, 28 Nov 2023 17:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfpyJ57hjz3csd; Tue, 28 Nov 2023 17:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Go5/drCY459uzafBMgbQCpjs3bhV1472OS67ijxj57A=; b=Htq/Ry7cQK+dnmmITzJfzCl2ZSuTWMuHLzuXHKEyxwtqnH19RBqjDD6S473ZaQwSAN0Qvs BFAm2gb1hiIRH/5MsPEt2VkerNdhzexC85sECVUl3nC5A3GOHJR5NcSamFIxpO2yCuGGCL PPaDhgfcd1voeHCCscCShevWcPebQiUfP66BjVAB/gHdAQTHv7Kh5KS7ndLHua9MRwRDbt No7McZh3wa0vpRnRNCBIAm6ZGAicRq7NjEHSTNqyVxQaUR3zxCTxr9LCLSyWUCQqHt7SEG MTq5hKmWMp/jPnEssPvTvik11HmNORAzADBmie0KOO6inEPq0QEBfXtOuNBCqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Go5/drCY459uzafBMgbQCpjs3bhV1472OS67ijxj57A=; b=VJow6Mkh1oX4MpZfIYTemN+JMLeZd/aEZTYou9l+hWnkkJP2bkIrwyULVQjxrobwzU/L25 Ng7aL8oFFnLg6PzLJEBFelrEq9lVMeZa6GTngEfhMqKEMOyirGdeQ1nsF1DWT0GvJXsIUx 3iQVmiPZDy5NFkYtbzqPiuceB7dQF7b/JZQCCu+nrFke1i1HKldVCWCvgpIhESVr3TksJL vLgIRv5yGVOj7uBbqtWr5jQhZCYQF8d6KKtfeox1aQxJmyWSBDuU2mUEjQsiwNkBWoKztV mH12FEnC9lIiNlSpNzC1+hTu4yjcpvcgtN5f2rWKHrvRV55Pv1AXZZ1wfPW5BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701191768; a=rsa-sha256; cv=none; b=SwmWYfUWcC8fkhXP8yp+VkLL1ukOdPKLO4q+ALo4n0M4dNrp65BM4jNjJ1g58xKgzcxulG A+S2eZAHoNum20RlqlNd7nX6mNGHn53o3ehzjYkz2h5k80P0DbZHvq08r72LstezqvS/SA evS3AQJNUXMHFnCOSEh/JaFjcVfEN5S90ZVsnHZNByPUsMyPFSijfwWX92xdiOJwni5UD8 qzS0U/XKmLQ1KvAdPv9TlcHpZWf4/xbLLMBJpEZDm7NPrhhDsVhRRAtdpj1G/NX873SeLg Ta81NikVFP+zBxQRlfyndYj1cDU6fAQ+WOgCoWAq9XarQYnstYoMU7Qv6vva9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfpyJ46klzWG4; Tue, 28 Nov 2023 17:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASHG8Fb095279; Tue, 28 Nov 2023 17:16:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHG8eR095276; Tue, 28 Nov 2023 17:16:08 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:16:08 GMT Message-Id: <202311281716.3ASHG8eR095276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: df65c89375e2 - main - getpagesizes(3): drop support for kernels before 9.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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df65c89375e242bf53e6c5b7614ab898104f71b7 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=df65c89375e242bf53e6c5b7614ab898104f71b7 commit df65c89375e242bf53e6c5b7614ab898104f71b7 Author: Brooks Davis AuthorDate: 2023-11-27 17:06:01 +0000 Commit: Brooks Davis CommitDate: 2023-11-28 17:09:26 +0000 getpagesizes(3): drop support for kernels before 9.0 AT_PAGESIZES and elf_aux_info where added prior to FreeBSD 9.0 in commit ee235befcb8253fab9beea27b916f1bc46b33147. It's safe to say that a FreeBSD 15 libc won't work on a 8.x kernel so drop sysctl fallback. Reviewed by: kevans, imp, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42707 --- lib/libc/gen/getpagesizes.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/lib/libc/gen/getpagesizes.c b/lib/libc/gen/getpagesizes.c index c9f7f2f29e16..7f481f84177a 100644 --- a/lib/libc/gen/getpagesizes.c +++ b/lib/libc/gen/getpagesizes.c @@ -27,11 +27,8 @@ */ #include -#include -#include - -#include -#include +#include +#include #include "libc_private.h" @@ -52,24 +49,18 @@ getpagesizes(size_t pagesize[], int nelem) { static u_long ps[MAXPAGESIZES]; static int nops; - size_t size; - int error, i; + int i; if (nelem < 0 || (nelem > 0 && pagesize == NULL)) { errno = EINVAL; return (-1); } - /* Cache the result of the sysctl(2). */ + /* Cache the result */ if (nops == 0) { - error = _elf_aux_info(AT_PAGESIZES, ps, sizeof(ps)); - size = sizeof(ps); - if (error != 0 || ps[0] == 0) { - if (sysctlbyname("hw.pagesizes", ps, &size, NULL, 0) - == -1) - return (-1); - } + if (_elf_aux_info(AT_PAGESIZES, ps, sizeof(ps)) != 0) + ps[0] = PAGE_SIZE; /* Count the number of page sizes that are supported. */ - nops = size / sizeof(ps[0]); + nops = nitems(ps); while (nops > 0 && ps[nops - 1] == 0) nops--; } From nobody Tue Nov 28 17:16:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfpyL1cwvz52FRl; Tue, 28 Nov 2023 17:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfpyK5sQJz3d6Z; Tue, 28 Nov 2023 17:16:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=04anU3oFTum3fx2nSt9cXpTC311QUKbB50BD6buXZhc=; b=xYv6MWBA23QFXhm1K4yge9J/99fbVpLp3i2OQZABp5rb2C5rI9LTzNsieHAC8hai5s2k5b KSeFpglXi1+EsOF/2QPdE1pch5uMYtqv2cdzqgLGTq7NQGDPyqkmHzuXz2SI3fKzbwv6X6 UWBzAMyFn1s6DxeOSJXoGJpvs7baInW3YAdhaxY9nGes1awBWPNXJFtue4+GvcfNeibyrr O/FQRrDb6FaI7tjWz7kmqYI2tdoypKqsPGzRxXsm/F3+ioZwUOF5Awc8ZqdarEYXGXPqXv o63SDMn3nJGK8Q4DzGhGQhNyOPfLKLDgruPt/U9WjHQFJLQoQP1bXGJUIAvi9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=04anU3oFTum3fx2nSt9cXpTC311QUKbB50BD6buXZhc=; b=m56PcOfrYXo36FqxhkweNU6rwZq1NL5OtgLqn9/su0Iz8ZuBG0Vdw+yDNZuZ76/OlsoEKL zqbAu1QsB0Osg7t2eoAIi89vV8ae7lJPc7oC7kcp/5n7DCuzHtLtuDOYfXdH5tJwdN7GuW mCwFW0un5NxfYWQ/oisIvcK5NTZb/iLljISaOb+7sgwKafaZ6OvnRAmfPj7hsugkgzBXxn DHcvWxmgClS950OjMOUZIS3S1MmboFlaRApgtg9y9F8U8bnOxi2/xooGQFNG0hra88kpJD 6CcO9EFV7f09H93ju/v0Db44rZxcnzi8CVFDP4KlCR2oEewQnvmF06kM7kT5Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701191769; a=rsa-sha256; cv=none; b=qvtRQggvrumbZY6bSprCFjWY58NO5zwxKtORWTyGmMDH1K+v3vcGwivvh/3SLmn5gwsGEc qZzbDDV1BzbeeRcUtyPFxQybEwrad65jZfmqCS209ptf5ziMh+KKdOAe5AZA9WkyBx1BsX uB39uAaexhymr9Q+eCL7GuyhQk21Pqj0jo9wCFQxqwQ6/KATsepWjgDn0WLmJi1Y8owzyE 9mibsPPzX2hyrTlpLZpwzkRcMUX6/JB6mGCbPOje1Hs2ugPF0ll8HOnHNkWHeVkCX00GNT QwvSywyxTbwir7GtrMkKe2hDLqaG8ToilcnDo/ljRhevIExaT9BTK+dFUKIR7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfpyK4p2RzWKq; Tue, 28 Nov 2023 17:16: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 3ASHG9Wj095324; Tue, 28 Nov 2023 17:16:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHG9Dv095321; Tue, 28 Nov 2023 17:16:09 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:16:09 GMT Message-Id: <202311281716.3ASHG9Dv095321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ea180bb3797e - main - getpagesize(3): drop support for non-ELF kernels List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea180bb3797ed4e976adccfba7d09c154d3244d1 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ea180bb3797ed4e976adccfba7d09c154d3244d1 commit ea180bb3797ed4e976adccfba7d09c154d3244d1 Author: Brooks Davis AuthorDate: 2023-11-27 17:06:25 +0000 Commit: Brooks Davis CommitDate: 2023-11-28 17:09:26 +0000 getpagesize(3): drop support for non-ELF kernels AT_PAGESZ was introduced with ELF support in 1996 (commit e1743d02cd14069f69a50bb8a6c626c1c6f47ddd) so we can safely count on being able to use it to get our page size via elf_aux_info(). As such we don't need a fallback sysctl query. Save a few bytes of bss by dropping caching as elf_aux_info() runs in constant time for a given query. Reviewed by: kevans, imp, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42708 --- lib/libc/gen/getpagesize.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c index 5fe9a965385f..23d2c6ea5eda 100644 --- a/lib/libc/gen/getpagesize.c +++ b/lib/libc/gen/getpagesize.c @@ -30,18 +30,11 @@ */ #include -#include - -#include -#include -#include +#include #include "libc_private.h" /* - * This is unlikely to change over the running time of any - * program, so we cache the result to save some syscalls. - * * NB: This function may be called from malloc(3) at initialization * NB: so must not result in a malloc(3) related call! */ @@ -49,23 +42,10 @@ int getpagesize(void) { - int mib[2]; - static int value; - size_t size; - int error; - - if (value != 0) - return (value); - - error = _elf_aux_info(AT_PAGESZ, &value, sizeof(value)); - if (error == 0 && value != 0) - return (value); + int value; - mib[0] = CTL_HW; - mib[1] = HW_PAGESIZE; - size = sizeof value; - if (sysctl(mib, nitems(mib), &value, &size, NULL, 0) == -1) - return (PAGE_SIZE); + if (_elf_aux_info(AT_PAGESZ, &value, sizeof(value)) != 0) + value = PAGE_SIZE; return (value); } From nobody Tue Nov 28 17:16:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfpyM1Q14z52FrH; Tue, 28 Nov 2023 17:16: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 4SfpyL6wmKz3d6f; Tue, 28 Nov 2023 17:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R7uOoKBZ3Y8PeGQNesysY3yqzVUrqa2GPpxrEOSfSII=; b=SpXcmLLvDXD1uVuSE580/u9kgNGxtwlThDHdsklhICCaqyxzQZaqLIsS/3m0pi3TkSuQ/t +CVmzz3tHC12ePbYyI4GF/S/6tbRXP1PHtlCVlSJbGRSSrpcSVYKtZB9WYYNrPWLTUuyKX VrR/4HnXwNPG96sAJ5vpYYsWugVSSBcfj33hqBUjyWoS6c/FfHTtiH2raqspEp4FVXPZ8V gIW/GEfxYHxpcsvGRQdEoUGBiHVGYPtE/7dzgvyAF6H+oh8sWa54xZoRkhGTa3/xUCt1fT BSg6lRJNcgo/hH43pWB3yOsjeBkeypfbj5/lNe1EVZLqMm18t2+X+816SSGrBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R7uOoKBZ3Y8PeGQNesysY3yqzVUrqa2GPpxrEOSfSII=; b=FD6EV4kFdZHia2kKsxr1BENkt1W0fD8JhZHIRhBUPg58MxUlJKmJCzVnBw97rZTp+aPJ/I 4NCZvhU1jZd3z3/wwYzXzlXIB+qUgvVwf/QOgbKNvXxq0K1QCIW2W1E6S0OF2ihR+YPGDy eNj60bLBWt2YeQ2v0fhz8g3UdYnn8RhGcLjbgEU+1LBOSPuCCv/aQBk21qwim7+horT6rO RsnsE3ITUdHotO0owQ3DeA12j1x47saPExUUTNmf9lOIGORlzQQdnXdoPllX3JCtQdKtqK vvbzBAxparLdQ/cHG63JUpjfHx/lPylHAMrs8bgbpRPwx5kncZ4WbsiDaXtq4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701191771; a=rsa-sha256; cv=none; b=e9/OeUL0tLtUVpTMz79Kt4DzsBRESkrgquJBEu+fGoupUQ/PRl3dQUqrhEHfMtF6+1JdHe smRO0z8IN08djtY4GxHSdhhueT/An8p4SdSYKFNvhphMebWBDv8c5Elazezc5lmLMoxyhZ JWfhtrUCHkTAeBrZo+q89J/QfnE+s3V6GyyZBS6r8A+keLUYCxRile3OGwJUgTxMt3cNnW GAspWyd4OuFDGA4g2B9T5a2+MqsO4n3r+38lsIqbrLrb15To/Uji6o61V3zb8C9QxrL0vH pLSkRIsw15jl4goZOMP1AV20IicMoO1cYomNtEEtmE6/abqStpacXyzWVoz0PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfpyL5nlPzWfB; Tue, 28 Nov 2023 17:16: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 3ASHGAZH095368; Tue, 28 Nov 2023 17:16:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHGA7N095365; Tue, 28 Nov 2023 17:16:10 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:16:10 GMT Message-Id: <202311281716.3ASHGA7N095365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: c3207e2d2554 - main - memfd_create: move implementation to libc/gen List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3207e2d2554c8e36f9cf5950f8cd52a19fedfd5 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c3207e2d2554c8e36f9cf5950f8cd52a19fedfd5 commit c3207e2d2554c8e36f9cf5950f8cd52a19fedfd5 Author: Brooks Davis AuthorDate: 2023-11-27 17:06:33 +0000 Commit: Brooks Davis CommitDate: 2023-11-28 17:09:27 +0000 memfd_create: move implementation to libc/gen Due to memfd_create(3)'s construction of a path to pass to shm_open2(2), it has a much larger than typical dependency footprint for a system call wrapper (the list currently includes calloc, memset, sprintf, and strlen). As such, split it off into its own file under libc/gen to lighten libc/sys's dependency list. Reviewed by: kevans, imp, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42709 --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 1 + lib/libc/gen/memfd_create.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ lib/libc/sys/Symbol.map | 1 - lib/libc/sys/shm_open.c | 93 ------------------------------- 5 files changed, 133 insertions(+), 94 deletions(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 5cb471fe4672..f657bd949cb7 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -101,6 +101,7 @@ SRCS+= __getosreldate.c \ lockf.c \ lrand48.c \ memalign.c \ + memfd_create.c \ mrand48.c \ nftw.c \ nftw-compat11.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 559c0252c338..b68d63b279f3 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -433,6 +433,7 @@ FBSD_1.6 { eventfd_write; getlogin_r; memalign; + memfd_create; pthread_getname_np; scandir_b; sigandset; diff --git a/lib/libc/gen/memfd_create.c b/lib/libc/gen/memfd_create.c new file mode 100644 index 000000000000..b26d638656a4 --- /dev/null +++ b/lib/libc/gen/memfd_create.c @@ -0,0 +1,131 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2019 Kyle Evans + * + * 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(s), this list of conditions and the following disclaimer as + * the first lines of this file unmodified other than the possible + * addition of one or more copyright notices. + * 2. Redistributions in binary form must reproduce the above copyright + * notice(s), 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 COPYRIGHT HOLDER(S) ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "libc_private.h" + +#define MEMFD_NAME_PREFIX "memfd:" + +/* + * The path argument is passed to the kernel, but the kernel doesn't currently + * do anything with it. Linux exposes it in linprocfs for debugging purposes + * only, but our kernel currently will not do the same. + */ +int +memfd_create(const char *name, unsigned int flags) +{ + char memfd_name[NAME_MAX + 1]; + size_t namelen, *pgs, pgsize; + struct shm_largepage_conf slc; + int error, fd, npgs, oflags, pgidx, saved_errno, shmflags; + + if (name == NULL) { + errno = EBADF; + return (-1); + } + namelen = strlen(name); + if (namelen + sizeof(MEMFD_NAME_PREFIX) - 1 > NAME_MAX) { + errno = EINVAL; + return (-1); + } + if ((flags & ~(MFD_CLOEXEC | MFD_ALLOW_SEALING | MFD_HUGETLB | + MFD_HUGE_MASK)) != 0) { + errno = EINVAL; + return (-1); + } + /* Size specified but no HUGETLB. */ + if ((flags & MFD_HUGE_MASK) != 0 && (flags & MFD_HUGETLB) == 0) { + errno = EINVAL; + return (-1); + } + + /* We've already validated that we're sufficiently sized. */ + snprintf(memfd_name, NAME_MAX + 1, "%s%s", MEMFD_NAME_PREFIX, name); + oflags = O_RDWR; + shmflags = 0; + if ((flags & MFD_CLOEXEC) != 0) + oflags |= O_CLOEXEC; + if ((flags & MFD_ALLOW_SEALING) != 0) + shmflags |= SHM_ALLOW_SEALING; + if ((flags & MFD_HUGETLB) != 0) + shmflags |= SHM_LARGEPAGE; + else + shmflags |= SHM_GROW_ON_WRITE; + fd = __sys_shm_open2(SHM_ANON, oflags, 0, shmflags, memfd_name); + if (fd == -1 || (flags & MFD_HUGETLB) == 0) + return (fd); + + pgs = NULL; + npgs = getpagesizes(NULL, 0); + if (npgs == -1) + goto clean; + pgs = calloc(npgs, sizeof(size_t)); + if (pgs == NULL) + goto clean; + error = getpagesizes(pgs, npgs); + if (error == -1) + goto clean; + pgsize = (size_t)1 << ((flags & MFD_HUGE_MASK) >> MFD_HUGE_SHIFT); + for (pgidx = 0; pgidx < npgs; pgidx++) { + if (pgsize == pgs[pgidx]) + break; + } + if (pgidx == npgs) { + errno = EOPNOTSUPP; + goto clean; + } + free(pgs); + pgs = NULL; + + memset(&slc, 0, sizeof(slc)); + slc.psind = pgidx; + slc.alloc_policy = SHM_LARGEPAGE_ALLOC_DEFAULT; + error = ioctl(fd, FIOSSHMLPGCNF, &slc); + if (error == -1) + goto clean; + return (fd); + +clean: + saved_errno = errno; + close(fd); + free(pgs); + errno = saved_errno; + return (-1); +} diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index b59ec1858ffd..f17aae279b8d 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -409,7 +409,6 @@ FBSD_1.6 { fhreadlink; getfhat; funlinkat; - memfd_create; shm_create_largepage; shm_rename; }; diff --git a/lib/libc/sys/shm_open.c b/lib/libc/sys/shm_open.c index b2c1532133bf..eb3022c857b1 100644 --- a/lib/libc/sys/shm_open.c +++ b/lib/libc/sys/shm_open.c @@ -34,9 +34,6 @@ #include #include -#include -#include -#include #include #include @@ -45,12 +42,9 @@ __weak_reference(shm_open, _shm_open); __weak_reference(shm_open, __sys_shm_open); -#define MEMFD_NAME_PREFIX "memfd:" - int shm_open(const char *path, int flags, mode_t mode) { - return (__sys_shm_open2(path, flags | O_CLOEXEC, mode, 0, NULL)); } @@ -77,90 +71,3 @@ shm_create_largepage(const char *path, int flags, int psind, int alloc_policy, } return (fd); } - -/* - * The path argument is passed to the kernel, but the kernel doesn't currently - * do anything with it. Linux exposes it in linprocfs for debugging purposes - * only, but our kernel currently will not do the same. - */ -int -memfd_create(const char *name, unsigned int flags) -{ - char memfd_name[NAME_MAX + 1]; - size_t namelen, *pgs, pgsize; - struct shm_largepage_conf slc; - int error, fd, npgs, oflags, pgidx, saved_errno, shmflags; - - if (name == NULL) { - errno = EBADF; - return (-1); - } - namelen = strlen(name); - if (namelen + sizeof(MEMFD_NAME_PREFIX) - 1 > NAME_MAX) { - errno = EINVAL; - return (-1); - } - if ((flags & ~(MFD_CLOEXEC | MFD_ALLOW_SEALING | MFD_HUGETLB | - MFD_HUGE_MASK)) != 0) { - errno = EINVAL; - return (-1); - } - /* Size specified but no HUGETLB. */ - if ((flags & MFD_HUGE_MASK) != 0 && (flags & MFD_HUGETLB) == 0) { - errno = EINVAL; - return (-1); - } - - /* We've already validated that we're sufficiently sized. */ - snprintf(memfd_name, NAME_MAX + 1, "%s%s", MEMFD_NAME_PREFIX, name); - oflags = O_RDWR; - shmflags = 0; - if ((flags & MFD_CLOEXEC) != 0) - oflags |= O_CLOEXEC; - if ((flags & MFD_ALLOW_SEALING) != 0) - shmflags |= SHM_ALLOW_SEALING; - if ((flags & MFD_HUGETLB) != 0) - shmflags |= SHM_LARGEPAGE; - else - shmflags |= SHM_GROW_ON_WRITE; - fd = __sys_shm_open2(SHM_ANON, oflags, 0, shmflags, memfd_name); - if (fd == -1 || (flags & MFD_HUGETLB) == 0) - return (fd); - - pgs = NULL; - npgs = getpagesizes(NULL, 0); - if (npgs == -1) - goto clean; - pgs = calloc(npgs, sizeof(size_t)); - if (pgs == NULL) - goto clean; - error = getpagesizes(pgs, npgs); - if (error == -1) - goto clean; - pgsize = (size_t)1 << ((flags & MFD_HUGE_MASK) >> MFD_HUGE_SHIFT); - for (pgidx = 0; pgidx < npgs; pgidx++) { - if (pgsize == pgs[pgidx]) - break; - } - if (pgidx == npgs) { - errno = EOPNOTSUPP; - goto clean; - } - free(pgs); - pgs = NULL; - - memset(&slc, 0, sizeof(slc)); - slc.psind = pgidx; - slc.alloc_policy = SHM_LARGEPAGE_ALLOC_DEFAULT; - error = ioctl(fd, FIOSSHMLPGCNF, &slc); - if (error == -1) - goto clean; - return (fd); - -clean: - saved_errno = errno; - close(fd); - free(pgs); - errno = saved_errno; - return (-1); -} From nobody Tue Nov 28 17:16:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfpyN1ZByz52FmP; Tue, 28 Nov 2023 17:16: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 4SfpyN0fCKz3dFb; Tue, 28 Nov 2023 17:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gpg82+uh40JbqOrVNvt56XDOJzX+iQemcGWVQjUU8zA=; b=EmW+6LBkFg5Fm7wFiWGdGMCMW6nnydlEdaGC7jhmdTTn/3Wk0ImQjHZYS+o/4Ulw3EKqvZ 1q9YpuNpxR/hUFAV0lHwTegpT98JO/D17wrH23BCiC+gOQd/ot9GAFJPALPjRdpeVhKT1g 1BRY/l5LPJe0rc4URgwIzu6eGlxs+LKKgDjUZraWTX6HpkHxHNYb4+FqUDrZNTy6+V/QW3 W6Nf7gJ3TC0YVkAnS+lsFx07O32jbd8nax2BlDcH90OzXLwy98yqh1IQD7Zxr2W1NYiwy/ GBlJRLMvZQ3PueRKLFYHanluiYm7ayxThZk3Hw2Lcw8Pdt/29Kqf4kCP+Lm4qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gpg82+uh40JbqOrVNvt56XDOJzX+iQemcGWVQjUU8zA=; b=D+Dm2ycmXC3av3tC30fvOCD2nTpElf1/0gVKTUrzPv+WaJ1yZVUzWVS9getSBdxY7CcX9F IHINOsTOV9vYWJKUMjtcTjqUxN1/HJTVvzVYD1QU1NhiVvSZ+uep1Ak1V2WEmTTQpNZzgD 1TOZTCE49NmaBvnmS+5QY5YUVqVTV6AdvqGzIST0EcRQVhhfkUdZMcsO0Tiq+3MTFmntUN i4/BVEK4pS0eVdcaL6u82Yj3GK1Iph62DFsyyITCF51y7IQ8dpYdMA2Q0LjfDYoJN53yoz QBOcXvtPq11WVqp9zX9Zrja4BLH9/JdRy7NN++fN0LN34kxAY5LN+FPkNUI0hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701191772; a=rsa-sha256; cv=none; b=TZLjebrP0pdVcSR1djW1/AS5AbJ5RETPz2GzkxrKnNoIyu5UcejuwFLkkbNT/Jap1chISx WL/a+BqcWFOwdPSxlcccFlGjAk7KAvOGLszTvrGjAM449pfJ3ZyY5BYzHeBKkzQMDAPliy 9v2w2fLp2eOrJL7DRwMEMzsTqIiz5COR00EYUWXD/S66JtHFH8Lq1K0pgpTb1sLlIokq9t Q/QYf4ljXEIEPPhpTDrh/YPthrXfW8jghYlq+eBXL/t+ujKHkJ5WX0OtJ+SuSIuLxJVDbH wehGMKIQapTwzTqgMG/XVxvREMBhleNgX/U5fGfIEis/gDeGRtRXbMhcED3xNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfpyM6nzSzWfC; Tue, 28 Nov 2023 17:16: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 3ASHGBmn095410; Tue, 28 Nov 2023 17:16:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHGBQ6095407; Tue, 28 Nov 2023 17:16:11 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:16:11 GMT Message-Id: <202311281716.3ASHGBQ6095407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: c96772227b7d - main - memfd_create: don't allocate heap memory List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c96772227b7dfcaf4eec4d07acb5c916643aca3a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c96772227b7dfcaf4eec4d07acb5c916643aca3a commit c96772227b7dfcaf4eec4d07acb5c916643aca3a Author: Brooks Davis AuthorDate: 2023-11-27 17:07:06 +0000 Commit: Brooks Davis CommitDate: 2023-11-28 17:09:27 +0000 memfd_create: don't allocate heap memory Rather than calling calloc() to allocate space for a page size array to pass to getpagesizes(), just follow the getpagesizes() implementation and allocate MAXPAGESIZES elements on the stack. This avoids the need for the allocation. While this does mean that a new libc is required to take advantage of a new huge page size, that was already true due to getpagesizes() using a static buffer of MAXPAGESIZES elements. Reviewed by: kevans, imp, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42710 --- lib/libc/gen/memfd_create.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/libc/gen/memfd_create.c b/lib/libc/gen/memfd_create.c index b26d638656a4..78131f46d7b1 100644 --- a/lib/libc/gen/memfd_create.c +++ b/lib/libc/gen/memfd_create.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -52,7 +51,8 @@ int memfd_create(const char *name, unsigned int flags) { char memfd_name[NAME_MAX + 1]; - size_t namelen, *pgs, pgsize; + size_t pgs[MAXPAGESIZES]; + size_t namelen, pgsize; struct shm_largepage_conf slc; int error, fd, npgs, oflags, pgidx, saved_errno, shmflags; @@ -92,16 +92,9 @@ memfd_create(const char *name, unsigned int flags) if (fd == -1 || (flags & MFD_HUGETLB) == 0) return (fd); - pgs = NULL; - npgs = getpagesizes(NULL, 0); + npgs = getpagesizes(pgs, nitems(pgs)); if (npgs == -1) goto clean; - pgs = calloc(npgs, sizeof(size_t)); - if (pgs == NULL) - goto clean; - error = getpagesizes(pgs, npgs); - if (error == -1) - goto clean; pgsize = (size_t)1 << ((flags & MFD_HUGE_MASK) >> MFD_HUGE_SHIFT); for (pgidx = 0; pgidx < npgs; pgidx++) { if (pgsize == pgs[pgidx]) @@ -111,8 +104,6 @@ memfd_create(const char *name, unsigned int flags) errno = EOPNOTSUPP; goto clean; } - free(pgs); - pgs = NULL; memset(&slc, 0, sizeof(slc)); slc.psind = pgidx; @@ -125,7 +116,6 @@ memfd_create(const char *name, unsigned int flags) clean: saved_errno = errno; close(fd); - free(pgs); errno = saved_errno; return (-1); } From nobody Tue Nov 28 17:17:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfpzy56bmz52G3D; Tue, 28 Nov 2023 17:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfpzy4Kgwz3fNf; Tue, 28 Nov 2023 17:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cqa9Yyiysvehb7JMVfNPtDxhSFNYQ+TUa6/ZMs7PLlk=; b=ELrx9ZJRtbYq9TvEugeOYQFyKjfHN3PACjHIPZArH9bNHE8+VRVjVUoJXuge1LW6z3Nikz iNNkjwjO9eoFlf1SLFR3wtMMALCRSuVpnL0KV/SAC9de0VnXSc0ZTd8a9V/UZ4rshUfb+j +93mnKoypmXH5gIWidVEOzqmt+CFYNdcyKQm3iro/WiqCH5gXuI72RSeNmFa3AOZ0cy7aa DPicRmEVGhWEUGt/gEfBfdo0DtIxp4E/00UWaAfsvOlRTq/+/Rzoi0Wl+w5efzkAiFOK6q Kb22YyXttJfKPO+hL1pbQ7ubVODV3fa6YCrLbtyG1qdPiy3HJHYG6Jhdz7Qjwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701191854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cqa9Yyiysvehb7JMVfNPtDxhSFNYQ+TUa6/ZMs7PLlk=; b=XwZkP9Y70mSc1utEgsuSh54cU537l+e4yZ2hP+LCOmQScx4GihxqHQ6L9lY1dawxHm0KYy vAS4F+U8Cyx3XdeiOnKxNWiY7KBUGngxVYlA2Pw6tYehKn5CBj5+A8vPrDT84gEceIRIV5 us9D+IRw4d0AiBu+k04QoMwBsDuQliO5kL7AJAKONvHB4j1t9dukKdeM1O83wXDSsshW2a IGWimdBFMX7ZYsbzknTTsWy2ZYGb3GlywY2E8pT68+hKJxR6zWRibSmgceKFCokgJZJw2J re2mIyrdeHuidyhAw4Y6yKb0rqcq6c4JMCjz9MlWofwNqjS6Fxk9FLqIvFw4Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701191854; a=rsa-sha256; cv=none; b=DCN3PBTLqnx9yEhH3jEdxtpbF+ugTRN1nNVJTk15cIvaJZiTxoamDDs5W6nqnsUp+zCFcm dvE+SUtImzOYux4GzywEhjGOAZfvdErM1JOZKKpKlVpao21UY3qN9f0i8eU4df+0f8xaEE 9NOgHhv2ojYIW3AiHj37ymYzHqkr5KoalkGoE/3M3JwvXsOJW+Pq5r+R0lCjl5SiBdV0yM BQhBAOCknV+Pb83psidJVAgN+q2UMqbArQbPuUUEKO0xkzm2gwlnwEbrqpEusv7h/lSHdP xu0ZYeqZMxhuHb/3dA2mu4H3ZMzrfXP4OTyLdPE4NJ8W9D8K5h/O7FeXGK+JNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfpzy3Q20zVsv; Tue, 28 Nov 2023 17:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASHHY8K095803; Tue, 28 Nov 2023 17:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHHYrK095800; Tue, 28 Nov 2023 17:17:34 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:17:34 GMT Message-Id: <202311281717.3ASHHYrK095800@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: f97aab79868c - main - pst-raid: De-pessimize the building of i386 kernels List-Id: Commit messages for the main 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: f97aab79868cd7d891c52b14bd964523fa56f015 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f97aab79868cd7d891c52b14bd964523fa56f015 commit f97aab79868cd7d891c52b14bd964523fa56f015 Author: Warner Losh AuthorDate: 2023-11-28 17:14:04 +0000 Commit: Warner Losh CommitDate: 2023-11-28 17:17:07 +0000 pst-raid: De-pessimize the building of i386 kernels Add include of sys/proc.h Fixes: c4dacfa7f4b8 --- sys/dev/pst/pst-raid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c index b369a6d36fdc..de152f611e3a 100644 --- a/sys/dev/pst/pst-raid.c +++ b/sys/dev/pst/pst-raid.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include From nobody Tue Nov 28 17:20:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfq3y4ZTVz52G4F for ; Tue, 28 Nov 2023 17:21:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) (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 4Sfq3y2nxMz3fT8 for ; Tue, 28 Nov 2023 17:21:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-50bbfad8758so880491e87.3 for ; Tue, 28 Nov 2023 09:21:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701192060; x=1701796860; 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=wPDEymffhBr+qkVTaTG24wcaW9+7dGRhhkY84sCvoAM=; b=Nu9f+edypu2aw7j6beg3O1KEjIwHK6z1DxnQ5U27wi0gh4DX+E+tFx3+Pfr9DBwMap oVLiCSq7J6UT/Y/eKGpwMkBBsIeyUz0mWSM1CglMFstplJicHDJxmUOKwaohih0rtP+z Oh66Cn5jl/YYtqOH4frb+Ld+mDkLOSGsOcMNdwzPrMt4Xwa2OvHP5JiOsf31qj/dUxFL 0XhCs25P4n0AD/G+fwhx3z3AQWLU/zxqH0PP85KahEESOAbmDQf9yW8FvoOswoMAvbRo YwOr1pVY09dQXVxqBTmYk21I0+NHgwUbUqFLJcdDs5deqC4NRdqGTRMgaQiqK8zCrHoN 6Vwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701192060; x=1701796860; 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=wPDEymffhBr+qkVTaTG24wcaW9+7dGRhhkY84sCvoAM=; b=nSImxpQlZXFAFEsD06HI1EZK5cwLXNZ/JEi9eyBMcOH8a6sBfK8wQLLeB/XkEpPfAC 0ED0uG6ZYMDMSZvLRvjvLXZZ+vrQwgKo2mRKMLDrrNYUwWLslKW2XFX2/TPRUr/iQyzR HYiR73zkyBUa/zOqn9I4oWCo81Ogs7ETFEu5UkbjMHylJDtmejUj9IKQm7lDUEIFWoD8 7gOzIrkSkGHEPFmzD7ZI6gWQiDULyc42jyMIjwuqC8/raY1uLj8GrlS58vwsO7xlq90x kZbl6uRVzalIbxYEJ0lFjWgcttAikVluFuPfAXMn+Egum4s9UTa72Yy0dWyd/KIl87EO eIOw== X-Gm-Message-State: AOJu0YzyoqcBwgVicxXxboqx1zd7P7Gp/YWJhC9uNYIH6S57sOTaUUD2 R5xX5Kh56KdbZp4wAq6h0KegvmGvk1WXzih5TCgInQ== X-Google-Smtp-Source: AGHT+IEkxG9HJyrGRFq/cCUokvFIX1g3Ev50IKAawdNj7NVaJi4mY5nJn//8+uH2U8U7qBmRjDnbUwUzvzpXNTf/tos= X-Received: by 2002:a05:6512:2513:b0:500:b2f6:592 with SMTP id be19-20020a056512251300b00500b2f60592mr9457547lfb.50.1701192060576; Tue, 28 Nov 2023 09:21:00 -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: <202311231948.3ANJmwEC076780@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 28 Nov 2023 10:20:49 -0700 Message-ID: Subject: Re: git: ad34121518bb - main - Revert "pst: improve shutdown_post_sync handler" To: Baptiste Daroussin Cc: Mitchell Horne , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000773f69060b39a4ec" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Sfq3y2nxMz3fT8 --000000000000773f69060b39a4ec Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Maybe f97aab79868cd7d891c52b14bd964523fa56f015 fixes this? Warner On Tue, Nov 28, 2023 at 10:11=E2=80=AFAM Baptiste Daroussin wrote: > i386 kernel is still broken :( > > /home/bapt/worktrees/main/sys/dev/pst/pst-raid.c:185:9: error: incomplete > definition of type 'struct thread' > > Best regards, > Bapt > > > On Sat, Nov 25, 2023 at 08:51:36AM +0100, Baptiste Daroussin wrote: > > Kernel building for i386 is broken now and pkgbase builders do complain= , > can > > anyone have a look? > > > > Best regards, > > Bapt > > > > On Thu, Nov 23, 2023 at 10:09:35PM +0100, Mateusz Guzik wrote: > > > i386 kernel is going down, i suggest just dropping the patch > > > > > > On 11/23/23, Mitchell Horne wrote: > > > > The branch main has been updated by mhorne: > > > > > > > > URL: > > > > > https://cgit.FreeBSD.org/src/commit/?id=3Dad34121518bb7e1a38d4a6b1ccf9ca6= fe298dd0a > > > > > > > > commit ad34121518bb7e1a38d4a6b1ccf9ca6fe298dd0a > > > > Author: Mitchell Horne > > > > AuthorDate: 2023-11-23 19:46:28 +0000 > > > > Commit: Mitchell Horne > > > > CommitDate: 2023-11-23 19:48:44 +0000 > > > > > > > > Revert "pst: improve shutdown_post_sync handler" > > > > > > > > I did not realize this driver was i386-only, and the change > fails to > > > > compile. Revert so that I can fix it properly. > > > > > > > > This reverts commit 428ebb7cd9f51afb6809bf81cf21a05e0fd93ff4. > > > > > > > > Pointy hat to: mhorne > > > > --- > > > > sys/dev/pst/pst-iop.c | 2 +- > > > > sys/dev/pst/pst-raid.c | 14 +++++--------- > > > > 2 files changed, 6 insertions(+), 10 deletions(-) > > > > > > > > diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c > > > > index 43ced2401d2c..f9921a564333 100644 > > > > --- a/sys/dev/pst/pst-iop.c > > > > +++ b/sys/dev/pst/pst-iop.c > > > > @@ -432,7 +432,7 @@ iop_queue_wait_msg(struct iop_softc *sc, int > mfa, struct > > > > i2o_basic_message *msg) > > > > int status, timeout =3D 10000; > > > > > > > > mtx_lock(&sc->mtx); > > > > - if ((sc->reg->oqueue_intr_mask & I20_OUT_INTR_QUEUE) =3D=3D 0)= { > > > > + if (!(sc->reg->oqueue_intr_mask & 0x08)) { > > > > msg->transaction_context =3D (u_int32_t)&request; > > > > msg->initiator_context =3D (u_int32_t)iop_done; > > > > sc->reg->iqueue =3D mfa; > > > > diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c > > > > index 4f9279462ee8..4e9c4fb724bc 100644 > > > > --- a/sys/dev/pst/pst-raid.c > > > > +++ b/sys/dev/pst/pst-raid.c > > > > @@ -73,7 +73,7 @@ struct pst_request { > > > > static disk_strategy_t pststrategy; > > > > static int pst_probe(device_t); > > > > static int pst_attach(device_t); > > > > -static void pst_shutdown_post_sync(device_t, int); > > > > +static int pst_shutdown(device_t); > > > > static void pst_start(struct pst_softc *); > > > > static void pst_done(struct iop_softc *, u_int32_t, struct > i2o_single_reply > > > > *); > > > > static int pst_rw(struct pst_request *); > > > > @@ -170,23 +170,18 @@ pst_attach(device_t dev) > > > > name, psc->info->capacity/(512*255*63), 255, 63, > > > > device_get_nameunit(psc->iop->dev)); > > > > > > > > - EVENTHANDLER_REGISTER(shutdown_post_sync, > pst_shutdown_post_sync, > > > > + EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown, > > > > dev, SHUTDOWN_PRI_FIRST); > > > > return 0; > > > > } > > > > > > > > -static void > > > > -pst_shutdown_post_sync(device_t dev, int howto __unused) > > > > +static int > > > > +pst_shutdown(device_t dev) > > > > { > > > > struct pst_softc *psc =3D device_get_softc(dev); > > > > struct i2o_bsa_cache_flush_message *msg; > > > > int mfa; > > > > > > > > - if (SCHEDULER_STOPPED()) { > > > > - /* Request polled shutdown. */ > > > > - psc->reg->oqueue_intr_mask =3D 0xffffffff; > > > > - } > > > > - > > > > mfa =3D iop_get_mfa(psc->iop); > > > > msg =3D (struct i2o_bsa_cache_flush_message *)(psc->iop->ibase= + > mfa); > > > > bzero(msg, sizeof(struct i2o_bsa_cache_flush_message)); > > > > @@ -199,6 +194,7 @@ pst_shutdown_post_sync(device_t dev, int howto > > > > __unused) > > > > msg->control_flags =3D 0x0; /* 0x80 =3D post progress reports = */ > > > > if (iop_queue_wait_msg(psc->iop, mfa, (struct i2o_basic_messag= e > > > > *)msg)) > > > > printf("pst: shutdown failed!\n"); > > > > + return 0; > > > > } > > > > > > > > static void > > > > > > > > > > > > > > > > > -- > > > Mateusz Guzik > > > > > > --000000000000773f69060b39a4ec Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Maybe=C2=A0f97aab79868cd7d891c52b14bd964523fa56f015 fixes = this?

Warner

<= div dir=3D"ltr" class=3D"gmail_attr">On Tue, Nov 28, 2023 at 10:11=E2=80=AF= AM Baptiste Daroussin <bapt@freebsd.= org> wrote:
i386 kernel is still broken :(

/home/bapt/worktrees/main/sys/dev/pst/pst-raid.c:185:9: error: incomplete definition of type 'struct thread'

Best regards,
Bapt


On Sat, Nov 25, 2023 at 08:51:36AM +0100, Baptiste Daroussin wrote:
> Kernel building for i386 is broken now and pkgbase builders do complai= n, can
> anyone have a look?
>
> Best regards,
> Bapt
>
> On Thu, Nov 23, 2023 at 10:09:35PM +0100, Mateusz Guzik wrote:
> > i386 kernel is going down, i suggest just dropping the patch
> >
> > On 11/23/23, Mitchell Horne <mhorne@freebsd.org> wrote:
> > > The branch main has been updated by mhorne:
> > >
> > > URL:
> > > htt= ps://cgit.FreeBSD.org/src/commit/?id=3Dad34121518bb7e1a38d4a6b1ccf9ca6fe298= dd0a
> > >
> > > commit ad34121518bb7e1a38d4a6b1ccf9ca6fe298dd0a
> > > Author:=C2=A0 =C2=A0 =C2=A0Mitchell Horne <mhorne@FreeBSD= .org>
> > > AuthorDate: 2023-11-23 19:46:28 +0000
> > > Commit:=C2=A0 =C2=A0 =C2=A0Mitchell Horne <mhorne@FreeBSD= .org>
> > > CommitDate: 2023-11-23 19:48:44 +0000
> > >
> > >=C2=A0 =C2=A0 =C2=A0Revert "pst: improve shutdown_post_s= ync handler"
> > >
> > >=C2=A0 =C2=A0 =C2=A0I did not realize this driver was i386-on= ly, and the change fails to
> > >=C2=A0 =C2=A0 =C2=A0compile. Revert so that I can fix it prop= erly.
> > >
> > >=C2=A0 =C2=A0 =C2=A0This reverts commit 428ebb7cd9f51afb6809b= f81cf21a05e0fd93ff4.
> > >
> > >=C2=A0 =C2=A0 =C2=A0Pointy hat to: mhorne
> > > ---
> > >=C2=A0 sys/dev/pst/pst-iop.c=C2=A0 |=C2=A0 2 +-
> > >=C2=A0 sys/dev/pst/pst-raid.c | 14 +++++---------
> > >=C2=A0 2 files changed, 6 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c > > > index 43ced2401d2c..f9921a564333 100644
> > > --- a/sys/dev/pst/pst-iop.c
> > > +++ b/sys/dev/pst/pst-iop.c
> > > @@ -432,7 +432,7 @@ iop_queue_wait_msg(struct iop_softc *sc,= int mfa, struct
> > > i2o_basic_message *msg)
> > >=C2=A0 =C2=A0 =C2=A0 int status, timeout =3D 10000;
> > >
> > >=C2=A0 =C2=A0 =C2=A0 mtx_lock(&sc->mtx);
> > > -=C2=A0 =C2=A0 if ((sc->reg->oqueue_intr_mask & I2= 0_OUT_INTR_QUEUE) =3D=3D 0) {
> > > +=C2=A0 =C2=A0 if (!(sc->reg->oqueue_intr_mask & 0= x08)) {
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 msg->transaction_contex= t =3D (u_int32_t)&request;
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 msg->initiator_context = =3D (u_int32_t)iop_done;
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sc->reg->iqueue =3D = mfa;
> > > diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c=
> > > index 4f9279462ee8..4e9c4fb724bc 100644
> > > --- a/sys/dev/pst/pst-raid.c
> > > +++ b/sys/dev/pst/pst-raid.c
> > > @@ -73,7 +73,7 @@ struct pst_request {
> > >=C2=A0 static disk_strategy_t pststrategy;
> > >=C2=A0 static int pst_probe(device_t);
> > >=C2=A0 static int pst_attach(device_t);
> > > -static void pst_shutdown_post_sync(device_t, int);
> > > +static int pst_shutdown(device_t);
> > >=C2=A0 static void pst_start(struct pst_softc *);
> > >=C2=A0 static void pst_done(struct iop_softc *, u_int32_t, st= ruct i2o_single_reply
> > > *);
> > >=C2=A0 static int pst_rw(struct pst_request *);
> > > @@ -170,23 +170,18 @@ pst_attach(device_t dev)
> > >=C2=A0 =C2=A0 =C2=A0 name, psc->info->capacity/(512*255= *63), 255, 63,
> > >=C2=A0 =C2=A0 =C2=A0 device_get_nameunit(psc->iop->dev)= );
> > >
> > > -=C2=A0 =C2=A0 EVENTHANDLER_REGISTER(shutdown_post_sync, pst= _shutdown_post_sync,
> > > +=C2=A0 =C2=A0 EVENTHANDLER_REGISTER(shutdown_post_sync, pst= _shutdown,
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0dev, SHUTDOWN_PRI_FIRST);
> > >=C2=A0 =C2=A0 =C2=A0 return 0;
> > >=C2=A0 }
> > >
> > > -static void
> > > -pst_shutdown_post_sync(device_t dev, int howto __unused) > > > +static int
> > > +pst_shutdown(device_t dev)
> > >=C2=A0 {
> > >=C2=A0 =C2=A0 =C2=A0 struct pst_softc *psc =3D device_get_sof= tc(dev);
> > >=C2=A0 =C2=A0 =C2=A0 struct i2o_bsa_cache_flush_message *msg;=
> > >=C2=A0 =C2=A0 =C2=A0 int mfa;
> > >
> > > -=C2=A0 =C2=A0 if (SCHEDULER_STOPPED()) {
> > > - /* Request polled shutdown. */
> > > - psc->reg->oqueue_intr_mask =3D 0xffffffff;
> > > -=C2=A0 =C2=A0 }
> > > -
> > >=C2=A0 =C2=A0 =C2=A0 mfa =3D iop_get_mfa(psc->iop);
> > >=C2=A0 =C2=A0 =C2=A0 msg =3D (struct i2o_bsa_cache_flush_mess= age *)(psc->iop->ibase + mfa);
> > >=C2=A0 =C2=A0 =C2=A0 bzero(msg, sizeof(struct i2o_bsa_cache_f= lush_message));
> > > @@ -199,6 +194,7 @@ pst_shutdown_post_sync(device_t dev, int= howto
> > > __unused)
> > >=C2=A0 =C2=A0 =C2=A0 msg->control_flags =3D 0x0; /* 0x80 = =3D post progress reports */
> > >=C2=A0 =C2=A0 =C2=A0 if (iop_queue_wait_msg(psc->iop, mfa,= (struct i2o_basic_message
> > > *)msg))
> > >=C2=A0 =C2=A0printf("pst: shutdown failed!\n");
> > > +=C2=A0 =C2=A0 return 0;
> > >=C2=A0 }
> > >
> > >=C2=A0 static void
> > >
> > >
> >
> >
> > --
> > Mateusz Guzik <mjguzik gmail.com>
> >
>
--000000000000773f69060b39a4ec-- From nobody Tue Nov 28 17:21:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfq4d611Yz52GJ7; Tue, 28 Nov 2023 17:21:37 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4Sfq4d3yjPz3fvN; Tue, 28 Nov 2023 17:21:37 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id 1EA386FB4A; Tue, 28 Nov 2023 09:21:36 -0800 (PST) Date: Tue, 28 Nov 2023 09:21:36 -0800 From: Gleb Smirnoff To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e1e847374bcc - main - Add DEBUG_POISON_POINTER Message-ID: References: <202311281635.3ASGZeew027691@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: <202311281635.3ASGZeew027691@gitrepo.freebsd.org> X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4Sfq4d3yjPz3fvN Mateusz, On Tue, Nov 28, 2023 at 04:35:40PM +0000, Mateusz Guzik wrote: M> Add DEBUG_POISON_POINTER M> M> If you have a pointer which you know points to stale data, you can M> fill it with junk so that dereference later will trap M> M> Reviewed by: kib M> Sponsored by: Rubicon Communications, LLC ("Netgate") M> Differential Revision: https://reviews.freebsd.org/D40946 M> --- M> sys/kern/vfs_bio.c | 6 ++++++ M> sys/sys/kassert.h | 31 +++++++++++++++++++++++++++++++ M> 2 files changed, 37 insertions(+) M> M> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c M> index 31059f1c0a94..4e0832475c3e 100644 M> --- a/sys/kern/vfs_bio.c M> +++ b/sys/kern/vfs_bio.c M> @@ -159,6 +159,9 @@ nbufp(unsigned i) M> } M> M> caddr_t __read_mostly unmapped_buf; M> +#ifdef INVARIANTS M> +caddr_t poisoned_buf = (void *)-1; M> +#endif Is there any good reason to use caddr_t here instead of void *? Later it is casted back to normal void* in #define DEBUG_POISON_POINTER(x). -- Gleb Smirnoff From nobody Tue Nov 28 17:23:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfq6x5p7tz52GNw; Tue, 28 Nov 2023 17:23:37 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) (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 4Sfq6x3cH7z3gTw; Tue, 28 Nov 2023 17:23:37 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-xc2a.google.com with SMTP id 006d021491bc7-58d439e3e15so1839103eaf.1; Tue, 28 Nov 2023 09:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701192216; x=1701797016; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=bMbbVlv6g9UrPMlKPvVqHttK6r1mfY5hboyulsh7BOA=; b=lrmprMPvOW6U9a1MQMuylMD+PthgU7cmhr6iUrTRKqJtYnC7wJh95XIzNNvv0IZHf6 tbg+zW8WNQyKqxNNX1mbFa6ZlYxBOjM7lpakIwuWp5qW06LLOERAdme9kPc2G3e1w3gH 1aBdvF0KibFOxEFn+IClJMD7nFhA+3Th5H9ynbveiCUTr+rIReflzUorYNzdZU4R7NYa 30mUbIrKPlYnhXgZ/OzvK6ZQE3ZR/0HqvAc6lc3uWUr7Q7jsNDgaeedWrCRZGIU3GY6J F0kwh02k5k4nTwKVExP38OrugTNKJYCQr4m+izgS3xPKEgmWSFKNm7J9RotV0WnOtrtk kMzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701192216; x=1701797016; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bMbbVlv6g9UrPMlKPvVqHttK6r1mfY5hboyulsh7BOA=; b=GamfDgtNfvudYNXIn/bK5a/dN0M7kL2CqCp8bQjt/NQekL3a0uMuCTe7N3+tp/4rV+ hUuN3miY6pfnMaPLsZqdhbhYfpDDKGpQDhfrIgiSenDZekdJqgOUIN57g7ExI6yqb0iQ B90p/kjccJ2vZ8CnhbXCKjrPjxI+kjw8Vml+Ufdv5FrLrcWpHh7BSPbTDE8L7t2JT98w EjRF2lo3vremo00e59T+35+cMYj79ewlwGvQnn1TSFCchUr6zT274OQTB7JCL6XrpICi Foh6V32XBARBOzfEaiaGvFy6m1apt8+RH4OVKyep+vfrjMWjbBC79dTJSkpcSY/OH0lb vakg== X-Gm-Message-State: AOJu0YwXDD4uLM9stTLzfXxebzhB75aeMBB8NNW/+eeNVAJQYyn1oF2R jfsjH39bUgisqkE85Gs4OWYrh6hJgwHpZCYpsTC1XnnPOtA= X-Google-Smtp-Source: AGHT+IGlQ2TzuxzE9eZav3qAFMlBmwE4U/gHsffts68uDAHsoW+shh+uYbtyODKsUxWEfpnEuBYLNbMeKMYSfaDho4Q= X-Received: by 2002:a4a:a645:0:b0:58d:6bf6:4daf with SMTP id j5-20020a4aa645000000b0058d6bf64dafmr5505292oom.2.1701192216350; Tue, 28 Nov 2023 09:23:36 -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 Received: by 2002:ac9:6c8c:0:b0:4f0:1250:dd51 with HTTP; Tue, 28 Nov 2023 09:23:35 -0800 (PST) In-Reply-To: References: <202311281635.3ASGZeew027691@gitrepo.freebsd.org> From: Mateusz Guzik Date: Tue, 28 Nov 2023 18:23:35 +0100 Message-ID: Subject: Re: git: e1e847374bcc - main - Add DEBUG_POISON_POINTER To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Sfq6x3cH7z3gTw On 11/28/23, Gleb Smirnoff wrote: > Mateusz, > > On Tue, Nov 28, 2023 at 04:35:40PM +0000, Mateusz Guzik wrote: > M> Add DEBUG_POISON_POINTER > M> > M> If you have a pointer which you know points to stale data, you can > M> fill it with junk so that dereference later will trap > M> > M> Reviewed by: kib > M> Sponsored by: Rubicon Communications, LLC ("Netgate") > M> Differential Revision: https://reviews.freebsd.org/D40946 > M> --- > M> sys/kern/vfs_bio.c | 6 ++++++ > M> sys/sys/kassert.h | 31 +++++++++++++++++++++++++++++++ > M> 2 files changed, 37 insertions(+) > M> > M> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c > M> index 31059f1c0a94..4e0832475c3e 100644 > M> --- a/sys/kern/vfs_bio.c > M> +++ b/sys/kern/vfs_bio.c > M> @@ -159,6 +159,9 @@ nbufp(unsigned i) > M> } > M> > M> caddr_t __read_mostly unmapped_buf; > M> +#ifdef INVARIANTS > M> +caddr_t poisoned_buf = (void *)-1; > M> +#endif > > Is there any good reason to use caddr_t here instead of void *? > > Later it is casted back to normal void* in #define DEBUG_POISON_POINTER(x). > unmapped_buf is caddr. if you want to roll with void * feel free to change. -- Mateusz Guzik From nobody Tue Nov 28 17:30:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfqGR3GBHz52GfD; Tue, 28 Nov 2023 17:30: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 4SfqGR0ll5z4D2Y; Tue, 28 Nov 2023 17:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KZxnXe25mSo5QiaRfdR28BADBQyNk+RL4pp9FAkN6I=; b=xOgZR95IJ5cMxIe9j4IVBWPrllH7NUBpbAtWFZC+3zBxzkspgp+H8JCp7B9EP1wGc/hT/w sCy6316P1Eiu0qFcMEoDL3MxDOfZKTW/Z6COkaenRht9NbUjB+KLKM3WDfHMixPkyZI6di radb9xafKHaFhANlbH0tXc2j/K/4dYztsDQM52MqqeePbJzKZP7cPewmjrvorcKPZ7SA+4 bDkRxut7jAD44wvU+dNXNMznj5pUlYISnf/eH6VfU83zHZt1HXW7jnfSlIIJNEOxkTp8ya E1BI5ql+kujou7jA2QUxQB/7HqDeyp/phEHdc6SzvLVqT4PuKbXyJXA6cR5U4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KZxnXe25mSo5QiaRfdR28BADBQyNk+RL4pp9FAkN6I=; b=IeCfOAYYfMaNIoQV/2QxrlzWjCHE5I8E1PKuhCql9jWr4NuHciry/EDSVXaD1qBe+BTOCD q7DZy3j86Yo0I+dGj3Qgs31Yuo4kzxQ+O/YKtW0saKc6k2khYeuK7Uo+lqe4UEIY0xybSv ih3jiIrdO8NGI5k0UOnfurNyXGtQV0WWSWWxUipSgUccNAwwdk+LYmbnJHS7hrci3nPN3H brmC0oZpTH658Y5PvmVI4ZpkQxdNTDLeP+U0UygzotZX08RM7FDzbQs+BuCbM7si5LoxFN cuWW6GAp6CqkttwjS2TV/va/cEoXMxlOUnyVg85LOA90NHWhTHNo2N+kk0rT0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701192607; a=rsa-sha256; cv=none; b=ogzCAQv/TVH78XxRjaOBjZIzdbs3sOQ3wigPnLx5C0pzm5I9HS7VfyxDL2YKIVQZj1rz1+ 71EK1NQ1RmqMRq6JFrdm/lHfEA0jHsxUgszEFQ0vSS+xHf53dcxfRNtHTmKQUicDA6WDxX la85DTk93gA6clEzeu69GJamCS1gDaYpXI9Y+SGPPJoXCzHxzRVcwbDFcTXdpdEFVlK5Y9 Vup54lIR46xm6P3aLcGzBIOBoRfAqQBb8OdBxQqh8QuD48wwuoCbud49OsqYAs5e61gY2a RMqMuHWXU6GekutwLntklUEKvgkxfyhuNJ+4qBvP4N8AX3SIfrk5/xZEm1XO6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfqGQ6pPNzWpw; Tue, 28 Nov 2023 17:30: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 3ASHU68W015500; Tue, 28 Nov 2023 17:30:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHU60X015495; Tue, 28 Nov 2023 17:30:06 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:30:06 GMT Message-Id: <202311281730.3ASHU60X015495@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: 877ef685322f - main - Revert "kqueue: on process exit, force-clear its registered signal events" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: 877ef685322f795c071da9657bb490730d8cbb89 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=877ef685322f795c071da9657bb490730d8cbb89 commit 877ef685322f795c071da9657bb490730d8cbb89 Author: Konstantin Belousov AuthorDate: 2023-11-28 12:32:24 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 17:29:58 +0000 Revert "kqueue: on process exit, force-clear its registered signal events" This reverts commit 393ac29f0b8be068c8e46f76c2eeee07d20ea4df. A different fix is following, which preserves semantic, required by the sys.kqueue.proc3_test.proc3 test. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week PR: 275286 Differential revision: https://reviews.freebsd.org/D42777 --- sys/kern/kern_exit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 0d974c192b93..f83f0433f9cd 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -983,7 +983,6 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) proc_id_clear(PROC_ID_PID, p->p_pid); PROC_LOCK(p); - knlist_delete(p->p_klist, td, 1); knlist_detach(p->p_klist); p->p_klist = NULL; PROC_UNLOCK(p); From nobody Tue Nov 28 17:30:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfqGS2Blcz52GT8; Tue, 28 Nov 2023 17:30: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 4SfqGS1fkgz4DN8; Tue, 28 Nov 2023 17:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7VsMYStDAiB7rASAwU+Fl8WnnXnVFdn9QOZWwyHjw0Y=; b=bUlYmvDIBkLx4ca+DYODjfSAaXl8+w14euNEdtZgh4F7zGtiOOdo5W/3qXPWyVydIk12ho EfMJItA+0PyyBWCHfz43rm6jmk9mGVhLb8YAYF7ekZFvS6hraQC1kHK//7DeAU3OQRpfGa Xalfj7Ic/pZQcb9rYxHps8SXQK+JES9QiTABh9ne094akqnfj7fiQfHnU2lRP4k9oxsUQa z/HBCQeYX4Ra/8YmPsI1U5hxUdnbyMWcoQsSytrMm7DKemWzLpsT0urgTtEL3wnoI47cwR 1VXLw7UjfNOPqRGsmg9HXgdFQo3MLZosyPGgu1vxHEix+eISxLoX4DicvygOYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7VsMYStDAiB7rASAwU+Fl8WnnXnVFdn9QOZWwyHjw0Y=; b=vkFv4GNo6nyUfoQ6baDVXqV44UCTKwR4/iFlS91YOoY6mVubx6WYL/NBgnjYD5gmLfiwto /xavPZ4S9h4ane4de4dEk/t9unihJqYmP46TlHoR39YYQdtpI8g9Gwe7QvGHHhETSaZ/mC BQvIVcKeQVftMU2o7TDfhdJF5Q1gZ+07rqg3tixKix+UXzpHRFKlsFkiLdTTlFKYLgfFaG wrK5wnTho+0kUaUGL540BM54D6SdcRE/62rx53Ov1vd4SQsHCQFAhtAPnKne4e7GOjR+qI 8vqykeAtwyUljz1/zD1WCnLXdZrnnx7Ax6gbu2rvtqd47IoaOlldIeOPJPOhgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701192608; a=rsa-sha256; cv=none; b=l76AJEH3rcyD6Zamv/SRlIeCdZ4I4OSDOf0PENyCEc/jp9fXK2ioWCosLjqRbnx2Iwqgbh Ec1mAjFEP0lMd3Nkmb7y80tS1You5CnHykkwKPUzBgc1yDHXCme/0YWTkw/AGvkRhnHLmx idAYlKtouWmDvLu3Vqx/KHvCALfL5Hf6FsxDs/XcplbOUPVEINSojbzFqOz8KQ65z2IpZZ m4lROZ5v+MQHC1yl5LD/5wWagc33Le8No+ETTeOgudaWI3XKzuSPBtHXlaOOvLbZvQJZR/ v4GHJLcoP7yKeX0+XP6Y6/lOutXrDPKF1sMuZFCaLbg+n7uJzN/zrZbLXCPt9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfqGS0L1GzWpx; Tue, 28 Nov 2023 17:30: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 3ASHU7Fx015791; Tue, 28 Nov 2023 17:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHU7eY015786; Tue, 28 Nov 2023 17:30:07 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:30:07 GMT Message-Id: <202311281730.3ASHU7eY015786@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: ed410b78edc5 - main - EVFILT_SIGNAL: do not use target process pointer on 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed410b78edc53e17b5a3e93ace2adbeb3a734ae9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed410b78edc53e17b5a3e93ace2adbeb3a734ae9 commit ed410b78edc53e17b5a3e93ace2adbeb3a734ae9 Author: Konstantin Belousov AuthorDate: 2023-11-28 12:51:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 17:29:58 +0000 EVFILT_SIGNAL: do not use target process pointer on detach It is enough to know knlist to remove from it, and the list is autodestroyed on last removal. PR: 275286 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42777 --- sys/kern/kern_sig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 230564adf823..a2ca74ac9183 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -4296,9 +4296,7 @@ filt_sigattach(struct knote *kn) static void filt_sigdetach(struct knote *kn) { - struct proc *p = kn->kn_ptr.p_proc; - - knlist_remove(p->p_klist, kn, 0); + knlist_remove(kn->kn_knlist, kn, 0); } /* From nobody Tue Nov 28 17:30:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfqGT2Lndz52GfQ; Tue, 28 Nov 2023 17:30: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 4SfqGT1qmFz4DWb; Tue, 28 Nov 2023 17:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKkOOp+Foe4lXcW1rSO4Hlx0BSly7F/2t0CH9+2s7UE=; b=PdQ35seyI7Mfcl36rXFfz0siYE6HQBRDTdze9Ppij4m0uUZOlBvPyVWKXJsPQrZtFRghwb mr1QiEAp0PYdURlvpqHpLTdVe1Q0B+KVm14OpLxIdwmGRuFlgdeu+IynQF1sqkv9/t6Dxk 0BWyV0x740QaUOlvWbV3tA6FNNNouJe2sJUF5MZ6VQEZe3VcFsUeFsa7z6igp0c+Mg3GNh 27BdnDLh3PIeELOCKuKsWdT75X3URdEXmBkK7wTgtxXEgy2MMdlqD/A4HQAlJkYxJQu7qV 6j3FLXuWyZci/jwXqhorgdPfLZJILj3y0nU9c+zSye/ZdJknXDuk+UWRlPavBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKkOOp+Foe4lXcW1rSO4Hlx0BSly7F/2t0CH9+2s7UE=; b=ATzbzi/DFf5HkFqmTYR05ZYAyVNn6SOBrmqTkrRoZa9ppMkvR21fToWOutlCSWsBDkG1f0 ngExpYUhg4GgURepOPhBE6npa398ab9JEJDFkH6/bRVuv80KiXQCW+LlgUKrgX9+GEl56A 7vk3YWJrJFg73Ev3a6iaBBIffPuZNR2yQzZ/apU4mW6uc98Qa04yoe4+pLaOmu306Xl1u1 QtmskIYn6TtPfk57ZFgtGu8aLFzdIXP2crVolNY/KFixFLzirm0UGGPJv3k0BRHi1VYAI2 rgTu5+x5R/VvK2ykoOISC7uWtv57GaxPnm2NbyMZVmx6KHLqllFfck0Re1smVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701192609; a=rsa-sha256; cv=none; b=SKbp0IFk9Y5jbmIeV1Wlu6/P+jTUZ1M4S8I1ngGrQ6UE3WBXOxN+gOWJliLFvDaYO7elL6 jalrIIxhLoW8aoJ0vh8nlYTijH8+mkGbhlNK8kcZivq5xAe/CoICM+PlRe/5qMlytW3juk 5I8c0549khQpT010P7cpPUReVlp/5DpYI94hYlXQIhFDpeEtM9PMwBiLQMCf3dS6u2fEoN cnvfVnGU2h5zo9xy3IfU+L3xtF7gu0GGnMC+ZV3MSiQIZylf185F4Qk5F9KPTxKfLdwlRL ERAEwfYVyx7QjWAadvh6NTvhxoORERB4jLKW1VmmM9EDfoaZ9NZGmcWeQoipdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfqGT0xDwzWt4; Tue, 28 Nov 2023 17:30: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 3ASHU97v016141; Tue, 28 Nov 2023 17:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHU9GL016133; Tue, 28 Nov 2023 17:30:09 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:30:09 GMT Message-Id: <202311281730.3ASHU9GL016133@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: 171f0832c5b1 - main - EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork List-Id: Commit messages for the main 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: 171f0832c5b15f2f66d2fe59967348a42814b0c1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=171f0832c5b15f2f66d2fe59967348a42814b0c1 commit 171f0832c5b15f2f66d2fe59967348a42814b0c1 Author: Konstantin Belousov AuthorDate: 2023-11-28 15:42:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 17:29:58 +0000 EVFILT_TIMER: intialize stop timer list in type-stable proc init, instead of fork Since kqueue timer may exist after the process that created it exited (same scenario with rfork(2) as in PR 275286), make the tailq p_kqtim_stop accessed by filt_timerdetach() type-stable. Noted and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42777 --- sys/kern/kern_fork.c | 1 - sys/kern/kern_proc.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 7b9aa4cd61d1..c7b2b1195841 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -622,7 +622,6 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * LIST_INIT(&p2->p_orphans); callout_init_mtx(&p2->p_itcallout, &p2->p_mtx, 0); - TAILQ_INIT(&p2->p_kqtim_stop); /* * This begins the section where we must prevent the parent diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 2c115202636e..8a396e208ff6 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -275,6 +275,7 @@ proc_init(void *mem, int size, int flags) EVENTHANDLER_DIRECT_INVOKE(process_init, p); p->p_stats = pstats_alloc(); p->p_pgrp = NULL; + TAILQ_INIT(&p->p_kqtim_stop); return (0); } From nobody Tue Nov 28 17:33:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfqLC27xPz52H0X; Tue, 28 Nov 2023 17:33: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 4SfqLB74zqz4FcN; Tue, 28 Nov 2023 17:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1sDl4fqJMojPgVr7ThgcKK5BdfHA6L1iYbMCMH5394o=; b=SxAgK+Pl2g0Cck5GKsUklxTdPg1skot0M/1CtwHYKoto9LljE5Td7bd5queIdqyFdU5OeF yRDE8qqE9TLSSsiV5tt4ICXOjKC6po/UKbQ3BO00iYQluHJwLbqQ2Je0Gi61fQ+6+Bldli aGotEsxDh5R1SXb4N4nbZ2jmRuuuUdcwxYyyVdogkGJv7ycZfLLZ1GqCcctJxEwdS+Env7 I8iVKz9MR7cPVYOwBwkMIBPwIghU21uufhS4Nwbtvjo6Xtpde0eT8fsETl3ddTM6iSWDpk 9b43mVjzv2RYy2zGzIUyuYuD0/8oIz6bluOmZV4+WA9L2YqB5krybWz/+G9ywg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1sDl4fqJMojPgVr7ThgcKK5BdfHA6L1iYbMCMH5394o=; b=AeKPvnF/LKwA5EusLXM4NjuGEa6OlVrBb3YkaO6J4cHgbZaGAxQdAy5u7NJ9VtJ7vMIDiB /9mH6Chh4YXcr0nL2Ga435wRcggP5FYn2LAMlU7fxcofbU4QW2RpYXtk40Z+A1JUDtJC/9 lSo1PRr7/njN1uuOiDTMnhe+4/pphaOJUTsERT/rjeVmcUyWS8U66PI9emqdkIt2VrLyMx XvPyXDgWtradorqx1uQt/QmYZkTeq1AzY/DQ6uMdJ13UvEkYJhcqu9wCdi2fr9vOds4sxj H0C/LCw89YMipd5PYqlI//70S0BVt3vtvNut+9vziG+z7RcriJ+HSADBRJXlvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701192803; a=rsa-sha256; cv=none; b=hcO7NQfMRloGuXpXKTz0s50Ru4ooCYv21LhP6PYAnqcZxDu9t55DZJzR2w2xZ0XgmIWSlT JonczqvQSQshF7+gwz4JzH8fOKsSvmh0ie6gs/XtMCRoXX2kj0Eyvs6Kr9PHoMqBtPAx+W QrObswXQPeYScNB5a4VQZI/OwkRdqXFDXEyq6TuPuo24fkW1yFbRlOqR8PR1kIiR8Tki5p Uak1pgYva/0L52k/4yzz6mR6M0yQiY8J2D1D4apPdCgtWb+cx5l07/RFwvcR1IEwwER8we vLUgIuhkGT3otZwmGF/ZvAj3NufxaT7xbUnKEUZpqfWWDssy6EaC0u+HMaZ6OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfqLB67lWzXDr; Tue, 28 Nov 2023 17:33: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 3ASHXM7r028824; Tue, 28 Nov 2023 17:33:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHXMcm028821; Tue, 28 Nov 2023 17:33:22 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:33:22 GMT Message-Id: <202311281733.3ASHXMcm028821@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: 4cbe4c48a7e5 - main - VFS: add VOP_GETLOWVNODE() List-Id: Commit messages for the main 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: 4cbe4c48a7e574ec1bb919351d7a57d252b00b62 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4cbe4c48a7e574ec1bb919351d7a57d252b00b62 commit 4cbe4c48a7e574ec1bb919351d7a57d252b00b62 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:55:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 17:32:53 +0000 VFS: add VOP_GETLOWVNODE() It is similar to VOP_GETWRITEMOUNT(), and for given vnode vp should return the lower vnode which would actually handle write to vp. Flags allow to specify FREAD or FWRITE for benefit of possible unionfs implementation. Reviewed by: markj, Olivier Certner Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42603 --- sys/fs/nullfs/null_vnops.c | 18 ++++++++++++++++++ sys/kern/vfs_default.c | 10 ++++++++++ sys/kern/vnode_if.src | 7 +++++++ 3 files changed, 35 insertions(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 7607b44e36c3..c05e3394a9a6 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1127,6 +1127,23 @@ null_vput_pair(struct vop_vput_pair_args *ap) return (res); } +static int +null_getlowvnode(struct vop_getlowvnode_args *ap) +{ + struct vnode *vp, *vpl; + + vp = ap->a_vp; + if (vn_lock(vp, LK_SHARED) != 0) + return (EBADF); + + vpl = NULLVPTOLOWERVP(vp); + vhold(vpl); + VOP_UNLOCK(vp); + VOP_GETLOWVNODE(vpl, ap->a_vplp, ap->a_flags); + vdrop(vpl); + return (0); +} + /* * Global vfs data structures */ @@ -1139,6 +1156,7 @@ struct vop_vector null_vnodeops = { .vop_bmap = VOP_EOPNOTSUPP, .vop_stat = null_stat, .vop_getattr = null_getattr, + .vop_getlowvnode = null_getlowvnode, .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_need_inactive = null_need_inactive, diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index a342cbb80c9c..67c7ace5f72f 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -82,6 +82,7 @@ static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); static int vop_stdread_pgcache(struct vop_read_pgcache_args *ap); static int vop_stdstat(struct vop_stat_args *ap); static int vop_stdvput_pair(struct vop_vput_pair_args *ap); +static int vop_stdgetlowvnode(struct vop_getlowvnode_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -112,6 +113,7 @@ struct vop_vector default_vnodeops = { .vop_fsync = VOP_NULL, .vop_stat = vop_stdstat, .vop_fdatasync = vop_stdfdatasync, + .vop_getlowvnode = vop_stdgetlowvnode, .vop_getpages = vop_stdgetpages, .vop_getpages_async = vop_stdgetpages_async, .vop_getwritemount = vop_stdgetwritemount, @@ -1607,3 +1609,11 @@ vop_stdvput_pair(struct vop_vput_pair_args *ap) vput(vp); return (0); } + +static int +vop_stdgetlowvnode(struct vop_getlowvnode_args *ap) +{ + vref(ap->a_vp); + *ap->a_vplp = ap->a_vp; + return (0); +} diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index c4051fdfe327..a2b6a7c8ff9f 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -468,6 +468,13 @@ vop_getwritemount { OUT struct mount **mpp; }; +%% getwritevnode vp = = = + +vop_getlowvnode { + IN struct vnode *vp; + OUT struct vnode **vplp; + IN int flags; +}; %% print vp - - - From nobody Tue Nov 28 17:33:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfqLD24DHz52GxR; Tue, 28 Nov 2023 17:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfqLD1N0bz4FNZ; Tue, 28 Nov 2023 17:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rznUSIjOSpA5XXA3MsPlKSEA5B4uJu0/od+w2f/tzrU=; b=EfCUKzMxi7CUmzefbLXuteEjHY+2v3TDo1TtYE+22f/PFdTj067+JVdBu9+CEhL/K2H0DU Pt60y+oxGYhh96vIS67atMqESVFqcWcmX0MyIYgPz6nuY01EmthnbigEn1eJMS8ngfRJJy YHZrO1EWExpPw840bUS5ea0LRI+4fnS38uMSb5he6igXrgddPZN9lO7Mwq6kD6Wo3SnlHu OVzkBNBYN2gOIQg7wZT6qZlFvCTZv+Q/2LTtInDrUY8+UsLObTLVsGkY3j2BH48TujP5hR NULTvqvY1WdelvAuOYmqnYoRvZgmDPe+EOXrD9qMRoQ+e42nkR0AZaFelOvnEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rznUSIjOSpA5XXA3MsPlKSEA5B4uJu0/od+w2f/tzrU=; b=SqhjfhpVEdOhqnu7bDHSPqQ7p8cmDejrPumoKOC66qBIgzY0iKq4gYaoxaJMgRdF9MHVb/ KxCqIxQFE4irwgu1S6CvCz5/W9yaSKd19iQVEX+GJExsGHn/lT5lxZwuwR+8p4ZQy01kmS JQaPnkNQPlqS054VbqCDTw+2oe01KdSo5ZdaDJR97Ws4JKPl+bj+mAit9IQl+MBKjgSoSg uJpBhqns3YmknYwrU4qToFn2ZUZe7Mnef6kLkdPmhIdGmFBBshC7W5ZQ1c5lvJxZT+9m6D 29nqYO2HFu4JQcOq6cRtuxdNArjlkVbQt7b2a0Ch2Lq+OsN+7EZ+FUiSs8nylA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701192804; a=rsa-sha256; cv=none; b=DK/S3T6VYW6lWtYZEbjpWlnI7HinxsnyXNLdCZIRH+JOQG8OIaPsZA9vLO3HySqog2m7yC na8lvXBUVCDP0cIXotffLDUsdy1ZQcep9d1SbwR15eAttjpcs/xQVoRVqqyMdhyuLk+D04 vLlXnmLhKurhCWez9azHpAMIbn8Zm2rpYYAtslciMUbrHyx+/LPMXbzNpYWgWXZ2ppIcfx sqdsLYXKkRYx4DEzhnxsf2OKl01Dev+Eny3EHsp6g4t/QKJK1S9hXydSZRME+zjPVgWbOF m05y2NHvYp1bTUeyGl11Qv1CZaY2uqaEWTGuidwY3GmNH0T2Nv6dbtepyTWYdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfqLD033VzWrH; Tue, 28 Nov 2023 17:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASHXNG5028888; Tue, 28 Nov 2023 17:33:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHXNm1028885; Tue, 28 Nov 2023 17:33:23 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:33:23 GMT Message-Id: <202311281733.3ASHXNm1028885@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: a9bc8637690c - main - vn_copy_file_range(): find write vnodes on which to call the VOP List-Id: Commit messages for the main 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: a9bc8637690ce29496650a41d3c25e225ed22e3d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a9bc8637690ce29496650a41d3c25e225ed22e3d commit a9bc8637690ce29496650a41d3c25e225ed22e3d Author: Konstantin Belousov AuthorDate: 2023-11-18 08:57:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 17:32:53 +0000 vn_copy_file_range(): find write vnodes on which to call the VOP Reviewed by: markj, Olivier Certner Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42603 --- sys/kern/vfs_vnops.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index e90330b08cbc..29114f795f5e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3070,10 +3070,12 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, struct ucred *outcred, struct thread *fsize_td) { struct mount *inmp, *outmp; + struct vnode *invpl, *outvpl; int error; size_t len; uint64_t uval; + invpl = outvpl = NULL; len = *lenp; *lenp = 0; /* For error returns. */ error = 0; @@ -3099,17 +3101,22 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, if (len == 0) goto out; - inmp = invp->v_mount; - outmp = outvp->v_mount; - if (inmp == NULL || outmp == NULL) { - error = EBADF; + error = VOP_GETLOWVNODE(invp, &invpl, FREAD); + if (error != 0) goto out; - } + error = VOP_GETLOWVNODE(outvp, &outvpl, FWRITE); + if (error != 0) + goto out1; + + inmp = invpl->v_mount; + outmp = outvpl->v_mount; + if (inmp == NULL || outmp == NULL) + goto out2; for (;;) { error = vfs_busy(inmp, 0); if (error != 0) - goto out; + goto out2; if (inmp == outmp) break; error = vfs_busy(outmp, MBF_NOWAIT); @@ -3120,7 +3127,7 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, vfs_unbusy(outmp); continue; } - goto out; + goto out2; } break; } @@ -3131,16 +3138,21 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, * which can handle copies across multiple file system types. */ *lenp = len; - if (inmp == outmp || strcmp(inmp->mnt_vfc->vfc_name, - outmp->mnt_vfc->vfc_name) == 0) - error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, + if (inmp == outmp || inmp->mnt_vfc == outmp->mnt_vfc) + error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else - error = vn_generic_copy_file_range(invp, inoffp, outvp, + error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); if (inmp != outmp) vfs_unbusy(inmp); +out2: + if (outvpl != NULL) + vrele(outvpl); +out1: + if (invpl != NULL) + vrele(invpl); out: return (error); } From nobody Tue Nov 28 17:33:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfqLF2XN0z52GmD; Tue, 28 Nov 2023 17:33: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 4SfqLF20F1z4Flj; Tue, 28 Nov 2023 17:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bO5qvUzlIp2EMUReifs4VrvbdCuDySNjveJrHb9dLz4=; b=snMqJ4Z8DJ09GfXIGCn8On3nnr1oIRd42AHwkELRHQxGrH/ooFtcLZIWqWUflsDUh1uic4 AOge+sbCHdCGpacctSKjjQ3L7yGR9IZyjd3F6QB8Kk77yTUeyN3fG+yd2Kki9R61+aCOo6 oMNf4VZ8UHolU0PX7mG44AcnGTyQ+dEdaPB1eqIy8Gq1QZwMu6Lv7LTKSAC61OK7NhRZrc Epb38ucoKGZy710hlvivS9CgTnstEbaJ6Lr9c1kHetZY1XJy0BbkXqm8fuX2AHnWF0JGfz G3Lj2EjlsQEj2hj7JXyzOE0+H2QtKet+Dd/vgd4zaFebl2x3SXaTPoZ7pqgOdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bO5qvUzlIp2EMUReifs4VrvbdCuDySNjveJrHb9dLz4=; b=eP8Vi4L0uXYQBXlWydEvEZZq4s0avFwpOxPwm6gucPxygipwDL8Ll8Hg+4ELIpMnTbPixY xvHNdVcPCv+Rkx5NmT8dqlenDH7awAQ22bNUuRSyqHinTqw1LIsdZvZ4IblBconoIxAIdV idDqew7wfX5NCyTtBfwtdPgkUUm6SC0zU0cWNo9Yy5bkQR0Hyw0pW3PU3JWsmJtrOCIEDW pwYB+vs7uJXfqyMwj+m7/CTU9UzYxMCekaVW8iCUgbCiRHK7q/hBJTXB6QJQ9uR4lo3aRV J3wOAGk7kFkOO6a6iKcF5tMlXf9XknwEX2WnU2EHx1P1Fi1kn5IWyStbnCTpVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701192805; a=rsa-sha256; cv=none; b=P+Aga9/7MmsNPPGjWilbEA5OwXe9OEJAa7VUZUz9J9K3L2JbtVgMkx4dpvz6jI0i36n/ly t99Eff5/89anjehLaG6Sluaf9x1CIq2p4dosCtFllWvG5LnUjTjmv+gc5WLX6zFWHujqjp Y25Ab5g5TrszhqHlT1/w4+AjGOnoLdemSyCya3VqAkFC+LR4zYjT1hGbBC94GAgLLOkfiF Vbz72RjY1k/Ehfv9AmJsncUSfEwXhyX6qDHWu8aTvxou0ZEXS9G520tKKJez0HfxWQMxWm Pfm/VABbFBrRgQCBa0WnCRTC3zd+dVBKl+lRxpx1KHzeuzjgDCAQrWnvRRSz3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfqLF14dFzWx8; Tue, 28 Nov 2023 17: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 3ASHXPlx028933; Tue, 28 Nov 2023 17: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 3ASHXPKM028930; Tue, 28 Nov 2023 17:33:25 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:33:25 GMT Message-Id: <202311281733.3ASHXPKM028930@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: c5405d1c8507 - main - vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() List-Id: Commit messages for the main 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: c5405d1c850765d04f74067ebb71f57e9a26b8ea Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c5405d1c850765d04f74067ebb71f57e9a26b8ea commit c5405d1c850765d04f74067ebb71f57e9a26b8ea Author: Konstantin Belousov AuthorDate: 2023-11-18 08:59:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 17:32:53 +0000 vn_copy_file_range(): provide ENOSYS fallback to vn_generic_copy_file_range() Reviewed by: markj, Olivier Certner Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42603 --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +--- sys/fs/fuse/fuse_vnops.c | 7 ++----- sys/fs/nfsclient/nfs_clvnops.c | 4 +--- sys/kern/vfs_vnops.c | 2 ++ 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 107cd69c756c..ccd708550f5b 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -6321,9 +6321,7 @@ bad_locked_fallback: bad_write_fallback: if (mp != NULL) vn_finished_write(mp); - error = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); + error = ENOSYS; return (error); } diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 42ed3e36b946..30965b45215d 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -860,6 +860,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) pid_t pid; int err; + err = ENOSYS; if (mp == NULL || mp != vnode_mount(outvp)) goto fallback; @@ -942,13 +943,9 @@ unlock: VOP_UNLOCK(invp); VOP_UNLOCK(outvp); - if (err == ENOSYS) { + if (err == ENOSYS) fsess_set_notimpl(mp, FUSE_COPY_FILE_RANGE); fallback: - err = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); - } /* * No need to call vn_rlimit_fsizex_res before return, since the uio is diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 00b6c7617101..5c9ca69b5d51 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3888,9 +3888,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) */ if (invp == outvp || invp->v_mount != outvp->v_mount) { generic_copy: - return (vn_generic_copy_file_range(invp, ap->a_inoffp, - outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd)); + return (ENOSYS); } /* Lock both vnodes, avoiding risk of deadlock. */ diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 29114f795f5e..7fe861ccaee7 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3142,6 +3142,8 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else + error = ENOSYS; + if (error == ENOSYS) error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); From nobody Tue Nov 28 17:33:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfqLG3MSPz52GmG; Tue, 28 Nov 2023 17: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 4SfqLG2q5Rz4FmH; Tue, 28 Nov 2023 17: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=1701192806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0NrWnzw5hmo3/PLt29cpU2pNlDzcOSQWtOqz4aJyryU=; b=g2jlZHOi07dt9TWPfl6EGqWWCs4+hw1rGCGUZ4FJa8l37tQXEDgeytC/Un339LPWMasJY1 lzZvxUjNM7kAgQrN/GEP3OuDiynRYCxhtq7XEoDGyDkp52FVQ3bNzWogpPgu57dKtNqcBS m5gNcQX43iTVmoLELMH+5Ev6gCqoM/z5WLc4F8fX68mNp9LG4o8AcULcsS0aO4CaanAtU/ 0wKP6qOLQFB/nrfRputBRervyVBtiTVjFuGd+giG8lBAxwiBQZLP8cGcNiRpGm+pYfp1L2 Ns2avoNjglVtrhiH6mKc0Jth77ICCk2Hqm0HrzKkuo0rj/11RfroPULDwjJhIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701192806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0NrWnzw5hmo3/PLt29cpU2pNlDzcOSQWtOqz4aJyryU=; b=QgsdON6Ue59jdozGnv3EYZbE1roCtaKH2U3/oNGAisZfOBDWVr0kLCbXjYMfs3xeZYmHuz C5orB6UhCwo/OmxbXFLsg3Wh01OVSnvHXygeJ8inE5tr7HOpLTxsEEfVWiPFNMRkml9Sgc PBi+DwcJCLA6TG24485Qzkq469YL6E+sDa2qWiRgcBvQ/NJ5D3NolVK2COwqZDT9KSMP6h JleHOrliirnij0Elbh8gdsS9klE86zTp4XOKKH2wQ2pf+kBiWg4ERvzu4Rco2vzBD4+93E H3S+cHmJppJ5yk5gxEIxqpNxiRr/PndarlPdSAsCk8+6s2xjxl36ooxNkHZvfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701192806; a=rsa-sha256; cv=none; b=E6qpFNBfRfAwwD1toQpRqsNZZ1cb4zQ89tmXPnZQmfC9tntHLCJ4MD0kfoXTbnpRut89/L r82S8RtshYcyXPfeiXLazHQa4Lqb61kQ832Gd9WBeDyYEcdRSHmuwMCyxpFCoY/umzFxlD tzfXcFiY19wGoGaVGtDcFCdcBnkev2zUhPejWMrGZuZOBdrMqVfojiV1adIPryxAFGagxG MNEQCAkQLo40w7C6qVTpx2i0Adj0wTb2XB122pwv6EayNg9//sqbt/udCs1vZdsZ9XDFeA DRWus2DGIW/i7F3qYBogkRk77KBKSYVnDRFrle9L5Zb0EGsbDpglldF0XfTj0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfqLG1wRWzWx9; Tue, 28 Nov 2023 17:33: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 3ASHXQNw028981; Tue, 28 Nov 2023 17:33:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASHXQV5028978; Tue, 28 Nov 2023 17:33:26 GMT (envelope-from git) Date: Tue, 28 Nov 2023 17:33:26 GMT Message-Id: <202311281733.3ASHXQV5028978@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: 326836a1ebc6 - main - nullfs: do not allow bypass on copy_file_range() List-Id: Commit messages for the main 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: 326836a1ebc6ce9b28c8f2bc1d177a444fba8ea6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=326836a1ebc6ce9b28c8f2bc1d177a444fba8ea6 commit 326836a1ebc6ce9b28c8f2bc1d177a444fba8ea6 Author: Konstantin Belousov AuthorDate: 2023-11-18 09:23:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 17:32:53 +0000 nullfs: do not allow bypass on copy_file_range() There must be no callers of VOP_COPY_FILE_RANGE() except vn_copy_file_range(), which does enough to find the write-vnodes where to call the VOP. Reviewed by: markj, Olivier Certner Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42603 --- sys/fs/nullfs/null_vnops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index c05e3394a9a6..4747b1dd5b82 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1177,5 +1177,6 @@ struct vop_vector null_vnodeops = { .vop_vptofh = null_vptofh, .vop_add_writecount = null_add_writecount, .vop_vput_pair = null_vput_pair, + .vop_copy_file_range = VOP_PANIC, }; VFS_VOP_VECTOR_REGISTER(null_vnodeops); From nobody Tue Nov 28 17:56:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfqs62zfwz52JpT; Tue, 28 Nov 2023 17:56:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfqs62M3wz4JYC; Tue, 28 Nov 2023 17:56:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701194202; 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=fs/sEljDSkm2yBz/FBhm9q3KYxFnM9opK3NidhXQfCA=; b=S8roNCrYr0s8B72ARQUgGtBqtRO5wpSwv9pe6qiazmbM6NVoKgHgr/9mvBgZiV3Bpcrbk5 DMfeB8L3JN57Trbj8haxSGaKRbXcgZLyveNI07EZpRAUCZkp7Z/+yvVyPbVs+/UqVzYbKt eGoK63q77+X0KknKyptDz+x+foNxF+Hfl5TI5gQzb1sAesn38id4l7fOrLooP6s6PVNblc JYCZFIxWQFPwzN+8E93VnQwWo4tzzhQ5VkpwV5NV9AIve5bZEFVcuyV/bkmzGZP4u426sd 40m8zfFFfQC3kyvO9V1b8BswmdeeHRh7wNzTicxTxzH/mZgOsYpBN+RMF8JJmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701194202; 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=fs/sEljDSkm2yBz/FBhm9q3KYxFnM9opK3NidhXQfCA=; b=tetZRECf/nfy6e93D08DNyaqwhyTjFu7F6SJ1DNHGw5N4PpUfFZLoYT9vWPkozkwvQwb7L 7dEYN0pV6SFnxGsGBreFGpxUW8YSGFZ5nA1iLnlyOu/FMY/Gsi89JuUUelJj1rP26vDCD/ SAkDbN0XFJ9rzJ7cqSjY1OXzLPxfRD0Gq/ig02GVWkjyr3X8QXNnTSUuJmOPQu2sH6XRiN 99c/kHL49ffTcrXJm4UOmNWaLLzSSc0AtHRqiUomP4VnUyqvo9Az7DPEMxmovd59/Df8zI qSMWtlIi28rPf0kRRq/8a0H6uMCOxWJCiqGt/Z5+IrxSEK38uWz3IOCRHG8hyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701194202; a=rsa-sha256; cv=none; b=KO/SJTRLV1NWWtg5GDDsTCodzBO4LYAaealtmqeSWhPmvcTUZ3wsrf7kjIDynr1UxxZvoM /5DlxDtTaa3YMCUlQnEMXrAO9C82vEsATwEbTf0InvatQ6fF7VYOOR2Ar/PzMIXH4etLJd iDY83yfdi02p39xb6z/+Pe49R2Sl1eqeGC8tj/a0Pt+m2nU+T/PExht7YFzrALvxZPIH9+ 0AtpKKXz6OFrWY8Zkzv2wQlJRbK/fvr3RzKU9WV/xjEQJV4bfzUxEK7c758m9Ea3jfnLwc C3uc0SUdayeB1jhfUNOsa6x7WHzEPOY5BAPkqTAD0crOVJLniWTeYp82mVSPTg== Received: from [IPV6:2601:648:8384:fd00:b9d4:6be:a338:f57a] (unknown [IPv6:2601:648:8384:fd00:b9d4:6be:a338:f57a]) (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 4Sfqs54rgBz1Mwy; Tue, 28 Nov 2023 17:56:41 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Tue, 28 Nov 2023 09:56:40 -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: c596126a5d3d - main - pmbr: Only load the first 545k rather than error out Content-Language: en-US To: Warner Losh Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202311272246.3ARMkNS1037267@gitrepo.freebsd.org> <8fa6ed4d-c26b-4dd6-86f2-c3751f86d426@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 11/28/23 9:07 AM, Warner Losh wrote: > On Tue, Nov 28, 2023 at 9:06 AM John Baldwin wrote: >> But also, can't you just leave a gap in the partitions to leave room >> for a future ESP? It might not always be safe to load a full 545k >> depending on if the firmware has reserved some of memory just below >> 640k. 545k is an upper bound on how much can be loaded in terms of >> 640k - the load address, but the practical limit might be lower. It is >> probably safer as a general rule to keep the boot partition closer to >> the size of the boot loader and leave a gap in place instead. >> > > Today we load 512k always. Well, we load the partition size always. The default size of the partition has grown over time. Arguably we should have been using padding instead of growing the partition, but that is harder to write in installer tools, etc. When I wrote pmbr I on purpose used the partition size as the size to load rather than trying to assume information about the payload and parse a length from the payload due to the limited room in the MBR. I think we started out creating freebsd-boot partitions that were 64k and later grew them with a desire they could be replaced with an ESP partition, but ESPs need a minimum size of 512k? -- John Baldwin From nobody Tue Nov 28 18:06:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfr4B5yQpz52Jyq for ; Tue, 28 Nov 2023 18:06:18 +0000 (UTC) (envelope-from tsoome@me.com) Received: from mr85p00im-zteg06011501.me.com (mr85p00im-zteg06011501.me.com [17.58.23.182]) (using TLSv1.3 with cipher TLS_AES_256_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 4Sfr4B3mwlz4K9Y for ; Tue, 28 Nov 2023 18:06:18 +0000 (UTC) (envelope-from tsoome@me.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1701194777; bh=1HeoP5YU7Dg8r/aUVGGC/DANRzEyMuOhmzwupjjPULI=; h=From:Message-Id:Content-Type:Mime-Version:Subject:Date:To; b=q4uympdOw7pMS2GrmDNZ2jg9k5LdjVg1Rj4Dee4UgO8gvTQKXeaJiI+ZL1r48FLt5 9R68XctcNBU6IRSveLr53A/un2QcH3OUsP9RpM2BmGGGwL0pR/+swbP8WsAuuV8S1L 5+sUfRfAYcBbRz9DMBDXXGJImRu+5XvA505Dl41ca6sUgUDXD1VsYge90dnoaQfFF2 j/paln3dErEyMkoHIls49sQCj0dFQ4cL53hQ36f9n4ANIGfXnUc/Cf/dLBodf1tvai bPuOkKEYDpyGKnYpbjqg5Ip6GOmow0LBjCkLdoZSPOpEbvd0dVdGaapGy47bU63EX6 def2putQLg85A== Received: from smtpclient.apple (mr38p00im-dlb-asmtp-mailmevip.me.com [17.57.152.18]) by mr85p00im-zteg06011501.me.com (Postfix) with ESMTPSA id 689064804BE; Tue, 28 Nov 2023 18:06:15 +0000 (UTC) From: Toomas Soome Message-Id: <234CE696-4583-41CF-A94D-3D29EA4676C5@me.com> Content-Type: multipart/alternative; boundary="Apple-Mail=_1938CAEA-1A7B-4C6C-AC05-91F5BC64EA33" List-Id: Commit messages for the main 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: c596126a5d3d - main - pmbr: Only load the first 545k rather than error out Date: Tue, 28 Nov 2023 20:06:02 +0200 In-Reply-To: Cc: Warner Losh , Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org To: John Baldwin References: <202311272246.3ARMkNS1037267@gitrepo.freebsd.org> <8fa6ed4d-c26b-4dd6-86f2-c3751f86d426@FreeBSD.org> X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Proofpoint-ORIG-GUID: TOD7t68z4q_nv-llrDAsjymr9sBBjhXQ X-Proofpoint-GUID: TOD7t68z4q_nv-llrDAsjymr9sBBjhXQ X-Proofpoint-Virus-Version: =?UTF-8?Q?vendor=3Dfsecure_engine=3D1.1.170-22c6f66c430a71ce266a39bfe25bc?= =?UTF-8?Q?2903e8d5c8f:6.0.138,18.0.572,17.0.605.474.0000000_definitions?= =?UTF-8?Q?=3D2020-02-14=5F11:2020-02-14=5F02,2020-02-14=5F11,2020-01-23?= =?UTF-8?Q?=5F02_signatures=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 spamscore=0 suspectscore=0 bulkscore=0 clxscore=1011 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2311280145 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:714, ipnet:17.58.16.0/20, country:US] X-Rspamd-Queue-Id: 4Sfr4B3mwlz4K9Y --Apple-Mail=_1938CAEA-1A7B-4C6C-AC05-91F5BC64EA33 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 28. Nov 2023, at 19:56, John Baldwin wrote: >=20 > On 11/28/23 9:07 AM, Warner Losh wrote: >> On Tue, Nov 28, 2023 at 9:06=E2=80=AFAM John Baldwin = wrote: >>> But also, can't you just leave a gap in the partitions to leave room >>> for a future ESP? It might not always be safe to load a full 545k >>> depending on if the firmware has reserved some of memory just below >>> 640k. 545k is an upper bound on how much can be loaded in terms of >>> 640k - the load address, but the practical limit might be lower. It = is >>> probably safer as a general rule to keep the boot partition closer = to >>> the size of the boot loader and leave a gap in place instead. >>>=20 >> Today we load 512k always. >=20 > Well, we load the partition size always. The default size of the = partition > has grown over time. Arguably we should have been using padding = instead of > growing the partition, but that is harder to write in installer tools, = etc. > When I wrote pmbr I on purpose used the partition size as the size to = load > rather than trying to assume information about the payload and parse a > length from the payload due to the limited room in the MBR. I think = we > started out creating freebsd-boot partitions that were 64k and later = grew > them with a desire they could be replaced with an ESP partition, but = ESPs > need a minimum size of 512k? >=20 The size is not specified (from UEFI_Spec_2_10_Aug29): "It is outside of the scope of this specifi- cation to attempt to = coordinate the specification of size and location of an ESP that can be = shared by multiple OS or Diagnostics installations, or to manage = potential namespace collisions in directory naming in a single (central) = ESP.=E2=80=9D and=20 "The EFI firmware must support the FAT32, FAT16, and FAT12 variants of = the EFI file system. What variant of EFI FAT to use is defined by the = size of the media.=E2=80=9D In reality, there are systems which only support FAT32 on hard disks, = and that will set minimum size ~34MB with 512B sector and a bit over = 256MB with 4k sector.=20 However, there are suggestions from vendors (notably Microsoft), to have = at least ~100MB to make it possible to store auxiliary files such as = diagnostics and other tools. rgds, toomas= --Apple-Mail=_1938CAEA-1A7B-4C6C-AC05-91F5BC64EA33 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On 28. Nov 2023, at 19:56, John Baldwin = <jhb@FreeBSD.org> wrote:

On 11/28/23 9:07 AM, = Warner Losh wrote:
On Tue, Nov 28, 2023 at = 9:06=E2=80=AFAM John Baldwin <jhb@freebsd.org> = wrote:
But also, can't you just leave a gap = in the partitions to leave room
for a future ESP?  It might not = always be safe to load a full 545k
depending on if the firmware has = reserved some of memory just below
640k.  545k is an upper bound = on how much can be loaded in terms of
640k - the load address, but = the practical limit might be lower.  It is
probably safer as a = general rule to keep the boot partition closer to
the size of the =  boot loader and leave a gap in place = instead.

Today we load 512k = always.

Well, we load the partition size always. =  The default size of the partition
has grown over time. =  Arguably we should have been using padding instead of
growing = the partition, but that is harder to write in installer tools, = etc.
When I wrote pmbr I on purpose used the partition size as the = size to load
rather than trying to assume information about the = payload and parse a
length from the payload due to the limited room = in the MBR.  I think we
started out creating freebsd-boot = partitions that were 64k and later grew
them with a desire they could = be replaced with an ESP partition, but ESPs
need a minimum size of = 512k?


The size is not = specified (from UEFI_Spec_2_10_Aug29):

"It is outside of = the scope of this specifi- cation to attempt to coordinate the = specification of size and location of an ESP that can be shared by = multiple OS or Diagnostics installations, or to manage potential = namespace collisions in directory naming in a single (central) = ESP.=E2=80=9D

and 

"The EFI firmware must support the = FAT32, FAT16, and FAT12 variants of the EFI file system. What variant of = EFI FAT to use is defined by the size of the media.=E2=80=9D

In = reality, there are systems which only support FAT32 on hard disks, and = that will set minimum size ~34MB with 512B sector and a bit over 256MB = with 4k sector. 

However, there are suggestions from vendors (notably = Microsoft), to have at least ~100MB to make it possible to store = auxiliary files such as diagnostics and other = tools.

rgds,
toomas
= --Apple-Mail=_1938CAEA-1A7B-4C6C-AC05-91F5BC64EA33-- From nobody Tue Nov 28 18:06:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfr4F1lbKz52KCY for ; Tue, 28 Nov 2023 18:06:21 +0000 (UTC) (envelope-from tsoome@me.com) Received: from mr85p00im-ztdg06011901.me.com (mr85p00im-ztdg06011901.me.com [17.58.23.198]) (using TLSv1.3 with cipher TLS_AES_256_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 4Sfr4D6Mqvz4KDD for ; Tue, 28 Nov 2023 18:06:20 +0000 (UTC) (envelope-from tsoome@me.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1701194779; bh=1HeoP5YU7Dg8r/aUVGGC/DANRzEyMuOhmzwupjjPULI=; h=From:Message-Id:Content-Type:Mime-Version:Subject:Date:To; b=DKBPNQ4rAnjSp0x/WM1zh7954oWBG+ri2xjy/st+SkOVC9sXLO1X+1fCAOBmWkm2s U+XRTOmroFwpSTxeBfwJwFOILylxDzJBgsygM9ostGXei4exSX3wVU/6hmywktI5Hk XPTqw3sHBf0woioWRJW4NYTa+VuEaVwEWPvjI4pbxhgYcOwyd08uGV/H0U6ROpz3ul uwarsY4c6D838hKZKPKMYdQUEI2bJErsKsx0uubqtCAfQIXkaMgmfXmefF0P5o4ZWG Fav9S0faw6xhUMNlGkA661sqJE9QrZdykJSBnlv6SkjHAEO8HS6M/skGpD7XZshZzl 0JfF/80F3P12Q== Received: from smtpclient.apple (mr38p00im-dlb-asmtp-mailmevip.me.com [17.57.152.18]) by mr85p00im-ztdg06011901.me.com (Postfix) with ESMTPSA id ADCA99000E8; Tue, 28 Nov 2023 18:06:17 +0000 (UTC) From: Toomas Soome Message-Id: <234CE696-4583-41CF-A94D-3D29EA4676C5@me.com> Content-Type: multipart/alternative; boundary="Apple-Mail=_1938CAEA-1A7B-4C6C-AC05-91F5BC64EA33" List-Id: Commit messages for the main 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: c596126a5d3d - main - pmbr: Only load the first 545k rather than error out Date: Tue, 28 Nov 2023 20:06:02 +0200 In-Reply-To: Cc: Warner Losh , Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org To: John Baldwin References: <202311272246.3ARMkNS1037267@gitrepo.freebsd.org> <8fa6ed4d-c26b-4dd6-86f2-c3751f86d426@FreeBSD.org> X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Proofpoint-ORIG-GUID: 6qT8u4FNjrGYJRLmp2k7YdzutxTcVODo X-Proofpoint-GUID: 6qT8u4FNjrGYJRLmp2k7YdzutxTcVODo X-Proofpoint-Virus-Version: =?UTF-8?Q?vendor=3Dfsecure_engine=3D1.1.170-22c6f66c430a71ce266a39bfe25bc?= =?UTF-8?Q?2903e8d5c8f:6.0.425,18.0.816,17.11.62.513.0000000_definitions?= =?UTF-8?Q?=3D2022-01-18=5F01:2022-01-14=5F01,2022-01-18=5F01,2021-12-02?= =?UTF-8?Q?=5F01_signatures=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxscore=0 clxscore=1015 suspectscore=0 spamscore=0 mlxlogscore=999 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2311280145 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:714, ipnet:17.58.16.0/20, country:US] X-Rspamd-Queue-Id: 4Sfr4D6Mqvz4KDD --Apple-Mail=_1938CAEA-1A7B-4C6C-AC05-91F5BC64EA33 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 28. Nov 2023, at 19:56, John Baldwin wrote: >=20 > On 11/28/23 9:07 AM, Warner Losh wrote: >> On Tue, Nov 28, 2023 at 9:06=E2=80=AFAM John Baldwin = wrote: >>> But also, can't you just leave a gap in the partitions to leave room >>> for a future ESP? It might not always be safe to load a full 545k >>> depending on if the firmware has reserved some of memory just below >>> 640k. 545k is an upper bound on how much can be loaded in terms of >>> 640k - the load address, but the practical limit might be lower. It = is >>> probably safer as a general rule to keep the boot partition closer = to >>> the size of the boot loader and leave a gap in place instead. >>>=20 >> Today we load 512k always. >=20 > Well, we load the partition size always. The default size of the = partition > has grown over time. Arguably we should have been using padding = instead of > growing the partition, but that is harder to write in installer tools, = etc. > When I wrote pmbr I on purpose used the partition size as the size to = load > rather than trying to assume information about the payload and parse a > length from the payload due to the limited room in the MBR. I think = we > started out creating freebsd-boot partitions that were 64k and later = grew > them with a desire they could be replaced with an ESP partition, but = ESPs > need a minimum size of 512k? >=20 The size is not specified (from UEFI_Spec_2_10_Aug29): "It is outside of the scope of this specifi- cation to attempt to = coordinate the specification of size and location of an ESP that can be = shared by multiple OS or Diagnostics installations, or to manage = potential namespace collisions in directory naming in a single (central) = ESP.=E2=80=9D and=20 "The EFI firmware must support the FAT32, FAT16, and FAT12 variants of = the EFI file system. What variant of EFI FAT to use is defined by the = size of the media.=E2=80=9D In reality, there are systems which only support FAT32 on hard disks, = and that will set minimum size ~34MB with 512B sector and a bit over = 256MB with 4k sector.=20 However, there are suggestions from vendors (notably Microsoft), to have = at least ~100MB to make it possible to store auxiliary files such as = diagnostics and other tools. rgds, toomas= --Apple-Mail=_1938CAEA-1A7B-4C6C-AC05-91F5BC64EA33 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On 28. Nov 2023, at 19:56, John Baldwin = <jhb@FreeBSD.org> wrote:

On 11/28/23 9:07 AM, = Warner Losh wrote:
On Tue, Nov 28, 2023 at = 9:06=E2=80=AFAM John Baldwin <jhb@freebsd.org> = wrote:
But also, can't you just leave a gap = in the partitions to leave room
for a future ESP?  It might not = always be safe to load a full 545k
depending on if the firmware has = reserved some of memory just below
640k.  545k is an upper bound = on how much can be loaded in terms of
640k - the load address, but = the practical limit might be lower.  It is
probably safer as a = general rule to keep the boot partition closer to
the size of the =  boot loader and leave a gap in place = instead.

Today we load 512k = always.

Well, we load the partition size always. =  The default size of the partition
has grown over time. =  Arguably we should have been using padding instead of
growing = the partition, but that is harder to write in installer tools, = etc.
When I wrote pmbr I on purpose used the partition size as the = size to load
rather than trying to assume information about the = payload and parse a
length from the payload due to the limited room = in the MBR.  I think we
started out creating freebsd-boot = partitions that were 64k and later grew
them with a desire they could = be replaced with an ESP partition, but ESPs
need a minimum size of = 512k?


The size is not = specified (from UEFI_Spec_2_10_Aug29):

"It is outside of = the scope of this specifi- cation to attempt to coordinate the = specification of size and location of an ESP that can be shared by = multiple OS or Diagnostics installations, or to manage potential = namespace collisions in directory naming in a single (central) = ESP.=E2=80=9D

and 

"The EFI firmware must support the = FAT32, FAT16, and FAT12 variants of the EFI file system. What variant of = EFI FAT to use is defined by the size of the media.=E2=80=9D

In = reality, there are systems which only support FAT32 on hard disks, and = that will set minimum size ~34MB with 512B sector and a bit over 256MB = with 4k sector. 

However, there are suggestions from vendors (notably = Microsoft), to have at least ~100MB to make it possible to store = auxiliary files such as diagnostics and other = tools.

rgds,
toomas
= --Apple-Mail=_1938CAEA-1A7B-4C6C-AC05-91F5BC64EA33-- From nobody Tue Nov 28 18:06:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfr534jc3z52KF1 for ; Tue, 28 Nov 2023 18:07:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450: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 4Sfr532dc6z4L7M for ; Tue, 28 Nov 2023 18:07:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-507a29c7eefso7601324e87.1 for ; Tue, 28 Nov 2023 10:07:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701194822; x=1701799622; 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=rw5/WbipIHtpfXJmx1CbZK6wRdM8Oe8rEGpRhhYYoJU=; b=scUo2shJY0EKbYtjfaFNNy3Wd65Eet6rrXp0l7J2ySN9uVtWQNZ2vEgiWHOORC1GD/ UUZneJ6AgW2wDGRLSZljDLhD/NF5okCZKtUmoazo5DwP5txYEYoAim4xyN5v5uG/yXns yOdHteCPsa29VwZIXtWZ36sfHTDqy8E+sI5beK3oRryEDIqlxGgpMo/JXIxDM4/B3iho xlRsw62zOX0pbN+hk/frA8HMzdDMuCUOfhzR/aT97p/dy2FnX+wEQps97/QfvXv1ejSp d/MDVJkTQC9PSQAiNmzogilIwnR3X4NtAc78sJhZ8hNMhcqSkn/ldtRAyfAak37UO3vW DDAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701194822; x=1701799622; 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=rw5/WbipIHtpfXJmx1CbZK6wRdM8Oe8rEGpRhhYYoJU=; b=qAzTFvKCEE2NcxHk4uJGHrBIGF4DX8E9/PVS+eTiAPvbvnNLETMAypxCxOpejY3n4q kyKBPNwMcNICXNzJHOykoBJ1qw6NNxCBOZGHSOwFoK1PBTz14EgEflwSp3E7wYyt1U3Q MNxfXq153EqxaQux0RUwHNobRFRShF280KG7i+Gdk/bE+vUdGxiLtyQDXlK4Qgx3R1wQ /2Op+8Ya9s/ePQq8H1s9ObLKnJt+kwUUNGdyHSwz+LYg5KamOYlElss+yWdaS/nI0j0M B0LxACufeJyDbxWiDWXDGj6XQfBPuppVTDcSY6oL3C3xHnp9Apmd7WTvPugRy+DrBK+/ H+EA== X-Gm-Message-State: AOJu0YzemUYQvveS+fmLgpBhK0p3bCWFBa8bgr/S3KWCIW9OkidL719+ HA3zFkQS4Zp8H19ocdlbpNABcURIz1ceB47UU8XGXg== X-Google-Smtp-Source: AGHT+IGjCrjklZ0l3/uFSstGPLyyb3w3kX8bV7J6+sbAG3SaOv3FcnnkeqkjtZA9Pc8rz+my3JaJVvJOzeFlgiiUE2Q= X-Received: by 2002:a05:6512:284:b0:50b:bf57:7d6 with SMTP id j4-20020a056512028400b0050bbf5707d6mr1215339lfp.6.1701194821784; Tue, 28 Nov 2023 10:07:01 -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: <202311272246.3ARMkNS1037267@gitrepo.freebsd.org> <8fa6ed4d-c26b-4dd6-86f2-c3751f86d426@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Tue, 28 Nov 2023 11:06:50 -0700 Message-ID: Subject: Re: git: c596126a5d3d - main - pmbr: Only load the first 545k rather than error out To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000000befe9060b3a496d" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Sfr532dc6z4L7M --0000000000000befe9060b3a496d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Nov 28, 2023 at 10:56=E2=80=AFAM John Baldwin wro= te: > On 11/28/23 9:07 AM, Warner Losh wrote: > > On Tue, Nov 28, 2023 at 9:06=E2=80=AFAM John Baldwin = wrote: > >> But also, can't you just leave a gap in the partitions to leave room > >> for a future ESP? It might not always be safe to load a full 545k > >> depending on if the firmware has reserved some of memory just below > >> 640k. 545k is an upper bound on how much can be loaded in terms of > >> 640k - the load address, but the practical limit might be lower. It i= s > >> probably safer as a general rule to keep the boot partition closer to > >> the size of the boot loader and leave a gap in place instead. > >> > > > > Today we load 512k always. > > Well, we load the partition size always. The default size of the partiti= on > has grown over time. Arguably we should have been using padding instead = of > growing the partition, but that is harder to write in installer tools, et= c. > When I wrote pmbr I on purpose used the partition size as the size to loa= d > rather than trying to assume information about the payload and parse > length from the payload due to the limited room in the MBR. I think we > started out creating freebsd-boot partitions that were 64k and later grew > them with a desire they could be replaced with an ESP partition, but ESPs > need a minimum size of 512k? > ESPs usually need at least a couple of megebytes since loader.efi is 660k right now and you really want a backup when you install a new one. It's better if it's tens of MB, though, since you may need it for other things... Warner --0000000000000befe9060b3a496d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Nov 28, 2023 at 10:56=E2=80= =AFAM John Baldwin <jhb@freebsd.org> wrote:
On= 11/28/23 9:07 AM, Warner Losh wrote:
> On Tue, Nov 28, 2023 at 9:06=E2=80=AFAM John Baldwin <jhb@freebsd.org> wrote:
>> But also, can't you just leave a gap in the partitions to leav= e room
>> for a future ESP?=C2=A0 It might not always be safe to load a full= 545k
>> depending on if the firmware has reserved some of memory just belo= w
>> 640k.=C2=A0 545k is an upper bound on how much can be loaded in te= rms of
>> 640k - the load address, but the practical limit might be lower.= =C2=A0 It is
>> probably safer as a general rule to keep the boot partition closer= to
>> the size of the=C2=A0 boot loader and leave a gap in place instead= .
>>
>
> Today we load 512k always.

Well, we load the partition size always.=C2=A0 The default size of the part= ition
has grown over time.=C2=A0 Arguably we should have been using padding inste= ad of
growing the partition, but that is harder to write in installer tools, etc.=
When I wrote pmbr I on purpose used the partition size as the size to load<= br> rather than trying to assume information about the payload and parse
length from the payload due to the limited room in the MBR.=C2=A0 I think w= e
started out creating freebsd-boot partitions that were 64k and later grew them with a desire they could be replaced with an ESP partition, but ESPs need a minimum size of 512k?

ESPs usual= ly need at least a couple of megebytes since loader.efi is 660k right now
and you really want a backup when you install a new one. It's = better if it's tens of MB,
though, since you may need it for = other things...

Warner
--0000000000000befe9060b3a496d-- From nobody Tue Nov 28 18:18:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfrL54kkMz52LCK; Tue, 28 Nov 2023 18:18: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 4SfrL545qxz4M1j; Tue, 28 Nov 2023 18:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701195501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fenIRAisrP9vX7Y/yBGF7lCOcqNOY/Un6hAqMK/VfqY=; b=nW2NCw0eg2ZpMPB8b6QVCWqoS1bB/I10sKFJlWzDT8pLvP/SWbNs9kcleQJY5yOIFCEIWQ yOI+Jjk8t0ezC6U9XT0itJeIwaQ8nbu3cz0MaeLwmO8fS8TaT8XoudeUfooKTLOfTYo140 +ZEsmsot1hweU3mQHJ/0J4mn+uywBn142ACKAKYQ3eezhwhvA4KoIvAoKPcAKdxpOfFWyN yrbTu1hjJSV66ThKtGOhsc7Br6Ibl4UvBHMsmFMwT1iUngJqbSOE/3/0Sm+fUzM16Not5d QfcuFsrK5UyWEaAx4Lpzv0CDTeve563X3bk6p+FslinQztMjEzvQ9gY+LS5Fwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701195501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fenIRAisrP9vX7Y/yBGF7lCOcqNOY/Un6hAqMK/VfqY=; b=nwVYdOCxAmjkvdjVf5R0t9YamjrIVS/LsBcPB8BUWBULw95bXizLCMFdYsW5ovuW+7Ia/7 v5w76M1uApjuYbDq4fp3NPIoRlUgA8qxqUoYaZNj347pHptMrUSAL+fG7yv8Qs3oSKaB0C wmJT3bac4qiWB1DhFkIaKDhz0UzFlqVv15Mh4rrlMluhy5yrNjDUyauQbcxNDE11z9GR4s 8oCSuRjyduL2h9KC/QE6la5AqdOZ734AhkpaJNP1OQorHsyaoBTNHl/Pj/yzV8l4BGhc2s 3vLCbwZD6OoeT2Xfp+qEwEz16+RzgpGIO6XhAZ1O1ePh8AhJWkyM63wd8TArfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701195501; a=rsa-sha256; cv=none; b=RfCn70WQkel9vr7GBc3/ARNDaeC+ni6IVjeWFijljGNl6wr190rdf2sTI+bMDsOLIE+vb6 1dvptAkxqJoPSOms66XjDe0y0qn24UjHrjGdJTU9dhh/1W8X1NndEFIhc0TldlXjD0Qr9K o4bkLTVmuibP8HXnxCcKkIaAIxUy9XKSJ8no7N+jgaciRDEARkRRajV7c7aPB1GzvUjkk/ fuBlV8Pc9oJSq7VXqgrIkdHamfdCAeiXVlaNFx3uSWQTTsSvwir38F6FQwuUZTOQqVW8gz ZtHMy2JxfQT2O0j1lZAv7742lkKxuI6tYuN9a6Qme8Sa2u+oaig9X4ATfdEbXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfrL533R5zXj2; Tue, 28 Nov 2023 18:18: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 3ASIILou097340; Tue, 28 Nov 2023 18:18:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASIILX3097337; Tue, 28 Nov 2023 18:18:21 GMT (envelope-from git) Date: Tue, 28 Nov 2023 18:18:21 GMT Message-Id: <202311281818.3ASIILX3097337@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: d2033021a73d - main - compiler-rt: remove unnecessary include List-Id: Commit messages for the main 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: d2033021a73db7b8d910c1ffc52f4d1d0def7162 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d2033021a73db7b8d910c1ffc52f4d1d0def7162 commit d2033021a73db7b8d910c1ffc52f4d1d0def7162 Author: Dimitry Andric AuthorDate: 2023-11-28 18:17:36 +0000 Commit: Dimitry Andric CommitDate: 2023-11-28 18:17:54 +0000 compiler-rt: remove unnecessary include This is to sync the code with upstream, see: See https://github.com/llvm/llvm-project/pull/73439#discussion_r1406644942 Fixes: 4c9a0adad182 MFC after: 3 days --- .../compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp index 58310e05b359..2e9329183e8d 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp @@ -47,7 +47,6 @@ #if SANITIZER_FREEBSD #include -#include #include #include #include From nobody Tue Nov 28 19:43:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SftD20Hwlz52SKh; Tue, 28 Nov 2023 19:43: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 4SftD154L9z4W32; Tue, 28 Nov 2023 19:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701200593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYXHCQRKJ28GcRb1FCpseXaK2m2aEdUBJhhhlXnrRkU=; b=MACWJWhDlcKB7NorXW34XLL7TYZqy6Ms6Hp3BwHRfWFKEOX8Y98B3F8DhZqNdI0UFZHga+ 5B9awWR1fpCls9h82j3vfly3ahYwcaSBbUUtKgjRfdcWJYChcR9tyA1kLcgUdLgraHARnq Us9W9s5NNUQJThm53ovEufYsXG5NPPmI5eHnoKfPRMVM3m9fz6XBdcZDTIPAb1LObA46I6 OC+5AKwmWRncsqYdg7MHhJg+IwYOoKDP6kIBGf5QngQ/2KbCUIxHxnRGelLcOgbL7RVzps 4YjHjM1xn1goVIyUU7Z/kb+h/Lt5swROon7qXjJfi/drrVsTtNy6f5uAL8HsVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701200593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYXHCQRKJ28GcRb1FCpseXaK2m2aEdUBJhhhlXnrRkU=; b=O41mCTP2RAxUyNMmwnRd+X+VpFZVHAiv223zI9ScASRQ5h+i7VfHlKdkF2gCtj8Fu1Tdhg jGCzDNgr8Z2JHHHxx9m4WnIAEV4yPVgbMFJ7cSO4MMIv8DFcuatUy1jUqUr/UUxnhImU1J pPma8W2DMKmFsgjgJwHkjCYb+uLIjTcLlrDd6VXnNDb0KRCDJ4DtmRPTE4KiQqvS/OD7SF 9j8Gei+peXifNVkdvvK85Aco7Jt7dSlMmAvlz6niuKDp7rfCgibJYnB8N+oNOffPA7MZ3q XlVo/9o2ei4gOGDu5+Akx7SoPLlKo0GCMxFCaSNvbts2HsbqMzTu6PaPej0OKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701200593; a=rsa-sha256; cv=none; b=d/OxanlFBMDJsu0vFYsjh3VDIRgojMqts4k6f3qJn68reWYq9xhtXtXRn6WVQKdvVdJec2 h4UyzpV/fzszBW4Ru0TxdGXu/vyGr2VFjDb0jNu7WVcmgmuVEPLcXhIwChcgxoFtVFp3ek DFmv0Mxj/sX9SMX3U4t239Qny3Bbia8mcIcweoMl9m61alBhdp7/OxhetosoPcsg4I2DRb 2ePehCc6I9s39fUGPVgEwXYjM0J+QbPXdKqsbFPl/rCx+LhUtY4yTL4FGBlgthjbdqDWDd DhsfqdnEUiNiQivfEJU0WtdNE+HNgyrUUjBivo0AngcS+scHHCJo3I20MD4ofw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SftD145wBzbL8; Tue, 28 Nov 2023 19:43: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 3ASJhDY6046763; Tue, 28 Nov 2023 19:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASJhDXs046760; Tue, 28 Nov 2023 19:43:13 GMT (envelope-from git) Date: Tue, 28 Nov 2023 19:43:13 GMT Message-Id: <202311281943.3ASJhDXs046760@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: 87826c87c63b - main - ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() List-Id: Commit messages for the main 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: 87826c87c63b2995cb69e9c1a624c7e20dd70fcd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87826c87c63b2995cb69e9c1a624c7e20dd70fcd commit 87826c87c63b2995cb69e9c1a624c7e20dd70fcd Author: Mark Johnston AuthorDate: 2023-11-28 19:35:49 +0000 Commit: Mark Johnston CommitDate: 2023-11-28 19:35:49 +0000 ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() Consumers may optionally provide a reference to a separate buffer containing AAD, but ossl_aes_gcm() didn't handle this and would thus compute an incorrect digest. Fixes: 9a3444d91c70 ("ossl: Add a VAES-based AES-GCM implementation for amd64") Reviewed by: jhb MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D42736 --- sys/crypto/openssl/ossl_aes.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index 130bf292e521..c0cb8ba08d35 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -198,14 +198,20 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, crypto_read_iv(crp, iv); ctx->ops->setiv(ctx, iv, csp->csp_ivlen); - crypto_cursor_init(&cc_in, &crp->crp_buf); - crypto_cursor_advance(&cc_in, crp->crp_aad_start); - for (size_t alen = crp->crp_aad_length; alen > 0; alen -= seglen) { - inseg = crypto_cursor_segment(&cc_in, &inlen); - seglen = MIN(alen, inlen); - if (ctx->ops->aad(ctx, inseg, seglen) != 0) + if (crp->crp_aad != NULL) { + if (ctx->ops->aad(ctx, crp->crp_aad, crp->crp_aad_length) != 0) return (EINVAL); - crypto_cursor_advance(&cc_in, seglen); + } else { + crypto_cursor_init(&cc_in, &crp->crp_buf); + crypto_cursor_advance(&cc_in, crp->crp_aad_start); + for (size_t alen = crp->crp_aad_length; alen > 0; + alen -= seglen) { + inseg = crypto_cursor_segment(&cc_in, &inlen); + seglen = MIN(alen, inlen); + if (ctx->ops->aad(ctx, inseg, seglen) != 0) + return (EINVAL); + crypto_cursor_advance(&cc_in, seglen); + } } crypto_cursor_init(&cc_in, &crp->crp_buf); From nobody Tue Nov 28 19:48:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SftLB6z3vz52SJl; Tue, 28 Nov 2023 19:48: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 4SftLB6R3Mz4Wdg; Tue, 28 Nov 2023 19:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701200914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHBElTvJImCt3Y2vnge4c0X9du+lU2k5T5geleuUpRM=; b=ECTR/Ej3+i4q9Cfn2veTXG0xNS71M5facfT04+QG/gobQiLBKJabRyBIMEGUDcqm15hofC L3MBsWsSffs1Gi8sP/ooySaeZPDEaaZYKapJR2KxPhjO13H21Sdeh3Z0yFqlBZY/bq5vL1 r3vXBOYyKuZDKiFpAt//UpDlO5Pzq655JyCCDY+4uhDDgztZK0Tc4HYleO3mUeNRx/Qnpm EOujVmrrY+BXA4XwrLOrh5oMmIMzxN80Y/WEa+vRU1QDrOJe508AJkNpQIF1MoplSD84Zp fsWeAPI9YUzX1O1mgfOBRwlezr29iKl4qYWRK1dLdqUdZpvoRqOZ0+UT0pcZOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701200914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHBElTvJImCt3Y2vnge4c0X9du+lU2k5T5geleuUpRM=; b=np3t/mrjVX/2uyUWk4rLv5mXex8bdwhjbJ6Cgmg5C8QTiCRMnfsHofV0u02f0Fno1OiewZ wMVgPHYGX9TylapSH4lqAi0khK54XgyPeULyjAdD4G6jMP8/NQVwBM6tv+JN6yY7DmFpQ4 ekQjz/CefkPaC5ZKARiww2RI0QhU5DhzZkfhgcSY+VKr4Po5/h8w4IdySnW2TMI5nkSgV3 3+ZBEhxnJY6WotxDVS7GBMhO80bNioeO2nJr0TeGq8NiponDlyA98aDAYq8NnaEWvXsY+Z w8eb+bOPmiitsJabP52zRrLetZ6GzbABzhVWstu5PueTxMjfT9NgXn/ervR+Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701200914; a=rsa-sha256; cv=none; b=LZU640WekkDhxovICUk71q4rXBT668yFJrPxAut8dD82+kWqAqFMomfWs1DWYpeLSJ4GmK pyegCqeDdbsAFCP8z3AwRahDT6Dwvl3/PF/ggX9BML9+aD9yRwhHegjuXHq1nEo25V/Spg B+92Tg3zGu+WIWsGJrAz1hifWtNsriPW7Gey31HftbsUQ1omvIq+JxayP7+KKY5pptnQZC 0eIWAm4zDQjR01W94IFuKn8SN50j2F6fW9W7dumtan5hZ8zG23RFCyH+L/E3xi41o7XyEy XiW9givfJsy7bH/VfAHbvqc/Fuy70EpSsRM71JGL1igaOZGY2stY5yFMjZqSYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SftLB5Thczb6t; Tue, 28 Nov 2023 19:48: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 3ASJmYWv047740; Tue, 28 Nov 2023 19:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASJmYnG047737; Tue, 28 Nov 2023 19:48:34 GMT (envelope-from git) Date: Tue, 28 Nov 2023 19:48:34 GMT Message-Id: <202311281948.3ASJmYnG047737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: cd201c090858 - main - ifconfig: add -D option to print driver name for interface List-Id: Commit messages for the main 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd201c090858e5cfae3be005453ec634c1fca36a Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=cd201c090858e5cfae3be005453ec634c1fca36a commit cd201c090858e5cfae3be005453ec634c1fca36a Author: Mike Karels AuthorDate: 2023-11-28 19:47:37 +0000 Commit: Mike Karels CommitDate: 2023-11-28 19:47:37 +0000 ifconfig: add -D option to print driver name for interface Add -D option to add the drivername and unit number to ifconfig output for normal display, including -a. Use ifconfig_get_orig_name() from libifconfig to fetch the name. Note that this is the original name for many drivers, but not for some exceptions like epair (which appends 'a' or 'b' to the unit number). epair interface pairs both display as "epair0", etc. Make -v imply -D; might as well be fully verbose. MFC after: 1 week Reviewed by: zlei, kp Differential Revision: https://reviews.freebsd.org/D42721 --- sbin/ifconfig/ifconfig.8 | 10 ++++++++-- sbin/ifconfig/ifconfig.c | 5 ++++- sbin/ifconfig/ifconfig.h | 1 + sbin/ifconfig/ifconfig_netlink.c | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 789b98fd7447..876b9b22ea56 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Nm .Op Fl j Ar jail -.Op Fl kLmn +.Op Fl DkLmn .Op Fl f Ar type Ns Cm \&: Ns Ar format .Ar interface .Op Cm create @@ -53,7 +53,7 @@ .Nm .Op Fl j Ar jail .Fl a -.Op Fl dkLmuv +.Op Fl dDkLmuv .Op Fl f Ar type Ns Cm \&: Ns Ar format .Op Fl G Ar groupname .Op Fl g Ar groupname @@ -102,6 +102,12 @@ with no additional information. Use of this flag is mutually exclusive with all other flags and commands. .It Fl d Display only the interfaces that are down. +.It Fl D +Include the driver name and unit number of the interface in the output. +This is normally the original name of the interface, +even if it has been renamed; it may differ from the original name +in some cases, such as +.Xr epair 4 . .It Fl f Xo .Ar type Ns Cm \&: Ns Ar format Ns .Op Cm \&, Ns Ar type Ns Cm \&: Ns Ar format Ar ... diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 5ee41bb24b71..2cbe7a881bd0 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -456,7 +456,7 @@ args_parse(struct ifconfig_args *args, int argc, char *argv[]) int c; /* Parse leading line options */ - strlcpy(options, "G:adf:j:klmnuv", sizeof(options)); + strlcpy(options, "G:adDf:j:klmnuv", sizeof(options)); for (p = opts; p != NULL; p = p->next) strlcat(options, p->opt, sizeof(options)); while ((c = getopt(argc, argv, options)) != -1) { @@ -467,6 +467,9 @@ args_parse(struct ifconfig_args *args, int argc, char *argv[]) case 'd': /* restrict scan to "down" interfaces */ args->downonly = true; break; + case 'D': /* Print driver name */ + args->drivername = true; + break; case 'f': if (optarg == NULL) usage(); diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 3303c4894ba7..76a5aeb718b1 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -231,6 +231,7 @@ struct ifconfig_args { bool supmedia; /* Supported media */ bool printkeys; /* Print security keys */ bool allfamilies; /* Print all families */ + bool drivername; /* Print driver name */ int verbose; /* verbosity level */ int argc; char **argv; diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index 826d199d3ccb..8964b63caf7b 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -388,6 +388,7 @@ status_nl(if_ctx *ctx, struct iface *iface) { if_link_t *link = &iface->link; struct ifconfig_args *args = ctx->args; + char *drivername = NULL; printf("%s: ", link->ifla_ifname); @@ -432,6 +433,22 @@ status_nl(if_ctx *ctx, struct iface *iface) args->afp->af_other_status(ctx); print_ifstatus(ctx); + if (args->drivername || args->verbose) { + if (ifconfig_get_orig_name(lifh, link->ifla_ifname, + &drivername) != 0) { + if (ifconfig_err_errtype(lifh) == OTHER) + fprintf(stderr, "get original name: %s\n", + strerror(ifconfig_err_errno(lifh))); + else + fprintf(stderr, + "get original name: error type %d\n", + ifconfig_err_errtype(lifh)); + exit_code = 1; + } + if (drivername != NULL) + printf("\tdrivername: %s\n", drivername); + free(drivername); + } if (args->verbose > 0) sfp_status(ctx); } From nobody Tue Nov 28 20:36:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfvPB5t1hz52WlV; Tue, 28 Nov 2023 20:36: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 4SfvPB5fxbz4fkX; Tue, 28 Nov 2023 20:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701203774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=leBKqtLY+IHNWOtGccrxfQbMeGDHGXZFMGxgOu+o0nE=; b=C2omspn28ntGV+W0MvvFFEpH7g5h3Ym4JiB70N1U7U7q2rmZGVtFKjGus99bLwt0moQ9Xf z6RWhZBwEoeYNmo7CylqMWyV3vFosT8Y1AVv+U4exZYgfZr+mjYp/uWG8+E+qJL0EZuKxt d+mUSkJe4oEmtzhtH99z/Xg+M2TqjbD6tpOKirYS3BGQ8uYfOI1bKGN4p4797OrO8AAzsQ Foi9Z88FI8pDaSM9CJ81NrTZDGDD35E/nlcleG54gbAMiYJ8njjJDV5Dbll1/GGu075yso jwjS/M/6MY6MspYKsG/v2YfwL5gIYtji3p+8R/zaEV5LUO+bvJEy/sOGPSEfYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701203774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=leBKqtLY+IHNWOtGccrxfQbMeGDHGXZFMGxgOu+o0nE=; b=opG7ByyaeGtPhmnjOkr5JG9+YhKoNC8BFnA+Ew8/pCg7biFqtGbi9O/qL72YL5DECX+hAz nxpq58wv/Jtn59xQRz5g/AdJKIzPK2apDfvz97RjpVLU37XWYFdFnwaVk1fzpyMtl3kegd ArMe0J5SdoBx6fJfzx9GDenfLSkHyV7ZCijQnkGlHxgw21MlzDWtGATvI9iNYfuLNcTddH fy+b/ijoetlSx5DZIhHly2RVTpjXyunZanKDmGLDBo5uttwdNw8YPQ/JU9VviWkPEZL7IA AWTCQUKSahcyGIU8iAGpQGASirw7iDY+AzSKInd/9RZDh+vYR+S12ezKn5Q55g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701203774; a=rsa-sha256; cv=none; b=JrIeaMv4DJEYFAy0VYTfHUTunfeqGCOCjzZASfWQR4e8W43mac2u+G//SyopKhubogHE8k DAtKvk8xJdgnAEPs5C//4+7vK9npfqvALJzlCqYL0tJDGaB+DGntKUVhpof5Ck08RN3+Si St8zLBTEvNzm6xfeG9YdeZZ/X2eY/YVsX8dKbbQwKK/uvEeP7bBPMKmH3GOpauNnmFq2IO rXmi6uO0h9a7Pz7VANgriDausfGcLKk7xXGooFwO2u4v8t9sBWQbyezE0xSYCViU0kZOjX NCsfDQGcZ51gPyyvW3F2u6JXpoV37rblRuO/PkjLztoR+9gnyIqO2E4Eg4Vp1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfvPB4jL2zcgJ; Tue, 28 Nov 2023 20:36: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 3ASKaEks031850; Tue, 28 Nov 2023 20:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASKaEnm031847; Tue, 28 Nov 2023 20:36:14 GMT (envelope-from git) Date: Tue, 28 Nov 2023 20:36:14 GMT Message-Id: <202311282036.3ASKaEnm031847@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: 2276e53940c2 - main - zfs: merge openzfs/zfs@688514e47 List-Id: Commit messages for the main 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: 2276e53940c2a2bf7c7e9cb705e51de4202258c2 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2276e53940c2a2bf7c7e9cb705e51de4202258c2 commit 2276e53940c2a2bf7c7e9cb705e51de4202258c2 Merge: cd201c090858 688514e4704b Author: Martin Matuska AuthorDate: 2023-11-28 20:35:02 +0000 Commit: Martin Matuska CommitDate: 2023-11-28 20:35:58 +0000 zfs: merge openzfs/zfs@688514e47 Notable upstream pull request merges: #15532 c1a47de86 zdb: Fix zdb '-O|-r' options with -e/exported zpool #15535 cf3316633 ZVOL: Minor code cleanup #15541 803a9c12c brt: lift internal definitions into _impl header #15541 213d68296 zdb: show BRT statistics and dump its contents #15543 a49087510 ZIL: Refactor TX_WRITE encryption similar to TX_CLONE_RANGE #15543 27d8c23c5 ZIL: Do not encrypt block pointers in lr_clone_range_t #15549 67894a597 unnecessary alloc/free in dsl_scan_visitbp() #15551 126efb588 FreeBSD: Fix the build on FreeBSD 12 #15563 acb33ee1c FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible #15564 7bbd42ef4 Don't allow attach to a raidz child vdev #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness Obtained from: OpenZFS OpenZFS commit: 688514e4704bdee4551d25960febd322ac26f297 sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 129 +++++++++++-- sys/contrib/openzfs/include/Makefile.am | 1 + .../openzfs/include/os/freebsd/spl/sys/vfs.h | 2 +- .../openzfs/include/os/freebsd/spl/sys/vnode.h | 3 +- sys/contrib/openzfs/include/sys/brt_impl.h | 199 +++++++++++++++++++++ sys/contrib/openzfs/man/man8/zdb.8 | 11 +- .../openzfs/module/os/freebsd/spl/spl_vfs.c | 9 +- .../openzfs/module/os/freebsd/spl/spl_zlib.c | 8 - .../openzfs/module/os/freebsd/zfs/event_os.c | 18 ++ .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 + .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 31 ++-- .../openzfs/module/os/linux/zfs/zio_crypt.c | 27 ++- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 2 +- sys/contrib/openzfs/module/zfs/brt.c | 164 +---------------- sys/contrib/openzfs/module/zfs/dbuf.c | 10 +- sys/contrib/openzfs/module/zfs/dnode.c | 12 +- sys/contrib/openzfs/module/zfs/dsl_scan.c | 19 +- sys/contrib/openzfs/module/zfs/spa.c | 9 +- sys/contrib/openzfs/module/zfs/zvol.c | 21 +-- sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in | 1 + .../tests/functional/cli_root/zdb/zdb_args_neg.ksh | 2 +- .../zfs_load-key/zfs_load-key_common.kshlib | 5 +- sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 26 files changed, 443 insertions(+), 255 deletions(-) diff --cc sys/contrib/openzfs/README.md index 331889560950,000000000000..af244c1fff14 mode 100644,000000..100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@@ -1,35 -1,0 +1,35 @@@ +![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png) + +OpenZFS is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. +This repository contains the code for running OpenZFS on Linux and FreeBSD. + +[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs) +[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/openzfs-zfs) + +# Official Resources + + * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo + * [ZoL Site](https://zfsonlinux.org) - Linux release info & links + * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) + * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) + +# Installation + +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). + +# Contribute & Develop + +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). + +We have a [Code of Conduct](./CODE_OF_CONDUCT.md). + +# Release + +OpenZFS is released under a CDDL license. +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197` + +# Supported Kernels + * The `META` file contains the officially recognized supported Linux kernel versions. - * Supported FreeBSD versions are any supported branches and releases starting from 12.2-RELEASE. ++ * Supported FreeBSD versions are any supported branches and releases starting from 12.4-RELEASE. diff --cc sys/contrib/openzfs/include/sys/brt_impl.h index 000000000000,9cc06fbb2c3a..9cc06fbb2c3a mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/sys/brt_impl.h +++ b/sys/contrib/openzfs/include/sys/brt_impl.h diff --cc sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index ccd708550f5b,aa1d4855e663..dd833f0a87b2 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@@ -6321,9 -6322,12 +6322,10 @@@ bad_locked_fallback bad_write_fallback: if (mp != NULL) vn_finished_write(mp); - error = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, - ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, - ap->a_incred, ap->a_outcred, ap->a_fsizetd); + error = ENOSYS; return (error); } + #endif struct vop_vector zfs_vnodeops; struct vop_vector zfs_fifoops; diff --cc sys/modules/zfs/zfs_config.h index bcd23c9ea276,000000000000..aab672a77324 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1149 -1,0 +1,1149 @@@ +/* + */ + +/* 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 */ + +/* 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_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 */ + +/* 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 */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* 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_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->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 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 */ + +/* 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 */ + +/* 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 */ + +/* 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 */ *** 303 LINES SKIPPED *** From nobody Tue Nov 28 21:13:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfwDK0xPBz52ZPM; Tue, 28 Nov 2023 21:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfwDK0CGLz3G2d; Tue, 28 Nov 2023 21:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701206017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZR4dxKUfnpS1mn7PCAjg3tBdZ+LY53Oq9KNGbaQrkE=; b=vsK4fPuqmG7LD6qD1TECCsuQL/ViPmnIAnShfy6LdpHBe79GtWRHA/8XlaEjZBz62r7eC8 gux7fPqInl/ywgsUsPWHD7KFYY1Z7v4sf0JcraB46cRvxn6+yVmJhhKb95xPRepoTfwyOZ kG2Q9pkP/phu/55vsWTsEcu2bpLB1LWbH3K83t9xF0RcPhWa1XmMGXuloALZK1fHayoX5n 8aKVOBINiRsfQK2lukXD72B0cN7yZJFn5oWq5niVPrIT4Qa8P4nep22beLhGJnk7vEtHa0 SjuJvMuo+4bkj3r/PMfs1QutACAtV6ePlEvOuhlkZ89QL971LJP04eFVgr3pnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701206017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZR4dxKUfnpS1mn7PCAjg3tBdZ+LY53Oq9KNGbaQrkE=; b=sxTQ2h3N847C3RhwpK/Z4pRCCKJvLdOZ+ZGE0dyfiYiYJJ64XD6Pz3YBnYqaviSXmXBqIu Zl3VHduY989jF1mq1uemraNjroH7iixkZkdhjNZpz8LSZ1wSQLc25ra7dFi4w7zoQ8OJIk uDoonwo8728dmE7XOlJR0WkEPCtGApB/upugrDAQpeYlaPMwZahjdLVkqXdNamkqPeJ3xG Og+OC2STYcXuUmMtrEIhq6dy/O2QvCY/Cbx4tMm87RxkqU9Y92LMOHjGr2/EFR7MZ8+kVn qh34NJS32cBJxp33T4YR6kzs0MVQo8i/FVgokghUXMvrTEuwlJ/WbisNxI5yBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701206017; a=rsa-sha256; cv=none; b=Axwqv9ZhC0cKUTmyOXuvuav+jDvaxzW9leM6ofE7hXNLmMLAvLSxZn6XeoDeYWZVf5Is5I BgwijHPoVM7Bej66HKjS3p6UsABHGVTMz/8lmvHIQtlqksTthWXpX4Rdz06qHjGgYkKnhI MWn5tWAWp2lZxDbMAmwtE92PerQHwnMLY+PYajfebPp2cOTcGOnuDPv5Qe/ioTAa7KRhzq 2ElUgkHMA1RhRKPnBjj23EB1dufiucXWACApC5L2ywwpWBffncm7PNWKkLEifJpsITzy1u 8MqygsyJcjD/XkO7DJyRXToEBk4v1BcOl3jcyAiAbw4b5xOrKmrtXriPNuzNaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfwDJ6NFxzdYq; Tue, 28 Nov 2023 21:13: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 3ASLDasj098639; Tue, 28 Nov 2023 21:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASLDahm098636; Tue, 28 Nov 2023 21:13:36 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:13:36 GMT Message-Id: <202311282113.3ASLDahm098636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "R. Christian McDonald" Subject: git: f818559774cb - main - netlink: fix adding an interface route List-Id: Commit messages for the main 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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f818559774cb0c1516364c4beca361480fd68b5b Auto-Submitted: auto-generated The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=f818559774cb0c1516364c4beca361480fd68b5b commit f818559774cb0c1516364c4beca361480fd68b5b Author: KUROSAWA Takahiro AuthorDate: 2023-11-28 18:14:50 +0000 Commit: R. Christian McDonald CommitDate: 2023-11-28 21:11:55 +0000 netlink: fix adding an interface route route add -iface " for a netif without an IPv4/IPv6 address fails with EINVAL. Need to use a link-level ifaddr for gw if an ifaddr for dst is not found as the rtsock-based implementation does. PR: 275341 Reported by: Sean Cody Reviewed by: rcm Tested by: rcm Approved by: kp (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41330 --- sys/netlink/route/rt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index cfaa2167b0d2..ed09748995dc 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -750,9 +750,14 @@ finalize_nhop(struct nhop_object *nh, const struct sockaddr *dst, int *perror) struct ifaddr *ifa = ifaof_ifpforaddr(gw_sa, nh->nh_ifp); if (ifa == NULL) { - NL_LOG(LOG_DEBUG, "Unable to determine ifa, skipping"); - *perror = EINVAL; - return (NULL); + /* Try link-level ifa. */ + gw_sa = &nh->gw_sa; + ifa = ifaof_ifpforaddr(gw_sa, nh->nh_ifp); + if (ifa == NULL) { + NL_LOG(LOG_DEBUG, "Unable to determine ifa, skipping"); + *perror = EINVAL; + return (NULL); + } } nhop_set_src(nh, ifa); } From nobody Tue Nov 28 21:16:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfwHw2fgvz52Zcm; Tue, 28 Nov 2023 21:16: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 4SfwHw23w5z3GMK; Tue, 28 Nov 2023 21:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701206204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1eA1iVsIPtpc5H8ZdOZRIAf8qhYvJFKuHPSj+80lj0g=; b=BMkue5EYl2POdlsDRP+GMjTz49d2oWuI58s68WiNhagXLbXsUjMuho9sjawkA2De8ZXsRI hTR3QoOb3hxaIep5G5wktgp99pZICdAx2PcBgewbdG9D01kg9056VkQ92ftiK9Qxn1B8Vl omQ79I/YL4MMRIQqLd2y57O85pmWDLUSXyHnFZ6//7T64n179atyv1/9W+8f2YB0Huw9nK Ab7xUTNp3i8qzFN029nFJBTuGS/NDpltYjj17uoopde8Hj0V24gepMLtMoA8F3OIxgsRWS f1l/HCWpRjewRBNQqmCoe72fdIEgiLCZ/nyri1zzEoiDBqZonKn1m4eVRzEo6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701206204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1eA1iVsIPtpc5H8ZdOZRIAf8qhYvJFKuHPSj+80lj0g=; b=q+j1FelOlIY+69OPAQPxELja0lWRJCoe4EhMptkyuyS3IHRVSB5bEkaNxQ0x3itw8rQrNK XyZaJWedV5OAKNkKN9U6VoOkojJVnl7p+dnSB/3k7pplLGhjMXaEG9Dczu5jXeIBX6q+ZQ E2R//nKqIRoA6RtoQpGzbFE44gIGGkA67hzl+G/1JUJ/kaTGPKFxcRalp+Lk+O4+r0huaf TEVOfcfp3UNat+w2Oc9Z0DRZFyPJhW+AeLS7vQoBatPV8vMqSx/zkhoS+GoedWLDJSa/yF TMZN3/Aq3U2XHN7ghQosCj3NfdoVcnwIOVrBiDibPs5iF9jOLFyCwwm2U4unBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701206204; a=rsa-sha256; cv=none; b=Vt+GmMlNeQfGWNO2jeHdefSijc2Q/B8LUEkywj1vYVYazyVNevdxonNCH8S0V5BRePYkys JsSR6GV7r1EobQ0hE81dMJ0g800br1/DFwjuqU4aBO1Joygk4gmb9q+zzTwZH9S2+9gufW JQCLdepWy5uHPeD4H6tsUQFk2nuRrdjpAKB5al5aNDal8/YG4Jffv9ygKwCv0+tYPG/a0e OCsCYXEBdQGv1uqfRMGrxVVTZqlQjvhjDNq3VRBTtQme9+UlDbrbAaoTEohCQgbBuk25HM A0+F+tAD3nAYyIVJ6/XrSN2TvOURbgsEelJs4H44yL4ZoNiacTbhDNyQGziu9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfwHw18Tqzd3R; Tue, 28 Nov 2023 21:16: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 3ASLGiFW099239; Tue, 28 Nov 2023 21:16:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASLGiEN099236; Tue, 28 Nov 2023 21:16:44 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:16:44 GMT Message-Id: <202311282116.3ASLGiEN099236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "R. Christian McDonald" Subject: git: ca7edd0d2c33 - main - route: introduce add interface route test cases List-Id: Commit messages for the main 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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca7edd0d2c339b8e6e5e52257ea6d4f22db02550 Auto-Submitted: auto-generated The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=ca7edd0d2c339b8e6e5e52257ea6d4f22db02550 commit ca7edd0d2c339b8e6e5e52257ea6d4f22db02550 Author: R. Christian McDonald AuthorDate: 2023-11-28 18:18:15 +0000 Commit: R. Christian McDonald CommitDate: 2023-11-28 21:16:25 +0000 route: introduce add interface route test cases As a followup to D41330 and D41436, this patch introduces two new tests for sbin/route: interface_route_v[46]. These tests fail without D41330. Reviewed by: kp Approved by: kp (mentor) MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/route/tests/basic.sh | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/sbin/route/tests/basic.sh b/sbin/route/tests/basic.sh index bb432daa0793..2e2ab9dba97f 100644 --- a/sbin/route/tests/basic.sh +++ b/sbin/route/tests/basic.sh @@ -117,8 +117,66 @@ basic_v6_cleanup() vnet_cleanup } +atf_test_case "interface_route_v4" "cleanup" +interface_route_v4_head() +{ + atf_set descr 'add interface route for v4' + atf_set require.user root + atf_set require.progs jail jq +} + +interface_route_v4_body() +{ + epair=$(vnet_mkepair) + ifconfig ${epair}a up + vnet_mkjail alcatraz ${epair}b + + # add interface route + jexec alcatraz route add "192.0.2.1" -iface ${epair}b + gateway=$(check_route "alcatraz" "192.0.2.1") + + if [ -z "${gateway}" ]; then + atf_fail "Failed to add interface route." + fi +} + +interface_route_v4_cleanup() +{ + vnet_cleanup +} + +atf_test_case "interface_route_v6" "cleanup" +interface_route_v6_head() +{ + atf_set descr 'add interface route for v6' + atf_set require.user root + atf_set require.progs jail jq +} + +interface_route_v6_body() +{ + epair=$(vnet_mkepair) + ifconfig ${epair}a up + vnet_mkjail alcatraz ${epair}b + + # add interface route + jexec alcatraz route add -6 "2001:db8:cc4b::1" -iface ${epair}b + gateway=$(check_route "alcatraz" "2001:db8:cc4b::1") + + if [ -z "${gateway}" ]; then + atf_fail "Failed to add interface route." + fi +} + +interface_route_v6_cleanup() +{ + vnet_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic_v4" atf_add_test_case "basic_v6" + atf_add_test_case "interface_route_v4" + atf_add_test_case "interface_route_v6" } From nobody Tue Nov 28 21:53:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfx6G2vNdz52cZp; Tue, 28 Nov 2023 21:53: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 4Sfx6G2TLYz3Kp7; Tue, 28 Nov 2023 21:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701208406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VCdzYpsvKywECFUB8Q5acf11+rQl9+AA8FuSJmJxUNE=; b=o2cJZggKTB5zgXoL9F006cpRYoLK4c5tFFYMKHxIuPZeoLuv+0UVIAh1hErY/EXAXXx54k VvJnEhEz42nDXji8Yf3L7xVRqBC3cVTCw72fqx3ZKhwH2HtT8/SwmKHNiyHIowcyMxU6wh tnpgv7SywewD/AlUxTQOZCkhEJXe9g2R+eXQSTTH66pwUs7hIPgkDCl3ld7ieRqrnHfv8i VJImEvojNDzfxfAKbX6fi88Rigxx2np7EwZovx3uhrbCGTMt7vxFUgHb3wdLUYfNTrPtal wSJJiLx6Li2XTHeqRP/NrS3N4gTeniYuyXmWpBmD1xYSLp11udtRaYv82RzJDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701208406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VCdzYpsvKywECFUB8Q5acf11+rQl9+AA8FuSJmJxUNE=; b=hEIkN7atOap65WL3oJUIVLXKR4A20yBFH8xKseHgmeTKz+ZblOHiuNxF5PId2G0Y2QTYEq yGS3eBVkER/DgksPTk3kjn7HQr5vUEgI07B5/O3KpXJZ0SAHvjgfd3LNfcsUy7C9jPJNpK F8dk2IesJLoxvHvpDpWMqZbxtmmdaSeTLnZ0s9ULTpfugJ3oZUd5E7gq14DtQRCzIXUt/7 iybdRM/KH+PBetXbHvi/yCdcpWypqHQzQQUc1P6KS2FH58nQZV/EcOy6sNq0SFpWQxAxVK fPTi1Isl5M8GZVxcsUGCaBAjZpGmihtvNaNAmUUgZ5FzDEd86rQyF2gGwqouHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701208406; a=rsa-sha256; cv=none; b=lQo3NmmUDZSATRCM84S97ARQJd+uGqVxmLVjpEy/VOmCORhLqyqGCCgs7TX3qHiDDZkXkM e0+PylNk7Hgxs40W0jaotFFNcCuDLk8gS8IlzJT1ge3WPcMMTO3l1mfQ3ExozH0zBp2M9l SwrnTbCBhLxf4fKXD6oL68xRBPOqTK6Vzu59URLFcKj5fyuIYv1wovQhW4ehURqkYw1zaU IJDQfccTNsQt8H6bajnai/zmCs1QKO3nEMMzt70RZi6VLoE2ygJGjl9UAzfj7IKFARAxI7 70d/APqKkmdx4d2gaSOo1pCukx5uhswJwAOhtnQaCZ2FPECkVgteArg+AzvlPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfx6G1Ybdzfwl; Tue, 28 Nov 2023 21:53: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 3ASLrPMo064877; Tue, 28 Nov 2023 21:53:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASLrP5I064874; Tue, 28 Nov 2023 21:53:25 GMT (envelope-from git) Date: Tue, 28 Nov 2023 21:53:25 GMT Message-Id: <202311282153.3ASLrP5I064874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "R. Christian McDonald" Subject: git: 1db64f89363c - main - netlink: Add tests when adding an interface route List-Id: Commit messages for the main 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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1db64f89363c97858961c4df0b7d02f3223723cf Auto-Submitted: auto-generated The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=1db64f89363c97858961c4df0b7d02f3223723cf commit 1db64f89363c97858961c4df0b7d02f3223723cf Author: Jose Luis Duran AuthorDate: 2023-11-28 19:58:03 +0000 Commit: R. Christian McDonald CommitDate: 2023-11-28 21:53:00 +0000 netlink: Add tests when adding an interface route Add tests for adding a route using an interface only (without an IP address). Reviewed by: rcm Approved by: kp (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41436 --- tests/sys/netlink/test_rtnl_route.py | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/sys/netlink/test_rtnl_route.py b/tests/sys/netlink/test_rtnl_route.py index e6bbe7656eb4..20f2c3ce3ee2 100644 --- a/tests/sys/netlink/test_rtnl_route.py +++ b/tests/sys/netlink/test_rtnl_route.py @@ -3,6 +3,7 @@ import socket import pytest from atf_python.sys.net.tools import ToolsHelper +from atf_python.sys.net.vnet import IfaceFactory from atf_python.sys.net.vnet import SingleVnetTestTemplate from atf_python.sys.netlink.attrs import NlAttrIp from atf_python.sys.netlink.attrs import NlAttrU32 @@ -45,6 +46,46 @@ class TestRtNlRoute(NetlinkTestTemplate, SingleVnetTestTemplate): ToolsHelper.print_net_debug() ToolsHelper.print_output("netstat -6onW") + @pytest.mark.timeout(5) + def test_add_route6_ll_if_gw(self): + tun_ifname = IfaceFactory().create_iface("", "tun")[0].name + tun_ifindex = socket.if_nametoindex(tun_ifname) + + msg = NetlinkRtMessage(self.helper, NlRtMsgType.RTM_NEWROUTE) + msg.set_request() + msg.add_nlflags([NlmNewFlags.NLM_F_CREATE]) + msg.base_hdr.rtm_family = socket.AF_INET6 + msg.base_hdr.rtm_dst_len = 64 + msg.add_nla(NlAttrIp(RtattrType.RTA_DST, "2001:db8:2::")) + msg.add_nla(NlAttrU32(RtattrType.RTA_OIF, tun_ifindex)) + + rx_msg = self.get_reply(msg) + assert rx_msg.is_type(NlMsgType.NLMSG_ERROR) + assert rx_msg.error_code == 0 + + ToolsHelper.print_net_debug() + ToolsHelper.print_output("netstat -6onW") + + @pytest.mark.timeout(5) + def test_add_route4_ll_if_gw(self): + tun_ifname = IfaceFactory().create_iface("", "tun")[0].name + tun_ifindex = socket.if_nametoindex(tun_ifname) + + msg = NetlinkRtMessage(self.helper, NlRtMsgType.RTM_NEWROUTE) + msg.set_request() + msg.add_nlflags([NlmNewFlags.NLM_F_CREATE]) + msg.base_hdr.rtm_family = socket.AF_INET + msg.base_hdr.rtm_dst_len = 32 + msg.add_nla(NlAttrIp(RtattrType.RTA_DST, "192.0.2.1")) + msg.add_nla(NlAttrU32(RtattrType.RTA_OIF, tun_ifindex)) + + rx_msg = self.get_reply(msg) + assert rx_msg.is_type(NlMsgType.NLMSG_ERROR) + assert rx_msg.error_code == 0 + + ToolsHelper.print_net_debug() + ToolsHelper.print_output("netstat -4onW") + @pytest.mark.timeout(20) def test_buffer_override(self): msg_flags = ( From nobody Tue Nov 28 23:04:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfyhG3ZkGz52hpG; Tue, 28 Nov 2023 23:04: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 4SfyhG2XPTz3StH; Tue, 28 Nov 2023 23:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701212670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mw4u9QHw4FZ9v14jhjFkeQqGE8EcyCeDYqeWRxy34PI=; b=vzdt1grZQ5g9/RwbbEoSE5s7zqLoshpAc88DPNwARdl/wH3cO9ARcNVT16AEoE9tBIP20+ Vn+ueBv1t1xCYgyih1Be9t7nVFUlj2yLsAFMt8cDguqTSZU9HTetmtEeQgwPDUqZfiAsOt Lk1LGKHBSFcLFSx5tDiWINCU2ffb1ZMSNtSFf0BSAlESUlAfIaF7qbyjGIEdc8qygNvL3T C/gRsEBCWHkaIFFRuFiYHl99Ebgxj8RnlVLoyVyYO1+M1RsHU4FG/sacveZu4vl6NnZM9X OQewfGSzdgS/l8vx48klHJhBYYM8pPhoVe4Bvue9CFo+ouyiahgY+F3gEY2lhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701212670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mw4u9QHw4FZ9v14jhjFkeQqGE8EcyCeDYqeWRxy34PI=; b=rnCEsOn5JBkHUhQJvdShTYvG3c5igQ43iX6FiTPz4rw04Q92o46tvKZpVLBABGycgcegY6 5RyHEPNjqw5/3DTSa5HFhIvqlLLwOWITJLWBlZ29RfQ56NVUf9bDvu4wkBDm8WUhjUxrQC OISXd4givFUWpQJT8/6Tm213v81ap+WbKppXtE+UkSYMQ2W+D2hhq2BnnqfdO5Zpvv3ZZE BD+8l3PyidpwPeUue5lduww5AE9dgic0PKI8F62kmix9JIvmVjaBCfgTorSLxxS9ebgbEs USRaAg8EuRA+fj4iKWB8OkBP93prM5OE1TTeMlX45d7Y0Tahi38yP/TCe+gxUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701212670; a=rsa-sha256; cv=none; b=mbtKxzXB7cdu0EVJolOj5gEt43pkYZtwxTuuDq0l64Xoue4ePtfwNKs1YsrD8rJNzRgsXy vo5Miv/XekEqUrHwScAm4sIpjSR38FxCwput3dAFnPC31uEAodOdIB8OohxIPj3xjOwK0C 8H49WpcIZ+u+T1DQNlAZT1ZaId2qIK7HMf0TTXu9e2SFl7ya8MzsqrO5+2tRBuev5WcJn6 8GD0tqZAIjCnRvBt7UiGGe0WT2zLYlm6Hcll1K6MmZPcEeqDgTl3BPVKUr65ZTXGJ6zh+q FcbjUB0V2qVvG8TZWFE8rIK7GQYuq6ZUbpPdFhO4T96Ne1HEQhHH4tPmfNDwmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfyhG1TZ9zhBw; Tue, 28 Nov 2023 23:04: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 3ASN4U5N082417; Tue, 28 Nov 2023 23:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASN4U0K082414; Tue, 28 Nov 2023 23:04:30 GMT (envelope-from git) Date: Tue, 28 Nov 2023 23:04:30 GMT Message-Id: <202311282304.3ASN4U0K082414@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: 0964743013fd - main - sys/sys: Remove some more vestiges of the $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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0964743013fdb71f1810cda1a85dab206e7f2a13 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0964743013fdb71f1810cda1a85dab206e7f2a13 commit 0964743013fdb71f1810cda1a85dab206e7f2a13 Author: Konstantin Belousov AuthorDate: 2023-11-28 22:56:03 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 23:03:56 +0000 sys/sys: Remove some more vestiges of the $FreeBSD$ Reviewed by: imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42824 --- sys/sys/_timespec.h | 1 - sys/sys/mdioctl.h | 2 -- sys/sys/timespec.h | 1 - 3 files changed, 4 deletions(-) diff --git a/sys/sys/_timespec.h b/sys/sys/_timespec.h index 3338c9f0e87e..e5ded73f1685 100644 --- a/sys/sys/_timespec.h +++ b/sys/sys/_timespec.h @@ -27,7 +27,6 @@ * 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. - * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp */ #ifndef _SYS__TIMESPEC_H_ diff --git a/sys/sys/mdioctl.h b/sys/sys/mdioctl.h index d4e0a623d117..da387f8524c2 100644 --- a/sys/sys/mdioctl.h +++ b/sys/sys/mdioctl.h @@ -34,8 +34,6 @@ * SUCH DAMAGE. * * from: Utah $Hdr: fdioctl.h 1.1 90/07/09$ - * - * From: src/sys/sys/vnioctl.h,v 1.4 */ #ifndef _SYS_MDIOCTL_H_ diff --git a/sys/sys/timespec.h b/sys/sys/timespec.h index f8547ca71c4e..48560524bc47 100644 --- a/sys/sys/timespec.h +++ b/sys/sys/timespec.h @@ -27,7 +27,6 @@ * 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. - * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp */ #ifndef _SYS_TIMESPEC_H_ From nobody Tue Nov 28 23:40:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfzVS0DZjz52krD for ; Tue, 28 Nov 2023 23:41:04 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfzVR1yXrz3WZT for ; Tue, 28 Nov 2023 23:41:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40b4734b975so20887825e9.2 for ; Tue, 28 Nov 2023 15:41:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701214861; x=1701819661; 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=+3QKsaJj/RWaDAF8ycrdCmCVX6f9Xo1yv1JcSB2x5YE=; b=tUiMY/uyKF0nhszrHtmDfkEJYANX/91nNScVWFfMHpv3Ykv5A4jIBvwBRUJN3ajThr 4bKqR7vub1+KzrjMoSKvTLmBWDQROnL1JMu8pnHaJyD5atSmnV94aFn5pfkdc6T+bFnD HzyOBmw651LUy6gsJDF+BJzMwkpqqPj4R5Oy2b/oGmbveTOppyssGTgVYj49zYjzZj3W nyevIH4BIoaNVsxrbguEXFZXBGI70A0LM+XYUCtUWR5JOOSqm6LArs+Zj8HRXrf0CrWh 3i8Amq62LBPMARL5MsFTSSS/uIcZuqxMIEE/+HpmID0wrBRisC/omQQ4GFnY7LUeHsNM 6GvA== X-Gm-Message-State: AOJu0YwMfmZ7Xi4OSmPM2uFp8Gqn0AL0TB9E3ZS2qY+O2PGcUMPVMpe+ gYbWxZnckBiW+tGAcCGQwyTH8Q== X-Google-Smtp-Source: AGHT+IG7/jPrxn7hzOlGa6w5DXAQsvOw26Ez8kFO3FSpLFwguw7tyREYgFC/7qDOOCBaDIxr+as71A== X-Received: by 2002:a05:600c:4ec7:b0:40b:4b93:a369 with SMTP id g7-20020a05600c4ec700b0040b4b93a369mr2592984wmq.14.1701214861089; Tue, 28 Nov 2023 15:41:01 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id a8-20020adffb88000000b00333083a20e5sm4910777wrr.113.2023.11.28.15.40.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Nov 2023 15:40:59 -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: 9eecef052155 - main - Add an Armv8 rndr random number provider From: Jessica Clarke In-Reply-To: Date: Tue, 28 Nov 2023 23:40:49 +0000 Cc: Andrew Turner , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <0831C0D9-428C-4DA7-A205-277B6729DB8F@freebsd.org> References: <202311151812.3AFICLIs077567@gitrepo.freebsd.org> <2423E245-0F1B-4195-A766-166183774421@freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Result: default: False [-2.23 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.88)[-0.879]; NEURAL_HAM_MEDIUM(-0.85)[-0.853]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.51:from]; FREEFALL_USER(0.00)[jrtc27]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.51:from]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4SfzVR1yXrz3WZT X-Spamd-Bar: -- On 22 Nov 2023, at 18:14, John Baldwin wrote: >=20 > On 11/15/23 4:29 PM, Jessica Clarke wrote: >> On 15 Nov 2023, at 18:27, Jessica Clarke wrote: >>>=20 >>> On 15 Nov 2023, at 18:12, Andrew Turner wrote: >>>>=20 >>>> The branch main has been updated by andrew: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9eecef052155646fbc5f8f533b952b37= 2572d06a >>>>=20 >>>> commit 9eecef052155646fbc5f8f533b952b372572d06a >>>> Author: Andrew Turner >>>> AuthorDate: 2023-11-15 17:42:02 +0000 >>>> Commit: Andrew Turner >>>> CommitDate: 2023-11-15 18:05:08 +0000 >>>>=20 >>>> Add an Armv8 rndr random number provider >>>>=20 >>>> Armv8.5 adds an optional random number generator. This is = implemented >>>> as two special registers one to read a random number, the other = to >>>> re-seed the entropy pool before reading a random number. Both = registers >>>> will set the condition flags to tell the caller they can't = produce a >>>> random number in a reasonable amount of time. >>>>=20 >>>> Without a signal to reseed the entropy pool use the latter = register >>>> to provide random numbers to the kernel pool. If at a later time = we >>>> had a way to tell the provider if it needs to reseed or not we = could >>>> use the former. >>>>=20 >>>> On an Amazon AWS Graviton3 VM this never failed, however this may = not >>>> be the case on low end CPUs so retry reading the random number 10 = times >>>> before returning an error. >>>>=20 >>>> Reviewed by: imp, delphij (csprng) >>>> Sponsored by: The FreeBSD Foundation >>>> Sponsored by: Arm Ltd >>>> Differential Revision: https://reviews.freebsd.org/D35411 >>>> --- >>>> sys/arm64/conf/std.dev | 1 + >>>> sys/conf/files.arm64 | 2 + >>>> sys/dev/random/armv8rng.c | 135 = +++++++++++++++++++++++++++++++++++++++ >>>> sys/dev/random/random_harvestq.c | 1 + >>>> sys/modules/Makefile | 2 + >>>> sys/modules/armv8_rng/Makefile | 11 ++++ >>>> sys/sys/random.h | 1 + >>>> 7 files changed, 153 insertions(+) >>>>=20 >>>> diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev >>>> index 74d2407e0aec..0ebf2e775b11 100644 >>>> --- a/sys/arm64/conf/std.dev >>>> +++ b/sys/arm64/conf/std.dev >>>> @@ -53,6 +53,7 @@ device vt_simplefb >>>>=20 >>>> # Pseudo devices. >>>> device crypto # core crypto support >>>> +device armv8_rng # Armv8.5 rndr RNG >>>> device loop # Network loopback >>>> device ether # Ethernet support >>>> device vlan # 802.1Q VLAN support >>>> diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 >>>> index 38b9e40463eb..9ccead6a98e1 100644 >>>> --- a/sys/conf/files.arm64 >>>> +++ b/sys/conf/files.arm64 >>>> @@ -379,6 +379,8 @@ dev/psci/psci.c standard >>>> dev/psci/smccc_arm64.S standard >>>> dev/psci/smccc.c standard >>>>=20 >>>> +dev/random/armv8rng.c optional armv8_rng !random_loadable >>>> + >>>> dev/safexcel/safexcel.c optional safexcel fdt >>>>=20 >>>> dev/sdhci/sdhci_xenon.c optional sdhci_xenon sdhci >>>> diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c >>>> new file mode 100644 >>>> index 000000000000..3cca42a5bbf3 >>>> --- /dev/null >>>> +++ b/sys/dev/random/armv8rng.c >>>> @@ -0,0 +1,135 @@ >>>> +/*- >>>> + * Copyright (c) 2022 The FreeBSD Foundation >>>> + * >>>> + * This software was developed by Andrew Turner under sponsorship = from >>>> + * the FreeBSD Foundation. >>>> + * >>>> + * Redistribution and use in source and binary forms, with or = without >>>> + * modification, are permitted provided that the following = conditions >>>> + * are met: >>>> + * 1. Redistributions of source code must retain the above = copyright >>>> + * notice, this list of conditions and the following = disclaimer. >>>> + * 2. Redistributions in binary form must reproduce the above = copyright >>>> + * notice, this list of conditions and the following disclaimer = in the >>>> + * documentation and/or other materials provided with the = distribution. >>>> + * >>>> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS = IS'' AND >>>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED = TO, THE >>>> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A = PARTICULAR PURPOSE >>>> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE >>>> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL >>>> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF = SUBSTITUTE GOODS >>>> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) >>>> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN = CONTRACT, STRICT >>>> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING = IN ANY WAY >>>> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF >>>> + * SUCH DAMAGE. >>>> + */ >>>> + >>>> +#include >>>> + >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> + >>>> +#include >>>> + >>>> +#include >>>> + >>>> +static u_int random_rndr_read(void *, u_int); >>>> + >>>> +static bool has_rndr; >>>> +static struct random_source random_armv8_rndr =3D { >>>> + .rs_ident =3D "Armv8 rndr RNG", >>>> + .rs_source =3D RANDOM_PURE_ARMV8, >>>> + .rs_read =3D random_rndr_read, >>>> +}; >>>> + >>>> +static inline int >>>> +random_rndr_read_one(u_long *buf) >>>> +{ >>>> + u_long val; >>>> + int loop, ret; >>>> + >>>> + loop =3D 10; >>>> + do { >>>> + __asm __volatile( >>>> + ".arch_extension rng \n" >>>> + "mrs %0, rndrrs \n" /* Read the random number */ >>>> + "cset %w1, ne \n" /* 1 on success, 0 on failure */ >>>> + ".arch_extension norng \n" >>>> + : "=3D&r" (val), "=3D&r"(ret) :: "cc"); >>>=20 >>> Early clobber doesn=E2=80=99t make sense with no inputs. >> This also breaks the aarch64 ubuntu-20.04 GitHub build, as its LLVM >> doesn=E2=80=99t know about the RNG extension. Can you please stop = breaking the >> arm64 kernel build with older LLVM, this is far from the first time >> it=E2=80=99s happened, and some of those never got fixed upstream, we = just had >> to hack around them downstream. >=20 > The aarch64 GitHub build is still broken and has been broken now for a > week. Can this be fixed to work with that version or should we = deprecated > support for LLVM 12 for aarch64? Morello LLVM is at LLVM 13 = currently. It=E2=80=99s been another week. I intend to revert this tomorrow unless = a real alternative solution is put forwards. We can=E2=80=99t keep leaving CI = broken for weeks on end due to a lack of pre-commit testing and committer responsiveness. Jess From nobody Wed Nov 29 01:55:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2TZ5HWLz52tLh; Wed, 29 Nov 2023 01:55: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 4Sg2TZ4grsz4CTt; Wed, 29 Nov 2023 01:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ZFORbckjLumWMO1PO6C/29/XvzY8rKQQ5zIv17yE9U=; b=dzbDhzdQgdd2bVZSgdnmgf66/RdUf9UfKK+X2GrVct5XdU/d3J6l51v73qfNm4xTgCdXlu PAIxgb4klCtB8zOclXCiLkY67n++7YQts+7F5D16x77604IHJHKr4fX94eowO8RjucLZNj S2h18OI/Mk1dCZM+CGgSc4LIkTB4j/ydYBXgDchNCXJTqpEnkslp+/9FLemcoBDDiiLn1Y U6abV50HYitC0X6AD9qs4IG7GWtNIW6vuES2K7ivl/BerXDMnSEWrBQVzbqvRascNCjs0f DcdEgW7E4UeuMy4psxtyNQi4kc8ggbPh0mBIBkAwUvtk6acXJkBFUuAfK6UC2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ZFORbckjLumWMO1PO6C/29/XvzY8rKQQ5zIv17yE9U=; b=vBQCulZGm4CBKKajYmfXqMugEUrDzG0mnnIGnbfTSIvxUGoGw5ds/K87BRjqkU2DPZDT/I xh7+KzoI3dtwy2CmqRi7f8El3Ut3EB/ZViZDuSTQSP/D+1rq47XuZDBgfFuTgZ53UKjf+j QjeVKYB6i83DXYOwFihyU/Sv4XDht1IJY8Kg3t0U/OIKTLNtfG97gCuf303JQoto5Bt6ig 46hJrQyIIup0+JedLFcL6+vodyPE1ilbV8bvZpoEDlPm7XCtZ/kOPQaAF3dOAbh/yzE8v2 rX+DbT/auS7hnYnCo9t3anaYWxAvs4e2AHIlG6iTtm41wxIydNenddFK4J0lnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222930; a=rsa-sha256; cv=none; b=usL+31X2r5g+XW3HcL9em9uz/lFUyxQHCw/CzUQPg5wTGAnUg0kvx5v5zqszlvvaO0IEV4 fwW7PsyDml83APkGqN3qGKLOfMZsS6p2uMe6eskk55x6h8qaFElLrQEluRpXEvJhbltnR4 TxbXEoxyDDjcjvHsFAOZVMLeHvBWeXx1KjuxHzBGGw2sDgVI6wlXmoBZ2fvgDF7vFWrTBC AJ6IlzeQJOWHSPMF3t+ON4z5eu7zfll7NZCwvJWS6ouJgcv0x5QbigTFYZ/GGotJg+hZ4Z guGu2vVLo9JPRH+eF1urEFffElzSDcUpfzs3Ky7NkaDRNxyloUnWoOAp9MzNVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2TZ3Jfkzmhd; Wed, 29 Nov 2023 01:55: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 3AT1tUtf064157; Wed, 29 Nov 2023 01:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tUIM064154; Wed, 29 Nov 2023 01:55:30 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:30 GMT Message-Id: <202311290155.3AT1tUIM064154@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: b411372b7d17 - main - mpi3mr: Don't hold fwevt_lock over call to taskqueue_drain List-Id: Commit messages for the main 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: b411372b7d17ae7e5d6c944732d41b979bde2ac4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b411372b7d17ae7e5d6c944732d41b979bde2ac4 commit b411372b7d17ae7e5d6c944732d41b979bde2ac4 Author: Warner Losh AuthorDate: 2023-11-29 01:48:48 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:48:48 +0000 mpi3mr: Don't hold fwevt_lock over call to taskqueue_drain Holding fwevt_lock when we call taskqueue_drain can lead to deadlock because it's draining a queue needs fwevt_lock to do work, so that other thread will try to take out the lock and block, making the thread never finish and taskqueue_drain never complete. There's a witness warning/error for this which was exposed when the lock was converted to a MTX_DEF lock from a MTX_SPIN prior to committing to the FreeBSD tree. The lock appears to be to protect against additional items being added to the event list while we're doing a reset. Since the taskqueue is blocked, items can get added to the list, but won't be processed during the reset, but there is still a (likely small) race between the taskqueue_drain and the taskqueue_block calls where an interrupt could fire on another CPU, resulting in a task being enqueued and started before the block can take effect. The only way to fix that race is to turn off interrupt processing during a reset. So we replace a deadlock with a smaller race. Sponsored by: Netflix Reviewed by: sumit.saxena_broadcom.com, mav, jhb Differential Revision: https://reviews.freebsd.org/D42537 --- sys/dev/mpi3mr/mpi3mr.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 776bfbdaee23..478b0944defa 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -2784,7 +2784,6 @@ int mpi3mr_initialize_ioc(struct mpi3mr_softc *sc, U8 init_type) mtx_init(&sc->sense_buf_q_lock, "Sense buffer Queue lock", NULL, MTX_SPIN); mtx_init(&sc->chain_buf_lock, "Chain buffer lock", NULL, MTX_SPIN); mtx_init(&sc->cmd_pool_lock, "Command pool lock", NULL, MTX_DEF); -// mtx_init(&sc->fwevt_lock, "Firmware Event lock", NULL, MTX_SPIN); mtx_init(&sc->fwevt_lock, "Firmware Event lock", NULL, MTX_DEF); mtx_init(&sc->target_lock, "Target lock", NULL, MTX_SPIN); mtx_init(&sc->reset_mutex, "Reset lock", NULL, MTX_DEF); @@ -5825,11 +5824,14 @@ static int mpi3mr_issue_reset(struct mpi3mr_softc *sc, U16 reset_type, inline void mpi3mr_cleanup_event_taskq(struct mpi3mr_softc *sc) { - mtx_lock(&sc->fwevt_lock); - taskqueue_drain(sc->cam_sc->ev_tq, &sc->cam_sc->ev_task); + /* + * Block the taskqueue before draining. This means any new tasks won't + * be queued to a worker thread. But it doesn't stop the current workers + * that are running. taskqueue_drain waits for those correctly in the + * case of thread backed taskqueues. + */ taskqueue_block(sc->cam_sc->ev_tq); - mtx_unlock(&sc->fwevt_lock); - return; + taskqueue_drain(sc->cam_sc->ev_tq, &sc->cam_sc->ev_task); } /** From nobody Wed Nov 29 01:55:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tb5TwQz52tRF; Wed, 29 Nov 2023 01:55: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 4Sg2Tb53fLz4CnJ; Wed, 29 Nov 2023 01:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTyquLqQp29J0Scbsk6Z3nK+WPl81drSDtQbtkDv964=; b=Sc5XrLwhoGBcaEGnrXRNM1HeJ5w6QWT6mlZRAnG8J3lu3jfPAzr7jSM9g0Aceo47tl+y4Q H2kwi6um1I7eX/1GVYO9WgqsSgzfz4EQw9GCClTuj3ggXE997a54JsPW13cF/+7pjBbfdR 4OhpvoN2T7j/JB79SUWPth3Yc/J/m8oRbx5o/ef06xCSHWjBbFBTbMUNsWSoFOBPB790SX zdFavZMt4xNRWaH8apvhX84Vs0PNn9pG33R5zjyTCQ1W+pdTO6G6abe4PTS370MPdU0l0o XJmTjlsW50+KFF3vBOGJFOa03h7AqjwHwMb77BilDIp5G3N+tMCaFMkB2yucEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTyquLqQp29J0Scbsk6Z3nK+WPl81drSDtQbtkDv964=; b=Wq3J1vyCwftcN9RedRuHdynWpBuGuzd0R9hojHVIKQZoc9PfL4pOAdK3E8PYhFKUaWOrvH b1zG50eP2dJBT14EXHxknkUEXRgf6yUM2Xz22UPR/1/l3FM+t1kQjNDG6nzgx06HyEO3h+ Hm4dz1i6AmmJuY36gPZH3YXYWkotEwPNWe8UD7w1OyvcpSpA61BePLcjItJSZ6o+jHehdV sCA7kx9YPLEjr8YgSW/OHYhkEgaMQ18ajr4bskeo07D2Po82r3b9FhZp9cEC9IyM1U07eW y+I/QKX4eV9UAoFsovpK7NkISHd3KuNLme9d6MEh8Ew1jpQ/TMMLhH41nunWhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222931; a=rsa-sha256; cv=none; b=nMVyIfeo7tb54bZSVBlBb3K7s5cAagYGZrRW2g3gGi7KkBd1moWXW6eCROwnHHg0SCDR3Q 3mxG8zBUYLk/Xphsk3bxBd0atgNCOhVf4Du4oc7nEUvn4NJchOXcDoRsR2wjSd79HBTTdz nBt3O6rGt1Tm5sUED5BNS2URjeNNQJN0WmZH1p/sO4fkeC4L4Y4ryy4jCAGJVxiumxi8CH VXbFrK3PXRC7/JCWrJ63nnnV5XUsq+AV74XepsFtC7OodNlt6Mh6Wck5N7sjRGSgo85c1K 65OZV9G2nx1zStD9O1LkP1grrYM/DRFqkvNYuqi2sxPKkXdqtZrZd4jj5o3LSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tb47fCzmf1; Wed, 29 Nov 2023 01:55: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 3AT1tVOu064208; Wed, 29 Nov 2023 01:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tVh8064205; Wed, 29 Nov 2023 01:55:31 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:31 GMT Message-Id: <202311290155.3AT1tVh8064205@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: a2b046620c54 - main - mpi3mr: Remove unused fields in struct mpi3mr_cmd List-Id: Commit messages for the main 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: a2b046620c54db977196128b3c53da2704b9fd20 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b046620c54db977196128b3c53da2704b9fd20 commit a2b046620c54db977196128b3c53da2704b9fd20 Author: Warner Losh AuthorDate: 2023-11-29 01:49:01 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:49:01 +0000 mpi3mr: Remove unused fields in struct mpi3mr_cmd All of these fields are either unused, or just initialized. Remove them. This saves about 1MB of memory for the cards that I have which can do 8k transactions at once. Sponsored by: Netflix Reviewed by: mav, jhb Differential Revision: https://reviews.freebsd.org/D42538 --- sys/dev/mpi3mr/mpi3mr.c | 3 --- sys/dev/mpi3mr/mpi3mr.h | 6 ------ 2 files changed, 9 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 478b0944defa..9a052c98d13e 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -4985,12 +4985,9 @@ mpi3mr_get_command(struct mpi3mr_softc *sc) cmd->data_dir = 0; cmd->ccb = NULL; cmd->targ = NULL; - cmd->max_segs = 0; - cmd->lun = 0; cmd->state = MPI3MR_CMD_STATE_BUSY; cmd->data = NULL; cmd->length = 0; - cmd->out_len = 0; out: mtx_unlock(&sc->cmd_pool_lock); return cmd; diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h index 479ba9c7b11b..b00d2ef562d8 100644 --- a/sys/dev/mpi3mr/mpi3mr.h +++ b/sys/dev/mpi3mr/mpi3mr.h @@ -456,19 +456,13 @@ struct mpi3mr_cmd { union ccb *ccb; void *data; u_int length; - u_int out_len; - struct uio uio; - struct iovec iovec[MPI3MR_IOVEC_COUNT]; - u_int max_segs; struct mpi3mr_target *targ; - u_int lun; u_int data_dir; u_int state; bus_dmamap_t dmamap; struct scsi_sense_data *sense; struct callout callout; bool callout_owner; - mpi3mr_cmd_callback_t *timeout_handler; U16 hosttag; U8 req_qidx; Mpi3SCSIIORequest_t io_request; From nobody Wed Nov 29 01:55:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Td09WCz52tNv; Wed, 29 Nov 2023 01:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sg2Tc5fhZz3gnp; Wed, 29 Nov 2023 01:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eCNzM7mNvEAuE1y5M6iHcyocpS1mlV17XZaQ4RRNvO4=; b=RKIU3pec4TD7gjIBMY1H4SHyC6qTWwOHJrbzlrsR83t+bA6vrXSx20RwOYcYjYGT8LPeE8 ctDEtFsk38e0pamWH91ZvBX6jciOHUsViMq1WGwgJzVyjUINsXvdG8LS1YuHt0uwDzQCXB PA5djBjmiuxGYiNZwkYyz1CfK3VjtqXMLjE4zILWC+vCUuZjTxMGTJ0PzbS0En2Qu9KV5b xhAvMUZzN2vxwvB4DlOKnyOupz5IhwlPM5lnlfI0BOe/8r10q6f68uDY7HI+yJ61WjXqUX MFxFY/sTvgbTmqc86e6KhRHkM3kLwVUhdhJq+YctX+3Yaln/PjlN8T8mIE3RMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eCNzM7mNvEAuE1y5M6iHcyocpS1mlV17XZaQ4RRNvO4=; b=Cvbc1BZiWFdq8w9wNN9Tf3HtyTFE92utvpY3pCzgXHfGCprp/Sf/gLpotpDWpCiUKegdff 10kXSQT+ddPHHDrT+lIJj80OkGY2ygbobyls74SEIjni1IFogLlWsMBG7LNFRpHtjTuaVc IpWX3AYA5+xinX/jyz+oEtLiZhbQrVwa1d/2YemJBRByL3qdgLpIYw+zc3NQQopxvih4nx lOtPqz0Jn6JNI81nFtzDPFvrpAbJyYt0DtEXrVUnDsovkQBoQlhjv89n0GkyTXzpvGj7Gq 8Zo0vCwF+zz5G0XngCIBNu1Azvi3IUADjSaW/ub7Ukma1/KAlLLf3NcSUZr4ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222932; a=rsa-sha256; cv=none; b=oROmL+WV1yPTcmeXgMYDrg0vi1h5WwkCsoxFz4CADXdedGdxuZWekwJf3bXJcxXd6WAcOg ulx0AYwVNKVxuwAPSXBA/JrrUsSKsYmoLuXhFrygcUal/wXGCgebjD+oc+UVcDI7f+0KNG uQceY73Nw+wzTEISvsjhQ8UjlMmgEcJ3m2Ccim04nlXBBAEpUvVjsio19LPPHYDuE/XA8y eV96rMINfqQK2eGi2TKyU5YaHUx035/145xRhKUdSRKU+gFYTxiVo1F6LAVd/xFRsySNj9 uUQm6GMc1X491G3EOFodXbFLy7DltLllv436yUuf7H0bniwBGqstkz+FhQMS/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 4Sg2Tc4mR7zmhf; Wed, 29 Nov 2023 01:55: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 3AT1tWsq064256; Wed, 29 Nov 2023 01:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tWjh064253; Wed, 29 Nov 2023 01:55:32 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:32 GMT Message-Id: <202311290155.3AT1tWjh064253@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: 7c4913093a75 - main - mpi3mr: Reduce the scope of the reset_mutext List-Id: Commit messages for the main 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: 7c4913093a759adf2e4c7d65535aee04aadee4df Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7c4913093a759adf2e4c7d65535aee04aadee4df commit 7c4913093a759adf2e4c7d65535aee04aadee4df Author: Warner Losh AuthorDate: 2023-11-29 01:49:08 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:49:08 +0000 mpi3mr: Reduce the scope of the reset_mutext Reduce the scope of reset_mutext to protect the msleep in the watch dog thread as well as the MPI3MR_FLAGS_SHUTDOWN bit. Use it to protect the wakeup in mpi3mr_detach so this thread can exit sooner when we're trying to do an orderly shutdown. Optimize the flow to check the sleep and other conditions before going to sleep. It's an open question if this should protect sc->unrecoverable, and if we should wakeup the watchdog thread when we set it. We might also want to move too booleans for the three flags that we have now in mpi3mr_flags. There are a number of U8s that should really be bools and we might want to also group them together to pack softc better. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D42539 --- sys/dev/mpi3mr/mpi3mr.c | 26 +++++++++++++++++--------- sys/dev/mpi3mr/mpi3mr_pci.c | 4 +++- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 9a052c98d13e..a2e43850d9b5 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -3037,9 +3037,6 @@ mpi3mr_watchdog_thread(void *arg) sc->watchdog_thread_active = 1; mtx_lock(&sc->reset_mutex); for (;;) { - /* Sleep for 1 second and check the queue status */ - msleep(&sc->watchdog_chan, &sc->reset_mutex, PRIBIO, - "mpi3mr_watchdog", 1 * hz); if (sc->mpi3mr_flags & MPI3MR_FLAGS_SHUTDOWN || (sc->unrecoverable == 1)) { mpi3mr_dprint(sc, MPI3MR_INFO, @@ -3048,20 +3045,21 @@ mpi3mr_watchdog_thread(void *arg) "Hardware critical error", __func__); break; } + mtx_unlock(&sc->reset_mutex); if ((sc->prepare_for_reset) && ((sc->prepare_for_reset_timeout_counter++) >= MPI3MR_PREPARE_FOR_RESET_TIMEOUT)) { mpi3mr_soft_reset_handler(sc, MPI3MR_RESET_FROM_CIACTVRST_TIMER, 1); - continue; + goto sleep; } ioc_status = mpi3mr_regread(sc, MPI3_SYSIF_IOC_STATUS_OFFSET); if (ioc_status & MPI3_SYSIF_IOC_STATUS_RESET_HISTORY) { mpi3mr_soft_reset_handler(sc, MPI3MR_RESET_FROM_FIRMWARE, 0); - continue; + goto sleep; } ioc_state = mpi3mr_get_iocstate(sc); @@ -3077,7 +3075,7 @@ mpi3mr_watchdog_thread(void *arg) "diag save in progress\n"); } if ((sc->diagsave_timeout++) <= MPI3_SYSIF_DIAG_SAVE_TIMEOUT) - continue; + goto sleep; } mpi3mr_print_fault_info(sc); sc->diagsave_timeout = 0; @@ -3088,12 +3086,12 @@ mpi3mr_watchdog_thread(void *arg) "Controller requires system power cycle or complete reset is needed," "fault code: 0x%x. marking controller as unrecoverable\n", fault); sc->unrecoverable = 1; - goto out; + break; } if ((fault == MPI3_SYSIF_FAULT_CODE_DIAG_FAULT_RESET) || (fault == MPI3_SYSIF_FAULT_CODE_SOFT_RESET_IN_PROGRESS) || (sc->reset_in_progress)) - goto out; + break; if (fault == MPI3_SYSIF_FAULT_CODE_CI_ACTIVATION_RESET) mpi3mr_soft_reset_handler(sc, MPI3MR_RESET_FROM_CIACTIV_FAULT, 0); @@ -3107,8 +3105,18 @@ mpi3mr_watchdog_thread(void *arg) mpi3mr_print_fault_info(sc); mpi3mr_soft_reset_handler(sc, sc->reset.reason, 1); } +sleep: + mtx_lock(&sc->reset_mutex); + /* + * Sleep for 1 second if we're not exiting, then loop to top + * to poll exit status and hardware health. + */ + if ((sc->mpi3mr_flags & MPI3MR_FLAGS_SHUTDOWN) == 0 && + !sc->unrecoverable) { + msleep(&sc->watchdog_chan, &sc->reset_mutex, PRIBIO, + "mpi3mr_watchdog", 1 * hz); + } } -out: mtx_unlock(&sc->reset_mutex); sc->watchdog_thread_active = 0; mpi3mr_kproc_exit(0); diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index 4935ac0d519c..eaf73022291d 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -635,13 +635,15 @@ mpi3mr_pci_detach(device_t dev) if (!sc->secure_ctrl) return 0; - sc->mpi3mr_flags |= MPI3MR_FLAGS_SHUTDOWN; if (sc->sysctl_tree != NULL) sysctl_ctx_free(&sc->sysctl_ctx); + mtx_lock(&sc->reset_mutex); + sc->mpi3mr_flags |= MPI3MR_FLAGS_SHUTDOWN; if (sc->watchdog_thread_active) wakeup(&sc->watchdog_chan); + mtx_unlock(&sc->reset_mutex); while (sc->reset_in_progress && (i < PEND_IOCTLS_COMP_WAIT_TIME)) { i++; From nobody Wed Nov 29 01:55:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tf0XP1z52tP0; Wed, 29 Nov 2023 01:55: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 4Sg2Td6h0Sz4Cwn; Wed, 29 Nov 2023 01:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6jTCZCJorJgBIQIqIbE8qn9Q103VfDjdL3GJYyhjHOo=; b=vNFHCwxAR2Ylb3oxxo2v6lAoBTNQDxpxQ64YkrcwDNtG+JYAXeSoF5h8VwhsMFl0KgHLQx tPSRQn/ikjsZ/i0awcr1uTctqZpLQTbqxjO+ryHpftBqC2BLBbnmkz0oTs3aO9jAJky0E7 0WBkg8oh4UNgURDbgMVa4sJGDhLxdNtiq5jIoF48GuVvMG6qpqXmC1bUHZ0gGCnFKjRT1d 9AcKOHPSWhYdlI7/OdIwKZy8qOmXxeFnCtek2+RQy+a7eyBHeS1in6fBH2mX2KBM5MVkMl 9CWuZ5MCmotHJWSxZMlXOg9UaxLuACb7a1ZY559a3PTJ5Q6MvHk/KV4Uc5rm8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6jTCZCJorJgBIQIqIbE8qn9Q103VfDjdL3GJYyhjHOo=; b=tBC9cP8wqVd5UM0otkOHoCR+kIb9uyCwf5fcblVOfh2GunDY7mNMZ1aBzmIGvzcUYLU1HH 9MNjpvM6hs64KPwvQmyjo0fN0teqOkNswqrLfVCyAeXrKvxBOoq4YWVKRjuEw/DjQ2zE1R 5DBL7mhSwUCFsQKCVvmG6JP5v4uX7U5NTHY/HCF+Y857vBUznEup08Qc+BJXNlreT2otxQ eTRjvppIlShL9F0z2EhtN7Pib+MaruSk2Mb93EC1XyW7nxNtGKhLbhXzXOVfWHjAmdOp7c +iIyTydd2GOYHbugElHQq7kZwk7wuKaltyLlg680+19CKPKJvK5upRLle2P+zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222933; a=rsa-sha256; cv=none; b=Dcp50s2hM6Q7po13kEs2vX1d6eGZSOxfwuCznpjaC1LpByH9N8YGRFd4ETUQJxfhBxp5b9 G0ohJn5Wxt4A8GtHyPzyexnZcXb5awPP1FCPrTPwLtcEPf6CZHBObtaBI5VpyxU4BfCkCr KGzokBTT0cJu6Z8TIKlVVh+Rd1g8jDkyeVsrmM9onSNzvbGvdS/l90mtMBbfvZV25HE670 gBOzXkTWeJNWeQQ5iz/4gPzC72hshfxdVa/84VTPp06tIVK5Dk1kiVAjWOxg7uyOn/weAx gWbz2sZfTMNNk1tAGUun7ezalkgtsN6VD09TTZyvRfHzvTRbAE43KM8lBDyS5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Td5lXVzmF0; Wed, 29 Nov 2023 01:55: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 3AT1tXnu064295; Wed, 29 Nov 2023 01:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tXIW064292; Wed, 29 Nov 2023 01:55:33 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:33 GMT Message-Id: <202311290155.3AT1tXIW064292@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: e2b27df9eb32 - main - mpi3mr: Minor style 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2b27df9eb324fa6e72e29d3185dcd6b390efa9d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e2b27df9eb324fa6e72e29d3185dcd6b390efa9d commit e2b27df9eb324fa6e72e29d3185dcd6b390efa9d Author: Warner Losh AuthorDate: 2023-11-29 01:49:16 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:49:16 +0000 mpi3mr: Minor style fix Fold two lines to make this more readable. Sponsored by: Netflix Reviewed by: mav, jhb Differential Revision: https://reviews.freebsd.org/D42540 --- sys/dev/mpi3mr/mpi3mr_cam.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index bb08943793df..430550e3edce 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -1212,8 +1212,7 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) } req->Flags = htole32(mpi_control); - if (mpi3mr_submit_io(sc, opreqq, - (U8 *)&cm->io_request)) { + if (mpi3mr_submit_io(sc, opreqq, (U8 *)&cm->io_request)) { mpi3mr_release_command(cm); if (tracked_io_sz) { mpi3mr_atomic_sub(&sc->pend_large_data_sz, tracked_io_sz); From nobody Wed Nov 29 01:55:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tg1jVrz52tKF; Wed, 29 Nov 2023 01:55: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 4Sg2Tg0xrhz4D3s; Wed, 29 Nov 2023 01:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZJxKWwb0N4rMIjBAPXl2hWHqJJSu+OpzpEh8btcgsx4=; b=GVBgGygY2vSyzPvTbaqmo754/iaqXGgcYOcjm9PospATCNMHingDaDXynNW7z7PQ+BbWpD Bk5q7XPqlRKtkPbvxtw3VzJhcNhP8Uh2ehaNj8/VqZQrSfdpymZrad+Bkv/i2BjPoc9tnC 93sHUP3qa8ximzdkXj+l/6g828N7uuyp5ItroW+OQQ4LTBYooey1K1aFhtfs2sycwTwH+5 CDaTT0U/HGficGlEqoSZxTH8xm/9Z0kr/+O/w8z2hdruQ1rTmxjwzzxvxugI2lkJZthC5b Go+Ii6hcOFiKaYd5O5KDTeelGUpKqXs8bEnhUjJkf2z6Khpf8hOkvuPrwXZuvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZJxKWwb0N4rMIjBAPXl2hWHqJJSu+OpzpEh8btcgsx4=; b=xD1fPVl1oIswAFg1HUi+1aCeBqRSpmNHP+u/DHSOy1U/PKdYeqKV9edr7Jdo/89/Cs42O2 IvFQusXYg3heJNcj3R8F0fzqvJDZjKrpX7MPiSQyhlQGemS+LZ3M0Fm+xW0Diob9Iaoal2 T93XrLGa8smluLdzOnZGSBoED/GUlzi1cSL4IeNKNeeTstioZqVizJuNnEcedRBjYUC/AJ PhHqA5ZeGOeDdUsmSCX+JqMwrZOAuhTuHPf8S79syu7HkqHD6c7b1pjMg6sbPCfpvpM38K rHXcrKnTLL5r4gu+Imysoab0QL/6BNf6SL8ixPe7G4INnhDwlxcyY9x0T+v22A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222935; a=rsa-sha256; cv=none; b=sNbSgxjlruWwijtE7v2V+DSCN+4f2aUmUKVzl2pr4K3HPQt6bL3hf5b3n6icSbuZQgiLh4 0oo81OUsrUSg04kUdzs+ncQO71DXU/HjpW8VbKq1gGqajCU8VfwQv3rpz1GAxDGzsluA+u k5u4Sxpkzl2OLhQVk3bhDs5pw5es7O5OSRgke5EHpIZwZsse+QI7CBpHD1Ns08altHGOYd 8PoknCG+9Ltec5feWNyCPn+3cjOW7dnG943tYHqFV69msiV8nFCrBKkKdy9YATWGWE9K+6 EBqTW9RheEON8VpHFMNDAvnd2rZvzFmcv2K7YJdCSYVxLczvfuv1IeZyhM4ksQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tf6zrszmsL; Wed, 29 Nov 2023 01:55: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 3AT1tYjJ064356; Wed, 29 Nov 2023 01:55:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tYdx064353; Wed, 29 Nov 2023 01:55:34 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:34 GMT Message-Id: <202311290155.3AT1tYdx064353@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: 1cfd01111eb6 - main - mpi3mr: Only set callout_owned when we create a timeout List-Id: Commit messages for the main 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: 1cfd01111eb6a28ca5043e928aa8e9099064177a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1cfd01111eb6a28ca5043e928aa8e9099064177a commit 1cfd01111eb6a28ca5043e928aa8e9099064177a Author: Warner Losh AuthorDate: 2023-11-29 01:49:24 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:49:24 +0000 mpi3mr: Only set callout_owned when we create a timeout Since we assume there's a timeout to cancel when this is true, only set it true when we set the timeout. Otherwise we may try to cancel a timeout when there's been an error in submission. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D42541 --- sys/dev/mpi3mr/mpi3mr_cam.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 430550e3edce..691be827cf89 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -1222,15 +1222,15 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) mpi3mr_set_ccbstatus(ccb, CAM_RESRC_UNAVAIL); xpt_done(ccb); } else { - callout_reset_sbt(&cm->callout, SBT_1S * 90 , 0, - mpi3mr_scsiio_timeout, cm, 0); + callout_reset_sbt(&cm->callout, mstosbt(ccb->ccb_h.timeout), 0, + mpi3mr_scsiio_timeout, cm, 0); + cm->callout_owner = true; mpi3mr_atomic_inc(&sc->fw_outstanding); mpi3mr_atomic_inc(&targ->outstanding); if (mpi3mr_atomic_read(&sc->fw_outstanding) > sc->io_cmds_highwater) sc->io_cmds_highwater++; } - cm->callout_owner = true; return; } From nobody Wed Nov 29 01:55:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Th2qMkz52tWh; Wed, 29 Nov 2023 01:55: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 4Sg2Th20wSz4DT9; Wed, 29 Nov 2023 01:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Hq26ArkgTIzYNdu4OlmHcfXAuc0Md5yjiRRGpCW1hA=; b=OFsMHbSldqeo+AcnhZX05eblR6w44jLRf7oQzxt65pqdHf40MVvDOG1pnlHbceGHlp/gTk 7lnjzpfY9UQ2cd2gIFOCK3fEW7rVGf06lUdyxsWL+NTW5olhOoa1hJQMAgYrh8FnRRNMmL K6zWMZhheDY8FIU3k+MGHOBwjD8We0EoOuW+ObCedMowjo4ixH4QCo5g4O1BYcntsO09KP YvZtlLxOjEMGJSiOVAIARPL/Kb8rNN3mpYwW4zkH7y0O5Hq+aI5HO9gR9PTcWURl4gdAoU OhPicgBbWgic9KTNf4VwXlN1Etr8Boi8w10jptKPj2Vw//Jl5d1gjvCuAHU+KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Hq26ArkgTIzYNdu4OlmHcfXAuc0Md5yjiRRGpCW1hA=; b=Zex/OmYrJecI9hO0WKv2xXDbjDNcygtisG+A3e5iBRLcQu+F0l73yKi71Hej96ZziT98oL v1i6vCoTa8cUF+07kx4NpVG5zkOA6+zD63FSM+7Ov3SiTu+zlpbbrplG/GMtODcmGYXJO3 mKwYoI+psWkUVKkT+jFEyBAcB5wT8QJciFFj7HQvGghE3D/dYuA1dZu9KI4sNin1M9quze usr/vClMJmI7d6WGOFmAoGw6sru/KsYqXenDnybIfB2m7N87bY7p6WBHf+tqAblLBA/RB7 gxa/wB8noms6Fe9n0+AKuu2a6aCMJBUe5e0wctVObogmAAuwglGd5x0adYnXVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222936; a=rsa-sha256; cv=none; b=TX0mR0U4DY0+d/1QA5+R+WPKtTPkj8l6MKT8h4hidHmZ4dn1xmNDliba3FLnUDZ1JeS4Jv H8M08RYgf2An0Zi+yc+NnVqbZOei79myvlNgyqfANU0v27RNhSgIB8DmVJo4bWWomOHgeK JYLkhmz0qUfdfjfieEGHxfMKN6seRQsPn3slTA/cLcrdPvInGjutB/duuUJ6zlxSxgpS9n FwWdp/RpthTJ9dLvN2dkX6snfNorFrKKa1YWawLOaB975s/snY6CwDkq57JA4I/CyXqBMi OZ8rD+KKKbf5DEUbpyG5lmOFrm/DFDJePn8z5Ks4NXdlmeIrI+HfjeOgR690hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Th0m6qzmwG; Wed, 29 Nov 2023 01:55: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 3AT1ta0F064413; Wed, 29 Nov 2023 01:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1taVg064410; Wed, 29 Nov 2023 01:55:36 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:36 GMT Message-Id: <202311290155.3AT1taVg064410@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: cf8c23230aab - main - mpi3mr: Cleaup setting of status in processing scsiio requests List-Id: Commit messages for the main 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: cf8c23230aabd30aa9251975dbe705da559a2d02 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cf8c23230aabd30aa9251975dbe705da559a2d02 commit cf8c23230aabd30aa9251975dbe705da559a2d02 Author: Warner Losh AuthorDate: 2023-11-29 01:49:30 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:49:30 +0000 mpi3mr: Cleaup setting of status in processing scsiio requests More uniformly use mpi3mr_set_ccbstatus in mpi3mr_action_scsiio. The routine mostly used it, but also has setting of status by hand. In those cases where we want to error out the request, use this routine. As part of this, move setting CAM_SIM_QUEUED later in the function to when we're sure it's been queued. Remove the places we clear it before this. Sponsored by: Netflix Reviewed by: mav, jhb Differential Revision: https://reviews.freebsd.org/D42542 --- sys/dev/mpi3mr/mpi3mr_cam.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 691be827cf89..4a525a222577 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -1024,7 +1024,7 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) cam_sc->flags |= MPI3MRSAS_QUEUE_FROZEN; } ccb->ccb_h.status &= ~CAM_SIM_QUEUED; - ccb->ccb_h.status |= CAM_REQUEUE_REQ; + mpi3mr_set_ccbstatus(ccb, CAM_REQUEUE_REQ); xpt_done(ccb); return; } @@ -1098,39 +1098,38 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) mpi3mr_dprint(sc, MPI3MR_TRACE, "[QID:%d]: func: %s line:%d CDB: 0x%x targetid: %x SMID: 0x%x\n", (queue_idx + 1), __func__, __LINE__, scsi_opcode, csio->ccb_h.target_id, cm->hosttag); - ccb->ccb_h.status |= CAM_SIM_QUEUED; - switch ((ccb->ccb_h.flags & CAM_DATA_MASK)) { case CAM_DATA_PADDR: case CAM_DATA_SG_PADDR: device_printf(sc->mpi3mr_dev, "%s: physical addresses not supported\n", __func__); mpi3mr_release_command(cm); - ccb->ccb_h.status = CAM_REQ_INVALID; - ccb->ccb_h.status &= ~CAM_SIM_QUEUED; + mpi3mr_set_ccbstatus(ccb, CAM_REQ_INVALID); xpt_done(ccb); return; case CAM_DATA_SG: device_printf(sc->mpi3mr_dev, "%s: scatter gather is not supported\n", __func__); mpi3mr_release_command(cm); - ccb->ccb_h.status = CAM_REQ_INVALID; + mpi3mr_set_ccbstatus(ccb, CAM_REQ_INVALID); xpt_done(ccb); return; case CAM_DATA_VADDR: case CAM_DATA_BIO: if (csio->dxfer_len > (MPI3MR_SG_DEPTH * MPI3MR_4K_PGSZ)) { + mpi3mr_set_ccbstatus(ccb, CAM_REQ_TOO_BIG); mpi3mr_release_command(cm); - ccb->ccb_h.status = CAM_REQ_TOO_BIG; xpt_done(ccb); return; } + ccb->ccb_h.status |= CAM_SIM_QUEUED; cm->length = csio->dxfer_len; if (cm->length) cm->data = csio->data_ptr; break; default: - ccb->ccb_h.status = CAM_REQ_INVALID; + mpi3mr_release_command(cm); + mpi3mr_set_ccbstatus(ccb, CAM_REQ_INVALID); xpt_done(ccb); return; } From nobody Wed Nov 29 01:55:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tj2txlz52t9N; Wed, 29 Nov 2023 01:55: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 4Sg2Tj2Qx2z4DZF; Wed, 29 Nov 2023 01:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1UQHXWqG7uXgfnDNcLcy4lj0pg4C3ugVkvrbTJ9fB4g=; b=uh/zVMnqNuTf0HE2Gn2RQ+VMVlh1ddyyud9Y/YhO/l815G4Xl3SXxpY42k1gfcspyOFDpM PrGebj7p3gChmoeWrz438XN3g2VCY7XpoiAEjzyePNMNQi77p7RXrxqxLdOJbQZbkCyNAH jJ/BaUq16+NuXqCoVTrypvUrxtXD7z3fWeuYhSc48OrGZf5MMdN1RV87sxO0p+iRgWLYWQ ck5SbnynH5G/1FnLhPjHz4EJrFCVd6qVwIuCl1ezJzdn9G9W/z4vUkomvnRX3rLoZ6/60T cXTOp12XzZidtevGOLXzRmhg6Yz+gWapJjQ/aJ/HegaHlZDehwCOt+xKsSmWLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1UQHXWqG7uXgfnDNcLcy4lj0pg4C3ugVkvrbTJ9fB4g=; b=wsPGVmCElBlC2TA/lyw4/CGWYHgRGNlHaHjGYIDZIs8l7JvrOFaVRpMrqo+l9F2FJcqU9W IfeVIso5C69Kcqlz1st3KLI/tXZK430lCuwT6urfOepvv3n4SsTP+zRqSvdHW0ibMPyKLi a6EUEJ3BFcKrWI1UobMVyjuMnR6fCwtki4JmM0D6XU7Y6m7n6XoYZtAPxZ36cR4vsDMJSq 93VIROPeU7Sa9+Vgg1KNbG8N6Cq/f7/McEJPWptwbkf5qvsYMf2na76PTsq0Md1h5ivLAp POKp0blS9rb1mOeJdD7B7ivbgFO5hbpq8sKD46jPcchOF+XYdGh/EJLMtNHSXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222937; a=rsa-sha256; cv=none; b=BsdQmvNiH8cfMw+Ot0P0O+7ZkZaGYsQ/DpRcWMpaG/E3/otbM6dMNLFqVDha+Q5I4Mc4S2 gZ5o4cyZgKyb8DmS0P9TwqHMpLiIn7JY4eY83VEdSiEnL0RmOYbRzhtG0w2xKywtyUwwyI LUTQsH1F7MLaxmG4icwMAx6NtY6hZcYYhoRb5ljqX0ioMncs1tksQtbTfgoQ2FYQlkUDQP AeWd+yKKd6J5yx4nktocYKvk0ORW5rpgaSKgSUTCB9cHRpndczcVnzVk7fvoluXPbjTumt Gx5IpazdM9sRE204pWDugDfddC2f4FGTq/lnqmct4TOiGIHD97jaH/GPJxL70A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tj1XJHzn29; Wed, 29 Nov 2023 01:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AT1tbI9064468; Wed, 29 Nov 2023 01:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tbmi064465; Wed, 29 Nov 2023 01:55:37 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:37 GMT Message-Id: <202311290155.3AT1tbmi064465@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: 3208a189c1e2 - main - mpi3mr: Fix EINPROGRESS errors hanging the card List-Id: Commit messages for the main 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: 3208a189c1e2c4ef35daa432fe45629a043d7047 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3208a189c1e2c4ef35daa432fe45629a043d7047 commit 3208a189c1e2c4ef35daa432fe45629a043d7047 Author: Warner Losh AuthorDate: 2023-11-29 01:49:39 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:49:39 +0000 mpi3mr: Fix EINPROGRESS errors hanging the card Move enqueueing of commands to bus_dmamap_load_ccb callback Fix fundamental difference between FreeBSD and Linux. On Linux, your dma load callback always happends before it returns, so drivers are written to load the map, then submit to hardware. On FreeBSD, the callback may be deferred and return EINPROGRESS. This means the callback is responsible for queueing the request to the hardware is done after the SGL list is created. Make a number of interrelated cahnages: At the end of mpi3mr_prepare_sgls, add a call to mpi3mr_enqueue_request. Split the hardware submission out from the end of mpi3mr_action_scsiio and move it into a new routine mpi3mr_enqueue_request. Move all error completion from the end of mpi3mr_action_scsiio to where the error is detected. We cannot pass errors back from the mpi3mr_enqueue_request to do this on a 'failed' mpi3mr in a centralized place (since it has to be fire and forget). Add comments about zero length SGLs never making it into mpi3mr_prepare_sgls. Keep the code there for the moment, but we only set cm->data to non-NULL when scsiio_req->DataLength is not zero. So the datalength can't be zero and we can't send the zero SGLs. Add commentts about other "impossible" tests in mpi3mr_prepare_sgls that really should be simple asserts of some flavor. Eliminate cm->error_code, since we can't pass data back from the mpi3mr_prepare_sgl callback anymore. In mpi3mr_map_request, call mpi3mr_enqueue_request for the no data case. This seems to work even though we've not done the special zero length handling that was in mpi3mr_prepare_sgls, giving further evidence to it not actually being needed. This is needed for SCSI CDBs that have no data to pass to the drive like TEST UNIT READY. With this change, and the prior ones, we're now able to run with mpi3mr on 128GB systems and very heavy disk load (so many buffers land > 4GB: the driver instructs busdma to never use memory abouve 4GB, which may be too conservative, but an issue for another time). Sponsored by: Netflix Reviewed by: sumit.saxena_broadcom.com, mav, jhb Differential Revision: https://reviews.freebsd.org/D42543 --- sys/dev/mpi3mr/mpi3mr.h | 1 - sys/dev/mpi3mr/mpi3mr_cam.c | 130 +++++++++++++++++++++++++------------------- 2 files changed, 73 insertions(+), 58 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h index b00d2ef562d8..bf23f0d1196c 100644 --- a/sys/dev/mpi3mr/mpi3mr.h +++ b/sys/dev/mpi3mr/mpi3mr.h @@ -466,7 +466,6 @@ struct mpi3mr_cmd { U16 hosttag; U8 req_qidx; Mpi3SCSIIORequest_t io_request; - int error_code; }; struct mpi3mr_chain { diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 4a525a222577..d16826ef1c16 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -85,7 +85,9 @@ #define smp_processor_id() PCPU_GET(cpuid) -static int +static void +mpi3mr_enqueue_request(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cm); +static void mpi3mr_map_request(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cm); void mpi3mr_release_simq_reinit(struct mpi3mr_cam_softc *cam_sc); @@ -117,18 +119,23 @@ static void mpi3mr_prepare_sgls(void *arg, U8 last_chain_sgl_flags; struct mpi3mr_chain *chain_req; Mpi3SCSIIORequest_t *scsiio_req; + union ccb *ccb; cm = (struct mpi3mr_cmd *)arg; sc = cm->sc; scsiio_req = (Mpi3SCSIIORequest_t *) &cm->io_request; + ccb = cm->ccb; if (error) { - cm->error_code = error; device_printf(sc->mpi3mr_dev, "%s: error=%d\n",__func__, error); if (error == EFBIG) { - cm->ccb->ccb_h.status = CAM_REQ_TOO_BIG; - return; + mpi3mr_set_ccbstatus(ccb, CAM_REQ_TOO_BIG); + } else { + mpi3mr_set_ccbstatus(ccb, CAM_REQ_CMP_ERR); } + mpi3mr_release_command(cm); + xpt_done(ccb); + return; } if (cm->data_dir == MPI3MR_READ) @@ -137,10 +144,9 @@ static void mpi3mr_prepare_sgls(void *arg, if (cm->data_dir == MPI3MR_WRITE) bus_dmamap_sync(sc->buffer_dmat, cm->dmamap, BUS_DMASYNC_PREWRITE); - if (nsegs > MPI3MR_SG_DEPTH) { - device_printf(sc->mpi3mr_dev, "SGE count is too large or 0.\n"); - return; - } + + KASSERT(nsegs <= MPI3MR_SG_DEPTH && nsegs > 0, + ("%s: bad SGE count: %d\n", device_get_nameunit(sc->mpi3mr_dev), nsegs)); simple_sgl_flags = MPI3_SGE_FLAGS_ELEMENT_TYPE_SIMPLE | MPI3_SGE_FLAGS_DLAS_SYSTEM; @@ -151,24 +157,15 @@ static void mpi3mr_prepare_sgls(void *arg, sg_local = (U8 *)&scsiio_req->SGL; - if (!scsiio_req->DataLength) { + if (scsiio_req->DataLength == 0) { + /* XXX we don't ever get here when DataLength == 0, right? cm->data is NULL */ + /* This whole if can likely be removed -- we handle it in mpi3mr_request_map */ mpi3mr_build_zero_len_sge(sg_local); - return; + goto enqueue; } sges_left = nsegs; - if (sges_left < 0) { - printf("scsi_dma_map failed: request for %d bytes!\n", - scsiio_req->DataLength); - return; - } - if (sges_left > MPI3MR_SG_DEPTH) { - printf("scsi_dma_map returned unsupported sge count %d!\n", - sges_left); - return; - } - sges_in_segment = (sc->facts.op_req_sz - offsetof(Mpi3SCSIIORequest_t, SGL))/sizeof(Mpi3SGESimple_t); @@ -217,33 +214,51 @@ fill_in_last_segment: i++; } +enqueue: + /* + * Now that we've created the sgls, we send the request to the device. + * Unlike in Linux, dmaload isn't guaranteed to load every time, but + * this function is always called when the resources are available, so + * we can send the request to hardware here always. mpi3mr_map_request + * knows about this quirk and will only take evasive action when an + * error other than EINPROGRESS is returned from dmaload. + */ + mpi3mr_enqueue_request(sc, cm); + return; } -int +static void mpi3mr_map_request(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cm) { u_int32_t retcode = 0; + union ccb *ccb; + ccb = cm->ccb; if (cm->data != NULL) { mtx_lock(&sc->io_lock); /* Map data buffer into bus space */ retcode = bus_dmamap_load_ccb(sc->buffer_dmat, cm->dmamap, - cm->ccb, mpi3mr_prepare_sgls, cm, 0); + ccb, mpi3mr_prepare_sgls, cm, 0); mtx_unlock(&sc->io_lock); - if (retcode) - device_printf(sc->mpi3mr_dev, "bus_dmamap_load(): retcode = %d\n", retcode); - if (retcode == EINPROGRESS) { - device_printf(sc->mpi3mr_dev, "request load in progress\n"); - xpt_freeze_simq(sc->cam_sc->sim, 1); + if (retcode != 0 && retcode != EINPROGRESS) { + device_printf(sc->mpi3mr_dev, + "bus_dmamap_load(): retcode = %d\n", retcode); + /* + * Any other error means prepare_sgls wasn't called, and + * will never be called, so we have to mop up. This error + * should never happen, though. + */ + mpi3mr_set_ccbstatus(ccb, CAM_REQ_CMP_ERR); + mpi3mr_release_command(cm); + xpt_done(ccb); } + } else { + /* + * No data, we enqueue it directly here. + */ + mpi3mr_enqueue_request(sc, cm); } - if (cm->error_code) - return cm->error_code; - if (retcode) - mpi3mr_set_ccbstatus(cm->ccb, CAM_REQ_INVALID); - - return (retcode); } void @@ -911,12 +926,6 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) struct mpi3mr_cmd *cm; uint8_t scsi_opcode, queue_idx; uint32_t mpi_control; - struct mpi3mr_op_req_queue *opreqq = NULL; - U32 data_len_blks = 0; - U32 tracked_io_sz = 0; - U32 ioc_pend_data_len = 0, tg_pend_data_len = 0; - struct mpi3mr_throttle_group_info *tg = NULL; - static int ratelimit; sc = cam_sc->sc; mtx_assert(&sc->mpi3mr_mtx, MA_OWNED); @@ -1103,15 +1112,15 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) case CAM_DATA_SG_PADDR: device_printf(sc->mpi3mr_dev, "%s: physical addresses not supported\n", __func__); - mpi3mr_release_command(cm); mpi3mr_set_ccbstatus(ccb, CAM_REQ_INVALID); + mpi3mr_release_command(cm); xpt_done(ccb); return; case CAM_DATA_SG: device_printf(sc->mpi3mr_dev, "%s: scatter gather is not supported\n", __func__); - mpi3mr_release_command(cm); mpi3mr_set_ccbstatus(ccb, CAM_REQ_INVALID); + mpi3mr_release_command(cm); xpt_done(ccb); return; case CAM_DATA_VADDR: @@ -1128,27 +1137,35 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) cm->data = csio->data_ptr; break; default: - mpi3mr_release_command(cm); mpi3mr_set_ccbstatus(ccb, CAM_REQ_INVALID); - xpt_done(ccb); - return; - } - - /* Prepare SGEs */ - if (mpi3mr_map_request(sc, cm)) { mpi3mr_release_command(cm); xpt_done(ccb); - printf("func: %s line: %d Build SGLs failed\n", __func__, __LINE__); return; } - - opreqq = &sc->op_req_q[queue_idx]; + + /* Prepare SGEs and queue to hardware */ + mpi3mr_map_request(sc, cm); +} + +static void +mpi3mr_enqueue_request(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cm) +{ + static int ratelimit; + struct mpi3mr_op_req_queue *opreqq = &sc->op_req_q[cm->req_qidx]; + struct mpi3mr_throttle_group_info *tg = NULL; + uint32_t data_len_blks = 0; + uint32_t tracked_io_sz = 0; + uint32_t ioc_pend_data_len = 0, tg_pend_data_len = 0; + struct mpi3mr_target *targ = cm->targ; + union ccb *ccb = cm->ccb; + Mpi3SCSIIORequest_t *req = (Mpi3SCSIIORequest_t *)&cm->io_request; if (sc->iot_enable) { - data_len_blks = csio->dxfer_len >> 9; - + data_len_blks = ccb->csio.dxfer_len >> 9; + if ((data_len_blks >= sc->io_throttle_data_length) && targ->io_throttle_enabled) { + tracked_io_sz = data_len_blks; tg = targ->throttle_group; if (tg) { @@ -1206,19 +1223,18 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) if (targ->io_divert) { req->MsgFlags |= MPI3_SCSIIO_MSGFLAGS_DIVERT_TO_FIRMWARE; - mpi_control |= MPI3_SCSIIO_FLAGS_DIVERT_REASON_IO_THROTTLING; + req->Flags = htole32(le32toh(req->Flags) | MPI3_SCSIIO_FLAGS_DIVERT_REASON_IO_THROTTLING); } } - req->Flags = htole32(mpi_control); if (mpi3mr_submit_io(sc, opreqq, (U8 *)&cm->io_request)) { - mpi3mr_release_command(cm); if (tracked_io_sz) { mpi3mr_atomic_sub(&sc->pend_large_data_sz, tracked_io_sz); if (tg) mpi3mr_atomic_sub(&tg->pend_large_data_sz, tracked_io_sz); } mpi3mr_set_ccbstatus(ccb, CAM_RESRC_UNAVAIL); + mpi3mr_release_command(cm); xpt_done(ccb); } else { callout_reset_sbt(&cm->callout, mstosbt(ccb->ccb_h.timeout), 0, From nobody Wed Nov 29 01:55:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tk6TXbz52t9S; Wed, 29 Nov 2023 01:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sg2Tk3Nlxz4DPR; Wed, 29 Nov 2023 01:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4QyyODI5xc/WUeG6tCtj1MxCDDIH6Sj1TdAizuFFOA=; b=FhDvWiZYGS0AHY1hctcfxExc2fR65iw+F2tru5mN4hv4mPOFchjGtRNY7yAgDRqWBlebXR b9M8bAMBJnqmaOMUSPApUrbgesASx42gTZemLKyEiwhwCVPpWwzWIzM1LemHY5J9+ZLAq0 yk4NSQyaJxkAEt5FP2/ujWuT1zHo0O5e4qPBoZCZ0zJJcnpWjGZIbO0KgecN1hevmHu4OY HdVYGeycIP632/+/thS4KjZEGSAWYt9Hp5xWNH6hac5KN8zm6MSqQTxAQapFFhY+yta1r1 I1TtDwroJWRfr2babZVr2Q4itcmJqT1EEPhdXoG/BHCMCTvWil7fQhono3MKvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4QyyODI5xc/WUeG6tCtj1MxCDDIH6Sj1TdAizuFFOA=; b=GKtmAvBI0x9kKUg+Yo04S07whANiESQcuLle/972MZTyv0EcoILb0ksaoNI/ex0gTScf7k LzT6aUNMd9CPWdaAOvVcwTwwRExpawpd+FUKR4stSjkYxrY3iIotEXmojJduLdaT+XCNhd kMX7UPkyO6wgeFo8PmM+fUILLQj+nNHYOnAvQcOokMTgT7XvuVcSn/g2ckcpQdT2Wu7uWo LkEn5HiX/BnMKlTfwNIL1iMnVLGEiR32CRNgjZJBNGiFS3jk936zbF5OVWfMYMS5NLPCAO yJiifScbRBFx7RfXsywB4BmeqTvk7Uu69pqJhGkmwOl/+0w+2busXLJIoY+L0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222938; a=rsa-sha256; cv=none; b=MctBg3EiU0e7qnLR7GzjJFA1ztFf0bvw9RvqC0s35QsZ+2kjSy7iDPeIvW7JHfDee9xlYx UkfmkMIsUs/ZajX3sMQVTcKMu6pYalJqkJBLIMLhYWv7FYykqNIvaMxi+fZ238KdOsETPy UgKjI2aXj70PQCBhSllplMbKwsm4XNk2SG3JfeNdduut5oGRU4XY4twGOgAC1oV17WAkl4 HfIL9p5o3bKSx+zeEDT9Bep/JefeJh+G43CpgV6cfh5cObuhIEPogNBsWLX7KQX7Bm9bO/ Abthz7DVuK9rHaCn4Pa/civ1swYjvm0dYayKG502rCmwoRWYdVoDAtOm0eW70w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tk2TRhzn2B; Wed, 29 Nov 2023 01:55: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 3AT1tcaU064516; Wed, 29 Nov 2023 01:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tciC064513; Wed, 29 Nov 2023 01:55:38 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:38 GMT Message-Id: <202311290155.3AT1tciC064513@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: 91d961356d03 - main - mpi3mr: Honor the dma mask from IOCFacts List-Id: Commit messages for the main 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: 91d961356d03465635c4784fab48acdd1304e1e0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=91d961356d03465635c4784fab48acdd1304e1e0 commit 91d961356d03465635c4784fab48acdd1304e1e0 Author: Warner Losh AuthorDate: 2023-11-29 01:49:49 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:49:49 +0000 mpi3mr: Honor the dma mask from IOCFacts The number of signficant bits that are decoded are returned in the flags field of the IOCFacts structure from the device. Rather than assume the worst with a pessimal 32-bit maximum, look at this value and pass it along to all the dma map creation requests. A lof of those creations are repetitive and could just inherit from the base tag if we moved to the templated interface. This is called out as desireable future work not done at this time. In addition, due to a chicken and an egg problem, we have to allocate some of the maps with a 32-bit loaddr. These are the ones we need to read iocfacts. And they are fine to be so restricted: they are little used after startup, and when they are used, bouncing is fine. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D42559 --- sys/dev/mpi3mr/mpi3mr.c | 27 +++++++++++++++++++++++++++ sys/dev/mpi3mr/mpi3mr_pci.c | 10 ++++++++++ 2 files changed, 37 insertions(+) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index a2e43850d9b5..4ee44eec6c9a 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -980,6 +980,11 @@ static int mpi3mr_setup_admin_qpair(struct mpi3mr_softc *sc) sc->admin_reply_ephase = 1; if (!sc->admin_req) { + /* + * We need to create the tag for the admin queue to get the + * iofacts to see how many bits the controller decodes. Solve + * this chicken and egg problem by only doing lower 4GB DMA. + */ if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ @@ -1434,6 +1439,12 @@ static int mpi3mr_issue_iocfacts(struct mpi3mr_softc *sc, MPI3_SGE_FLAGS_END_OF_LIST); + /* + * We can't use sc->dma_loaddr / hiaddr here. We set those only after + * we get the iocfacts. So allocate in the lower 4GB. The amount of + * data is tiny and we don't do this that often, so any bouncing we + * might have to do isn't a cause for concern. + */ if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ @@ -1668,6 +1679,22 @@ static int mpi3mr_process_factsdata(struct mpi3mr_softc *sc, sc->max_host_ios = sc->facts.max_reqs - (MPI3MR_INTERNALCMDS_RESVD + 1); + /* + * Set the DMA mask for the card. dma_mask is the number of bits that + * can have bits set in them. Translate this into bus_dma loaddr/hiaddr + * args. Add sanity for more bits than address space or other overflow + * situations. + */ + if (sc->facts.dma_mask == 0 || + (sc->facts.dma_mask >= sizeof(bus_addr_t) * 8)) + sc->dma_loaddr = BUS_SPACE_MAXADDR; + else + sc->dma_loaddr = ~((1ull << sc->facts.dma_mask) - 1); + sc->dma_hiaddr = BUS_SPACE_MAXADDR; + mpi3mr_dprint(sc, MPI3MR_INFO, + "dma_mask bits: %d loaddr 0x%jx hiaddr 0x%jx\n", + sc->facts.dma_mask, sc->dma_loaddr, sc->dma_hiaddr); + return retval; } diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index eaf73022291d..11ec98882949 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -273,6 +273,16 @@ static int mpi3mr_setup_resources(struct mpi3mr_softc *sc) sc->mpi3mr_btag = rman_get_bustag(sc->mpi3mr_regs_resource); sc->mpi3mr_bhandle = rman_get_bushandle(sc->mpi3mr_regs_resource); + /* + * XXX Perhaps we should move this to after we read iocfacts and use + * that to create the proper parent tag. However, to get the iocfacts + * we need to have a dmatag for both the admin queue and the iocfacts + * DMA transfer. So for now, we just create a 'no restriction' tag and + * use sc->dma_loaddr for all the other tag_create calls to get the + * right value. It would be nice if one could retroactively adjust a + * created tag. The Linux driver effectively does this by setting the + * dma_mask on the device. + */ /* Allocate the parent DMA tag */ if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, 0, /* algnmnt, boundary */ From nobody Wed Nov 29 01:55:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tl4f7qz52tTX; Wed, 29 Nov 2023 01:55: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 4Sg2Tl4Ggqz4DRY; Wed, 29 Nov 2023 01:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o0CdbBHk8PpZgvOvFpul9nAm+gcJ00sob0bfNuhqzyw=; b=S8ft92Oag4Ta2LzW0hLuAnga4T8FK+AYsp3b6UklZ55gIDftPRks11qq+rJbpbsMx/vEd7 U6zzPNSyPC6Ymv7x+moX3Ssz/dbfOUWexIOUsSGrtVFbvUIJK1Jh2PzQ/5DuFY6ye+w3Xk xxhTlLUeX+ZVWwtXXcGR6I5TQAiMHW9/Wt5wHx9DOfDdie/BDKZA3eaqvj8Wdt5Gyw2v1L Xgirco22pypk0WWc+yakSxidfLtZi9/hIOl7qRXunHekKpTX0CBPmdYg77XtK1L+UAWGyj LswaudHC9RzHEy+RjU0b8iWEwdluvNNPXxAXq3Cduqow29J/uk/CHTtn7CHqRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o0CdbBHk8PpZgvOvFpul9nAm+gcJ00sob0bfNuhqzyw=; b=YXnXTbQneciXO+y+eT0EzfKTH0DAP6RtNKfGYmyvZPmoiE/e7mDJIS8H9rl08Ev/f+NFfW OQ2QD2x6vP3sqQZ4eGMAAg4Ul0Lwc9FrNHmh52C+TPHBeDwC/RcAZXnIYT+iB+qrBrnEmT plkG7x78DRGftixqZQ/7sf1ISp4TPLBV8Gh4qVh2s8Kf7cRguO3RK1711k/QlNteJ2Q9VX K5AhfMnKRn4/svYM9UD8/cfUmNhZ2WqgMMeLSWXm0ayr3nsZk/zlB9WlR0BybjLw+ip8Uu /ri8WxwqZ3FlJidZGBvibTUIKadHlOdLPEtW16Jaq9SRp7YpCVYtkNuC+dRmcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222939; a=rsa-sha256; cv=none; b=pyicGVKGDwZ+JicrcrQ/WWPb/5F8/J2vBMf35ACqefJiOkf+5CWPdM1aHY+ckMQSqjoqC3 fkGOYVB08McJPjf721xnTxFJlujqQkD0rSWe3qAcsN+Q50sLK52x4MVwviwbD+jX+oTDTr LTpXBL66PME7CZ+oFy5M/n24wPlBIgaWX6s2uPcLgdeWaf2guGbSiXF73LyRIqr4TdALwi ltiyS0SGCzfp0cY7R2Y0Miz6cwVqrjDzDjM+6WvVwHC3RTHTDqOKBtSIMLiwqQF57tWLwQ jEoQDb84ZYz8xbn+CajJdzkgMsYI/n1Z6tfsRh7KHWSjVrTAKMBzKv3FRhXcCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tl3L7kzmsM; Wed, 29 Nov 2023 01:55: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 3AT1td7a064561; Wed, 29 Nov 2023 01:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tdKa064558; Wed, 29 Nov 2023 01:55:39 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:39 GMT Message-Id: <202311290155.3AT1tdKa064558@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: ee7c431c4991 - main - mpi3mr: Trivial trailing white space reduction List-Id: Commit messages for the main 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: ee7c431c4991febefcd15f16caa0e2b17c73b7b6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ee7c431c4991febefcd15f16caa0e2b17c73b7b6 commit ee7c431c4991febefcd15f16caa0e2b17c73b7b6 Author: Warner Losh AuthorDate: 2023-11-29 01:49:56 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:49:56 +0000 mpi3mr: Trivial trailing white space reduction Sponsored by: Netflix --- sys/dev/mpi3mr/mpi3mr.c | 68 ++++++++++++++++++++++----------------------- sys/dev/mpi3mr/mpi3mr.h | 3 +- sys/dev/mpi3mr/mpi3mr_app.c | 4 +-- sys/dev/mpi3mr/mpi3mr_cam.c | 50 ++++++++++++++++----------------- sys/dev/mpi3mr/mpi3mr_pci.c | 2 +- 5 files changed, 64 insertions(+), 63 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 4ee44eec6c9a..35baa82fe487 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -603,8 +603,8 @@ static int mpi3mr_create_op_reply_queue(struct mpi3mr_softc *sc, U16 qid) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ op_reply_q->qsz, /* maxsize */ 1, /* nsegments */ @@ -618,7 +618,7 @@ static int mpi3mr_create_op_reply_queue(struct mpi3mr_softc *sc, U16 qid) if (bus_dmamem_alloc(op_reply_q->q_base_tag, (void **)&op_reply_q->q_base, BUS_DMA_NOWAIT, &op_reply_q->q_base_dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); return (ENOMEM); } bzero(op_reply_q->q_base, op_reply_q->qsz); @@ -749,8 +749,8 @@ static int mpi3mr_create_op_req_queue(struct mpi3mr_softc *sc, U16 req_qid, U8 r if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ op_req_q->qsz, /* maxsize */ 1, /* nsegments */ @@ -764,7 +764,7 @@ static int mpi3mr_create_op_req_queue(struct mpi3mr_softc *sc, U16 req_qid, U8 r if (bus_dmamem_alloc(op_req_q->q_base_tag, (void **)&op_req_q->q_base, BUS_DMA_NOWAIT, &op_req_q->q_base_dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); return (ENOMEM); } @@ -1002,7 +1002,7 @@ static int mpi3mr_setup_admin_qpair(struct mpi3mr_softc *sc) if (bus_dmamem_alloc(sc->admin_req_tag, (void **)&sc->admin_req, BUS_DMA_NOWAIT, &sc->admin_req_dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); return (ENOMEM); } bzero(sc->admin_req, sc->admin_req_q_sz); @@ -1040,7 +1040,7 @@ static int mpi3mr_setup_admin_qpair(struct mpi3mr_softc *sc) if (bus_dmamem_alloc(sc->admin_reply_tag, (void **)&sc->admin_reply, BUS_DMA_NOWAIT, &sc->admin_reply_dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); return (ENOMEM); } bzero(sc->admin_reply, sc->admin_reply_q_sz); @@ -1730,8 +1730,8 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 16, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1766,8 +1766,8 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 8, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1800,8 +1800,8 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1834,8 +1834,8 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 8, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1971,8 +1971,8 @@ mpi3mr_print_fw_pkg_ver(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ fw_pkg_ver_len, /* maxsize */ 1, /* nsegments */ @@ -2092,8 +2092,8 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ drvr_info_len, /* maxsize */ 1, /* nsegments */ @@ -2508,8 +2508,8 @@ static int mpi3mr_alloc_chain_bufs(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4096, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -2584,8 +2584,8 @@ static int mpi3mr_pel_alloc(struct mpi3mr_softc *sc) sc->pel_seq_number_sz = sizeof(Mpi3PELSeq_t); if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sc->pel_seq_number_sz, /* maxsize */ 1, /* nsegments */ @@ -4940,8 +4940,8 @@ mpi3mr_alloc_requests(struct mpi3mr_softc *sc) nsegs = MPI3MR_SG_DEPTH; ret = bus_dma_tag_create( sc->mpi3mr_parent_dmat, /* parent */ 1, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ MAXPHYS,/* maxsize */ nsegs, /* nsegments */ @@ -5114,8 +5114,8 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ @@ -5129,7 +5129,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dmamem_alloc(mem_desc->tag, (void **)&mem_desc->addr, BUS_DMA_NOWAIT, &mem_desc->dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); goto out_failed; } bzero(mem_desc->addr, mem_desc->size); @@ -5144,8 +5144,8 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) mem_desc->size = MPI3MR_4K_PGSZ; if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ @@ -5159,7 +5159,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dmamem_alloc(mem_desc->tag, (void **)&mem_desc->addr, BUS_DMA_NOWAIT, &mem_desc->dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); goto out_failed; } bzero(mem_desc->addr, mem_desc->size); @@ -5173,8 +5173,8 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) mem_desc->size = MPI3MR_4K_PGSZ; if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h index bf23f0d1196c..7df31cb15e3f 100644 --- a/sys/dev/mpi3mr/mpi3mr.h +++ b/sys/dev/mpi3mr/mpi3mr.h @@ -543,7 +543,8 @@ struct mpi3mr_softc { char name[MPI3MR_NAME_LENGTH]; char driver_name[MPI3MR_NAME_LENGTH]; int bars; - int dma_mask; + bus_addr_t dma_loaddr; + bus_addr_t dma_hiaddr; u_int mpi3mr_debug; struct mpi3mr_reset reset; int max_msix_vectors; diff --git a/sys/dev/mpi3mr/mpi3mr_app.c b/sys/dev/mpi3mr/mpi3mr_app.c index 737d88801824..eaa983958565 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -335,8 +335,8 @@ mpi3mr_app_build_nvme_prp(struct mpi3mr_softc *sc, sc->nvme_encap_prp_sz = 0; if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ dev_pgsz, /* maxsize */ 1, /* nsegments */ diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index d16826ef1c16..0b882b3a641e 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -388,7 +388,7 @@ static bool mpi3mr_allow_unmap_to_fw(struct mpi3mr_softc *sc, mpi3mr_dprint(sc, MPI3MR_INFO, "%s: Truncating param_list_len from (%d) to (%d)\n", __func__, param_list_len, trunc_param_len); - scsiio_cdb_ptr(csio)[7] = (param_list_len >> 8) | 0xff; + scsiio_cdb_ptr(csio)[7] = (param_list_len >> 8) | 0xff; scsiio_cdb_ptr(csio)[8] = param_list_len | 0xff; mpi3mr_print_cdb(ccb); } @@ -506,12 +506,12 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, if (sc->unrecoverable) { - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "Controller is in unrecoverable state!! TM not required\n"); return retval; } if (sc->reset_in_progress) { - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "controller reset in progress!! TM not required\n"); return retval; } @@ -553,7 +553,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, tm_req.TaskHostTag = htole16(cmd->hosttag); tm_req.TaskRequestQueueID = htole16(op_req_q->qid); } - } + } if (tgtdev) mpi3mr_atomic_inc(&tgtdev->block_io); @@ -569,14 +569,14 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, sc->tm_chan = (void *)&drv_cmd; - mpi3mr_dprint(sc, MPI3MR_DEBUG_TM, + mpi3mr_dprint(sc, MPI3MR_DEBUG_TM, "posting task management request: type(%d), handle(0x%04x)\n", tm_type, tgtdev->dev_handle); init_completion(&drv_cmd->completion); retval = mpi3mr_submit_admin_cmd(sc, &tm_req, sizeof(tm_req)); if (retval) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "posting task management request is failed\n"); retval = -1; goto out_unlock; @@ -587,20 +587,20 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, drv_cmd->is_waiting = 0; retval = -1; if (!(drv_cmd->state & MPI3MR_CMD_RESET)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "task management request timed out after %ld seconds\n", timeout); if (sc->mpi3mr_debug & MPI3MR_DEBUG_TM) { mpi3mr_dprint(sc, MPI3MR_INFO, "tm_request dump\n"); mpi3mr_hexdump(&tm_req, sizeof(tm_req), 8); } - trigger_reset_from_watchdog(sc, MPI3MR_TRIGGER_SOFT_RESET, MPI3MR_RESET_FROM_TM_TIMEOUT); + trigger_reset_from_watchdog(sc, MPI3MR_TRIGGER_SOFT_RESET, MPI3MR_RESET_FROM_TM_TIMEOUT); retval = ETIMEDOUT; } goto out_unlock; } if (!(drv_cmd->state & MPI3MR_CMD_REPLYVALID)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "invalid task management reply message\n"); retval = -1; goto out_unlock; @@ -615,7 +615,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, resp_code = MPI3_SCSITASKMGMT_RSPCODE_TM_COMPLETE; break; default: - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "task management request to handle(0x%04x) is failed with ioc_status(0x%04x) log_info(0x%08x)\n", tgtdev->dev_handle, drv_cmd->ioc_status, drv_cmd->ioc_loginfo); retval = -1; @@ -635,7 +635,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, break; } - mpi3mr_dprint(sc, MPI3MR_DEBUG_TM, + mpi3mr_dprint(sc, MPI3MR_DEBUG_TM, "task management request type(%d) completed for handle(0x%04x) with ioc_status(0x%04x), log_info(0x%08x)" "termination_count(%u), response:%s(0x%x)\n", tm_type, tgtdev->dev_handle, drv_cmd->ioc_status, drv_cmd->ioc_loginfo, tm_reply->TerminationCount, mpi3mr_tm_response_name(resp_code), resp_code); @@ -651,7 +651,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, switch (tm_type) { case MPI3_SCSITASKMGMT_TASKTYPE_ABORT_TASK: if (cmd->state == MPI3MR_CMD_STATE_IN_TM) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: task abort returned success from firmware but corresponding CCB (%p) was not terminated" "marking task abort failed!\n", sc->name, cmd->ccb); retval = -1; @@ -659,7 +659,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, break; case MPI3_SCSITASKMGMT_TASKTYPE_TARGET_RESET: if (mpi3mr_atomic_read(&tgtdev->outstanding)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: target reset returned success from firmware but IOs are still pending on the target (%p)" "marking target reset failed!\n", sc->name, tgtdev); @@ -703,13 +703,13 @@ static int mpi3mr_task_abort(struct mpi3mr_cmd *cmd) } ccb = cmd->ccb; - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "attempting abort task for ccb(%p)\n", ccb); mpi3mr_print_cdb(ccb); if (cmd->state != MPI3MR_CMD_STATE_BUSY) { - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "%s: ccb is not in driver scope, abort task is not required\n", sc->name); return retval; @@ -718,7 +718,7 @@ static int mpi3mr_task_abort(struct mpi3mr_cmd *cmd) retval = mpi3mr_issue_tm(sc, cmd, MPI3_SCSITASKMGMT_TASKTYPE_ABORT_TASK, MPI3MR_ABORTTM_TIMEOUT); - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "abort task is %s for ccb(%p)\n", ((retval == 0) ? "SUCCESS" : "FAILED"), ccb); return retval; @@ -749,12 +749,12 @@ static int mpi3mr_target_reset(struct mpi3mr_cmd *cmd) return retval; } - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "attempting target reset on target(%d)\n", target->per_id); if (mpi3mr_atomic_read(&target->outstanding)) { - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "no outstanding IOs on the target(%d)," " target reset not required.\n", target->per_id); return retval; @@ -762,7 +762,7 @@ static int mpi3mr_target_reset(struct mpi3mr_cmd *cmd) retval = mpi3mr_issue_tm(sc, cmd, MPI3_SCSITASKMGMT_TASKTYPE_TARGET_RESET, MPI3MR_RESETTM_TIMEOUT); - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "target reset is %s for target(%d)\n", ((retval == 0) ? "SUCCESS" : "FAILED"), target->per_id); @@ -790,7 +790,7 @@ static inline int mpi3mr_get_fw_pending_ios(struct mpi3mr_softc *sc) * mpi3mr_wait_for_host_io - block for I/Os to complete * @sc: Adapter instance reference * @timeout: time out in seconds - * + * * Waits for pending I/Os for the given adapter to complete or * to hit the timeout. * @@ -859,7 +859,7 @@ mpi3mr_scsiio_timeout(void *data) * with max timeout for outstanding IOs to complete is 180sec. */ targ_dev = cmd->targ; - if (targ_dev && (targ_dev->dev_type == MPI3_DEVICE_DEVFORM_VD)) { + if (targ_dev && (targ_dev->dev_type == MPI3_DEVICE_DEVFORM_VD)) { if (mpi3mr_wait_for_host_io(sc, MPI3MR_RAID_ERRREC_RESET_TIMEOUT)) trigger_reset_from_watchdog(sc, MPI3MR_TRIGGER_SOFT_RESET, MPI3MR_RESET_FROM_SCSIIO_TIMEOUT); return; @@ -870,7 +870,7 @@ mpi3mr_scsiio_timeout(void *data) if (!retval || (retval == ETIMEDOUT)) return; - /* + /* * task abort has failed to recover the timed out IO, * try with the target reset */ @@ -878,7 +878,7 @@ mpi3mr_scsiio_timeout(void *data) if (!retval || (retval == ETIMEDOUT)) return; - /* + /* * task abort and target reset has failed. So issue Controller reset(soft reset) * through OCR thread context */ @@ -2106,7 +2106,7 @@ mpi3mr_cam_attach(struct mpi3mr_softc *sc) TASK_INIT(&cam_sc->ev_task, 0, mpi3mr_firmware_event_work, sc); cam_sc->ev_tq = taskqueue_create("mpi3mr_taskq", M_NOWAIT | M_ZERO, taskqueue_thread_enqueue, &cam_sc->ev_tq); - taskqueue_start_threads(&cam_sc->ev_tq, 1, PRIBIO, "%s taskq", + taskqueue_start_threads(&cam_sc->ev_tq, 1, PRIBIO, "%s taskq", device_get_nameunit(sc->mpi3mr_dev)); mtx_lock(&sc->mpi3mr_mtx); @@ -2218,7 +2218,7 @@ get_target: goto out_tgt_free; } mtx_unlock_spin(&sc->target_lock); -out_tgt_free: +out_tgt_free: if (target) { free(target, M_MPI3MR); target = NULL; diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index 11ec98882949..8a2c101e06c2 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -286,7 +286,7 @@ static int mpi3mr_setup_resources(struct mpi3mr_softc *sc) /* Allocate the parent DMA tag */ if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ + BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ BUS_SPACE_MAXSIZE_32BIT,/* maxsize */ From nobody Wed Nov 29 01:55:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tm6RX8z52t9Y; Wed, 29 Nov 2023 01:55: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 4Sg2Tm5KKXz4DS8; Wed, 29 Nov 2023 01:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLzJL7bNGAsj88GNCsKZpoN2V4KpLiOU83cnL2Nau3M=; b=gg+mFiWZiQOQlK5qr1ZL7F84tqcu5hOvfJL25TONGBBA+nftIZ5ufvYFq3FQqceJXHdibD thvrZB3jvleG0Wx5zs8I/t3JaybeEa2uWh/c55wIn24IuVdE5bQ/STGW6LgqIc8N5fyfMx aNvRQYmksGVJna0IbBAFbqfGVMRMM0jVAx2lh0kIAdHJGXSJSdCaFPW1f6i/tZmXqvbsra Nm+RKH4uyA7KGRNGNt94OZlVmwx0cB3g5Vk2Mggg0ZDL/zyubahXUVbJ8cEXb6B8GXSq0M fm2eK98IfILAuzNYcQWexIbhg9iEWinksFbIx5eJJuPnGGf/RhSLKQ9YpOSTaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLzJL7bNGAsj88GNCsKZpoN2V4KpLiOU83cnL2Nau3M=; b=gQ+yxfheTN8jgPGYKAl8yBHjnGV4GgDzT3dpxgEKZAnrgJYlkzo34I5mtMV93p5hkuHIMJ Z5OgCjX4WLVOaPawSgmV+VgOCmlqmASOUaXOo2OloxtFQq1wFN/0422tDgDyanRzkffvs/ rhR/xjSe/cTi0HzaeMLpuQBfgaGLOpzBiaekcnZfvLJRygBBO5kpFLScQfCnSkZpldFIYp 2vCY84qLHazGyghGks2BsfZ0Cld+3qxueV8r19QMBlUzuiP5HJqYbMBU73LC+py9q4JmJ2 g6HCXV5B2nN9xRdSCvR7T2ajGwmcqEOeJhATyuXA5+LGvle3IpcB24TdjEoS2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222940; a=rsa-sha256; cv=none; b=Qi9zl19XPtia0WiGt+xCRTX1TCKhuZLvqwfcVi0vAhJjfs5UKo0PVyaRTIqyPbJf51oeht 91IOfuB1m9v+BQoZqYDMCx/4OVQFt0ZcashYCjdzvuYmWs6eVLlRoKRz1uXdVRt3DSBuVE TpELeJRtY0UI+7JUNLpaUi87Scc87jT4zwmR+To/8YX18IWLa9GjyxucuphnfZwZV7Xdqh M1rEcYt0Ec61n+Et2Ac+4p7AWTCppXS+lIxpH9ENa8VGzsJWXMLdkCcG/BfI94YBlbrPG3 l5sNfGJqLxVd8Lf5kvxvMzcevytoJj6OS9f+il/LcuvlXBsSP6dWjZfEpwHOcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tm49hbzmhg; Wed, 29 Nov 2023 01:55: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 3AT1texv064606; Wed, 29 Nov 2023 01:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1te7h064603; Wed, 29 Nov 2023 01:55:40 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:40 GMT Message-Id: <202311290155.3AT1te7h064603@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: 28a274342ea0 - main - mpi3mr: Add firmware version List-Id: Commit messages for the main 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: 28a274342ea0b0666b56704477d2d1c17564942e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=28a274342ea0b0666b56704477d2d1c17564942e commit 28a274342ea0b0666b56704477d2d1c17564942e Author: Warner Losh AuthorDate: 2023-11-29 01:50:10 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:50:10 +0000 mpi3mr: Add firmware version Publish the firmware version on the card like we do for mps/mpr. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D42588 --- sys/dev/mpi3mr/mpi3mr.c | 15 +++++++++------ sys/dev/mpi3mr/mpi3mr.h | 3 +-- sys/dev/mpi3mr/mpi3mr_pci.c | 4 ++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 35baa82fe487..5109b970b3bc 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -1564,6 +1564,7 @@ static int mpi3mr_process_factsdata(struct mpi3mr_softc *sc, { int retval = 0; U32 ioc_config, req_sz, facts_flags; + struct mpi3mr_compimg_ver *fwver; if (le16toh(facts_data->IOCFactsDataLength) != (sizeof(*facts_data) / 4)) { @@ -1660,6 +1661,12 @@ static int mpi3mr_process_factsdata(struct mpi3mr_softc *sc, sc->io_throttle_high = (sc->facts.io_throttle_high * 2 * 1024); sc->io_throttle_low = (sc->facts.io_throttle_low * 2 * 1024); + fwver = &sc->facts.fw_ver; + snprintf(sc->fw_version, sizeof(sc->fw_version), + "%d.%d.%d.%d.%05d-%05d", + fwver->gen_major, fwver->gen_minor, fwver->ph_major, + fwver->ph_minor, fwver->cust_id, fwver->build_num); + mpi3mr_dprint(sc, MPI3MR_INFO, "ioc_num(%d), maxopQ(%d), maxopRepQ(%d), maxdh(%d)," "maxreqs(%d), mindh(%d) maxPDs(%d) maxvectors(%d) maxperids(%d)\n", sc->facts.ioc_num, sc->facts.max_op_req_q, @@ -1675,7 +1682,7 @@ static int mpi3mr_process_factsdata(struct mpi3mr_softc *sc, sc->facts.max_dev_per_tg, sc->facts.max_io_throttle_group, sc->facts.io_throttle_data_length * 4, sc->facts.io_throttle_high, sc->facts.io_throttle_low); - + sc->max_host_ios = sc->facts.max_reqs - (MPI3MR_INTERNALCMDS_RESVD + 1); @@ -2219,7 +2226,6 @@ mpi3mr_display_ioc_info(struct mpi3mr_softc *sc) { int i = 0; char personality[16]; - struct mpi3mr_compimg_ver *fwver = &sc->facts.fw_ver; switch (sc->facts.personality) { case MPI3_IOCFACTS_FLAGS_PERSONALITY_EHBA: @@ -2235,9 +2241,7 @@ mpi3mr_display_ioc_info(struct mpi3mr_softc *sc) mpi3mr_dprint(sc, MPI3MR_INFO, "Current Personality: %s\n", personality); - mpi3mr_dprint(sc, MPI3MR_INFO, "FW Version: %d.%d.%d.%d.%05d-%05d\n", - fwver->gen_major, fwver->gen_minor, fwver->ph_major, - fwver->ph_minor, fwver->cust_id, fwver->build_num); + mpi3mr_dprint(sc, MPI3MR_INFO, "%s\n", sc->fw_version); mpi3mr_dprint(sc, MPI3MR_INFO, "Protocol=("); @@ -2880,7 +2884,6 @@ int mpi3mr_initialize_ioc(struct mpi3mr_softc *sc, U8 init_type) sc->reply_sz = sc->facts.reply_sz; } - mpi3mr_display_ioc_info(sc); retval = mpi3mr_reply_alloc(sc); diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h index 7df31cb15e3f..2af94123c090 100644 --- a/sys/dev/mpi3mr/mpi3mr.h +++ b/sys/dev/mpi3mr/mpi3mr.h @@ -555,8 +555,7 @@ struct mpi3mr_softc { uint32_t chain_frame_size; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; - char fw_version[16]; - char msg_version[8]; + char fw_version[32]; struct mpi3mr_chain *chains; struct callout periodic; struct callout device_check_callout; diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index 8a2c101e06c2..d07463366943 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -145,6 +145,10 @@ mpi3mr_setup_sysctl(struct mpi3mr_softc *sc) OID_AUTO, "io_cmds_highwater", CTLFLAG_RD, &sc->io_cmds_highwater, 0, "Max FW outstanding commands"); + SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), + OID_AUTO, "firmware_version", CTLFLAG_RD, sc->fw_version, + strlen(sc->fw_version), "firmware version"); + SYSCTL_ADD_UINT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "mpi3mr_debug", CTLFLAG_RW, &sc->mpi3mr_debug, 0, "Driver debug level"); From nobody Wed Nov 29 01:55:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tp00Jlz52tTb; Wed, 29 Nov 2023 01:55: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 4Sg2Tn6N8mz4DYZ; Wed, 29 Nov 2023 01:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXI/sORaSmLNbMKhy+VjCzPX2cAkAJPtaIJGpIosKUI=; b=J0dVZC6/MLZoyQASpyNDEAbYWk0BomtfCbw85etKXOxKEJISO7csplesqF9GNmS43EkBwd ROmKrXc8BJs37g7ABh1ijVrHswHL9RlTT9BTJcKD1YpoKKF5BNIRPNzsNeoAqKfdljKPq0 WiHf0LmMJ0lTkOSYVat/CjNlPcTeaRHkJ3nOJHFlypWOJFOxyxtbdhplC8d7R2z0piJ+uH iyzZLiOgsnjgajLwqqhJ8XwD2wCgfKlxPXP6HWLo8rYFaHDf8bFF2SVfSrG0RMG5+qKLeU 7GAiAmSQotOq7xywiVRrDs+YvlprUk09fEVQtZb4h6rjdBBsQInMrwe4+dEujw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXI/sORaSmLNbMKhy+VjCzPX2cAkAJPtaIJGpIosKUI=; b=Tv2yzmvtl6joNVj0qgijxPGIq1+FLRaQIKWK3YMTNiw29w0QknPcD9oOMwT16sg/gSfIhA 8OUZL1XsarO2fbgtuVOVLi9eXmooD8S+Pt/9G6vJ2cssUq52m87Wtq271J6FTXJdMg47F+ EOYce7NqXvEThK9IdHkOGr5XucemR3PenyulLfAdpNZ+/m+6+S0Yh9wIVJjdEJSeMsqTvP O4BmDzzg1AZft6vThibMFhuDdUp0JAHAIb9vWNUZPZStxybjXUaCR0nDE73BXoBV+U0K2H SIyr8heF93TCr6GQNbDB03y7k2HF/VeI/HCeuw9nPuQCQVOwax/ik0RLywP2VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222941; a=rsa-sha256; cv=none; b=u/fdM093Qvewrj3gMocL/GEMbbCINaX+4yFzoPMCuGeftxnWU8rJ35wbtlJsCn9zCKbiY7 9Df8w6V6QiAPvwS1xf6BC73GG2FX+VeJIgrCBakXaTNdIuAs9ehexNFX17ubKy95LPjtFY Ni15CxlZDhYhiXRo69WVgNhXsj9KXHSDuzZR/kJR6Hlpck1mRuK3udGOVMBMV5wXlk3Ap3 wlRYSdQi1JOYg4YPkLdq1f1AMOIsUWx5U2BXnmHSf7ztZIC3D9yfeP0EtfZdWKtxpoAcEE e3ZhkDsGC4vKpmKPZwEqYforzvcu9zuMoJp1k2PSCQo2mNUQMo1a8XcnjVYIBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tn592FzmwH; Wed, 29 Nov 2023 01:55: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 3AT1tf0S064645; Wed, 29 Nov 2023 01:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tfm2064642; Wed, 29 Nov 2023 01:55:41 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:41 GMT Message-Id: <202311290155.3AT1tfm2064642@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: 4e6d128bd823 - main - mpi3mr: Fix MAXPHYS 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e6d128bd823e5b5d0b058f918c7036978a0e8bf Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e6d128bd823e5b5d0b058f918c7036978a0e8bf commit 4e6d128bd823e5b5d0b058f918c7036978a0e8bf Author: Alexander Motin AuthorDate: 2023-11-29 01:50:24 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:52:08 +0000 mpi3mr: Fix MAXPHYS usage This usage is obsolete. Replace with maximum bus space size. maxphys will sort itself out at higher levels. Reviewed by: mav, jhb, imp Differential Revision: https://reviews.freebsd.org/D42605 --- sys/dev/mpi3mr/mpi3mr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 5109b970b3bc..d063ca1b6255 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -4946,9 +4946,9 @@ mpi3mr_alloc_requests(struct mpi3mr_softc *sc) sc->dma_loaddr, /* lowaddr */ sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MAXPHYS,/* maxsize */ + BUS_SPACE_MAXSIZE, /* maxsize */ nsegs, /* nsegments */ - MAXPHYS,/* maxsegsize */ + BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ BUS_DMA_ALLOCNOW, /* flags */ busdma_lock_mutex, /* lockfunc */ &sc->io_lock, /* lockarg */ From nobody Wed Nov 29 01:55:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tq2Hc6z52tRW; Wed, 29 Nov 2023 01:55: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 4Sg2Tq04KWz4Dpx; Wed, 29 Nov 2023 01:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sCR0c9zblKqGIjcWoPa7UO4uSwCnlx5AzefK7PmDIJc=; b=xLppFEUcpJBA5GOhjLEjWbBpnHjXHdcIyPLLMJX1/UVcOL3W5Ylsx24sXr4P0tV0tAND5w eP8dOLcA4ArFhQ8DphLQs8eNMDiz7J1AOJBQDDj61MXRcIWWp1CR1s0mHfw4DVNqMg5vBF UIGU2b5EKNmFzHZnSrHmY8G8aRsBavp2BV9nJfFJI4dyELqzrk+wmhDEmbvfrZuIzD8tET Vnj1HQxlaJ9CX9VeyZ45BCZ+7d6/HEQZEUJ7+nKCJmP92ypGzlCNndFer/doilcI1g30Hu mIr8jzUcoVP6WkKXzY8f1L7kJHe6z5GSA7PTYc2HO9R5wQsB8Qr7Y5Z5QuLglg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sCR0c9zblKqGIjcWoPa7UO4uSwCnlx5AzefK7PmDIJc=; b=FnSA2ShHTj/c8R6B5TvSonZQtTeSDqI555YSMeDBvnlUpgca15OzlnKIkDvaVZu1dua2mO gZJ0AIg0SDDXrsPJDMnIwViV1CdI78GkCHETROoxedSSQ561uXiMp28N746KcIDjSRtL4X OYHurmXJKNec8bgbdpfMMc70sNY16F12YUabUSXRfbWxXpCZIIRjOcANmHdOoPWpb7JP1L aqpuo5CwadV4GDcc8Jh/BV0U0qMSwxwT2HTFuP5kdlTo5b4N9abGd3r2gBwEaLjC5trZnb rGWu+7Nqw3yEqw7lS5psLCAZSRW9YxK7Z72G2fL6oh8MbkMOlV2sFDfmgVkjfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222943; a=rsa-sha256; cv=none; b=q4KehGGX05+aU+JSUJY+xA/XleQIFhXscmHGa/oD4LNuslMQ6pgHhq/JkTttsJ6dmc49WJ JXg0sWT1V/S0tOVd9wxhHTrDhzWObyigzxi4tdA8bDtfLkFGo4opZ9zmqdJ1xecKlSUNe4 3SnbwJ9Wpe6Gk4bQoCELu7QEFwBFgNyvWxbOtRQ69HfpJT/o3Jnsp2RTeEpuK8fgj/JCf8 VBw3L0nkgy7+6C9mrX1xj/biL18tCyJw/ROKn7fOhKehkx1nCv2dh8B+zaEaGiIUVNg6df 7xqXD+XsTByUHkeb1vm+G3Q1e2VY/leXc5IBt7VDU1Wf2hs8S2cxvn7H+ZE/Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tp6HZ7zmhh; Wed, 29 Nov 2023 01:55: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 3AT1tgXB064690; Wed, 29 Nov 2023 01:55:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tgrS064687; Wed, 29 Nov 2023 01:55:42 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:42 GMT Message-Id: <202311290155.3AT1tgrS064687@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: 39a3e6a812ad - main - mpi3mr: Make these bus_dmamap_load calls synchronous List-Id: Commit messages for the main 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: 39a3e6a812ad9c089bd2c4935193f1b3c4c5c35a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=39a3e6a812ad9c089bd2c4935193f1b3c4c5c35a commit 39a3e6a812ad9c089bd2c4935193f1b3c4c5c35a Author: Alexander Motin AuthorDate: 2023-11-29 01:50:30 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:52:16 +0000 mpi3mr: Make these bus_dmamap_load calls synchronous These calls "should" all be synchrounous. There's no bouncing that's needed for them (at least in the typical case that we have a sane card that has more bits of dma addresses decoded than we have memory), so there's no errors possible. Ensure these calls are really synchronous with BUS_DMA_NOWAIT flags (which should never fail now that the bus_dmamem_alloc() has succeeded). Reviewed by: mav, jhb, imp Differential Revision: https://reviews.freebsd.org/D42606 --- sys/dev/mpi3mr/mpi3mr.c | 33 +++++++++++++++++---------------- sys/dev/mpi3mr/mpi3mr_app.c | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index d063ca1b6255..cc970de00e8b 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -623,7 +623,7 @@ static int mpi3mr_create_op_reply_queue(struct mpi3mr_softc *sc, U16 qid) } bzero(op_reply_q->q_base, op_reply_q->qsz); bus_dmamap_load(op_reply_q->q_base_tag, op_reply_q->q_base_dmamap, op_reply_q->q_base, op_reply_q->qsz, - mpi3mr_memaddr_cb, &op_reply_q->q_base_phys, 0); + mpi3mr_memaddr_cb, &op_reply_q->q_base_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "Operational Reply queue ID: %d phys addr= %#016jx virt_addr: %pa size= %d\n", qid, (uintmax_t)op_reply_q->q_base_phys, op_reply_q->q_base, op_reply_q->qsz); @@ -771,7 +771,7 @@ static int mpi3mr_create_op_req_queue(struct mpi3mr_softc *sc, U16 req_qid, U8 r bzero(op_req_q->q_base, op_req_q->qsz); bus_dmamap_load(op_req_q->q_base_tag, op_req_q->q_base_dmamap, op_req_q->q_base, op_req_q->qsz, - mpi3mr_memaddr_cb, &op_req_q->q_base_phys, 0); + mpi3mr_memaddr_cb, &op_req_q->q_base_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "Operational Request QID: %d phys addr= %#016jx virt addr= %pa size= %d associated Reply QID: %d\n", req_qid, (uintmax_t)op_req_q->q_base_phys, op_req_q->q_base, op_req_q->qsz, reply_qid); @@ -1007,7 +1007,7 @@ static int mpi3mr_setup_admin_qpair(struct mpi3mr_softc *sc) } bzero(sc->admin_req, sc->admin_req_q_sz); bus_dmamap_load(sc->admin_req_tag, sc->admin_req_dmamap, sc->admin_req, sc->admin_req_q_sz, - mpi3mr_memaddr_cb, &sc->admin_req_phys, 0); + mpi3mr_memaddr_cb, &sc->admin_req_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "Admin Req queue phys addr= %#016jx size= %d\n", (uintmax_t)sc->admin_req_phys, sc->admin_req_q_sz); @@ -1045,7 +1045,7 @@ static int mpi3mr_setup_admin_qpair(struct mpi3mr_softc *sc) } bzero(sc->admin_reply, sc->admin_reply_q_sz); bus_dmamap_load(sc->admin_reply_tag, sc->admin_reply_dmamap, sc->admin_reply, sc->admin_reply_q_sz, - mpi3mr_memaddr_cb, &sc->admin_reply_phys, 0); + mpi3mr_memaddr_cb, &sc->admin_reply_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "Admin Reply queue phys addr= %#016jx size= %d\n", (uintmax_t)sc->admin_reply_phys, sc->admin_req_q_sz); @@ -1469,7 +1469,7 @@ static int mpi3mr_issue_iocfacts(struct mpi3mr_softc *sc, bzero(data, data_len); bus_dmamap_load(data_tag, data_map, data, data_len, - mpi3mr_memaddr_cb, &data_phys, 0); + mpi3mr_memaddr_cb, &data_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "Func: %s line: %d IOCfacts data phys addr= %#016jx size= %d\n", __func__, __LINE__, (uintmax_t)data_phys, data_len); @@ -1759,7 +1759,7 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) bzero(sc->reply_buf, sz); bus_dmamap_load(sc->reply_buf_tag, sc->reply_buf_dmamap, sc->reply_buf, sz, - mpi3mr_memaddr_cb, &sc->reply_buf_phys, 0); + mpi3mr_memaddr_cb, &sc->reply_buf_phys, BUS_DMA_NOWAIT); sc->reply_buf_dma_min_address = sc->reply_buf_phys; sc->reply_buf_dma_max_address = sc->reply_buf_phys + sz; @@ -1795,7 +1795,7 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) bzero(sc->reply_free_q, sz); bus_dmamap_load(sc->reply_free_q_tag, sc->reply_free_q_dmamap, sc->reply_free_q, sz, - mpi3mr_memaddr_cb, &sc->reply_free_q_phys, 0); + mpi3mr_memaddr_cb, &sc->reply_free_q_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "reply_free_q (0x%p): depth(%d), frame_size(%d), " "pool_size(%d kB), reply_free_q_dma(0x%llx)\n", @@ -1829,7 +1829,7 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) bzero(sc->sense_buf, sz); bus_dmamap_load(sc->sense_buf_tag, sc->sense_buf_dmamap, sc->sense_buf, sz, - mpi3mr_memaddr_cb, &sc->sense_buf_phys, 0); + mpi3mr_memaddr_cb, &sc->sense_buf_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "sense_buf (0x%p): depth(%d), frame_size(%d), " "pool_size(%d kB), sense_dma(0x%llx)\n", @@ -1863,7 +1863,7 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) bzero(sc->sense_buf_q, sz); bus_dmamap_load(sc->sense_buf_q_tag, sc->sense_buf_q_dmamap, sc->sense_buf_q, sz, - mpi3mr_memaddr_cb, &sc->sense_buf_q_phys, 0); + mpi3mr_memaddr_cb, &sc->sense_buf_q_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "sense_buf_q (0x%p): depth(%d), frame_size(%d), " "pool_size(%d kB), sense_dma(0x%llx)\n", @@ -1999,7 +1999,8 @@ mpi3mr_print_fw_pkg_ver(struct mpi3mr_softc *sc) bzero(fw_pkg_ver, fw_pkg_ver_len); - bus_dmamap_load(fw_pkg_ver_tag, fw_pkg_ver_map, fw_pkg_ver, fw_pkg_ver_len, mpi3mr_memaddr_cb, &fw_pkg_ver_dma, 0); + bus_dmamap_load(fw_pkg_ver_tag, fw_pkg_ver_map, fw_pkg_ver, fw_pkg_ver_len, + mpi3mr_memaddr_cb, &fw_pkg_ver_dma, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "Func: %s line: %d fw package version phys addr= %#016jx size= %d\n", __func__, __LINE__, (uintmax_t)fw_pkg_ver_dma, fw_pkg_ver_len); @@ -2121,7 +2122,7 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_softc *sc) bzero(drvr_info, drvr_info_len); bus_dmamap_load(drvr_info_tag, drvr_info_map, drvr_info, drvr_info_len, - mpi3mr_memaddr_cb, &drvr_info_phys, 0); + mpi3mr_memaddr_cb, &drvr_info_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "Func: %s line: %d IOCfacts drvr_info phys addr= %#016jx size= %d\n", __func__, __LINE__, (uintmax_t)drvr_info_phys, drvr_info_len); @@ -2535,7 +2536,7 @@ static int mpi3mr_alloc_chain_bufs(struct mpi3mr_softc *sc) bzero(sc->chain_sgl_list[i].buf, sz); bus_dmamap_load(sc->chain_sgl_list_tag, sc->chain_sgl_list[i].buf_dmamap, sc->chain_sgl_list[i].buf, sz, - mpi3mr_memaddr_cb, &sc->chain_sgl_list[i].buf_phys, 0); + mpi3mr_memaddr_cb, &sc->chain_sgl_list[i].buf_phys, BUS_DMA_NOWAIT); mpi3mr_dprint(sc, MPI3MR_XINFO, "Func: %s line: %d phys addr= %#016jx size= %d\n", __func__, __LINE__, (uintmax_t)sc->chain_sgl_list[i].buf_phys, sz); } @@ -2612,7 +2613,7 @@ static int mpi3mr_pel_alloc(struct mpi3mr_softc *sc) bzero(sc->pel_seq_number, sc->pel_seq_number_sz); bus_dmamap_load(sc->pel_seq_num_dmatag, sc->pel_seq_num_dmamap, sc->pel_seq_number, - sc->pel_seq_number_sz, mpi3mr_memaddr_cb, &sc->pel_seq_number_dma, 0); + sc->pel_seq_number_sz, mpi3mr_memaddr_cb, &sc->pel_seq_number_dma, BUS_DMA_NOWAIT); if (!sc->pel_seq_number) { printf(IOCNAME "%s:%d Cannot load PEL seq number dma memory for size: %d\n", sc->name, @@ -5137,7 +5138,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) } bzero(mem_desc->addr, mem_desc->size); bus_dmamap_load(mem_desc->tag, mem_desc->dmamap, mem_desc->addr, mem_desc->size, - mpi3mr_memaddr_cb, &mem_desc->dma_addr, 0); + mpi3mr_memaddr_cb, &mem_desc->dma_addr, BUS_DMA_NOWAIT); if (!mem_desc->addr) goto out_failed; @@ -5167,7 +5168,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) } bzero(mem_desc->addr, mem_desc->size); bus_dmamap_load(mem_desc->tag, mem_desc->dmamap, mem_desc->addr, mem_desc->size, - mpi3mr_memaddr_cb, &mem_desc->dma_addr, 0); + mpi3mr_memaddr_cb, &mem_desc->dma_addr, BUS_DMA_NOWAIT); if (!mem_desc->addr) goto out_failed; @@ -5196,7 +5197,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) } bzero(mem_desc->addr, mem_desc->size); bus_dmamap_load(mem_desc->tag, mem_desc->dmamap, mem_desc->addr, mem_desc->size, - mpi3mr_memaddr_cb, &mem_desc->dma_addr, 0); + mpi3mr_memaddr_cb, &mem_desc->dma_addr, BUS_DMA_NOWAIT); if (!mem_desc->addr) goto out_failed; diff --git a/sys/dev/mpi3mr/mpi3mr_app.c b/sys/dev/mpi3mr/mpi3mr_app.c index eaa983958565..14cea43db2ca 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -357,7 +357,7 @@ mpi3mr_app_build_nvme_prp(struct mpi3mr_softc *sc, bzero(sc->nvme_encap_prp_list, dev_pgsz); bus_dmamap_load(sc->nvme_encap_prp_list_dmatag, sc->nvme_encap_prp_list_dma_dmamap, sc->nvme_encap_prp_list, dev_pgsz, mpi3mr_memaddr_cb, &sc->nvme_encap_prp_list_dma, - 0); + BUS_DMA_NOWAIT); if (!sc->nvme_encap_prp_list) { printf(IOCNAME "%s:%d Cannot load ioctl NVME dma memory for size: %d\n", sc->name, From nobody Wed Nov 29 01:55:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tr1m9Qz52tTj; Wed, 29 Nov 2023 01:55: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 4Sg2Tr0yH2z4F1W; Wed, 29 Nov 2023 01:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1lqe8aE0U1mjmF7j/Q/CShqZgqxifVCsfATihfpyTPM=; b=h26hVH5hN5+HaVfX52ywOMxeLz7lGtWGsY79uMTnhfTfC+13HOhOcYJm88Y1d9TjjoKtCz i/ry3vTKs0eYpxQGWP0AM/ebrnGP8vWbo/aVpvql6ERA/G06Fw9ow+Yba83AGJOSV3IXuZ WO6S9XTmHHhLb+2u7HVcPT4IqJ7gPCqVG0qFvSYZKnpGv0lx1CJB7M6UCWAyOnKdHneSEt IkBQ84YGMAcx/CJyC3+UVlMhB0G5PGeqmTDlJd3tslbMCwIJZKXQo74YNTqQOEd2xyC3nh SjsX4hvhGD+I65hJQDxMQkm+r21BJbiCtxApn8vPmbarGCcZo26jBwndhmgQjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1lqe8aE0U1mjmF7j/Q/CShqZgqxifVCsfATihfpyTPM=; b=Set3OUDlE6AMIRFZbRnxcgdV2L9rmLElDuq5BakrBv3V6DmGnhzWTskkYbzy4cPs7rwwzY ZZTbvosASelbSXZTaeFrpZmpxt5tOApKlve/gFIwUaaluevkVNbsDkunHkj5w6keRRgjC9 gFgx7uRxH7IlPZPrJLJ5cUCzn0h3WmckD5bQn4kI/SP3TR0a78cFNDIj6S/ZZisI1N4mEB mQvxa0CaLNSQih3e3UWLcZmYymzt2sgYh0hPxgjZDaAtDw5hZ0Mi533HgZ8mo45CgffpLK S+E2KTYJ4grik4JzdrcC/JDnEuqCd9+ZUjwRy876CScS/6PNpMgXoLFuJuRzbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222944; a=rsa-sha256; cv=none; b=yzrGHv0RlV0xwpWxowVK/HZ7rc4S0xZsP/Z//lkasDOrfpi9hQ9QD3Ml55/+wH5B80z+0b PrrFS2lnMNPEKwYTqfLtz4S+L9zkDxjJiI+AJt1nyT8zEC5OSyCVi3Ll99qTbJPeaosgo/ kD5jG/btsWPsifAtUDayPA6U18PWuwHh3JaZIiFGL/LzxYCkOpXTzO911dVtePXABDYhPt yvha6B0q8pndGScKzR+ndnBoh5maEVMWzgpqjan0U4dGnd9pYgP/2TkEkX/OQzR7h6ZecL bg5/a4UzRrmN0kQtrahN19S3RUSbdXUmVsktQypIqqpKfoJAzpmErACGx6XwFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tr03vVzmhj; Wed, 29 Nov 2023 01:55: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 3AT1th5A064738; Wed, 29 Nov 2023 01:55:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1th4B064735; Wed, 29 Nov 2023 01:55:43 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:43 GMT Message-Id: <202311290155.3AT1th4B064735@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: 489eee0d41dc - main - mpi3mr: Use template for main busdma tag. List-Id: Commit messages for the main 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: 489eee0d41dce317678adb0dae8d509a5f1d6d93 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=489eee0d41dce317678adb0dae8d509a5f1d6d93 commit 489eee0d41dce317678adb0dae8d509a5f1d6d93 Author: Alexander Motin AuthorDate: 2023-11-29 01:50:39 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:52:23 +0000 mpi3mr: Use template for main busdma tag. Use the simpler template code for the parent busdma tag for all I/O to this card. Reviewed by: mav, jhb, imp Differential Revision: https://reviews.freebsd.org/D42607 --- sys/dev/mpi3mr/mpi3mr_pci.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index d07463366943..c1c0211aab4e 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -256,6 +256,7 @@ mpi3mr_release_resources(struct mpi3mr_softc *sc) static int mpi3mr_setup_resources(struct mpi3mr_softc *sc) { + bus_dma_template_t t; int i; device_t dev = sc->mpi3mr_dev; @@ -288,20 +289,11 @@ static int mpi3mr_setup_resources(struct mpi3mr_softc *sc) * dma_mask on the device. */ /* Allocate the parent DMA tag */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ - 1, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - BUS_SPACE_MAXSIZE_32BIT,/* maxsize */ - BUS_SPACE_UNRESTRICTED, /* nsegments */ - BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ - 0, /* flags */ - NULL, NULL, /* lockfunc, lockarg */ - &sc->mpi3mr_parent_dmat)) { + bus_dma_template_init(&t, bus_get_dma_tag(dev)); + if (bus_dma_template_tag(&t, &sc->mpi3mr_parent_dmat)) { mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate parent DMA tag\n"); return (ENOMEM); - } + } sc->max_msix_vectors = pci_msix_count(dev); From nobody Wed Nov 29 01:55:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Ts2T6Vz52tX1; Wed, 29 Nov 2023 01: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 4Sg2Ts1zvYz4Dt5; Wed, 29 Nov 2023 01: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=1701222945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NH1SzNYKM4/g/6kTDHOdug5CZxDI8pCJk4ZBL2eWIRI=; b=gyF79tASifKuLfzfxOrhEE6zc69p2uzbDEzjQAclV+5lNGsIWahjWLDmXdS2NPBi/Ge7bj YtzO+H8sxqtF5GqyF3xFTGlK2ZQMnnMNsyFowQhRUeo21hjOw24USlETtXsnphyNMJaZXT ycUtV131CageZ/RFo51ISK61bUEFUNEEsWX0J0CBYp2ByBJCp1JNDwSmj07eReLmdhT6KJ TQM3sgYMar3jT3eM2wTYF1GdM0Gg79T48VIWGzE/F5gqVr4TEOD8s9wykkUsffCOM68kfw Pp88HOJ0UOAPB/eG86iGAqjWLjurSOvtT/vzNCnthoIbrKiiSkPTRHSiVdaHrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NH1SzNYKM4/g/6kTDHOdug5CZxDI8pCJk4ZBL2eWIRI=; b=LhQn1ohzS967PyN5B0kmJrAzEJSCf2IUzrV9UrgjpeWyhzel2eOX4N7vWjl0XUnp9Fdn1z 126VEdlbgIEjmqEti69I1JjVE9DcR+tlZbQyYT3JhyWfLUPluQV7/oPGyna42/Mb772sR5 copKbWYSZSB0yZTtak/tCdlgrJxBgQzVvRecfFlAfmqQQ95G3CKjXKHTx0ZlOXvxC5AXRa WwMo8kSDmT4VdnPc1vRIQEMTlpJnsXkx1N51ehoFPzmfyt0SInpT3DQefT3GEgSbaGFkUS UM3NvHsV8MULKsaU2jB5hdhXAj1GzG5pXDqXRpqsaHXmaSeHu72HHgYPd0j23g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222945; a=rsa-sha256; cv=none; b=F4mIVM0Z9xN2E9x3dIOiU+eUFuh8aGrj5uy3/xZxKgIstiFfs3RM3v1xF1PFKHWciD52jc sM5iuaYXiys9uiA7YjhbfcvbkVV6o5H0NwJOBwvifsqhPMeMc/CfCpffftEOiI7xftsytO F4M04600uT8EjC1CLSw+KMUNTj04J+s9+tzJO9ZfZv8b7JrUnCrKeo2cTTpDpaklrVktVk cEWOxKWks8M1SPvyHX0FrBlqx9QkWRnRBBFNQJsH9aGUsQuT5ecK2+8PF9MRbZyhyJs5N0 rSvrmFUeAk8jo7k2TkkfG0jLJ4P5jZxseb1kTaEZY+7Kpkg1Qvj26PMnmMJ8QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Ts0wQqzmyk; Wed, 29 Nov 2023 01: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 3AT1tjDN064795; Wed, 29 Nov 2023 01: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 3AT1tjZY064792; Wed, 29 Nov 2023 01:55:45 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:45 GMT Message-Id: <202311290155.3AT1tjZY064792@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: 2361a0056fc1 - main - mpi3mr: Replace can't happen DataLength == 0 with an assert List-Id: Commit messages for the main 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: 2361a0056fc16b5e11df2aa948aaa633ac01d685 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2361a0056fc16b5e11df2aa948aaa633ac01d685 commit 2361a0056fc16b5e11df2aa948aaa633ac01d685 Author: Warner Losh AuthorDate: 2023-11-29 01:50:47 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:52:28 +0000 mpi3mr: Replace can't happen DataLength == 0 with an assert Replace the test for DataLength == 0 with an assert. It can't happen, but an assert doesn't hurt. Emacs removed some trailing white space too. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42807 --- sys/dev/mpi3mr/mpi3mr_cam.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 0b882b3a641e..3cef46f3f642 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -98,7 +98,6 @@ extern int mpi3mr_register_events(struct mpi3mr_softc *sc); extern void mpi3mr_add_sg_single(void *paddr, U8 flags, U32 length, bus_addr_t dma_addr); -extern void mpi3mr_build_zero_len_sge(void *paddr); static U32 event_count; @@ -147,6 +146,9 @@ static void mpi3mr_prepare_sgls(void *arg, KASSERT(nsegs <= MPI3MR_SG_DEPTH && nsegs > 0, ("%s: bad SGE count: %d\n", device_get_nameunit(sc->mpi3mr_dev), nsegs)); + KASSERT(scsiio_req->DataLength != 0, + ("%s: Data segments (%d), but DataLength == 0\n", + device_get_nameunit(sc->mpi3mr_dev), nsegs)); simple_sgl_flags = MPI3_SGE_FLAGS_ELEMENT_TYPE_SIMPLE | MPI3_SGE_FLAGS_DLAS_SYSTEM; @@ -157,13 +159,6 @@ static void mpi3mr_prepare_sgls(void *arg, sg_local = (U8 *)&scsiio_req->SGL; - if (scsiio_req->DataLength == 0) { - /* XXX we don't ever get here when DataLength == 0, right? cm->data is NULL */ - /* This whole if can likely be removed -- we handle it in mpi3mr_request_map */ - mpi3mr_build_zero_len_sge(sg_local); - goto enqueue; - } - sges_left = nsegs; sges_in_segment = (sc->facts.op_req_sz - @@ -214,7 +209,6 @@ fill_in_last_segment: i++; } -enqueue: /* * Now that we've created the sgls, we send the request to the device. * Unlike in Linux, dmaload isn't guaranteed to load every time, but @@ -879,10 +873,10 @@ mpi3mr_scsiio_timeout(void *data) return; /* - * task abort and target reset has failed. So issue Controller reset(soft reset) + * task abort and target reset has failed. So issue Controller reset(soft reset) * through OCR thread context */ - trigger_reset_from_watchdog(sc, MPI3MR_TRIGGER_SOFT_RESET, MPI3MR_RESET_FROM_SCSIIO_TIMEOUT); + trigger_reset_from_watchdog(sc, MPI3MR_TRIGGER_SOFT_RESET, MPI3MR_RESET_FROM_SCSIIO_TIMEOUT); return; } @@ -976,7 +970,7 @@ mpi3mr_action_scsiio(struct mpi3mr_cam_softc *cam_sc, union ccb *ccb) } if (targ->dev_handle == 0x0) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "%s NULL handle for target 0x%x\n", + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s NULL handle for target 0x%x\n", __func__, csio->ccb_h.target_id); mpi3mr_set_ccbstatus(ccb, CAM_DEV_NOT_THERE); xpt_done(ccb); From nobody Wed Nov 29 01:55:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tt3rSgz52tTp; Wed, 29 Nov 2023 01: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 4Sg2Tt37T6z4DxK; Wed, 29 Nov 2023 01: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=1701222946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxSG2vbFoLx1qt17py4WhKHWLODAG/DDGXHsjuXsP8Y=; b=fUUmf5DUtqaptmASHEdP1/NImRDOYXDte/kElS1BiUsNjumOlI1Xkedc7j6L7wxVJ5vCP5 /gXRDocdDxGBU9P7ADJigABgMTlKGtMlclB8OGlr2jZfO4pz1FfoBeqY+lSoisz/+drhhc 8Hc9jpQPSTf9yN29BX+O/ZP9PBweic/DOvQtc5Gy/ZCzVm19n4POkmnKSWk596o5QKRcMI HICXxoBAIyxpT2rta0p0D5ljtOnysZ+LYKgRznQs/8ZWBO4L0cOd1UbTEnXszwO2fdLNxP ZAwWKqOTgow1jdutBS35Q+ddYYGCmW5HKfy0OLf3ue1ooeiSKNQxQIQq4unLqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxSG2vbFoLx1qt17py4WhKHWLODAG/DDGXHsjuXsP8Y=; b=NcYMq8w7L2ayChAPNLk3Kkf7xXWbx+vhbMU/ua/jRNzFoHjJ5BJ8gxWYi8pQoQ9sndBjPI lkTCqAMCxlbGVHX+vU6c0dSmh9LBdEeW5uUK+mbbwFVph2IUhnO7g2lbK7XfK+0OsIZUGa H7bvREwlyWFC45QsCjg8leG7HviEbmS+JThZn2q+K7iSrmaWfJXw8QWyhG2JbRoY51R9pJ ti6lNQklvf1alk7JrR2WYP0SbwtlclXWXmsT/BG/Nz8mOE1dyr8DxU4aRx5EEu19JqBwBP dH7tFvs8k5h4g8pVpaupNpCLliD4eiy/Te6G9vN589KHBxw0VWDf18SdHdVz3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222946; a=rsa-sha256; cv=none; b=S3qpiU3mqBeoa5J7EqCIyta9LC3TKn6atlY1l0Aa5rFa6lg4KELfUASJTRaJr82UaUq7lY PuXplszutwuie/JoMoZov6WAfvS0iC4P4Eepy4dG5R6fYkOJ28xgokiBKeCendyklqjJCu sydUdEAPxzZn+vuHk31PA0jtLlkcqXojKmoTqFSEPu/16Ho5rxQEAek2/rTszsT85tALfp 6wfm3JeRS19tsj0wGjU66U0QHEvO+1LFbay9VIA65NUf7qm5xHhZfabSzlSG9Rx9+y5ChD iGcYSlrXIk/3HGHJimuSmuxYmunz5NCgCLObQh2xeGNJamHt7ZQsLK55OVWtmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tt28XNzmyl; Wed, 29 Nov 2023 01: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 3AT1tkbN064843; Wed, 29 Nov 2023 01: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 3AT1tkwn064840; Wed, 29 Nov 2023 01:55:46 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:46 GMT Message-Id: <202311290155.3AT1tkwn064840@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: 1ec7c672bc28 - main - mpi3mr: Assume dma_hiaddr is BUS_SPACE_MAXADDR List-Id: Commit messages for the main 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: 1ec7c672bc2854a1efb1d50f189d4881163c16c6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1ec7c672bc2854a1efb1d50f189d4881163c16c6 commit 1ec7c672bc2854a1efb1d50f189d4881163c16c6 Author: Warner Losh AuthorDate: 2023-11-29 01:50:52 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:52:28 +0000 mpi3mr: Assume dma_hiaddr is BUS_SPACE_MAXADDR No sense having a variable for this. So use BUS_SPACE_MAXADDR and remove dma_hiaddr from softc. Suggested by: jhb Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D42808 --- sys/dev/mpi3mr/mpi3mr.c | 47 ++++++++++++++++++++++----------------------- sys/dev/mpi3mr/mpi3mr.h | 1 - sys/dev/mpi3mr/mpi3mr_app.c | 2 +- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index cc970de00e8b..39cefd15d476 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -604,7 +604,7 @@ static int mpi3mr_create_op_reply_queue(struct mpi3mr_softc *sc, U16 qid) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ op_reply_q->qsz, /* maxsize */ 1, /* nsegments */ @@ -750,7 +750,7 @@ static int mpi3mr_create_op_req_queue(struct mpi3mr_softc *sc, U16 req_qid, U8 r if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ op_req_q->qsz, /* maxsize */ 1, /* nsegments */ @@ -1440,10 +1440,10 @@ static int mpi3mr_issue_iocfacts(struct mpi3mr_softc *sc, /* - * We can't use sc->dma_loaddr / hiaddr here. We set those only after - * we get the iocfacts. So allocate in the lower 4GB. The amount of - * data is tiny and we don't do this that often, so any bouncing we - * might have to do isn't a cause for concern. + * We can't use sc->dma_loaddr here. We set those only after we get the + * iocfacts. So allocate in the lower 4GB. The amount of data is tiny + * and we don't do this that often, so any bouncing we might have to do + * isn't a cause for concern. */ if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ @@ -1688,8 +1688,8 @@ static int mpi3mr_process_factsdata(struct mpi3mr_softc *sc, /* * Set the DMA mask for the card. dma_mask is the number of bits that - * can have bits set in them. Translate this into bus_dma loaddr/hiaddr - * args. Add sanity for more bits than address space or other overflow + * can have bits set in them. Translate this into bus_dma loaddr args. + * Add sanity for more bits than address space or other overflow * situations. */ if (sc->facts.dma_mask == 0 || @@ -1697,10 +1697,9 @@ static int mpi3mr_process_factsdata(struct mpi3mr_softc *sc, sc->dma_loaddr = BUS_SPACE_MAXADDR; else sc->dma_loaddr = ~((1ull << sc->facts.dma_mask) - 1); - sc->dma_hiaddr = BUS_SPACE_MAXADDR; mpi3mr_dprint(sc, MPI3MR_INFO, - "dma_mask bits: %d loaddr 0x%jx hiaddr 0x%jx\n", - sc->facts.dma_mask, sc->dma_loaddr, sc->dma_hiaddr); + "dma_mask bits: %d loaddr 0x%jx\n", + sc->facts.dma_mask, sc->dma_loaddr); return retval; } @@ -1738,7 +1737,7 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 16, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1774,7 +1773,7 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 8, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1808,7 +1807,7 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1842,7 +1841,7 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 8, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1979,7 +1978,7 @@ mpi3mr_print_fw_pkg_ver(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ fw_pkg_ver_len, /* maxsize */ 1, /* nsegments */ @@ -2101,7 +2100,7 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ drvr_info_len, /* maxsize */ 1, /* nsegments */ @@ -2514,7 +2513,7 @@ static int mpi3mr_alloc_chain_bufs(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4096, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -2589,8 +2588,8 @@ static int mpi3mr_pel_alloc(struct mpi3mr_softc *sc) sc->pel_seq_number_sz = sizeof(Mpi3PELSeq_t); if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* alignment, boundary */ - sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ sc->pel_seq_number_sz, /* maxsize */ 1, /* nsegments */ @@ -4945,7 +4944,7 @@ mpi3mr_alloc_requests(struct mpi3mr_softc *sc) ret = bus_dma_tag_create( sc->mpi3mr_parent_dmat, /* parent */ 1, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ BUS_SPACE_MAXSIZE, /* maxsize */ nsegs, /* nsegments */ @@ -5119,7 +5118,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ @@ -5149,7 +5148,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ @@ -5178,7 +5177,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h index 2af94123c090..d93c53b286cb 100644 --- a/sys/dev/mpi3mr/mpi3mr.h +++ b/sys/dev/mpi3mr/mpi3mr.h @@ -544,7 +544,6 @@ struct mpi3mr_softc { char driver_name[MPI3MR_NAME_LENGTH]; int bars; bus_addr_t dma_loaddr; - bus_addr_t dma_hiaddr; u_int mpi3mr_debug; struct mpi3mr_reset reset; int max_msix_vectors; diff --git a/sys/dev/mpi3mr/mpi3mr_app.c b/sys/dev/mpi3mr/mpi3mr_app.c index 14cea43db2ca..99a922b2bec9 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -336,7 +336,7 @@ mpi3mr_app_build_nvme_prp(struct mpi3mr_softc *sc, if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ sc->dma_loaddr, /* lowaddr */ - sc->dma_hiaddr, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ dev_pgsz, /* maxsize */ 1, /* nsegments */ From nobody Wed Nov 29 01:55:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2Tv6nmzz52tX9; Wed, 29 Nov 2023 01:55: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 4Sg2Tv49nCz4FJN; Wed, 29 Nov 2023 01:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGSAK9hlVH+ssrRx0qRCvhDCwr46ZR0RQRkV/vbDcJc=; b=pLmEPXh+OpDLtAnMmYcSXBrlFGQ1sOcqqaTaWSLUWL1p3ANilaohQCOxqCEkERghpfmhSX 0oET3RAn5RSlE63ThSkj8BZv6f5D0Uqj4gabOUBwNeWfIeXPTTT/NYqn4KhvBUZCgLkPPt uXpQPtsWF4L3WpQm3DCymTUyCP1OSER7kNMXqblAXYhf2o/8PbmYIrML2ZO8o8nmV+uK3l OcjlSC2Ilv+HNmluBadZ+NiWHLfQgcGcOMWxAm50/kH5/ly0aVwhcypTzXRLMFvN6y8Ult Onexoz/P2/rkKbx0WNWmCFIlpZmKIzarWVkeAoiGypHfFrRgv0hysJLi9XIZ+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701222947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BGSAK9hlVH+ssrRx0qRCvhDCwr46ZR0RQRkV/vbDcJc=; b=S9Wn6HoBEtehX17FOP4YRHQmqeYhGQaE5eX1Vd1bZsd0vScuwEdzUKILB1q4F8tt6VxpyB XjjqJpZ9mYuDlR7ju/r8eiV0iC1KZ55YuBJliD+97ynXwAP93OatSjcv2g7ttsenXjg+LP 544F8x4lzwr0LkTPKQX8aueIhTR8/XVnjEaRZfbkOjZlwIDWA8MOzKvE5RUrh92ZK5QQWn M5ycQx2iy+UYqOMOCOh5y4in3tPiAQwFYPPdrv8iuBhr2aUpgo5Off2Shsw+ZBvbfoKG6Z A2iSP8xOVaGBm/KS+SBCEva/ZP2WHVj4zr2XZl8VwjwkJf1PA3lzHzs7pVK0xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701222947; a=rsa-sha256; cv=none; b=bmI62wes/s0cHMsdyCpkQvie+OlLVULea4S3IoiBIShtUnzPGD8gMDo0rEh2IW0hSRCYEn qwPBQIKYUdOnP5u00+iVYBHstWPE/PVLH6wHf0D4oGehPYz0NhWXay8SWUMM1fPQajj2y+ gWd2ix5PI47rnVGpOClSvhP6n4A0lu8G8OyR/xBywnLVVyaHObmm914kZOgr+/ginxk9gL fWy0RxtqRjafkwuzn9Kt84CtPIbURR7HdB4yDMAp49WQLt6L+Ul6oFYGjl3cXzNwDtTcuL vRwwjkcpWtSgZse3sYzpaRdWYpB2j0SZZXvsgCTr9g9eFhF6zwmFIWryPYGNjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sg2Tv3GzgzmtD; Wed, 29 Nov 2023 01:55: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 3AT1tle3064892; Wed, 29 Nov 2023 01:55:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AT1tlv5064889; Wed, 29 Nov 2023 01:55:47 GMT (envelope-from git) Date: Wed, 29 Nov 2023 01:55:47 GMT Message-Id: <202311290155.3AT1tlv5064889@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: 272a40604260 - main - mpi3mr: Minor tweak to task queue pausing List-Id: Commit messages for the main 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: 272a406042608da9bc3e67e41c6b7fc31d4166b8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=272a406042608da9bc3e67e41c6b7fc31d4166b8 commit 272a406042608da9bc3e67e41c6b7fc31d4166b8 Author: Warner Losh AuthorDate: 2023-11-29 01:50:57 +0000 Commit: Warner Losh CommitDate: 2023-11-29 01:52:28 +0000 mpi3mr: Minor tweak to task queue pausing Use a while loop with cancel / drain to make sure that all tasks have completed before proceeding to reset. Suggested by: jhb Sponsored by: Netflix --- sys/dev/mpi3mr/mpi3mr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 39cefd15d476..932d174a6b50 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -5860,13 +5860,16 @@ static int mpi3mr_issue_reset(struct mpi3mr_softc *sc, U16 reset_type, inline void mpi3mr_cleanup_event_taskq(struct mpi3mr_softc *sc) { /* - * Block the taskqueue before draining. This means any new tasks won't - * be queued to a worker thread. But it doesn't stop the current workers - * that are running. taskqueue_drain waits for those correctly in the - * case of thread backed taskqueues. + * Block the taskqueue before draining. This means any new tasks won't + * be queued to the taskqueue worker thread. But it doesn't stop the + * current workers that are running. taskqueue_drain waits for those + * correctly in the case of thread backed taskqueues. The while loop + * ensures that all taskqueue threads have finished their current tasks. */ taskqueue_block(sc->cam_sc->ev_tq); - taskqueue_drain(sc->cam_sc->ev_tq, &sc->cam_sc->ev_task); + while (taskqueue_cancel(sc->cam_sc->ev_tq, &sc->cam_sc->ev_task, NULL) != 0) { + taskqueue_drain(sc->cam_sc->ev_tq, &sc->cam_sc->ev_task); + } } /** From nobody Wed Nov 29 02:07:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sg2lg5XPsz52tnW; Wed, 29 Nov 2023 02:07:43 +0000 (UTC) (envelope-from bz@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 4Sg2lg5397z4Kj8; Wed, 29 Nov 2023 02:07:43 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701223663; 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=r3ty8XB54HDW7Nth2RtJlyU56v839MG9MQ3EZz0BX0g=; b=eIWOxhlOk7T+SuYOz6t0GpbcKuNq+trpyeSKfccZPrCKQL9ePrSMO1Oj57Feyq+XXzQV3X C++4p0nyT1TzXTa52M8DrlCUw6E9scbE7QmE+9NWZslldaqRcN/hjHji9gA1nuLGpfSxvV jWlRSkONrnQeBNbh5syWlONGVwp0Qan/5BGJ6L5YqgO/r1XQQjyLRNknGRnPqRbooH752L LDeddp8aSQyYObOoegt6Tpp2Q/tbrnMd11VTRV5dHPY/rmZ102lDP7YwzgEgwmCkZyj38K 6aLDbQjRR4q+M8KTqYtV2svmCtPbA+qNdMT5we67cSwZWCsLvbe2jTznLW7bfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701223663; 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=r3ty8XB54HDW7Nth2RtJlyU56v839MG9MQ3EZz0BX0g=; b=sppOyc9RyVduosVKJ/vgVD07W0Njw+oZijyGZBnkNa/RfnvpqFcRonXFOIBpei+EjXg/lg VWji6FuKvsX+8TE7QghR7Zhp0aNixisullNKLF+S7iaYoRFMUkIPv9oQia8WQbkShTfG6C MHCFpA4r0bn3Yh4q37B3P5ERtuIsp6oWEKA3IyNEEl5k7kpCKWYZvZ6R9NHQmNrAJaiTMs O09ciP3FgmjW/oWzV/h0mzZNrcsGR2CA9WcjIZst77bsZ7Yjuikdyy8xygz5RonTJn+SRM Qa/Z3hM+Xkre7kevs7HR+5L/de+Ch8LYwBpBpkU6J9XazC+D7ZsS4m5OwCuEjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701223663; a=rsa-sha256; cv=none; b=Z5ZFxEEV3V8HCuH7qIZ6RyftuxGHSXn1xN/ACJpqy+lvmQECFjYUGpqAkSZ4ydD2SKxhvu JwHzUv3kS4UuksHQejjqKagT9v3UItPsxJbwjMLB3pAom4sDG6BNKWfmVEKq+Ojalbbpq2 xaGGMd91wBsW4Coc9fAezcBNOpB8nXaXZzH4rwi+aLE8IbPttISr3PKnqCvmm7ouxycaW4 KaP+ugIH2EQ0sr4Bkj/EK15p5YM5h6hT7H5ZWmzOlpJCmXTdLuKFau7VOW1tjAMls6a2Z2 trfvLOHkKSfdjli8RMIYoJHpU1cLs+TrlkwQMPVk+I4QOGeHuU3Dt6q373gPlw== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sg2lg2W6Zz6QM; Wed, 29 Nov 2023 02:07:43 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 049FE8D4A21B; Wed, 29 Nov 2023 02:07:41 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 309802D029D6; Wed, 29 Nov 2023 02:07:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id BfZh5nuk8J2C; Wed, 29 Nov 2023 02:07:40 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id E35482D029D2; Wed, 29 Nov 2023 02:07:39 +0000 (UTC) Date: Wed, 29 Nov 2023 02:07:39 +0000 (UTC) From: "Bjoern A. Zeeb" To: Jessica Clarke cc: John Baldwin , Andrew Turner , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 9eecef052155 - main - Add an Armv8 rndr random number provider In-Reply-To: <0831C0D9-428C-4DA7-A205-277B6729DB8F@freebsd.org> Message-ID: <7ns957or-7135-407q-p1o3-321o20p317s6@SerrOFQ.bet> References: <202311151812.3AFICLIs077567@gitrepo.freebsd.org> <2423E245-0F1B-4195-A766-166183774421@freebsd.org> <0831C0D9-428C-4DA7-A205-277B6729DB8F@freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-1754933245-1701223660=:54546" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-1754933245-1701223660=:54546 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Tue, 28 Nov 2023, Jessica Clarke wrote: > On 22 Nov 2023, at 18:14, John Baldwin wrote: >> >> On 11/15/23 4:29 PM, Jessica Clarke wrote: >>> On 15 Nov 2023, at 18:27, Jessica Clarke wrote: >>>> >>>> On 15 Nov 2023, at 18:12, Andrew Turner wrote: >>>>> >>>>> The branch main has been updated by andrew: >>>>> >>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=9eecef052155646fbc5f8f533b952b372572d06a >>>>> >>>>> commit 9eecef052155646fbc5f8f533b952b372572d06a >>>>> Author: Andrew Turner >>>>> AuthorDate: 2023-11-15 17:42:02 +0000 >>>>> Commit: Andrew Turner >>>>> CommitDate: 2023-11-15 18:05:08 +0000 >>>>> >>>>> Add an Armv8 rndr random number provider ... >>> This also breaks the aarch64 ubuntu-20.04 GitHub build, as its LLVM >>> doesn’t know about the RNG extension. Can you please stop breaking the >>> arm64 kernel build with older LLVM, this is far from the first time >>> it’s happened, and some of those never got fixed upstream, we just had >>> to hack around them downstream. >> >> The aarch64 GitHub build is still broken and has been broken now for a >> week. Can this be fixed to work with that version or should we deprecated >> support for LLVM 12 for aarch64? Morello LLVM is at LLVM 13 currently. > > It’s been another week. I intend to revert this tomorrow unless a real > alternative solution is put forwards. We can’t keep leaving CI broken > for weeks on end due to a lack of pre-commit testing and committer > responsiveness. This is main; the upgrade path for FreeBSD means latest release on previous major branch needs to be able to build it; does 14.0-R build it? If it does I see little reason to back this out. -- Bjoern A. Zeeb r15:7 --1098556516-1754933245-1701223660=:54546-- From nobody Wed Nov 29 13:36:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgL2y23drz52k9W for ; Wed, 29 Nov 2023 13:36:58 +0000 (UTC) (envelope-from bT.wtqgzz4f30=acob8es64578=u8ed1yjihz@return.smtpservice.net) Received: from e2i190.smtp2go.com (e2i190.smtp2go.com [103.2.140.190]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgL2x5zkNz4Q9r for ; Wed, 29 Nov 2023 13:36:57 +0000 (UTC) (envelope-from bT.wtqgzz4f30=acob8es64578=u8ed1yjihz@return.smtpservice.net) Authentication-Results: mx1.freebsd.org; dkim=none ("invalid DKIM record") header.d=smtpservice.net header.s=mgy720.a1-4.dyn header.b=nMAVHvrP; spf=pass (mx1.freebsd.org: domain of "bT.wtqgzz4f30=acob8es64578=u8ed1yjihz@return.smtpservice.net" designates 103.2.140.190 as permitted sender) smtp.mailfrom="bT.wtqgzz4f30=acob8es64578=u8ed1yjihz@return.smtpservice.net"; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=mgy720.a1-4.dyn; x=1701265917; h=Feedback-ID: X-Smtpcorp-Track:To:Date:Subject:Message-Id:From:Reply-To:Sender: List-Unsubscribe; bh=zlLIqYpnhHovu+qKNws5CjLcgDKSXhPv0nMmU6xpUSU=; b=nMAVHvrP X5vdWi7s+qW3wgL3Jd0Z3oxaivUwC1d1NMZQ6YILUo0IoKuQ0A7mh8imV6ggZG5ZIDCQVpcGazEfF buD9B8XPo6oIdUkxr84YeQK1Wc+P047pVvJrYZoL7uHSvYsTekp1JkYLqAhZCotxASkBXwp2iG9GW +ByN5cuBa7pnDmKGScTQpl5aDIVpMd9rkED+KtrtCbuEMK4afcPePvG4MB0SWlLwvG++uvY32xrcT XuVkJrO1sxpwL91lYQgGGHjY0f7+8gpt633dNaHzCPM1uTA0RefdTaEIKrJDrBAuC8Ad+5WreDBq6 Njfd3D8NpmhliXQVNwRwU/yN0g==; Received: from [10.176.58.103] (helo=SmtpCorp) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2-S2G) (envelope-from ) id 1r8KkF-Y8PGM5-Rm; Wed, 29 Nov 2023 13:36:51 +0000 Received: from [10.99.243.232] (helo=morbo.fubar.geek.nz) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96.1-S2G) (envelope-from ) id 1r8KkF-9EPw8Y-1k; Wed, 29 Nov 2023 13:36:51 +0000 Received: from smtpclient.apple (cpc91210-cmbg18-2-0-cust37.5-4.cable.virginm.net [81.102.44.38]) by morbo.fubar.geek.nz (Postfix) with ESMTPSA id B4D6835E67; Wed, 29 Nov 2023 13:36:50 +0000 (UTC) From: Andrew Turner Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_02C5D982-810F-4E82-812F-EC44B08517A3" List-Id: Commit messages for the main 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.100.2.1.4\)) Subject: Re: git: 9eecef052155 - main - Add an Armv8 rndr random number provider Date: Wed, 29 Nov 2023 13:36:40 +0000 In-Reply-To: Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Jessica Clarke To: John Baldwin References: <202311151812.3AFICLIs077567@gitrepo.freebsd.org> <2423E245-0F1B-4195-A766-166183774421@freebsd.org> X-Mailer: Apple Mail (2.3774.100.2.1.4) X-Smtpcorp-Track: 1r8KkF9Eew8Y1k.ZA5xay9tGwWq0 Feedback-ID: 790814m:790814amQcrys:790814sbzm_Pu5WD X-Report-Abuse: Please forward a copy of this message, including all headers, to X-Spamd-Result: default: False [-1.81 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.80)[-0.798]; MV_CASE(0.50)[]; NEURAL_HAM_MEDIUM(-0.41)[-0.407]; FORGED_SENDER(0.30)[andrew@FreeBSD.org,bT.wtqgzz4f30=acob8es64578=u8ed1yjihz@return.smtpservice.net]; R_SPF_ALLOW(-0.20)[+ip4:103.2.140.0/22:c]; RCVD_IN_DNSWL_LOW(-0.10)[103.2.140.190:from]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DKIM_TRACE(0.00)[smtpservice.net:~]; ASN(0.00)[asn:23352, ipnet:103.2.140.0/22, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_DKIM_PERMFAIL(0.00)[smtpservice.net:s=mgy720.a1-4.dyn]; MLMMJ_DEST(0.00)[dev-commits-src-main@FreeBSD.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrew@FreeBSD.org,bT.wtqgzz4f30=acob8es64578=u8ed1yjihz@return.smtpservice.net]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4SgL2x5zkNz4Q9r X-Spamd-Bar: - --Apple-Mail=_02C5D982-810F-4E82-812F-EC44B08517A3 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 22 Nov 2023, at 18:14, John Baldwin wrote: >=20 > On 11/15/23 4:29 PM, Jessica Clarke wrote: >> On 15 Nov 2023, at 18:27, Jessica Clarke wrote: >>>=20 >>> On 15 Nov 2023, at 18:12, Andrew Turner wrote: >>>>=20 >>>> The branch main has been updated by andrew: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9eecef052155646fbc5f8f533b952b37= 2572d06a >>>>=20 >>>> commit 9eecef052155646fbc5f8f533b952b372572d06a >>>> Author: Andrew Turner >>>> AuthorDate: 2023-11-15 17:42:02 +0000 >>>> Commit: Andrew Turner >>>> CommitDate: 2023-11-15 18:05:08 +0000 >>>>=20 >>>> Add an Armv8 rndr random number provider >>>>=20 >>>> Armv8.5 adds an optional random number generator. This is = implemented >>>> as two special registers one to read a random number, the other = to >>>> re-seed the entropy pool before reading a random number. Both = registers >>>> will set the condition flags to tell the caller they can't = produce a >>>> random number in a reasonable amount of time. >>>>=20 >>>> Without a signal to reseed the entropy pool use the latter = register >>>> to provide random numbers to the kernel pool. If at a later time = we >>>> had a way to tell the provider if it needs to reseed or not we = could >>>> use the former. >>>>=20 >>>> On an Amazon AWS Graviton3 VM this never failed, however this may = not >>>> be the case on low end CPUs so retry reading the random number 10 = times >>>> before returning an error. >>>>=20 >>>> Reviewed by: imp, delphij (csprng) >>>> Sponsored by: The FreeBSD Foundation >>>> Sponsored by: Arm Ltd >>>> Differential Revision: https://reviews.freebsd.org/D35411 >>>> --- >>>> sys/arm64/conf/std.dev | 1 + >>>> sys/conf/files.arm64 | 2 + >>>> sys/dev/random/armv8rng.c | 135 = +++++++++++++++++++++++++++++++++++++++ >>>> sys/dev/random/random_harvestq.c | 1 + >>>> sys/modules/Makefile | 2 + >>>> sys/modules/armv8_rng/Makefile | 11 ++++ >>>> sys/sys/random.h | 1 + >>>> 7 files changed, 153 insertions(+) >>>>=20 >>>> diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev >>>> index 74d2407e0aec..0ebf2e775b11 100644 >>>> --- a/sys/arm64/conf/std.dev >>>> +++ b/sys/arm64/conf/std.dev >>>> @@ -53,6 +53,7 @@ device vt_simplefb >>>>=20 >>>> # Pseudo devices. >>>> device crypto # core crypto support >>>> +device armv8_rng # Armv8.5 rndr RNG >>>> device loop # Network loopback >>>> device ether # Ethernet support >>>> device vlan # 802.1Q VLAN support >>>> diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 >>>> index 38b9e40463eb..9ccead6a98e1 100644 >>>> --- a/sys/conf/files.arm64 >>>> +++ b/sys/conf/files.arm64 >>>> @@ -379,6 +379,8 @@ dev/psci/psci.c standard >>>> dev/psci/smccc_arm64.S standard >>>> dev/psci/smccc.c standard >>>>=20 >>>> +dev/random/armv8rng.c optional armv8_rng !random_loadable >>>> + >>>> dev/safexcel/safexcel.c optional safexcel fdt >>>>=20 >>>> dev/sdhci/sdhci_xenon.c optional sdhci_xenon sdhci >>>> diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c >>>> new file mode 100644 >>>> index 000000000000..3cca42a5bbf3 >>>> --- /dev/null >>>> +++ b/sys/dev/random/armv8rng.c >>>> @@ -0,0 +1,135 @@ >>>> +/*- >>>> + * Copyright (c) 2022 The FreeBSD Foundation >>>> + * >>>> + * This software was developed by Andrew Turner under sponsorship = from >>>> + * the FreeBSD Foundation. >>>> + * >>>> + * Redistribution and use in source and binary forms, with or = without >>>> + * modification, are permitted provided that the following = conditions >>>> + * are met: >>>> + * 1. Redistributions of source code must retain the above = copyright >>>> + * notice, this list of conditions and the following = disclaimer. >>>> + * 2. Redistributions in binary form must reproduce the above = copyright >>>> + * notice, this list of conditions and the following disclaimer = in the >>>> + * documentation and/or other materials provided with the = distribution. >>>> + * >>>> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS = IS'' AND >>>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED = TO, THE >>>> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A = PARTICULAR PURPOSE >>>> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE >>>> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL >>>> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF = SUBSTITUTE GOODS >>>> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) >>>> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN = CONTRACT, STRICT >>>> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING = IN ANY WAY >>>> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF >>>> + * SUCH DAMAGE. >>>> + */ >>>> + >>>> +#include >>>> + >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> + >>>> +#include >>>> + >>>> +#include >>>> + >>>> +static u_int random_rndr_read(void *, u_int); >>>> + >>>> +static bool has_rndr; >>>> +static struct random_source random_armv8_rndr =3D { >>>> + .rs_ident =3D "Armv8 rndr RNG", >>>> + .rs_source =3D RANDOM_PURE_ARMV8, >>>> + .rs_read =3D random_rndr_read, >>>> +}; >>>> + >>>> +static inline int >>>> +random_rndr_read_one(u_long *buf) >>>> +{ >>>> + u_long val; >>>> + int loop, ret; >>>> + >>>> + loop =3D 10; >>>> + do { >>>> + __asm __volatile( >>>> + ".arch_extension rng \n" >>>> + "mrs %0, rndrrs \n" /* Read the random number */ >>>> + "cset %w1, ne \n" /* 1 on success, 0 on failure */ >>>> + ".arch_extension norng \n" >>>> + : "=3D&r" (val), "=3D&r"(ret) :: "cc"); >>>=20 >>> Early clobber doesn=E2=80=99t make sense with no inputs. >> This also breaks the aarch64 ubuntu-20.04 GitHub build, as its LLVM >> doesn=E2=80=99t know about the RNG extension. Can you please stop = breaking the >> arm64 kernel build with older LLVM, this is far from the first time >> it=E2=80=99s happened, and some of those never got fixed upstream, we = just had >> to hack around them downstream. >=20 > The aarch64 GitHub build is still broken and has been broken now for a > week. Can this be fixed to work with that version or should we = deprecated > support for LLVM 12 for aarch64? Morello LLVM is at LLVM 13 = currently. I think depicting LLVM 12 is best. There is https://apt.llvm.org/ that = may be usable to get a toolchain to build FreeBSD on older Ubuntu and = Debian installs. I=E2=80=99m happy to keep 13 as the baseline for now, but expect we will = find it=E2=80=99s too old as I work through adding support for newer = Architecture features. Andrew= --Apple-Mail=_02C5D982-810F-4E82-812F-EC44B08517A3 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On 22 Nov 2023, at 18:14, John Baldwin = <jhb@FreeBSD.org> wrote:

On 11/15/23 4:29 PM, Jessica Clarke = wrote:
On 15 Nov 2023, at 18:27, Jessica Clarke = <jrtc27@FreeBSD.org> wrote:

On 15 = Nov 2023, at 18:12, Andrew Turner <andrew@FreeBSD.org> = wrote:

The branch main has been updated = by andrew:

URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9eecef052155646fbc5f8f533b952b37= 2572d06a

commit = 9eecef052155646fbc5f8f533b952b372572d06a
Author: =     Andrew Turner = <andrew@FreeBSD.org>
AuthorDate: 2023-11-15 17:42:02 = +0000
Commit:     Andrew Turner = <andrew@FreeBSD.org>
CommitDate: 2023-11-15 18:05:08 = +0000

  Add an Armv8 rndr random number = provider

  Armv8.5 adds an optional random number = generator. This is implemented
  as two special registers = one to read a random number, the other to
  re-seed the = entropy pool before reading a random number. Both = registers
  will set the condition flags to tell the caller = they can't produce a
  random number in a reasonable amount = of time.

  Without a signal to reseed the entropy pool = use the latter register
  to provide random numbers to the = kernel pool. If at a later time we
  had a way to tell the = provider if it needs to reseed or not we could
  use the = former.

  On an Amazon AWS Graviton3 VM this never = failed, however this may not
  be the case on low end CPUs = so retry reading the random number 10 times
  before = returning an error.

  Reviewed by: =    imp, delphij (csprng)
  Sponsored by: =   The FreeBSD Foundation
  Sponsored by: =   Arm Ltd
  Differential Revision: =  https://reviews.freebsd.org/D35411
---
sys/arm64/conf/std.dev =           | =   1 +
sys/conf/files.arm64 =             | =   2 +
sys/dev/random/armv8rng.c =        | 135 = +++++++++++++++++++++++++++++++++++++++
sys/dev/random/random_harvestq.= c |   1 +
sys/modules/Makefile =             | =   2 +
sys/modules/armv8_rng/Makefile   |  11 = ++++
sys/sys/random.h =             &n= bsp;   |   1 +
7 files changed, 153 = insertions(+)

diff --git a/sys/arm64/conf/std.dev = b/sys/arm64/conf/std.dev
index 74d2407e0aec..0ebf2e775b11 = 100644
--- a/sys/arm64/conf/std.dev
+++ = b/sys/arm64/conf/std.dev
@@ -53,6 +53,7 @@ device = vt_simplefb

# Pseudo devices.
device crypto # core crypto = support
+device armv8_rng # Armv8.5 rndr RNG
device loop # Network = loopback
device ether # Ethernet support
device vlan # 802.1Q VLAN = support
diff --git a/sys/conf/files.arm64 = b/sys/conf/files.arm64
index 38b9e40463eb..9ccead6a98e1 100644
--- = a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -379,6 +379,8 = @@ dev/psci/psci.c standard
dev/psci/smccc_arm64.S = standard
dev/psci/smccc.c standard

+dev/random/armv8rng.c = optional armv8_rng !random_loadable
+
dev/safexcel/safexcel.c = optional safexcel fdt

dev/sdhci/sdhci_xenon.c optional = sdhci_xenon sdhci
diff --git a/sys/dev/random/armv8rng.c = b/sys/dev/random/armv8rng.c
new file mode 100644
index = 000000000000..3cca42a5bbf3
--- /dev/null
+++ = b/sys/dev/random/armv8rng.c
@@ -0,0 +1,135 @@
+/*-
+ * = Copyright (c) 2022 The FreeBSD Foundation
+ *
+ * This software = was developed by Andrew Turner under sponsorship from
+ * the FreeBSD = Foundation.
+ *
+ * Redistribution and use in source and binary = forms, with or without
+ * modification, are permitted provided that = the following conditions
+ * are met:
+ * 1. Redistributions of = source code must retain the above copyright
+ * =    notice, this list of conditions and the following = disclaimer.
+ * 2. Redistributions in binary form must reproduce the = above copyright
+ *    notice, this list of conditions = and the following disclaimer in the
+ * =    documentation and/or other materials provided with the = distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND = CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, = INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF = MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE = DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ = * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT = OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; = OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF = LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT = (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE = USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH = DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+
+#include = <sys/param.h>
+#include <sys/systm.h>
+#include = <sys/conf.h>
+#include <sys/kernel.h>
+#include = <sys/lock.h>
+#include <sys/malloc.h>
+#include = <sys/module.h>
+#include <sys/random.h>
+
+#include = <machine/armreg.h>
+
+#include = <dev/random/randomdev.h>
+
+static u_int = random_rndr_read(void *, u_int);
+
+static bool = has_rndr;
+static struct random_source random_armv8_rndr =3D {
+ = .rs_ident =3D "Armv8 rndr RNG",
+ .rs_source =3D = RANDOM_PURE_ARMV8,
+ .rs_read =3D = random_rndr_read,
+};
+
+static inline = int
+random_rndr_read_one(u_long *buf)
+{
+ u_long val;
+ = int loop, ret;
+
+ loop =3D 10;
+ do {
+ __asm = __volatile(
+    ".arch_extension rng =   \n"
+    "mrs %0, rndrrs \n" /* Read the = random number */
+    "cset %w1, ne =    \n" /* 1 on success, 0 on failure */
+ =    ".arch_extension norng \n"
+    : = "=3D&r" (val), "=3D&r"(ret) :: "cc");

Early = clobber doesn=E2=80=99t make sense with no inputs.
This = also breaks the aarch64 ubuntu-20.04 GitHub build, as its = LLVM
doesn=E2=80=99t know about the RNG extension. Can you please = stop breaking the
arm64 kernel build with older LLVM, this is far = from the first time
it=E2=80=99s happened, and some of those never = got fixed upstream, we just had
to hack around them = downstream.

The = aarch64 GitHub build is still broken and has been broken now for = a
week.  Can this be = fixed to work with that version or should we deprecated
support for LLVM 12 for aarch64? =  Morello LLVM is at LLVM 13 currently.

I think depicting LLVM 12 is = best. There is https://apt.llvm.org/ that may be usable to get a = toolchain to build FreeBSD on older Ubuntu and Debian = installs.

I=E2=80=99m happy to keep 13 as the = baseline for now, but expect we will find it=E2=80=99s too old as I work = through adding support for newer Architecture = features.

Andrew
= --Apple-Mail=_02C5D982-810F-4E82-812F-EC44B08517A3-- From nobody Wed Nov 29 14:51:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgMhh0d8dz52pZj; Wed, 29 Nov 2023 14:51: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 4SgMhh08rGz4XGJ; Wed, 29 Nov 2023 14:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701269476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4KxO1JS5exkKf+EUQ9zeeYuroX9EhhZou2ovVxS88Dc=; b=ifOOGKJDClJncuQaeHkWQjDyPm0bwO9WC50rHFgVGRVk/7VWW+B8mbeu+2wT2lK4sP3f89 SZ/YtdCTkWpZK86bwbJIGQ4y2GsbKTol4RUHlUhz6DzE2YmpQmfkR8Stb+TITy/UKC1sby GWuhoTgAbGqPvLrXKf80x72IzRwSdHsirBXD+k0N9wuMYljNZ3+z/lWA4z3kfGAbC0j3Pi ZHlwsS+ADUdyCW7PrZKyO7ltYFEDAIMVDORcLtx7hMgwEgl5rKnEsXHPSlbJQR+0xY01oc el/K+H+jcTxFaha+7BuU9LW1UYfpogSTkuOK4IAFsLo6VVIOJjMn/0XL/1v/Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701269476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4KxO1JS5exkKf+EUQ9zeeYuroX9EhhZou2ovVxS88Dc=; b=M5Z5bjzW4E26H9VR0DsS962jKxtyk6xBEIBZNGpPI0ngpKYBfwJ7HYfOr6jeqeziIEB2Pm RmLiJjAMUTbH7Wyklp0AHCqPeWD4JCQtbwuxYAHiY5fqRoxQya54iwrxZ05rOZvqeD2gV5 v8EXmhChYiGWbFIr59qqdkWy8h4IXuo4Ds8gceulIJVwcFq/ZEKgz4VeGNDBBvnqeQ78T8 wtQAtuwymcnmj9LZAJMG3ZvO/XL0le/6G4q8fCSnY8+Aqj2ki25JnnFPyH7jJiddnjUWVF gnnlG1W0B5KCJot+0zBn03CJJMdO2jRKgqwmeSWAru8QU/RS4FDUPvR9IdBuiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701269476; a=rsa-sha256; cv=none; b=YBpWveGnj726bJlQRuNHLKbUULfpY9stJOvTbRQL7LxK9qN8+5YwGMqFfD2RIzqHUNcA1S BWMoIZsc+KF4HkIgtt9jfDyMg0LMWfWHc6JlwjNlb33AXNfV5zgJeki1JM7BxxHHHps3s+ MM9rCra5bneMgsPN3BmrCVEeSsW3ifql+mBKNThEHHapkQPyjKhTZ/8KaRdPAWMJeYpQHN T1M2C4lw5gX9QH8LNkPc+Sh+h+r3HHpXNQdWm46n78pVyC9+ZGbOz5DT+hqwgGChxrfuQ5 qzbSpq0s/987cyQyTBPGoses1rIyXe1dOOydf51JXnlGAArnEN8I9Rv1H9A92Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgMhg6Lhcz18lg; Wed, 29 Nov 2023 14:51: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 3ATEpFdg070898; Wed, 29 Nov 2023 14:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATEpFAY070895; Wed, 29 Nov 2023 14:51:15 GMT (envelope-from git) Date: Wed, 29 Nov 2023 14:51:15 GMT Message-Id: <202311291451.3ATEpFAY070895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: d565784a7eba - main - zfsd: fault disks that generate too many I/O delay events List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d565784a7ebaa59e26febdcfd4a60329786ea5f5 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=d565784a7ebaa59e26febdcfd4a60329786ea5f5 commit d565784a7ebaa59e26febdcfd4a60329786ea5f5 Author: Alan Somers AuthorDate: 2023-07-12 20:46:27 +0000 Commit: Alan Somers CommitDate: 2023-11-29 14:51:11 +0000 zfsd: fault disks that generate too many I/O delay events If ZFS reports that a disk had at least 8 I/O operations over 60s that were each delayed by at least 30s (implying a queue depth > 4 or I/O aggregation, obviously), fault that disk. Disks that respond this slowly can degrade the entire system's performance. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D42825 --- cddl/usr.sbin/zfsd/case_file.cc | 20 ++++- cddl/usr.sbin/zfsd/case_file.h | 6 +- cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 66 +++++++++++++++ tests/sys/cddl/zfs/tests/zfsd/Makefile | 1 + .../sys/cddl/zfs/tests/zfsd/zfsd_fault_002_pos.ksh | 99 ++++++++++++++++++++++ tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh | 32 +++++++ 6 files changed, 220 insertions(+), 4 deletions(-) diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc index 3728913b646b..39f89fbbf7c8 100644 --- a/cddl/usr.sbin/zfsd/case_file.cc +++ b/cddl/usr.sbin/zfsd/case_file.cc @@ -470,7 +470,8 @@ CaseFile::ReEvaluate(const ZfsEvent &event) consumed = true; } else if (event.Value("class") == "ereport.fs.zfs.io" || - event.Value("class") == "ereport.fs.zfs.checksum") { + event.Value("class") == "ereport.fs.zfs.checksum" || + event.Value("class") == "ereport.fs.zfs.delay") { m_tentativeEvents.push_front(event.DeepCopy()); RegisterCallout(event); @@ -1171,6 +1172,13 @@ IsIOEvent(const Event* const event) return ("ereport.fs.zfs.io" == event->Value("type")); } +/* Does the argument event refer to an IO delay? */ +static bool +IsDelayEvent(const Event* const event) +{ + return ("ereport.fs.zfs.delay" == event->Value("type")); +} + bool CaseFile::ShouldDegrade() const { @@ -1181,8 +1189,14 @@ CaseFile::ShouldDegrade() const bool CaseFile::ShouldFault() const { - return (std::count_if(m_events.begin(), m_events.end(), - IsIOEvent) > ZFS_DEGRADE_IO_COUNT); + bool should_fault_for_io, should_fault_for_delay; + + should_fault_for_io = std::count_if(m_events.begin(), m_events.end(), + IsIOEvent) > ZFS_DEGRADE_IO_COUNT; + should_fault_for_delay = std::count_if(m_events.begin(), m_events.end(), + IsDelayEvent) > ZFS_FAULT_DELAY_COUNT; + + return (should_fault_for_io || should_fault_for_delay); } nvlist_t * diff --git a/cddl/usr.sbin/zfsd/case_file.h b/cddl/usr.sbin/zfsd/case_file.h index e6c7010af234..9566b1586ef5 100644 --- a/cddl/usr.sbin/zfsd/case_file.h +++ b/cddl/usr.sbin/zfsd/case_file.h @@ -242,7 +242,11 @@ protected: * to transition a vdev from healthy to degraded * status. */ - ZFS_DEGRADE_IO_COUNT = 50 + ZFS_DEGRADE_IO_COUNT = 50, + /** + * The number of delay errors on a vdev required to fault it + */ + ZFS_FAULT_DELAY_COUNT = 8, }; static CalloutFunc_t OnGracePeriodEnded; diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc index caeb077a3de8..d76abb54c9ed 100644 --- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc +++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc @@ -519,6 +519,72 @@ TEST_F(CaseFileTest, PoolDestroy) EXPECT_TRUE(m_caseFile->ReEvaluate(*zfs_event)); } +/* + * A Vdev with a very large number of Delay errors should fault + * For performance reasons, RefreshVdevState should be called at most once + */ +TEST_F(CaseFileTest, VeryManyDelayErrors) +{ + EXPECT_CALL(*m_caseFile, RefreshVdevState()) + .Times(::testing::AtMost(1)) + .WillRepeatedly(::testing::Return(true)); + + for(int i=0; i<100; i++) { + stringstream evStringStream; + evStringStream << + "!system=ZFS " + "class=ereport.fs.zfs.delay " + "ena=12091638756982918145 " + "parent_guid=13237004955564865395 " + "parent_type=raidz " + "pool=testpool.4415 " + "pool_context=0 " + "pool_failmode=wait " + "pool_guid=456 " + "pool_state= 0" + "subsystem=ZFS " + "time="; + evStringStream << i << "0000000000000000 "; + evStringStream << "timestamp=" << i << " "; + evStringStream << + "type=ereport.fs.zfs.delay " + "vdev_ashift=12 " + "vdev_cksum_errors=0 " + "vdev_complete_ts=948336226469 " + "vdev_delays=77 " + "vdev_delta_ts=123998485899 " + "vdev_guid=123 " + "vdev_path=/dev/da400 " + "vdev_read_errors=0 " + "vdev_spare_guids= " + "vdev_type=disk " + "vdev_write_errors=0 " + "zio_blkid=622 " + "zio_delay=31000041101 " + "zio_delta=123998485899 " + "zio_err=0 " + "zio_flags=1572992 " + "zio_level=-2 " + "zio_object=0 " + "zio_objset=37 " + "zio_offset=25598976 " + "zio_pipeline=48234496 " + "zio_priority=3 " + "zio_size=1024" + "zio_stage=33554432 " + "zio_timestamp=824337740570 "; + Event *event(Event::CreateEvent(*m_eventFactory, + evStringStream.str())); + ZfsEvent *zfs_event = static_cast(event); + EXPECT_TRUE(m_caseFile->ReEvaluate(*zfs_event)); + delete event; + } + + m_caseFile->SpliceEvents(); + EXPECT_FALSE(m_caseFile->ShouldDegrade()); + EXPECT_TRUE(m_caseFile->ShouldFault()); +} + /* * A Vdev with a very large number of IO errors should fault * For performance reasons, RefreshVdevState should be called at most once diff --git a/tests/sys/cddl/zfs/tests/zfsd/Makefile b/tests/sys/cddl/zfs/tests/zfsd/Makefile index a1863a03196c..7d3f29a7359e 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/Makefile +++ b/tests/sys/cddl/zfs/tests/zfsd/Makefile @@ -21,6 +21,7 @@ ${PACKAGE}FILES+= zfsd_autoreplace_003_pos.ksh ${PACKAGE}FILES+= zfsd_degrade_001_pos.ksh ${PACKAGE}FILES+= zfsd_degrade_002_pos.ksh ${PACKAGE}FILES+= zfsd_fault_001_pos.ksh +${PACKAGE}FILES+= zfsd_fault_002_pos.ksh ${PACKAGE}FILES+= zfsd_hotspare_001_pos.ksh ${PACKAGE}FILES+= zfsd_hotspare_002_pos.ksh ${PACKAGE}FILES+= zfsd_hotspare_003_pos.ksh diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_002_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_002_pos.ksh new file mode 100644 index 000000000000..d8de1ceaff4b --- /dev/null +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_002_pos.ksh @@ -0,0 +1,99 @@ +#!/usr/local/bin/ksh93 -p +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2023 Axcient. All rights reserved. +# Use is subject to license terms. +# +# $FreeBSD$ + +. $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/include/libgnop.kshlib + +################################################################################ +# +# __stc_assertion_start +# +# ID: zfsd_fault_002_pos +# +# DESCRIPTION: +# If a vdev experiences delayed I/O, it will become faulted. +# +# +# STRATEGY: +# 1. Create a storage pool. Use gnop vdevs so we can inject I/O delays. +# 2. Inject IO delays while doing IO to the pool. +# 3. Verify that the vdev becomes FAULTED. +# 4. ONLINE it and verify that it resilvers and joins the pool. +# +# TESTABILITY: explicit +# +# TEST_AUTOMATION_LEVEL: automated +# +# __stc_assertion_end +# +############################################################################### + +verify_runnable "global" + +log_assert "ZFS will fault a vdev that experiences delayed I/O" + +ensure_zfsd_running + +DISK0_NOP=${DISK0}.nop +DISK1_NOP=${DISK1}.nop + +log_must create_gnops $DISK0 $DISK1 + +for type in "raidz" "mirror"; do + log_note "Testing raid type $type" + + # Create a pool on the supplied disks + create_pool $TESTPOOL $type "$DISK0_NOP" "$DISK1_NOP" + log_must $ZFS create $TESTPOOL/$TESTFS + + # Cause some IO delays writing to the pool + while true; do + # ZFS currently considers an I/O to be "slow" if it's delayed + # for 30 seconds (zio_slow_io_ms). + log_must gnop configure -d 31000 -x 100 "$DISK1_NOP" + $DD if=/dev/zero bs=128k count=1 >> \ + /$TESTPOOL/$TESTFS/$TESTFILE 2> /dev/null + $FSYNC /$TESTPOOL/$TESTFS/$TESTFILE + # Check to see if the pool is faulted yet + $ZPOOL status $TESTPOOL | grep -q 'state: DEGRADED' + if [ $? == 0 ] + then + log_note "$TESTPOOL got degraded" + $ZPOOL status -s $TESTPOOL + break + fi + done + + log_must check_state $TESTPOOL $TMPDISK "FAULTED" + + log_must gnop configure -x 0 "$DISK1_NOP" + destroy_pool $TESTPOOL + log_must $RM -rf /$TESTPOOL +done + +log_pass diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh index de9bd7bc94ed..fe4ac4866ed3 100755 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh @@ -56,6 +56,37 @@ zfsd_fault_001_pos_cleanup() } +atf_test_case zfsd_fault_002_pos cleanup +zfsd_fault_002_pos_head() +{ + atf_set "descr" "ZFS will fault a vdev that experiences delayed I/O" + atf_set "require.progs" "ksh93 gnop zfs zpool zfsd" + atf_set "timeout" 300 +} +zfsd_fault_002_pos_body() +{ + . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/../hotspare/hotspare.kshlib + . $(atf_get_srcdir)/../hotspare/hotspare.cfg + . $(atf_get_srcdir)/zfsd.cfg + + verify_disk_count "$DISKS" 2 + verify_zfsd_running + ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" + ksh93 $(atf_get_srcdir)/zfsd_fault_002_pos.ksh + if [[ $? != 0 ]]; then + save_artifacts + atf_fail "Testcase failed" + fi +} +zfsd_fault_002_pos_cleanup() +{ + . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/zfsd.cfg + + ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" +} + atf_test_case zfsd_degrade_001_pos cleanup zfsd_degrade_001_pos_head() { @@ -631,6 +662,7 @@ zfsd_import_001_pos_cleanup() atf_init_test_cases() { atf_add_test_case zfsd_fault_001_pos + atf_add_test_case zfsd_fault_002_pos atf_add_test_case zfsd_degrade_001_pos atf_add_test_case zfsd_degrade_002_pos atf_add_test_case zfsd_hotspare_001_pos From nobody Wed Nov 29 15:07:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgN3272Tcz52q6c; Wed, 29 Nov 2023 15:07:10 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4SgN3252y6z4Y4n; Wed, 29 Nov 2023 15:07:10 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id A87ED72115; Wed, 29 Nov 2023 07:07:03 -0800 (PST) Date: Wed, 29 Nov 2023 07:07:03 -0800 From: Gleb Smirnoff To: Warner Losh , mav@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1cfd01111eb6 - main - mpi3mr: Only set callout_owned when we create a timeout Message-ID: References: <202311290155.3AT1tYdx064353@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: <202311290155.3AT1tYdx064353@gitrepo.freebsd.org> X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4SgN3252y6z4Y4n On Wed, Nov 29, 2023 at 01:55:34AM +0000, Warner Losh wrote: W> The branch main has been updated by imp: W> W> URL: https://cgit.FreeBSD.org/src/commit/?id=1cfd01111eb6a28ca5043e928aa8e9099064177a W> W> commit 1cfd01111eb6a28ca5043e928aa8e9099064177a W> Author: Warner Losh W> AuthorDate: 2023-11-29 01:49:24 +0000 W> Commit: Warner Losh W> CommitDate: 2023-11-29 01:49:24 +0000 W> W> mpi3mr: Only set callout_owned when we create a timeout W> W> Since we assume there's a timeout to cancel when this is true, only set W> it true when we set the timeout. Otherwise we may try to cancel a timeout W> when there's been an error in submission. IMHO, better use callout_active() instead of external flag. Also, if I remember well doing callout_stop() on a stopped callout is completely safe, so other option is skip the check. What really needs to be done is to associate callout with the driver mutex. -- Gleb Smirnoff From nobody Wed Nov 29 15:10:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgN7G2kjjz52qfw; Wed, 29 Nov 2023 15:10:50 +0000 (UTC) (envelope-from bapt@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 4SgN7G28Njz4YWR; Wed, 29 Nov 2023 15:10:50 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701270650; 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=MjwG7lv2gfDBgU8ob3mfMVMIRyKn2vjztmfLmmM5kB4=; b=VY1jnnsyW9a2zIt6f5TVq6jAep4fZ2LxR2BaR/scbPtr56kbDHsGf5YFZm3Jve3z/6eVb/ zBdz3I+vBeukNasxq3QJ3sS8EIlaG1BZxGwsI/7w9W8FVx/YRFK5WDCNAHlT27P6DI98YU makuMidzUAajt8s1Kkp34PZ1rhmjChD7TByBiLHre1vP2xFpgRwo/t8sAsoUii3BJwA2hc ytZ4gWfeChLc1HmGAcR9gatyeKernZ13CKJh+3hV2QwVwMsceYdEEZUbB246y9Ir31+RfS ImH2ByqZee9LRBc73tgOLkG4Iz2/ubWmqU5aaON4aOA+uKI6EHbvUUxcLDa5/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701270650; 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=MjwG7lv2gfDBgU8ob3mfMVMIRyKn2vjztmfLmmM5kB4=; b=J4NtOQ+XebXpq57iyVpt7vQBB3COezItojDY33Fgqogljo24UPZpL18tG+E8WMXTeni8WZ x3lWCzLSjUDE3cV6mMudSV8JJp+bXJhGwp9goBf/yRPaV5GR1gW1CmotE6Lna+llJL705F 8OPSI3ehX98UZ2xNfYyLZdJgrS8krtZf9sY4r513hZzFROoI6GBVj1zF/WnBkxFMqpu5zK UZpxGS8PWdidFyfRP4lD3QONHzfTm/GamyFgbMi7DITXM6qdiuWGrdGFzfArAPTK7dMt4l qvx3G0D91ROXfzzfAYE+qdEPnza8/E1DWxux6KMIxAqLsSurJHimqWYPha/wFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701270650; a=rsa-sha256; cv=none; b=ILJgtDCGU7Ge6Z0pOAoHh9cjNFTscxvG0N4qwCQMDBcSsITG4QP+kM5iZyC5pUu2doQC+t RnaWZ/5AbO2M4XWHDyV4Q+MH1ABMUyM0qLs+6VlXkPY/bbkne6vi4PVI9TC4+Xol4so8yp TqDnE1koKt5P7SOl64m1kmjN1xJBZGBt4XQ0uuyhbuY128xtVmL9+6wfU/ko6/eQEcyofQ M73h+rQxbhKJayoE07pLcCbSJrarTQB/h4GGpx38e2GOg0C61uGsJRSyFGj78D9ictnRgN Y8MzuW0LzMNIfO1x6MKSQbf/nqlGAKAD2C24wM5xIsvLjEfKZfjmLHn3vRkg+g== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_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: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SgN7G0Xkrzqy7; Wed, 29 Nov 2023 15:10:50 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id CC4571CB69; Wed, 29 Nov 2023 16:10:47 +0100 (CET) Date: Wed, 29 Nov 2023 16:10:47 +0100 From: Baptiste Daroussin To: Warner Losh Cc: Mitchell Horne , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ad34121518bb - main - Revert "pst: improve shutdown_post_sync handler" Message-ID: References: <202311231948.3ANJmwEC076780@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: On Tue, Nov 28, 2023 at 10:20:49AM -0700, Warner Losh wrote: > Maybe f97aab79868cd7d891c52b14bd964523fa56f015 fixes this? It does thank you! Best regards, Bapt From nobody Wed Nov 29 15:11:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgN860QWfz52qVb for ; Wed, 29 Nov 2023 15:11:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgN852njMz4YmG for ; Wed, 29 Nov 2023 15:11:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-54be88056c2so475866a12.1 for ; Wed, 29 Nov 2023 07:11:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701270690; x=1701875490; 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=0WWnnMubiyJVhhSgI4pwqchObKefgdBTBmORsZ+4eHU=; b=2qmCv8/X0iZcDBNfHfnthDbmjGsdg7ukFiV9gczG3FfVVfKZIWurq7AQG3KAe8WX/y 6DE624qrEqUgjtb3n6JWS3bfqUPYcEvHZwEZNjE94T7TbkD+2J9AIFNKVsNqxCcnO8jG qg1h57cJm2bIttsiQ0HJt0N3ivtOqE5YdxwrF+GX1S+hnfmrYGu/McidE9PV4BqioO4P HbNAwcLmRaXDrgaNy2BIfI/kcP22/1VsyY6AwxJ/2y2YhC0HoepbxgA10/NaCZHI0XkY WIKUU1VrLTwqklc3kYmZiOvap2lhawiEhOxWTeWfrulRpHVs01pi+BkFeZFC/Zl4ESjP Ig7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701270690; x=1701875490; 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=0WWnnMubiyJVhhSgI4pwqchObKefgdBTBmORsZ+4eHU=; b=iZZyYhiA+mjvW2QvScCpndjGjCSlcSSocFj345A9Qj+DJmqFRjtS032K3rSxs/EiBO jra6+KAdUEJp6xgqx7R0pCcMTEd2vlhdkhxlRgt4Tl3giKR2Ahs47zm29+MtDGZPE+b0 tMJE/HZnTCv0g6oLDQPySAofwrU2010L7YSmLP6+8o2XjrMsn7JezF4/GOLvBo2wb8/P JOFqc3QuTMW1nD3NCpnL2iupVJnsc+IcV/TqaQIqY7bf7mHMyh3ieQH7K18yhsrkwzL3 LCF/GNUuduWB0565Zw38Fv6WoUyOHfBRV+lAskDynpnA1e2m1Tso7h1bBbUTJ0TamKsk 4dBw== X-Gm-Message-State: AOJu0Yz2mWGisjGGua/lhh/SzMsiI38kp/XjM50egM62sHWkj9nTvFv/ gARumAfqjo2SEFkt7mADcwA+d9jT76hUeDa5dWnMzg== X-Google-Smtp-Source: AGHT+IH6yDUQVmgZMLpZN6Vu7+a+G7BzR6EtlXlmg7DhC0N9pA5HZH1m+npf7ScckS17c8A7JadH9daJSDeuAq7xPWY= X-Received: by 2002:a17:907:7203:b0:a01:9985:30d9 with SMTP id dr3-20020a170907720300b00a01998530d9mr14335995ejc.12.1701270690507; Wed, 29 Nov 2023 07:11:30 -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: <202311290155.3AT1tYdx064353@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 29 Nov 2023 08:11:24 -0700 Message-ID: Subject: Re: git: 1cfd01111eb6 - main - mpi3mr: Only set callout_owned when we create a timeout To: Gleb Smirnoff Cc: Warner Losh , mav@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002cc345060b4bf37d" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4SgN852njMz4YmG --0000000000002cc345060b4bf37d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Nov 29, 2023 at 8:07=E2=80=AFAM Gleb Smirnoff = wrote: > On Wed, Nov 29, 2023 at 01:55:34AM +0000, Warner Losh wrote: > W> The branch main has been updated by imp: > W> > W> URL: > https://cgit.FreeBSD.org/src/commit/?id=3D1cfd01111eb6a28ca5043e928aa8e90= 99064177a > W> > W> commit 1cfd01111eb6a28ca5043e928aa8e9099064177a > W> Author: Warner Losh > W> AuthorDate: 2023-11-29 01:49:24 +0000 > W> Commit: Warner Losh > W> CommitDate: 2023-11-29 01:49:24 +0000 > W> > W> mpi3mr: Only set callout_owned when we create a timeout > W> > W> Since we assume there's a timeout to cancel when this is true, onl= y > set > W> it true when we set the timeout. Otherwise we may try to cancel a > timeout > W> when there's been an error in submission. > > IMHO, better use callout_active() instead of external flag. Also, if I > remember well > doing callout_stop() on a stopped callout is completely safe, so other > option is skip > the check. > > What really needs to be done is to associate callout with the driver mute= x. > I thought I'd removed the bool and always cancelled. It's already kinda associated with the right mutex. Maybe I did that in a later patch... Warner --0000000000002cc345060b4bf37d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Nov 29, 2023 at 8:07=E2=80=AF= AM Gleb Smirnoff <glebius@freebsd= .org> wrote:
On Wed, Nov 29, 2023 at 01:55:34AM +0000, Warner Losh wrote:
W> The branch main has been updated by imp:
W>
W> URL: https:/= /cgit.FreeBSD.org/src/commit/?id=3D1cfd01111eb6a28ca5043e928aa8e9099064177a=
W>
W> commit 1cfd01111eb6a28ca5043e928aa8e9099064177a
W> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
W> AuthorDate: 2023-11-29 01:49:24 +0000
W> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
W> CommitDate: 2023-11-29 01:49:24 +0000
W>
W>=C2=A0 =C2=A0 =C2=A0mpi3mr: Only set callout_owned when we create a ti= meout
W>=C2=A0 =C2=A0 =C2=A0
W>=C2=A0 =C2=A0 =C2=A0Since we assume there's a timeout to cancel wh= en this is true, only set
W>=C2=A0 =C2=A0 =C2=A0it true when we set the timeout. Otherwise we may = try to cancel a timeout
W>=C2=A0 =C2=A0 =C2=A0when there's been an error in submission.

IMHO, better use callout_active() instead of external flag.=C2=A0 Also, if = I remember well
doing callout_stop() on a stopped callout is completely safe, so other opti= on is skip
the check.

What really needs to be done is to associate callout with the driver mutex.=

I thought I'd removed the bool and= always cancelled. It's already kinda associated
with the rig= ht mutex.=C2=A0 Maybe I did that in a later patch...

Warner
--0000000000002cc345060b4bf37d-- From nobody Wed Nov 29 15:14:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgNCW4gRhz52qkG; Wed, 29 Nov 2023 15:14:31 +0000 (UTC) (envelope-from bapt@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 4SgNCW496Sz4ZZK; Wed, 29 Nov 2023 15:14:31 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701270871; 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=N3fucL/qF2pich5ndvYt6Br2j8uUp6P7ZdrQanr+8BA=; b=Xe4PJygo39cEh7a8/3fJScI5neH+MZu70bWDKDyBKqSKF+o5DO5Pqa4wN/pPKYAg00o75y JESkVUW3BJv6RbJiaHloQdTOUeBb842fwVMWKcf1zzWxO7Re/5nkRNGF3HeQICvk5PcofP ueQnrNd/US1jcS21Hx+y+/QHIxKS1v17GbadhnD3KreMSlxq68OfsYbeYnqIIA/T/lwW6X qT5x5CDHoZP5Hk5Qx8Lauzak1jQGT2Sk/KesHoK5z+77zr8o8Fbclh7n4YirrejlhvTsmJ JujRmITzjwvGa95A1wBLyUTV+Mu0aOOt8fmdQPRQvJiPAIcO4W11Dbrmp555Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701270871; 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=N3fucL/qF2pich5ndvYt6Br2j8uUp6P7ZdrQanr+8BA=; b=SiHGUjbOZNEVKcbNrXYbm6ijURzM5gtgAy27hfvvy4OmfVeCj/CKMUeux3WigH1CSQbd/k zog4dfmh739vo4vwFUEpL3fGyRYnrVbtfsiQlC85u0MxNGgiK/2HM2s1Zi1a1Gic0F/uE8 KD1sxt0f+Alq266D+h2HruZ4EupApz1qEBZC5ehQH3Rwb8qpCFObJRJeOyC8zmspDyPEVx OtWH/5sgVwCJcTwG2eFnWDn5cw4Ol01e/Zw0hlTNEgI8Jz6pKPbfodzkUQtxqev59D64mC +rvwYqefcyLpUtuSO1oMz4Ud1e+WEgTcGXGeIWLonnkzNooyIBuMtE28k5IW2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701270871; a=rsa-sha256; cv=none; b=rVpbZ35RaZLGFILfk39GQwvSTckH9TudFLvHtuZzES5gSbpToORvw46QEZcVLzp2GeAsMt PuZOkkxh2qu3NLru6Bz5zOhDEzZLMnOXV5Fzv61W8WRe3pugxwGiZoNobr8UcIL6msWTY7 Ltanmrn29DkbA3CNGb5S5jNw5eEAns+2e6YwZYsw0khTmhq1UBpdaMoIzmCzkscs1RRaJ4 9aWczFc+ygBRoob/MoFaJcHuHfTQRXdBcn34Mj7Icou1XeolU4xp40adObV5VpyDZquOT+ IvAINOQ/uJtCioAwzn9dxY2jLgG87s/fg6ucbh9RuC+uahag5DsZUgOFrHeaEw== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SgNCW2MRqzq83; Wed, 29 Nov 2023 15:14:31 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 459B51CADF; Wed, 29 Nov 2023 16:14:30 +0100 (CET) Date: Wed, 29 Nov 2023 16:14:30 +0100 From: Baptiste Daroussin To: Martin Matuska Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2276e53940c2 - main - zfs: merge openzfs/zfs@688514e47 Message-ID: <2md6axxcaidm44r7xqt5mtfylthx6rlb62gk45bctfrq6nfvfc@h4faamv7omqa> References: <202311282036.3ASKaEnm031847@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: <202311282036.3ASKaEnm031847@gitrepo.freebsd.org> On Tue, Nov 28, 2023 at 08:36:14PM +0000, Martin Matuska wrote: > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2276e53940c2a2bf7c7e9cb705e51de4202258c2 > > commit 2276e53940c2a2bf7c7e9cb705e51de4202258c2 > Merge: cd201c090858 688514e4704b > Author: Martin Matuska > AuthorDate: 2023-11-28 20:35:02 +0000 > Commit: Martin Matuska > CommitDate: 2023-11-28 20:35:58 +0000 > > zfs: merge openzfs/zfs@688514e47 > > Notable upstream pull request merges: > #15532 c1a47de86 zdb: Fix zdb '-O|-r' options with -e/exported zpool > #15535 cf3316633 ZVOL: Minor code cleanup > #15541 803a9c12c brt: lift internal definitions into _impl header > #15541 213d68296 zdb: show BRT statistics and dump its contents > #15543 a49087510 ZIL: Refactor TX_WRITE encryption similar to > TX_CLONE_RANGE > #15543 27d8c23c5 ZIL: Do not encrypt block pointers in lr_clone_range_t > #15549 67894a597 unnecessary alloc/free in dsl_scan_visitbp() > #15551 126efb588 FreeBSD: Fix the build on FreeBSD 12 > #15563 acb33ee1c FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are > NFS visible > #15564 7bbd42ef4 Don't allow attach to a raidz child vdev > #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL > #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness > > Obtained from: OpenZFS > OpenZFS commit: 688514e4704bdee4551d25960febd322ac26f297 > /home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2129:37: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] /home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2159:44: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] Best regards, Bapt From nobody Wed Nov 29 15:57:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgP8j0hw9z52tVm; Wed, 29 Nov 2023 15:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgP8j0BhKz4cn4; Wed, 29 Nov 2023 15:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701273429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=skV7g82UMOcx85mqD/upO/ptSm85WB523xHWwdPhsMw=; b=MEjarod2EZlv8kpp1qQUaA3EAeCRQgeeTBbYgsSL8yXv1yMeXUocJwIqItFReI37aQHZEX ANPjGsdt5pSNGHLZtuxT1SjBNRWw+l2gtDP18XBmFmGpxvBKylBf2SNOHlYxbXEBP1sWvU +O++VWZ66CjXrPMSvF8X+JEOhMYDkN+nQjRHLwRcHyF5dOntJVo4MYvOMeZTxZhNo8zCEb RGy3X2Snsd+MGxx9Mt1ntCjDvtFT7MSaDkiz8DvwQ/q+LJIfQ6c++uNoQnmvB4pSaRmc0J Eot7bF/Ln2ktb8xANETMJnnn4nYeSV7ucENJV1NbGt/g/fAf2cBXbi6jvfmDXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701273429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=skV7g82UMOcx85mqD/upO/ptSm85WB523xHWwdPhsMw=; b=sd8YdYnTSA1eK2qqq+303YDS3+SruPrQGVs3V58YuCKmRR7K8dNm6jBcNbNmnP4BCzkzdM nRpoC0CviH0bqm3E4Pw9DzPuvd+KL50eJoLKU6FlWolfxBApONYVJgR1OaDdjtFae07c63 20nRMJ9f2kBYphNue92cTR2qDXMNwVw0IibCYWnu2C6oiBFi2oHKxihYCjMdzymG1gArdS CKgbAXYjHp1+9NU17tLtLgOrtqyxzihbRxXKAenyJTXp+S7963n94SeyYRDjjRulEboLz4 TKeA+t/Q3uVRM2De2GhDzY2JFwtAkx58ha/VgJ94W4HmI81rYNus43XIBZP5RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701273429; a=rsa-sha256; cv=none; b=eU+5vMtJdNecD4e0hxHIHHYOIL9Fd38Vtkmzzch+s7Gi4xAuTtDa7JCq/QiVEI3uDBFMJY qS1yGM77k+0JqBAhUOqFF9UJdjkV94R3tb+B8Uv78b4ZwTxl3FUSBMx82srbyVM2IhLns8 LsUr4Wp4DjdOC+W4ZWdLD+TVROhrcC6SQvEHAeE2iQNW9kEqDYB13LxETXHvaDGDuPXPPI EmsXV7/Q1iepRmjaWYMS3IQ/7Nfjd7RlU5/RdOIZLrsJgd1Gp7JjlX375qkGBvm7HWTN1o QQTYSYAucOUxwZrwXp1OJefEYbQw23jCn/uUJC0W41ULkpmnwZwkRYb0aeawVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgP8h6Mttz1BYP; Wed, 29 Nov 2023 15:57: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 3ATFv8GD076228; Wed, 29 Nov 2023 15:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATFv85t076225; Wed, 29 Nov 2023 15:57:08 GMT (envelope-from git) Date: Wed, 29 Nov 2023 15:57:08 GMT Message-Id: <202311291557.3ATFv85t076225@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: db0a4f2d7a65 - main - openzfs: unbreak 32-bit builds. List-Id: Commit messages for the main 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: db0a4f2d7a654250f329241c6bd3f535be9a05bc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=db0a4f2d7a654250f329241c6bd3f535be9a05bc commit db0a4f2d7a654250f329241c6bd3f535be9a05bc Author: Warner Losh AuthorDate: 2023-11-29 15:26:29 +0000 Commit: Warner Losh CommitDate: 2023-11-29 15:26:29 +0000 openzfs: unbreak 32-bit builds. 32-bit builds are broken. fix that by using PRIu64 instead of a bare '%lu.' Feel free to revert when upstream has this fixed. I'm agnostic as to the proper fix, but don't have the time to fight upstreaming this on top of everything else. --- sys/contrib/openzfs/cmd/zdb/zdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c index 486bec9910a4..777032bf82f6 100644 --- a/sys/contrib/openzfs/cmd/zdb/zdb.c +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c @@ -2126,14 +2126,14 @@ dump_brt(spa_t *spa) continue; if (!brtvd->bv_initiated) { - printf("BRT: vdev %lu: empty\n", vdevid); + printf("BRT: vdev %" PRIu64 ": empty\n", vdevid); continue; } zdb_nicenum(brtvd->bv_totalcount, count, sizeof (count)); zdb_nicebytes(brtvd->bv_usedspace, used, sizeof (used)); zdb_nicebytes(brtvd->bv_savedspace, saved, sizeof (saved)); - printf("BRT: vdev %lu: refcnt %s; used %s; saved %s\n", + printf("BRT: vdev %" PRIu64 ": refcnt %s; used %s; saved %s\n", vdevid, count, used, saved); } @@ -2156,7 +2156,7 @@ dump_brt(spa_t *spa) uint64_t offset = *(uint64_t *)za.za_name; uint64_t refcnt = za.za_first_integer; - snprintf(dva, sizeof (dva), "%lu:%llx", vdevid, + snprintf(dva, sizeof (dva), "%" PRIu64 ":%llx", vdevid, (u_longlong_t)offset); printf("%-16s %-10llu\n", dva, (u_longlong_t)refcnt); } From nobody Wed Nov 29 16:00:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgPDh0Fv6z52tc8; Wed, 29 Nov 2023 16:00:36 +0000 (UTC) (envelope-from bapt@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 4SgPDg6vlKz4dQ2; Wed, 29 Nov 2023 16:00:35 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701273636; 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=0vrbJ7rtgrMmq1iWZTqCHST9wE2LRI03Gmznd5t/EcI=; b=g9CaUcsxeuqZRZqnvzISp2MBarbmSbj6qLiCS+79V7WFGv9K+yXcRpl0+3FdnUzxU7f98Q YDNlziR5lHbtVv/qcLi6F1MmC0GB55+MLZmfwl76ZMkQf0ZJj4Pqr8KLOgF5VqtJ9XEP3j hoO+ThsuVdyjX5Ms72xcaHwO5yqV9U6VXC2d/WjAwVd+aC7U+KlfoQ8VBV6XzKmtvxf9gD k0oOQC1yJtSEtb6A5nV9txAhKxHrD5KDNj1p11CuhSRvN5x+8RYPjPYVLoup0NEvlN0Kwk p6nRimJW+ClIwWmYsMNTDBU3x+/1o5ATWRq2Ih76ne7k4K9nHHjEpGvpkAH8OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701273636; 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=0vrbJ7rtgrMmq1iWZTqCHST9wE2LRI03Gmznd5t/EcI=; b=kmBmFH6WzwhdbxgmklzI0eU0oaXbkbgIR+28NA1qxWTBr319Fx8kueosTxL6FChtD53yGY VpmdMG5zhCnfXHecp2mgEsigJVfi43FFIosxjXfB4skzg5P0WxxPX4LViRZpR7cYLbLELx Gu3nrL7Bg2aZwbBr78yDj8HebkWIxy6iw2SBZYE5x+n2dh+u0Z6aE1D7UmLvnL/DDj8PpU uHDeB7u4gkg6lNqhN3WDHsFnp2PmVv6hNNaxnrmboQd+sfw1LjoN780FXNGz4oqmSbphJ+ C/HdWi6CBo2Dd7GAjtFEu+tfp7Xpiga4tUiwpwfP8jtvUSpfgxuktq11lnuAsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701273636; a=rsa-sha256; cv=none; b=yfGRNYkSXcKu85fLBx7+weTDedlvH0On1WS2zt6usr8zLCFDmo/jgxLaYyTO3dhWPjbUb/ KgF8Xj8xt6T791EJkazYDuZX2d1PI3Aroz1L6Sv0Ths18NxRw5Gf8Zn9wR6tmzOSpATDAi VnuvtmpLWhbtFjZ1oSdvDohNgCx0pkL1vZGQUYYIkFYkxPaP/RDsYk3NZDK+w/2INV7IEV PUVfVTyqTQ4tBwHfB8L6jfcra2Dsqkay+/80SSOHv7ezmEkjheBRZf7lWRzoOGnhs2yWFb Wyc1OFAj/buQu10iSNWSuRYhwlC4lJ2eMNTD1xq4SES3W2nwmV6nZ/c5MmrJbg== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SgPDg5HPNzsHZ; Wed, 29 Nov 2023 16:00:35 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 4DDDA1CCF0; Wed, 29 Nov 2023 17:00:34 +0100 (CET) Date: Wed, 29 Nov 2023 17:00:34 +0100 From: Baptiste Daroussin To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: db0a4f2d7a65 - main - openzfs: unbreak 32-bit builds. Message-ID: <6efureb5she43sgdpfrkwl7alcemv3yd322hcqeo35qk3jbs3y@xbr2e7o6e4b5> References: <202311291557.3ATFv85t076225@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: <202311291557.3ATFv85t076225@gitrepo.freebsd.org> Thank you! Best regards, Bapt On Wed, Nov 29, 2023 at 03:57:08PM +0000, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=db0a4f2d7a654250f329241c6bd3f535be9a05bc > > commit db0a4f2d7a654250f329241c6bd3f535be9a05bc > Author: Warner Losh > AuthorDate: 2023-11-29 15:26:29 +0000 > Commit: Warner Losh > CommitDate: 2023-11-29 15:26:29 +0000 > > openzfs: unbreak 32-bit builds. > > 32-bit builds are broken. fix that by using PRIu64 instead of a > bare '%lu.' > > Feel free to revert when upstream has this fixed. I'm agnostic as to the > proper fix, but don't have the time to fight upstreaming this on top of > everything else. > --- > sys/contrib/openzfs/cmd/zdb/zdb.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c > index 486bec9910a4..777032bf82f6 100644 > --- a/sys/contrib/openzfs/cmd/zdb/zdb.c > +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c > @@ -2126,14 +2126,14 @@ dump_brt(spa_t *spa) > continue; > > if (!brtvd->bv_initiated) { > - printf("BRT: vdev %lu: empty\n", vdevid); > + printf("BRT: vdev %" PRIu64 ": empty\n", vdevid); > continue; > } > > zdb_nicenum(brtvd->bv_totalcount, count, sizeof (count)); > zdb_nicebytes(brtvd->bv_usedspace, used, sizeof (used)); > zdb_nicebytes(brtvd->bv_savedspace, saved, sizeof (saved)); > - printf("BRT: vdev %lu: refcnt %s; used %s; saved %s\n", > + printf("BRT: vdev %" PRIu64 ": refcnt %s; used %s; saved %s\n", > vdevid, count, used, saved); > } > > @@ -2156,7 +2156,7 @@ dump_brt(spa_t *spa) > uint64_t offset = *(uint64_t *)za.za_name; > uint64_t refcnt = za.za_first_integer; > > - snprintf(dva, sizeof (dva), "%lu:%llx", vdevid, > + snprintf(dva, sizeof (dva), "%" PRIu64 ":%llx", vdevid, > (u_longlong_t)offset); > printf("%-16s %-10llu\n", dva, (u_longlong_t)refcnt); > } > From nobody Wed Nov 29 17:48:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgRcs1xkcz531fs; Wed, 29 Nov 2023 17:48:13 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) (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 4SgRcs02qgz3gfM; Wed, 29 Nov 2023 17:48:13 +0000 (UTC) (envelope-from mavbsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yb1-xb2f.google.com with SMTP id 3f1490d57ef6-db35caa1749so6413914276.2; Wed, 29 Nov 2023 09:48:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701280092; x=1701884892; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=oMJog/vp1gPuY4DVmRGKmZswx8JIl2OynUcRUkGyzMA=; b=CwfS7emmIDTGkkVJaVht1jObOVFHkLf0dV0X8Cx9DoUua1JaN8YLZusUEsryaR0gUb VRwzb/yH2SUV6w4+nCEqjP/N9MmVJng/HepK1SQaZ16iriC7gUqPUuhd3TEM+5F7Rmvd hoT0PnUee6QC9957PlQuRFAgc7DRknF9RQuBFg5dYFb/QjmWm6DvsqfncFp8LvKYa5VW Xq8WVqiMzcIoiULph++KFvX7jvZTbrm9lH2VGvRICEWhSKYk8XY58St/zn1iScIL/DEw hgVs1j60WGiAM8wvXYpZTwn9s++g9niAcNNOvyfk+aWlcCye/5y3HABKKKYe/vRvg9t2 myOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701280092; x=1701884892; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oMJog/vp1gPuY4DVmRGKmZswx8JIl2OynUcRUkGyzMA=; b=sGs0btbDqjGYUQ1fmML24hSTNkygyCoCombVd5WdUhMJpBNTgMghprvsgVg+7P0oZO L9tcTdO1b318YF8nSgzcaGUbHrDrf2DxV1tMkUl5LNouq8VNEp3D2mESy+i7VsWGKhGU SSFwL5KeC/GufOGw6c4OMzLaEp6X104ZYJQCBxlIXRB+uAEh46ArqmYi7wANifLZeAYW y0YFlhXFvz/46aKDhK0wN/u1fymiidoy4ir+Rl0yY2EMZqxIpPtlXYeqiVGolkj5JWF8 6DoLVxGg1n6SdcagVdE1/xIaxgB3kkMSJuvj7p2mdTXnFDazblRoU7lJRW9WDLn4XYp/ Wz6A== X-Gm-Message-State: AOJu0YxyJfQqTEX07AYIXmZMQAwIA6pBXsx+29qs4bK6sEz1aCeZdEx6 cK27ZcErLFvIoDDU6onOGhBuRpsz6KY= X-Google-Smtp-Source: AGHT+IEHB5ATbTHJ7s3ObZSnFOVb66SpRomSItYo3zVGq8xu5SCE9wHQsor2Ao5pirtx3/oQHCuLlw== X-Received: by 2002:a25:d394:0:b0:daf:7468:459 with SMTP id e142-20020a25d394000000b00daf74680459mr19662150ybf.3.1701280091709; Wed, 29 Nov 2023 09:48:11 -0800 (PST) Received: from [10.230.45.5] ([38.32.73.2]) by smtp.gmail.com with ESMTPSA id f14-20020a5b0d4e000000b00da041da21e7sm4157068ybr.65.2023.11.29.09.48.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Nov 2023 09:48:11 -0800 (PST) Message-ID: <07c41fe2-ffc2-03f0-43e3-2543df96e316@FreeBSD.org> Date: Wed, 29 Nov 2023 12:48:08 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: git: 2276e53940c2 - main - zfs: merge openzfs/zfs@688514e47 Content-Language: en-US To: Baptiste Daroussin , Martin Matuska Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202311282036.3ASKaEnm031847@gitrepo.freebsd.org> <2md6axxcaidm44r7xqt5mtfylthx6rlb62gk45bctfrq6nfvfc@h4faamv7omqa> From: Alexander Motin In-Reply-To: <2md6axxcaidm44r7xqt5mtfylthx6rlb62gk45bctfrq6nfvfc@h4faamv7omqa> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4SgRcs02qgz3gfM Hi, On 29.11.2023 10:14, Baptiste Daroussin wrote: > On Tue, Nov 28, 2023 at 08:36:14PM +0000, Martin Matuska wrote: >> The branch main has been updated by mm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=2276e53940c2a2bf7c7e9cb705e51de4202258c2 >> >> commit 2276e53940c2a2bf7c7e9cb705e51de4202258c2 >> Merge: cd201c090858 688514e4704b >> Author: Martin Matuska >> AuthorDate: 2023-11-28 20:35:02 +0000 >> Commit: Martin Matuska >> CommitDate: 2023-11-28 20:35:58 +0000 >> >> zfs: merge openzfs/zfs@688514e47 >> >> Notable upstream pull request merges: >> #15532 c1a47de86 zdb: Fix zdb '-O|-r' options with -e/exported zpool >> #15535 cf3316633 ZVOL: Minor code cleanup >> #15541 803a9c12c brt: lift internal definitions into _impl header >> #15541 213d68296 zdb: show BRT statistics and dump its contents >> #15543 a49087510 ZIL: Refactor TX_WRITE encryption similar to >> TX_CLONE_RANGE >> #15543 27d8c23c5 ZIL: Do not encrypt block pointers in lr_clone_range_t >> #15549 67894a597 unnecessary alloc/free in dsl_scan_visitbp() >> #15551 126efb588 FreeBSD: Fix the build on FreeBSD 12 >> #15563 acb33ee1c FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are >> NFS visible >> #15564 7bbd42ef4 Don't allow attach to a raidz child vdev >> #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL >> #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness >> >> Obtained from: OpenZFS >> OpenZFS commit: 688514e4704bdee4551d25960febd322ac26f297 >> > /home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2129:37: error: > format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka > 'unsigned long long') [-Werror,-Wformat] > /home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2159:44: error: > format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka > 'unsigned long long') [-Werror,-Wformat] Should already be fixed. Warner fixed it in FreeBSD and Martin upstreamed to OpenZFS: https://github.com/openzfs/zfs/pull/15606 -- Alexander Motin From nobody Wed Nov 29 17:54:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgRlp4zs1z532PZ; Wed, 29 Nov 2023 17:54:14 +0000 (UTC) (envelope-from bapt@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 4SgRlp3Fv2z4F8p; Wed, 29 Nov 2023 17:54:14 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701280454; 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=9Pe3GJFH9GxjGeb3117/rRyyc1k7dPxL60oGe5JTKXw=; b=nAcuXhuU1HRjKlbgBpnHnUQKaq68wRvbmQxr4S9m/pqRK3vyK+ni7KHITAVHDxDBD8GZYN BRflJOD41Lx3wut87c0oR7cnJM6gS1iaBtFhMHMEQKsNxGDLVd9WHKtoVKN4voBuqqZyNU J4r1W/EeefR1mfR9ABjPxbiH9yckjvycaojmaInWbxWlRuNRi7cOaPNpsPbev5nHZ/xoxg OtQCxtLVAimgSTjX0amHO0l+R6RZYBdjM/+druEe9iR9M2b53Ms4t8Vo6TqiSiM7E7gZgY zWepbxIo1Ma8/PkpCPmc07QEIk9J3GA49p6x1wX79QoixPnxRvFH3DBrJArPEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701280454; 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=9Pe3GJFH9GxjGeb3117/rRyyc1k7dPxL60oGe5JTKXw=; b=UmMw4xJ6VEK8vCVvsePFmoGIlwpsZXfBpPVre7Q4u8j9Ygcy2xVh5FDo+1HrBoBqj40vNL ZnEj5f8GvOMXYqR0W1Mfl4p71UtNDSlHx2TzlxUu7jZ/Zhj+hmzz9mrs1rVfYlTyO7A4NX T1+hfJNAOFkd+zmF47yCMPF7QKBObZCc7tDkBXj0A60GtTjk8qOAa/Cq2pr3z4+L0UC8e7 Fc2wGex9Z+WfNJqZoKXzR1qRX8aFWCtoFAYdIgoWoWfh0Wij/gzCHGzVrMs25+h56NUjz7 fxdlKjBVY+uZNYgVm3vR424Z9BLG+NxD87WivTMBdP+X0tGKJLEVlrhEI6sF4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701280454; a=rsa-sha256; cv=none; b=lFq7Qmj+Po7Q54jwhm973fWYkJxwPzXbT4jfMLMz4DMT9elASTDPdtvpYC8e4IVV1Wzguo HCg69+NPYc8DnzvAZZvnvLwXtHgUd6OtrRT2xBq5RKy6iXxIJ/1GFLbDtgiQxKFy2/et4Y cpTHE0CZop8pmn77jm0ck7XcouD0Co1lrfgFMN5LXssGE9xa2Ms/kwK9Q/e2l2/2UAW8n8 UmvFsUhv3axrYChaN+1Hbgn1dRvhUekCDxDpP820q5MMr9FV6gFcFESyEl0bHEsHfAZxwu KXxjKG8kbHG+xZ3dvqbxkAi/2hmE4EC5gbWKCxksfiIUdJFcOOujlU+RwTNb3A== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SgRlp1f7pzvhg; Wed, 29 Nov 2023 17:54:14 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 1DC7D1D18D; Wed, 29 Nov 2023 18:54:10 +0100 (CET) Date: Wed, 29 Nov 2023 18:54:10 +0100 From: Baptiste Daroussin To: Alexander Motin Cc: Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2276e53940c2 - main - zfs: merge openzfs/zfs@688514e47 Message-ID: <4u66ldfa5k6lzyyijolugyjtzlu2gjqebkuwebuwufpc53wnnr@6vemdevogcoz> References: <202311282036.3ASKaEnm031847@gitrepo.freebsd.org> <2md6axxcaidm44r7xqt5mtfylthx6rlb62gk45bctfrq6nfvfc@h4faamv7omqa> <07c41fe2-ffc2-03f0-43e3-2543df96e316@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: <07c41fe2-ffc2-03f0-43e3-2543df96e316@FreeBSD.org> On Wed, Nov 29, 2023 at 12:48:08PM -0500, Alexander Motin wrote: > Hi, > > On 29.11.2023 10:14, Baptiste Daroussin wrote: > > On Tue, Nov 28, 2023 at 08:36:14PM +0000, Martin Matuska wrote: > > > The branch main has been updated by mm: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=2276e53940c2a2bf7c7e9cb705e51de4202258c2 > > > > > > commit 2276e53940c2a2bf7c7e9cb705e51de4202258c2 > > > Merge: cd201c090858 688514e4704b > > > Author: Martin Matuska > > > AuthorDate: 2023-11-28 20:35:02 +0000 > > > Commit: Martin Matuska > > > CommitDate: 2023-11-28 20:35:58 +0000 > > > > > > zfs: merge openzfs/zfs@688514e47 > > > Notable upstream pull request merges: > > > #15532 c1a47de86 zdb: Fix zdb '-O|-r' options with -e/exported zpool > > > #15535 cf3316633 ZVOL: Minor code cleanup > > > #15541 803a9c12c brt: lift internal definitions into _impl header > > > #15541 213d68296 zdb: show BRT statistics and dump its contents > > > #15543 a49087510 ZIL: Refactor TX_WRITE encryption similar to > > > TX_CLONE_RANGE > > > #15543 27d8c23c5 ZIL: Do not encrypt block pointers in lr_clone_range_t > > > #15549 67894a597 unnecessary alloc/free in dsl_scan_visitbp() > > > #15551 126efb588 FreeBSD: Fix the build on FreeBSD 12 > > > #15563 acb33ee1c FreeBSD: Fix ZFS so that snapshots under .zfs/snapshot are > > > NFS visible > > > #15564 7bbd42ef4 Don't allow attach to a raidz child vdev > > > #15566 688514e47 dmu_buf_will_clone: fix race in transition back to NOFILL > > > #15571 30d581121 dnode_is_dirty: check dnode and its data for dirtiness > > > Obtained from: OpenZFS > > > OpenZFS commit: 688514e4704bdee4551d25960febd322ac26f297 > > > > > /home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2129:37: error: > > format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka > > 'unsigned long long') [-Werror,-Wformat] > > /home/bapt/worktrees/main/sys/contrib/openzfs/cmd/zdb/zdb.c:2159:44: error: > > format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka > > 'unsigned long long') [-Werror,-Wformat] > > Should already be fixed. Warner fixed it in FreeBSD and Martin upstreamed > to OpenZFS: https://github.com/openzfs/zfs/pull/15606 > Thanks all people included Best regards, Bapt From nobody Wed Nov 29 17:58:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgRrg0T6Nz532cL; Wed, 29 Nov 2023 17:58: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 4SgRrg01CQz4FYC; Wed, 29 Nov 2023 17:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701280707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxO8EQjQ3pCH5a1KTE4mbccQ2rtpSqh4Q/5Ld9xDhcw=; b=SBTJm911Q8qiIhcZ93Oadwb3JjeOFZEtwvWkx668ujzc+elREnxzhi+agDLpVoap1TdauC EbfgDUjIH0YjPLn6xCQ187W//ab9SlGouX5jxxBN3RBTj0gHyEyI5WRWl3lhsjaJptSNur dAviSKhr9AVDg6jj667870qdAsKSibBrIlPWYe1a8Hes5W1W7mCYtHm9X47B4OImOUbFZr 2qDN59AYqZk9aavEM3N5zriX/7NFCbCYu4X8a/5YwZ2TNYadXz0G0GgyFAApJ0SQoU+pk1 YE8z+xozhioucHMWbeor/RSf1abwBZXPke/tn7x6zLDENK6lFbj8e0Q8Iju3oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701280707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VxO8EQjQ3pCH5a1KTE4mbccQ2rtpSqh4Q/5Ld9xDhcw=; b=Y3xUnE6pnTuhXNTqCvLJT4Z8S91eY7MsDQAwVSrMSW28YYPN2o3/Ve9NbdIHrGjS7lwGuV rwiuHCaVglmnvK5YzvDOAyK26gA3T+azBxO8G63bobgYgktiknTWe+NuPot7XzprVFfXf+ 2NDgs0HEKX4X2C7eOwwdVm6kv1EgEXjOF7FRmc9EXn3y7xcvt04fw/s8EBylgTv5KuHy/k 9Y0J8c5njr2fSZFbP4aPZzzrAjZcC/ADY/kIKtr/MPMugyiOzka0jquvAwW3/Os3VuYKyv BVJeOEbqwk7oLUXirjJZ1c6QXyQme2lDmXAHSP94BeySqt2ZPQcgbBDTG3p+gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701280707; a=rsa-sha256; cv=none; b=oi86zjOpu+pRN8Jlzm1rgqlegFBclEWv9ROVf+ChYcF9Ajmqfyv+hdwejxE1zFoUp9woFT X2REUvjgysfGjWQqwyp5A9eONKv+QIZYnedQWiHlI6//jXluFGvPBcwFSE15vgOplr8dPk BIdWHvPjh/8zTf6XCK4Zf9MeuXTd5Q84qFjX1yKWCTifohVKHUoEC94Hq/epFNnRz3Wgl3 AVSI07gUjXK6Fjm2Tyu/r18OVmyk8PzevxpVuSTImvDZ8KVijRGWp864RarPfxbcQVFjgl 2lx1gyd9Oz3fRBVAuPI2s+I95/ynAnF5tKzkJv+5i+v/BAZ73AM80kDpbYyXpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgRrf6B0Qz1RF; Wed, 29 Nov 2023 17:58: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 3ATHwQcp081082; Wed, 29 Nov 2023 17:58:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATHwQ0k081079; Wed, 29 Nov 2023 17:58:26 GMT (envelope-from git) Date: Wed, 29 Nov 2023 17:58:26 GMT Message-Id: <202311291758.3ATHwQ0k081079@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: 5c0dac0b7a01 - main - ossl: Keep mutable AES-GCM state on the stack List-Id: Commit messages for the main 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: 5c0dac0b7a012f326edab06ad85aee5ad68ff120 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5c0dac0b7a012f326edab06ad85aee5ad68ff120 commit 5c0dac0b7a012f326edab06ad85aee5ad68ff120 Author: Mark Johnston AuthorDate: 2023-11-29 17:51:55 +0000 Commit: Mark Johnston CommitDate: 2023-11-29 17:55:51 +0000 ossl: Keep mutable AES-GCM state on the stack ossl(4)'s AES-GCM implementation keeps mutable state in the session structure, together with the key schedule. This was done for convenience, as both are initialized together. However, some OCF consumers, particularly ZFS, assume that requests may be dispatched to the same session in parallel. Without serialization, this results in incorrect output. Fix the problem by explicitly copying per-session state onto the stack at the beginning of each operation. PR: 275306 Reviewed by: jhb Fixes: 9a3444d91c70 ("ossl: Add a VAES-based AES-GCM implementation for amd64") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42783 --- sys/crypto/openssl/ossl_aes.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index c0cb8ba08d35..65b6f126736e 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -167,10 +167,9 @@ static int ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, const struct crypto_session_params *csp) { - struct ossl_cipher_context key; + struct ossl_gcm_context ctx; struct crypto_buffer_cursor cc_in, cc_out; unsigned char iv[AES_BLOCK_LEN], tag[AES_BLOCK_LEN]; - struct ossl_gcm_context *ctx; const unsigned char *inseg; unsigned char *outseg; size_t inlen, outlen, seglen; @@ -182,24 +181,25 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, if (crp->crp_cipher_key != NULL) { if (encrypt) error = s->cipher->set_encrypt_key(crp->crp_cipher_key, - 8 * csp->csp_cipher_klen, &key); + 8 * csp->csp_cipher_klen, + (struct ossl_cipher_context *)&ctx); else error = s->cipher->set_decrypt_key(crp->crp_cipher_key, - 8 * csp->csp_cipher_klen, &key); + 8 * csp->csp_cipher_klen, + (struct ossl_cipher_context *)&ctx); if (error) return (error); - ctx = (struct ossl_gcm_context *)&key; } else if (encrypt) { - ctx = (struct ossl_gcm_context *)&s->enc_ctx; + memcpy(&ctx, &s->enc_ctx, sizeof(struct ossl_gcm_context)); } else { - ctx = (struct ossl_gcm_context *)&s->dec_ctx; + memcpy(&ctx, &s->dec_ctx, sizeof(struct ossl_gcm_context)); } crypto_read_iv(crp, iv); - ctx->ops->setiv(ctx, iv, csp->csp_ivlen); + ctx.ops->setiv(&ctx, iv, csp->csp_ivlen); if (crp->crp_aad != NULL) { - if (ctx->ops->aad(ctx, crp->crp_aad, crp->crp_aad_length) != 0) + if (ctx.ops->aad(&ctx, crp->crp_aad, crp->crp_aad_length) != 0) return (EINVAL); } else { crypto_cursor_init(&cc_in, &crp->crp_buf); @@ -208,7 +208,7 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, alen -= seglen) { inseg = crypto_cursor_segment(&cc_in, &inlen); seglen = MIN(alen, inlen); - if (ctx->ops->aad(ctx, inseg, seglen) != 0) + if (ctx.ops->aad(&ctx, inseg, seglen) != 0) return (EINVAL); crypto_cursor_advance(&cc_in, seglen); } @@ -229,10 +229,10 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, seglen = MIN(plen, MIN(inlen, outlen)); if (encrypt) { - if (ctx->ops->encrypt(ctx, inseg, outseg, seglen) != 0) + if (ctx.ops->encrypt(&ctx, inseg, outseg, seglen) != 0) return (EINVAL); } else { - if (ctx->ops->decrypt(ctx, inseg, outseg, seglen) != 0) + if (ctx.ops->decrypt(&ctx, inseg, outseg, seglen) != 0) return (EINVAL); } @@ -242,18 +242,19 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, error = 0; if (encrypt) { - ctx->ops->tag(ctx, tag, GMAC_DIGEST_LEN); + ctx.ops->tag(&ctx, tag, GMAC_DIGEST_LEN); crypto_copyback(crp, crp->crp_digest_start, GMAC_DIGEST_LEN, tag); } else { crypto_copydata(crp, crp->crp_digest_start, GMAC_DIGEST_LEN, tag); - if (ctx->ops->finish(ctx, tag, GMAC_DIGEST_LEN) != 0) + if (ctx.ops->finish(&ctx, tag, GMAC_DIGEST_LEN) != 0) error = EBADMSG; } explicit_bzero(iv, sizeof(iv)); explicit_bzero(tag, sizeof(tag)); + explicit_bzero(&ctx, sizeof(ctx)); return (error); } From nobody Wed Nov 29 18:04:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgRzf20Tlz532bm; Wed, 29 Nov 2023 18:04: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 4SgRzf1Zqhz4GJv; Wed, 29 Nov 2023 18:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701281070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5KXDZpURdalv+i+jusjKLsedk5OkSOmxcSItYHAGHA=; b=Op597yPgk8s/BWuLK2h6lKHH5RUCtGIBv4Y5LFdjVMN7RlHxpdAY9vApJo31yMqyv/eyUC NuZqouPCi3cvy/dBtg3Ccjhzk7YsvHSoGf2/v4fj56nVekXTsfaTAJALvVxo955o5J0cme 6zwylldKqNkZf/jQuhekOsEiyLt4XGqIhiPvN61qbe8RP58zwvzgDKrMI1nLisaVXr4Dd4 HXp7+/JvmnHmj57tjEZ6VVCOgt4Xz46jIajwEVoeSko6UbttZOkSfoVWWKUEuVOCWCyqbH meE56IP8hdlWfd+YaGvPUrdLn/9enDfW6iJlDSpXo+nRyR2pd9LXRkuoM68Tmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701281070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5KXDZpURdalv+i+jusjKLsedk5OkSOmxcSItYHAGHA=; b=ucEPucQeS21RhAxA5ryEJlLzc3i7B/7Gh/kshcsLwVrPPkCPNG/PaEQ0uhZdyBVcOtfj17 5ewXqqTnuKm0WqEaFAhHxDhWhS0RBTUfNSjMT8wTiKHJ91XUxI5L9P7N4Lb+vrSORiBeAx x8DXALm5RwQ33ExHAhw7TjJMglHvkpw069YBpqdjcj+ztHPLqT6s3nZcTIDensvJsm55qp H+nizPUiDV9AVapv22w++I5Aej3NOzJamW0F7tdFBskZ1VJsE6qyNd5hExPPamocppa/+j dwaI3dgPHkTXHmzqEUIOKTvh3CsbSHSQjTGx4b8mTkLbtXIIDjApHfwUu3yYYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701281070; a=rsa-sha256; cv=none; b=C1MtNCi1JLvXtR6AKz0qeOF6iGw5kIsv6zx56JL0dYHu7xPoK081Lc/cT1yArROnTkI/C1 YGyLeAOFra6RHnhmLw4dSwWIVxkcVjz5zMNBpGs4+KSvkOSmJqlNSlctkTL1PG84cLPUBF Hk1tBk3AqXStzYoVDmDpKP7E52SKhfSb+EqSS6+aWM2opHI1cyfiFZSBVlEQ7Sdvfn+nhh NjkvYgOnoSyT2NMMP+ngo0jNZyhpCN2fJ6v3xxEJCtKM436XqrQiILNWxPqbLdRGCeJr10 pq1Gs/Vmb+hCsgWj/kyjqW72j0m/dmrdpxkV3lV9XFVCALxYWXcF144jbOraSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgRzf0fxLz23W; Wed, 29 Nov 2023 18:04: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 3ATI4Tcn098341; Wed, 29 Nov 2023 18:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATI4TmM098338; Wed, 29 Nov 2023 18:04:29 GMT (envelope-from git) Date: Wed, 29 Nov 2023 18:04:29 GMT Message-Id: <202311291804.3ATI4TmM098338@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: 0626d30e41cb - main - pf: fix mem leaks upon vnet destroy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: 0626d30e41cba64b41667314c3a4f7611f0eb685 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0626d30e41cba64b41667314c3a4f7611f0eb685 commit 0626d30e41cba64b41667314c3a4f7611f0eb685 Author: Igor Ostapenko AuthorDate: 2023-11-29 12:35:41 +0000 Commit: Kristof Provost CommitDate: 2023-11-29 16:59:28 +0000 pf: fix mem leaks upon vnet destroy Add missing cleanup actions: - remove user defined anchor rulesets - remove user defined ether anchor rulesets - remove tables linked to user defined anchors - deal with wildcard anchor peculiarities to get them removed correctly PR: 274310 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42747 --- sys/netpfil/pf/pf_ioctl.c | 67 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index ec55d43d3800..007327b1932d 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5809,6 +5809,7 @@ pf_clear_tables(void) int error; bzero(&io, sizeof(io)); + io.pfrio_flags |= PFR_FLAG_ALLRSETS; error = pfr_clr_tables(&io.pfrio_table, &io.pfrio_ndel, io.pfrio_flags); @@ -6219,8 +6220,54 @@ shutdown_pf(void) int error = 0; u_int32_t t[5]; char nn = '\0'; + struct pf_kanchor *anchor; + struct pf_keth_anchor *eth_anchor; + int rs_num; do { + /* Unlink rules of all user defined anchors */ + RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (anchor->refcnt == 0) + anchor->refcnt = 1; + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + if ((error = pf_begin_rules(&t[rs_num], rs_num, + anchor->path)) != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: " + "anchor.path=%s rs_num=%d\n", + anchor->path, rs_num)); + goto error; /* XXX: rollback? */ + } + } + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + error = pf_commit_rules(t[rs_num], rs_num, + anchor->path); + MPASS(error == 0); + } + } + + /* Unlink rules of all user defined ether anchors */ + RB_FOREACH(eth_anchor, pf_keth_anchor_global, + &V_pf_keth_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (eth_anchor->refcnt == 0) + eth_anchor->refcnt = 1; + if ((error = pf_begin_eth(&t[0], eth_anchor->path)) + != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: eth " + "anchor.path=%s\n", eth_anchor->path)); + goto error; + } + error = pf_commit_eth(t[0], eth_anchor->path); + MPASS(error == 0); + } + if ((error = pf_begin_rules(&t[0], PF_RULESET_SCRUB, &nn)) != 0) { DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: SCRUB\n")); @@ -6247,12 +6294,16 @@ shutdown_pf(void) break; /* XXX: rollback? */ } - /* XXX: these should always succeed here */ - pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); - pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); - pf_commit_rules(t[2], PF_RULESET_NAT, &nn); - pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); - pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + error = pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[2], PF_RULESET_NAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + MPASS(error == 0); if ((error = pf_clear_tables()) != 0) break; @@ -6261,7 +6312,8 @@ shutdown_pf(void) DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: eth\n")); break; } - pf_commit_eth(t[0], &nn); + error = pf_commit_eth(t[0], &nn); + MPASS(error == 0); #ifdef ALTQ if ((error = pf_begin_altq(&t[0])) != 0) { @@ -6279,6 +6331,7 @@ shutdown_pf(void) /* fingerprints and interfaces have their own cleanup code */ } while(0); +error: return (error); } From nobody Wed Nov 29 18:34:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgSfT4d04z534cM; Wed, 29 Nov 2023 18:34: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 4SgSfT48kFz4LLV; Wed, 29 Nov 2023 18:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701282881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6jLFoEYn8HJM9v3rd5JAxuoTcf9SQ6bNATdWaKM+pI=; b=yUxdzfddWXvquweA9MhO2x+FLCfmpVc63Y+GmFlaR4hQa3soLeBBZpTiguj43cH49XjNUv i0lWOsMNITc4xmgOZSu81GCYFq3M99IO/HnNuSHak2uwBOgEIxv9b5QcN/mTgg17qFhaWU 0jzfyTevDbmxatF2T7trj58FYTejzyIm0BVOUhQqmZyAXyhWTHTJ/D4/7CIrSv2+2XjEk6 agfoczA4OX2IR+6ET04TnbIUIUpk8qNcC5o4a8Fov0nqgv4KjbjiuMNDip+1UzsqndRkdM k+LmGTknNQvn8CK6L701NHHrX9mxFP3c0tWAuvh99RyOwA/G97kF7B6rf88A8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701282881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w6jLFoEYn8HJM9v3rd5JAxuoTcf9SQ6bNATdWaKM+pI=; b=H887xpRPyuwX4aE5NQdplyuB+7qgO7nDrRe46/POc+sMrp6uZNfLeSRjDTzooIvch9z50h kt4NLYuUlGN7YNPCkxhIEpBI85dfGI9KI/ZzfTw2OCdVs2gWOCsPF/3JCx5am6DqjY2GQf ksFVbBNp316J/S+/rnXBEgCKNaVirK+d4uGvR/cG1ngbuJIRBzINr9Uz+ZWzuzulYRDj6u HJKD8iaGZ2OLoN9cXCC+FhLG7hJKLKeEII6kOZ24S/BTfAA8MQBg/Ajn6LmZ70vtSDELPv Vu6rRKB919fGsW4KqgXRnCUt/zVhrMmuFjyoDUeBoBIwoi+zasQxz8iiIiIRsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701282881; a=rsa-sha256; cv=none; b=tk02MLCmnt9BjrYPd8o6FGERUIgXTy+mccVt6GY6fu5Hz5n3g71PBfM4fItDb/75x08LKg HZRaYlNekPV4QSeOTWB2WI4dDmt7JRlfhnMYq9iOMCMrOKuXXKnyxoPhz1P0RJ89BlkPTf 0vVeQtXKGaCCRusWWh9DQWAmom2exohEj/Zms2flJ28yocArWIlN06Q26YZkUdMtNwMTZ9 DuFFMBdrGN1qVuu7hOyT+9Pr2dacEgqjXVMxjn70NeCAlIC35Olk7hDGiAET4TuXiWdDH3 Hd3Uxxqaqui9wi911KaHvC+LjHQ3IaBXDhQ0QRJehbqpEKi/1yQSFvK+iq1Vyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgSfT3DMtz2cP; Wed, 29 Nov 2023 18:34: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 3ATIYfMQ048254; Wed, 29 Nov 2023 18:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATIYf96048251; Wed, 29 Nov 2023 18:34:41 GMT (envelope-from git) Date: Wed, 29 Nov 2023 18:34:41 GMT Message-Id: <202311291834.3ATIYf96048251@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: 71ac18a84df2 - main - agp_amd64: Use rather than bare prototypes List-Id: Commit messages for the main 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: 71ac18a84df2771fb9bd91e2349eae91602c4e46 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=71ac18a84df2771fb9bd91e2349eae91602c4e46 commit 71ac18a84df2771fb9bd91e2349eae91602c4e46 Author: John Baldwin AuthorDate: 2023-11-29 18:31:16 +0000 Commit: John Baldwin CommitDate: 2023-11-29 18:31:16 +0000 agp_amd64: Use rather than bare prototypes Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42826 --- sys/dev/agp/agp_amd64.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c index bb413ef46b3a..117a22247998 100644 --- a/sys/dev/agp/agp_amd64.c +++ b/sys/dev/agp/agp_amd64.c @@ -46,12 +46,9 @@ #include #include #include +#include #include -/* XXX */ -extern void pci_cfgregwrite(int, int, int, int, uint32_t, int); -extern uint32_t pci_cfgregread(int, int, int, int, int); - static void agp_amd64_apbase_fixup(device_t); static void agp_amd64_uli_init(device_t); From nobody Wed Nov 29 18:34:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgSfV5dF5z534cV; Wed, 29 Nov 2023 18:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgSfV579dz4LFl; Wed, 29 Nov 2023 18:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701282882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yq36QUF/Sz5mGgkLyAKise66mYdp/G3Mb7YHLsmvsX0=; b=t9Ve/OLXu4RSkHBRoO1JANxqYzF7T9eOm7i5hQG7aqZpS9Jcxg5YwvEjGD21P7uhEezZf4 nBR8xEyrcq8Lj0+4vtDcNhPi2YVGE6jcRps4cvN/g+h177XvkMmqqfbGYb+U9jf2lKf1tW htu1QoiMbUFxOMtH4NYi3Xpq4jlYOcQYCF3xheJ8Qc/jlaMWpa2bS6HtxTBCp4gYUD/VAm lZVfkRKcsKehvujlATPDSlNfa8czL1bbe6gI3HJQ5X1ygVHFWLgKLkVpsNunQ2VXfo7Y+r uMOX0se14eDwcGHgOvTSFnzeRM6sp2PgyuxiYoFYguXfgkrOIlWSnlyCmluk8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701282882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yq36QUF/Sz5mGgkLyAKise66mYdp/G3Mb7YHLsmvsX0=; b=UnGdlh0c94nwc/Sd+bp6pP8hMEprc+4gnbB6Vla1h64Oxs9vM9qQHCLHEz80JHDUeF3Apv X/tb8vVNIbg5SXlNKVmuKlUyJWtBQIGnTJgRFOPW0znZxhD8hXLEJ584RlSZpi0J0aljsf PDp0BzNtKdxF7pPM+DbUQ75h0xdUpGYpUwDUVZwE+PWjSTjeMkbSAimM239tnbUKt7pktm T8rg7OzUgFzxYJ539Az8u/TlFwCYSeu51jCrUCV1TVVsbUQp8lQx8FcE0azSvF3gfKqKqe vKG3nOOS7Zoq5RE3flYjIlv+m9OM5oJMI1UWoEjtMg4g6+AVb2dFg5hmCQloAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701282882; a=rsa-sha256; cv=none; b=VS+XF1GTU1AyRAqkJVnby1hEwnIpj4J6JlsNHKdUwludWvVotIWGf14NPq5gaD7M1pAzY9 9earJtD8Vcb9W24bLUDMc388iOjxHKzpgsnpPOKyCMvvX1X5Z/k2cw3NWPyVCKhSpVB4qi 8Dzm0Ep6/c5pMo9l8t7XBcqOxIA1/Swexc7wTviWholYTpsi4R8zZvcXlG1qvXbujVkc/R T9RZjHxPP9xEVSfHr2WBE9XsGJwUwgPw9SiHONA3hPq0PFr1NCKEEk3suXsw3qTM6iCc8K 9YR23y1lX4Ezr0ux/PYUfN93WdqKSOCMaLVSKl80qclQSzHqT0jfuuzNSvghvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgSfV47LBz2l2; Wed, 29 Nov 2023 18:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATIYgaZ048314; Wed, 29 Nov 2023 18:34:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATIYgSE048311; Wed, 29 Nov 2023 18:34:42 GMT (envelope-from git) Date: Wed, 29 Nov 2023 18:34:42 GMT Message-Id: <202311291834.3ATIYgSE048311@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: 1587a9db92c0 - main - pci_cfgreg: Add a PCI domain argument to the low-level register API List-Id: Commit messages for the main 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: 1587a9db92c03c738bb3f0fc5874b43c961e7c99 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1587a9db92c03c738bb3f0fc5874b43c961e7c99 commit 1587a9db92c03c738bb3f0fc5874b43c961e7c99 Author: John Baldwin AuthorDate: 2023-11-29 18:31:47 +0000 Commit: John Baldwin CommitDate: 2023-11-29 18:31:47 +0000 pci_cfgreg: Add a PCI domain argument to the low-level register API This commit changes the API of pci_cfgreg(read|write) to add a domain argument (referred to as a segment in ACPI parlance) (note that this is not the same as a NUMA domain, but something PCI-specific). This does not yet enable access to domains other than 0, but updates the API to support domains. Places that use hard-coded bus/slot/function addresses have been updated to hardcode a domain of 0. A few places that have the PCI domain (segment) available such as the acpi_pcib_acpi.c Host-PCI bridge driver pass the PCI domain. The hpt27xx(4) and hptnr(4) drivers fail to attach to a device not on domain 0 since they provide APIs to their binary blobs that only permit bus/slot/function addressing. The x86 non-ACPI PCI bus drivers all hardcode a domain of 0 as they do not support multiple domains. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42827 --- sys/amd64/pci/pci_cfgreg.c | 62 +++++++++++++++++++--------------- sys/amd64/vmm/amd/amdvi_hw.c | 2 +- sys/amd64/vmm/amd/ivrs_drv.c | 3 +- sys/arm64/acpica/pci_cfgreg.c | 5 +-- sys/arm64/include/pci_cfgreg.h | 4 +-- sys/dev/acpica/Osd/OsdHardware.c | 6 ++-- sys/dev/acpica/acpi_pci_link.c | 33 +++++++++++------- sys/dev/acpica/acpi_pcib_acpi.c | 8 +++-- sys/dev/agp/agp_amd64.c | 71 +++++++++++++++++++++------------------ sys/dev/amdtemp/amdtemp.c | 5 +-- sys/dev/hpt27xx/hpt27xx_os_bsd.c | 8 ++--- sys/dev/hpt27xx/hpt27xx_osm_bsd.c | 5 +++ sys/dev/hptnr/hptnr_os_bsd.c | 2 +- sys/dev/hptnr/hptnr_osm_bsd.c | 5 +++ sys/dev/ichwd/ichwd.c | 8 ++--- sys/dev/ipmi/ipmi_isa.c | 2 +- sys/dev/pci/pci_subr.c | 18 +++++----- sys/dev/pci/pcib_private.h | 3 +- sys/i386/pci/pci_cfgreg.c | 62 +++++++++++++++++++--------------- sys/i386/pci/pci_pir.c | 10 +++--- sys/x86/include/pci_cfgreg.h | 4 +-- sys/x86/iommu/intel_drv.c | 2 +- sys/x86/pci/pci_bus.c | 4 +-- sys/x86/pci/pci_early_quirks.c | 47 +++++++++++++------------- sys/x86/pci/qpi.c | 2 +- sys/x86/x86/legacy.c | 8 ++--- 26 files changed, 218 insertions(+), 171 deletions(-) diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index ee97f88951f0..452c5898e959 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -41,12 +41,12 @@ #include #include -static uint32_t pci_docfgregread(int bus, int slot, int func, int reg, - int bytes); -static int pciereg_cfgread(int bus, unsigned slot, unsigned func, - unsigned reg, unsigned bytes); -static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func, - unsigned reg, int data, unsigned bytes); +static uint32_t pci_docfgregread(int domain, int bus, int slot, int func, + int reg, int bytes); +static int pciereg_cfgread(int domain, int bus, unsigned slot, + unsigned func, unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(int domain, int bus, unsigned slot, + unsigned func, unsigned reg, int data, unsigned bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); @@ -76,22 +76,25 @@ pci_cfgregopen(void) } static uint32_t -pci_docfgregread(int bus, int slot, int func, int reg, int bytes) +pci_docfgregread(int domain, int bus, int slot, int func, int reg, int bytes) { + if (domain == 0 && bus == 0 && (1 << slot & pcie_badslots) != 0) + return (pcireg_cfgread(bus, slot, func, reg, bytes)); if (cfgmech == CFGMECH_PCIE && - (bus >= pcie_minbus && bus <= pcie_maxbus) && - (bus != 0 || !(1 << slot & pcie_badslots))) - return (pciereg_cfgread(bus, slot, func, reg, bytes)); - else + (bus >= pcie_minbus && bus <= pcie_maxbus)) + return (pciereg_cfgread(domain, bus, slot, func, reg, bytes)); + else if (domain == 0) return (pcireg_cfgread(bus, slot, func, reg, bytes)); + else + return (-1); } /* * Read configuration space register */ u_int32_t -pci_cfgregread(int bus, int slot, int func, int reg, int bytes) +pci_cfgregread(int domain, int bus, int slot, int func, int reg, int bytes) { uint32_t line; @@ -104,26 +107,31 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes) * as an invalid IRQ. */ if (reg == PCIR_INTLINE && bytes == 1) { - line = pci_docfgregread(bus, slot, func, PCIR_INTLINE, 1); + line = pci_docfgregread(domain, bus, slot, func, PCIR_INTLINE, + 1); if (line == 0 || line >= 128) line = PCI_INVALID_IRQ; return (line); } - return (pci_docfgregread(bus, slot, func, reg, bytes)); + return (pci_docfgregread(domain, bus, slot, func, reg, bytes)); } /* * Write configuration space register */ void -pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes) +pci_cfgregwrite(int domain, int bus, int slot, int func, int reg, uint32_t data, + int bytes) { + if (domain == 0 && bus == 0 && (1 << slot & pcie_badslots) != 0) { + pcireg_cfgwrite(bus, slot, func, reg, data, bytes); + return; + } if (cfgmech == CFGMECH_PCIE && - (bus >= pcie_minbus && bus <= pcie_maxbus) && - (bus != 0 || !(1 << slot & pcie_badslots))) - pciereg_cfgwrite(bus, slot, func, reg, data, bytes); - else + (bus >= pcie_minbus && bus <= pcie_maxbus)) + pciereg_cfgwrite(domain, bus, slot, func, reg, data, bytes); + else if (domain == 0) pcireg_cfgwrite(bus, slot, func, reg, data, bytes); } @@ -242,7 +250,7 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) if (val1 == 0xffffffff) continue; - val2 = pciereg_cfgread(0, slot, 0, 0, 4); + val2 = pciereg_cfgread(0, 0, slot, 0, 0, 4); if (val2 != val1) pcie_badslots |= (1 << slot); } @@ -267,14 +275,14 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) */ static int -pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, +pciereg_cfgread(int domain, int bus, unsigned slot, unsigned func, unsigned reg, unsigned bytes) { vm_offset_t va; int data = -1; - if (bus < pcie_minbus || bus > pcie_maxbus || slot > PCI_SLOTMAX || - func > PCI_FUNCMAX || reg > PCIE_REGMAX) + if (domain != 0 || bus < pcie_minbus || bus > pcie_maxbus || + slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) return (-1); va = PCIE_VADDR(pcie_base, reg, bus, slot, func); @@ -298,13 +306,13 @@ pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, } static void -pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data, - unsigned bytes) +pciereg_cfgwrite(int domain, int bus, unsigned slot, unsigned func, + unsigned reg, int data, unsigned bytes) { vm_offset_t va; - if (bus < pcie_minbus || bus > pcie_maxbus || slot > PCI_SLOTMAX || - func > PCI_FUNCMAX || reg > PCIE_REGMAX) + if (domain != 0 || bus < pcie_minbus || bus > pcie_maxbus || + slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) return; va = PCIE_VADDR(pcie_base, reg, bus, slot, func); diff --git a/sys/amd64/vmm/amd/amdvi_hw.c b/sys/amd64/vmm/amd/amdvi_hw.c index 3471c3b1932f..e87d173023f8 100644 --- a/sys/amd64/vmm/amd/amdvi_hw.c +++ b/sys/amd64/vmm/amd/amdvi_hw.c @@ -124,7 +124,7 @@ static inline uint32_t amdvi_pci_read(struct amdvi_softc *softc, int off) { - return (pci_cfgregread(PCI_RID2BUS(softc->pci_rid), + return (pci_cfgregread(softc->pci_seg, PCI_RID2BUS(softc->pci_rid), PCI_RID2SLOT(softc->pci_rid), PCI_RID2FUNC(softc->pci_rid), off, 4)); } diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index d8ea2442de23..7dd68d8aea95 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -649,7 +649,8 @@ ivhd_attach(device_t dev) softc->dev = dev; ivhd = ivhd_hdrs[unit]; KASSERT(ivhd, ("ivhd is NULL")); - softc->pci_dev = pci_find_bsf(PCI_RID2BUS(ivhd->Header.DeviceId), + softc->pci_dev = pci_find_dbsf(ivhd->PciSegmentGroup, + PCI_RID2BUS(ivhd->Header.DeviceId), PCI_RID2SLOT(ivhd->Header.DeviceId), PCI_RID2FUNC(ivhd->Header.DeviceId)); diff --git a/sys/arm64/acpica/pci_cfgreg.c b/sys/arm64/acpica/pci_cfgreg.c index d2972bd1579f..f35ae9d380d8 100644 --- a/sys/arm64/acpica/pci_cfgreg.c +++ b/sys/arm64/acpica/pci_cfgreg.c @@ -40,7 +40,7 @@ * Read configuration space register */ uint32_t -pci_cfgregread(int bus, int slot, int func, int reg, int bytes) +pci_cfgregread(int domain, int bus, int slot, int func, int reg, int bytes) { /* ARM64TODO */ @@ -52,7 +52,8 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes) * Write configuration space register */ void -pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes) +pci_cfgregwrite(int domain, int bus, int slot, int func, int reg, uint32_t data, + int bytes) { /* ARM64TODO */ diff --git a/sys/arm64/include/pci_cfgreg.h b/sys/arm64/include/pci_cfgreg.h index 2c34f62c00c8..579dcd954c9b 100644 --- a/sys/arm64/include/pci_cfgreg.h +++ b/sys/arm64/include/pci_cfgreg.h @@ -27,7 +27,7 @@ #define _MACHINE_PCI_CFGREG_H int pci_cfgregopen(void); -uint32_t pci_cfgregread(int, int, int, int, int); -void pci_cfgregwrite(int, int, int, int, u_int32_t, int); +uint32_t pci_cfgregread(int, int, int, int, int, int); +void pci_cfgregwrite(int, int, int, int, int, uint32_t, int); #endif /* !_MACHINE_PCI_CFGREG_H */ diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index b9c11454913b..fbaf76d2a91a 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -110,7 +110,7 @@ AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register, UINT64 *Value, if (!pci_cfgregopen()) return (AE_NOT_EXIST); - *(UINT64 *)Value = pci_cfgregread(PciId->Bus, PciId->Device, + *(UINT64 *)Value = pci_cfgregread(PciId->Segment, PciId->Bus, PciId->Device, PciId->Function, Register, Width / 8); return (AE_OK); @@ -132,8 +132,8 @@ AcpiOsWritePciConfiguration (ACPI_PCI_ID *PciId, UINT32 Register, if (!pci_cfgregopen()) return (AE_NOT_EXIST); - pci_cfgregwrite(PciId->Bus, PciId->Device, PciId->Function, Register, - Value, Width / 8); + pci_cfgregwrite(PciId->Segment, PciId->Bus, PciId->Device, PciId->Function, + Register, Value, Width / 8); return (AE_OK); #endif diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index f354441bfd86..dac07a07ae7d 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -572,16 +572,16 @@ fail: /* XXX: Note that this is identical to pci_pir_search_irq(). */ static uint8_t -acpi_pci_link_search_irq(int bus, int device, int pin) +acpi_pci_link_search_irq(int domain, int bus, int device, int pin) { uint32_t value; uint8_t func, maxfunc; /* See if we have a valid device at function 0. */ - value = pci_cfgregread(bus, device, 0, PCIR_VENDOR, 2); + value = pci_cfgregread(domain, bus, device, 0, PCIR_VENDOR, 2); if (value == PCIV_INVALID) return (PCI_INVALID_IRQ); - value = pci_cfgregread(bus, device, 0, PCIR_HDRTYPE, 1); + value = pci_cfgregread(domain, bus, device, 0, PCIR_HDRTYPE, 1); if ((value & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) return (PCI_INVALID_IRQ); if (value & PCIM_MFDEV) @@ -591,10 +591,12 @@ acpi_pci_link_search_irq(int bus, int device, int pin) /* Scan all possible functions at this device. */ for (func = 0; func <= maxfunc; func++) { - value = pci_cfgregread(bus, device, func, PCIR_VENDOR, 2); + value = pci_cfgregread(domain, bus, device, func, PCIR_VENDOR, + 2); if (value == PCIV_INVALID) continue; - value = pci_cfgregread(bus, device, func, PCIR_INTPIN, 1); + value = pci_cfgregread(domain, bus, device, func, PCIR_INTPIN, + 1); /* * See if it uses the pin in question. Note that the passed @@ -603,7 +605,8 @@ acpi_pci_link_search_irq(int bus, int device, int pin) */ if (value != pin + 1) continue; - value = pci_cfgregread(bus, device, func, PCIR_INTLINE, 1); + value = pci_cfgregread(domain, bus, device, func, PCIR_INTLINE, + 1); if (bootverbose) printf( "ACPI: Found matching pin for %d.%d.INT%c at func %d: %d\n", @@ -638,18 +641,22 @@ acpi_pci_link_add_reference(device_t dev, int index, device_t pcib, int slot, { struct link *link; uint8_t bios_irq; - uintptr_t bus; + uintptr_t bus, domain; /* - * Look up the PCI bus for the specified PCI bridge device. Note - * that the PCI bridge device might not have any children yet. - * However, looking up its bus number doesn't require a valid child - * device, so we just pass NULL. + * Look up the PCI domain and bus for the specified PCI bridge + * device. Note that the PCI bridge device might not have any + * children yet. However, looking up these IVARs doesn't + * require a valid child device, so we just pass NULL. */ if (BUS_READ_IVAR(pcib, NULL, PCIB_IVAR_BUS, &bus) != 0) { device_printf(pcib, "Unable to read PCI bus number"); panic("PCI bridge without a bus number"); } + if (BUS_READ_IVAR(pcib, NULL, PCIB_IVAR_DOMAIN, &domain) != 0) { + device_printf(pcib, "Unable to read PCI domain number"); + panic("PCI bridge without a domain number"); + } /* Bump the reference count. */ ACPI_SERIAL_BEGIN(pci_link); @@ -667,7 +674,7 @@ acpi_pci_link_add_reference(device_t dev, int index, device_t pcib, int slot, * The BIOS only routes interrupts via ISA IRQs using the ATPICs * (8259As). Thus, if this link is routed via an ISA IRQ, go * look to see if the BIOS routed an IRQ for this link at the - * indicated (bus, slot, pin). If so, we prefer that IRQ for + * indicated (domain, bus, slot, pin). If so, we prefer that IRQ for * this link and add that IRQ to our list of known-good IRQs. * This provides a good work-around for link devices whose _CRS * method is either broken or bogus. We only use the value @@ -684,7 +691,7 @@ acpi_pci_link_add_reference(device_t dev, int index, device_t pcib, int slot, } /* Try to find a BIOS IRQ setting from any matching devices. */ - bios_irq = acpi_pci_link_search_irq(bus, slot, pin); + bios_irq = acpi_pci_link_search_irq(domain, bus, slot, pin); if (!PCI_INTERRUPT_VALID(bios_irq)) { ACPI_SERIAL_END(pci_link); return; diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index a66ca1199af7..06e6bc233720 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -629,14 +629,18 @@ static uint32_t acpi_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) { - return (pci_cfgregread(bus, slot, func, reg, bytes)); + struct acpi_hpcib_softc *sc = device_get_softc(dev); + + return (pci_cfgregread(sc->ap_segment, bus, slot, func, reg, bytes)); } static void acpi_pcib_write_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, uint32_t data, int bytes) { - pci_cfgregwrite(bus, slot, func, reg, data, bytes); + struct acpi_hpcib_softc *sc = device_get_softc(dev); + + pci_cfgregwrite(sc->ap_segment, bus, slot, func, reg, data, bytes); } static int diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c index 117a22247998..ff36200bd299 100644 --- a/sys/dev/agp/agp_amd64.c +++ b/sys/dev/agp/agp_amd64.c @@ -118,10 +118,10 @@ static int agp_amd64_nvidia_match(uint16_t devid) { /* XXX nForce3 requires secondary AGP bridge at 0:11:0. */ - if (pci_cfgregread(0, 11, 0, PCIR_CLASS, 1) != PCIC_BRIDGE || - pci_cfgregread(0, 11, 0, PCIR_SUBCLASS, 1) != PCIS_BRIDGE_PCI || - pci_cfgregread(0, 11, 0, PCIR_VENDOR, 2) != 0x10de || - pci_cfgregread(0, 11, 0, PCIR_DEVICE, 2) != devid) + if (pci_cfgregread(0, 0, 11, 0, PCIR_CLASS, 1) != PCIC_BRIDGE || + pci_cfgregread(0, 0, 11, 0, PCIR_SUBCLASS, 1) != PCIS_BRIDGE_PCI || + pci_cfgregread(0, 0, 11, 0, PCIR_VENDOR, 2) != 0x10de || + pci_cfgregread(0, 0, 11, 0, PCIR_DEVICE, 2) != devid) return (ENXIO); return (0); @@ -131,11 +131,11 @@ static int agp_amd64_via_match(void) { /* XXX Some VIA bridge requires secondary AGP bridge at 0:1:0. */ - if (pci_cfgregread(0, 1, 0, PCIR_CLASS, 1) != PCIC_BRIDGE || - pci_cfgregread(0, 1, 0, PCIR_SUBCLASS, 1) != PCIS_BRIDGE_PCI || - pci_cfgregread(0, 1, 0, PCIR_VENDOR, 2) != 0x1106 || - pci_cfgregread(0, 1, 0, PCIR_DEVICE, 2) != 0xb188 || - (pci_cfgregread(0, 1, 0, AGP_VIA_AGPSEL, 1) & 2)) + if (pci_cfgregread(0, 0, 1, 0, PCIR_CLASS, 1) != PCIC_BRIDGE || + pci_cfgregread(0, 0, 1, 0, PCIR_SUBCLASS, 1) != PCIS_BRIDGE_PCI || + pci_cfgregread(0, 0, 1, 0, PCIR_VENDOR, 2) != 0x1106 || + pci_cfgregread(0, 0, 1, 0, PCIR_DEVICE, 2) != 0xb188 || + (pci_cfgregread(0, 0, 1, 0, AGP_VIA_AGPSEL, 1) & 2)) return (0); return (1); @@ -165,7 +165,7 @@ agp_amd64_attach(device_t dev) int i, n, error; for (i = 0, n = 0; i < PCI_SLOTMAX && n < AMD64_MAX_MCTRL; i++) { - devid = pci_cfgregread(0, i, 3, 0, 4); + devid = pci_cfgregread(0, 0, i, 3, 0, 4); if (devid == 0x11031022 || devid == 0x12031022) { sc->mctrl[n] = i; n++; @@ -227,11 +227,11 @@ agp_amd64_attach(device_t dev) /* Install the gatt and enable aperture. */ for (i = 0; i < sc->n_mctrl; i++) { - pci_cfgregwrite(0, sc->mctrl[i], 3, AGP_AMD64_ATTBASE, + pci_cfgregwrite(0, 0, sc->mctrl[i], 3, AGP_AMD64_ATTBASE, (uint32_t)(gatt->ag_physical >> 8) & AGP_AMD64_ATTBASE_MASK, 4); - pci_cfgregwrite(0, sc->mctrl[i], 3, AGP_AMD64_APCTRL, - (pci_cfgregread(0, sc->mctrl[i], 3, AGP_AMD64_APCTRL, 4) | + pci_cfgregwrite(0, 0, sc->mctrl[i], 3, AGP_AMD64_APCTRL, + (pci_cfgregread(0, 0, sc->mctrl[i], 3, AGP_AMD64_APCTRL, 4) | AGP_AMD64_APCTRL_GARTEN) & ~(AGP_AMD64_APCTRL_DISGARTCPU | AGP_AMD64_APCTRL_DISGARTIO), 4); @@ -249,8 +249,8 @@ agp_amd64_detach(device_t dev) agp_free_cdev(dev); for (i = 0; i < sc->n_mctrl; i++) - pci_cfgregwrite(0, sc->mctrl[i], 3, AGP_AMD64_APCTRL, - pci_cfgregread(0, sc->mctrl[i], 3, AGP_AMD64_APCTRL, 4) & + pci_cfgregwrite(0, 0, sc->mctrl[i], 3, AGP_AMD64_APCTRL, + pci_cfgregread(0, 0, sc->mctrl[i], 3, AGP_AMD64_APCTRL, 4) & ~AGP_AMD64_APCTRL_GARTEN, 4); AGP_SET_APERTURE(dev, sc->initial_aperture); @@ -278,7 +278,7 @@ agp_amd64_get_aperture(device_t dev) struct agp_amd64_softc *sc = device_get_softc(dev); uint32_t i; - i = (pci_cfgregread(0, sc->mctrl[0], 3, AGP_AMD64_APCTRL, 4) & + i = (pci_cfgregread(0, 0, sc->mctrl[0], 3, AGP_AMD64_APCTRL, 4) & AGP_AMD64_APCTRL_SIZE_MASK) >> 1; if (i >= AGP_AMD64_TABLE_SIZE) @@ -301,8 +301,8 @@ agp_amd64_set_aperture(device_t dev, uint32_t aperture) return (EINVAL); for (j = 0; j < sc->n_mctrl; j++) - pci_cfgregwrite(0, sc->mctrl[j], 3, AGP_AMD64_APCTRL, - (pci_cfgregread(0, sc->mctrl[j], 3, AGP_AMD64_APCTRL, 4) & + pci_cfgregwrite(0, 0, sc->mctrl[j], 3, AGP_AMD64_APCTRL, + (pci_cfgregread(0, 0, sc->mctrl[j], 3, AGP_AMD64_APCTRL, 4) & ~(AGP_AMD64_APCTRL_SIZE_MASK)) | (i << 1), 4); switch (pci_get_vendor(dev)) { @@ -356,10 +356,15 @@ agp_amd64_flush_tlb(device_t dev) struct agp_amd64_softc *sc = device_get_softc(dev); int i; - for (i = 0; i < sc->n_mctrl; i++) - pci_cfgregwrite(0, sc->mctrl[i], 3, AGP_AMD64_CACHECTRL, - pci_cfgregread(0, sc->mctrl[i], 3, AGP_AMD64_CACHECTRL, 4) | - AGP_AMD64_CACHECTRL_INVGART, 4); + for (i = 0; i < sc->n_mctrl; i++) { + uint32_t val; + + val = pci_cfgregread(0, 0, sc->mctrl[i], 3, AGP_AMD64_CACHECTRL, + 4); + val |= AGP_AMD64_CACHECTRL_INVGART; + pci_cfgregwrite(0, 0, sc->mctrl[i], 3, AGP_AMD64_CACHECTRL, val, + 4); + } } static void @@ -372,7 +377,7 @@ agp_amd64_apbase_fixup(device_t dev) sc->apbase = rman_get_start(sc->agp.as_aperture); apbase = (sc->apbase >> 25) & AGP_AMD64_APBASE_MASK; for (i = 0; i < sc->n_mctrl; i++) - pci_cfgregwrite(0, sc->mctrl[i], 3, + pci_cfgregwrite(0, 0, sc->mctrl[i], 3, AGP_AMD64_APBASE, apbase, 4); } @@ -418,8 +423,8 @@ agp_amd64_nvidia_init(device_t dev) pci_write_config(dev, AGP_AMD64_NVIDIA_0_APBASE, (pci_read_config(dev, AGP_AMD64_NVIDIA_0_APBASE, 4) & 0x0000000f) | sc->apbase, 4); - pci_cfgregwrite(0, 11, 0, AGP_AMD64_NVIDIA_1_APBASE1, sc->apbase, 4); - pci_cfgregwrite(0, 11, 0, AGP_AMD64_NVIDIA_1_APBASE2, sc->apbase, 4); + pci_cfgregwrite(0, 0, 11, 0, AGP_AMD64_NVIDIA_1_APBASE1, sc->apbase, 4); + pci_cfgregwrite(0, 0, 11, 0, AGP_AMD64_NVIDIA_1_APBASE2, sc->apbase, 4); } static int @@ -438,12 +443,12 @@ agp_amd64_nvidia_set_aperture(device_t dev, uint32_t aperture) return (EINVAL); } - pci_cfgregwrite(0, 11, 0, AGP_AMD64_NVIDIA_1_APSIZE, - (pci_cfgregread(0, 11, 0, AGP_AMD64_NVIDIA_1_APSIZE, 4) & + pci_cfgregwrite(0, 0, 11, 0, AGP_AMD64_NVIDIA_1_APSIZE, + (pci_cfgregread(0, 0, 11, 0, AGP_AMD64_NVIDIA_1_APSIZE, 4) & 0xfffffff0) | apsize, 4); - pci_cfgregwrite(0, 11, 0, AGP_AMD64_NVIDIA_1_APLIMIT1, + pci_cfgregwrite(0, 0, 11, 0, AGP_AMD64_NVIDIA_1_APLIMIT1, sc->apbase + aperture - 1, 4); - pci_cfgregwrite(0, 11, 0, AGP_AMD64_NVIDIA_1_APLIMIT2, + pci_cfgregwrite(0, 0, 11, 0, AGP_AMD64_NVIDIA_1_APLIMIT2, sc->apbase + aperture - 1, 4); return (0); @@ -455,9 +460,9 @@ agp_amd64_via_init(device_t dev) struct agp_amd64_softc *sc = device_get_softc(dev); agp_amd64_apbase_fixup(dev); - pci_cfgregwrite(0, 1, 0, AGP3_VIA_ATTBASE, sc->gatt->ag_physical, 4); - pci_cfgregwrite(0, 1, 0, AGP3_VIA_GARTCTRL, - pci_cfgregread(0, 1, 0, AGP3_VIA_ATTBASE, 4) | 0x180, 4); + pci_cfgregwrite(0, 0, 1, 0, AGP3_VIA_ATTBASE, sc->gatt->ag_physical, 4); + pci_cfgregwrite(0, 0, 1, 0, AGP3_VIA_GARTCTRL, + pci_cfgregread(0, 0, 1, 0, AGP3_VIA_ATTBASE, 4) | 0x180, 4); } static int @@ -468,7 +473,7 @@ agp_amd64_via_set_aperture(device_t dev, uint32_t aperture) apsize = ((aperture - 1) >> 20) ^ 0xff; if ((((apsize ^ 0xff) << 20) | ((1 << 20) - 1)) + 1 != aperture) return (EINVAL); - pci_cfgregwrite(0, 1, 0, AGP3_VIA_APSIZE, apsize, 1); + pci_cfgregwrite(0, 0, 1, 0, AGP3_VIA_APSIZE, apsize, 1); return (0); } diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index 1b66bde0bdad..865804bdc96e 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -434,8 +434,9 @@ amdtemp_attach(device_t dev) erratum319 = 1; break; case 1: /* Socket AM2+ or AM3 */ - if ((pci_cfgregread(pci_get_bus(dev), - pci_get_slot(dev), 2, AMDTEMP_DRAM_CONF_HIGH, 2) & + if ((pci_cfgregread(pci_get_domain(dev), + pci_get_bus(dev), pci_get_slot(dev), 2, + AMDTEMP_DRAM_CONF_HIGH, 2) & AMDTEMP_DRAM_MODE_DDR3) != 0 || model > 0x04 || (model == 0x04 && (cpuid & CPUID_STEPPING) >= 3)) break; diff --git a/sys/dev/hpt27xx/hpt27xx_os_bsd.c b/sys/dev/hpt27xx/hpt27xx_os_bsd.c index ebd58e771462..f4bbcfd11e82 100644 --- a/sys/dev/hpt27xx/hpt27xx_os_bsd.c +++ b/sys/dev/hpt27xx/hpt27xx_os_bsd.c @@ -90,19 +90,19 @@ BUS_ADDRESS get_dmapool_phy_addr(void *osext, void * dmapool_virt_addr) /* PCI space access */ HPT_U8 pcicfg_read_byte (HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg) { - return (HPT_U8)pci_cfgregread(bus, dev, func, reg, 1); + return (HPT_U8)pci_cfgregread(0, bus, dev, func, reg, 1); } HPT_U32 pcicfg_read_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg) { - return (HPT_U32)pci_cfgregread(bus, dev, func, reg, 4); + return (HPT_U32)pci_cfgregread(0, bus, dev, func, reg, 4); } void pcicfg_write_byte (HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg, HPT_U8 v) { - pci_cfgregwrite(bus, dev, func, reg, v, 1); + pci_cfgregwrite(0, bus, dev, func, reg, v, 1); } void pcicfg_write_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg, HPT_U32 v) { - pci_cfgregwrite(bus, dev, func, reg, v, 4); + pci_cfgregwrite(0, bus, dev, func, reg, v, 4); }/* PCI space access */ void *os_map_pci_bar( diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c index 7eb7dbc8fc72..32d3e465c569 100644 --- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c +++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c @@ -75,6 +75,11 @@ static int hpt_attach(device_t dev) PVBUS vbus; PVBUS_EXT vbus_ext; + if (pci_get_domain(dev) != 0) { + device_printf(dev, "does not support PCI domains\n"); + return (ENXIO); + } + KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev))); him = hpt_match(dev, 1); diff --git a/sys/dev/hptnr/hptnr_os_bsd.c b/sys/dev/hptnr/hptnr_os_bsd.c index 62b852ddb6af..59f6fb651db9 100644 --- a/sys/dev/hptnr/hptnr_os_bsd.c +++ b/sys/dev/hptnr/hptnr_os_bsd.c @@ -88,7 +88,7 @@ BUS_ADDRESS get_dmapool_phy_addr(void *osext, void * dmapool_virt_addr) HPT_U32 pcicfg_read_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg) { - return (HPT_U32)pci_cfgregread(bus, dev, func, reg, 4); + return (HPT_U32)pci_cfgregread(0, bus, dev, func, reg, 4); }/* PCI space access */ void *os_map_pci_bar( diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c index c1c908b62c9d..00774bf9be4a 100644 --- a/sys/dev/hptnr/hptnr_osm_bsd.c +++ b/sys/dev/hptnr/hptnr_osm_bsd.c @@ -77,6 +77,11 @@ static int hpt_attach(device_t dev) PVBUS vbus; PVBUS_EXT vbus_ext; + if (pci_get_domain(dev) != 0) { + device_printf(dev, "does not support PCI domains\n"); + return (ENXIO); + } + KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev))); him = hpt_match(dev, 1); diff --git a/sys/dev/ichwd/ichwd.c b/sys/dev/ichwd/ichwd.c index cdba8319daea..cade2cc4fb45 100644 --- a/sys/dev/ichwd/ichwd.c +++ b/sys/dev/ichwd/ichwd.c @@ -698,12 +698,12 @@ ichwd_identify(driver_t *driver, device_t parent) * Space via the bridge's BAR. * Then hide back the bridge. */ - pci_cfgregwrite(0, 31, 1, 0xe1, 0, 1); - base_address64 = pci_cfgregread(0, 31, 1, SBREG_BAR + 4, 4); + pci_cfgregwrite(0, 0, 31, 1, 0xe1, 0, 1); + base_address64 = pci_cfgregread(0, 0, 31, 1, SBREG_BAR + 4, 4); base_address64 <<= 32; - base_address64 |= pci_cfgregread(0, 31, 1, SBREG_BAR, 4); + base_address64 |= pci_cfgregread(0, 0, 31, 1, SBREG_BAR, 4); base_address64 &= ~0xfull; - pci_cfgregwrite(0, 31, 1, 0xe1, 1, 1); + pci_cfgregwrite(0, 0, 31, 1, 0xe1, 1, 1); /* * No Reboot bit is in General Control register, offset 0xc, diff --git a/sys/dev/ipmi/ipmi_isa.c b/sys/dev/ipmi/ipmi_isa.c index 6c8be8616ddf..432c63b327ee 100644 --- a/sys/dev/ipmi/ipmi_isa.c +++ b/sys/dev/ipmi/ipmi_isa.c @@ -66,7 +66,7 @@ ipmi_isa_identify(driver_t *driver, device_t parent) * create an isa ipmi device. For now we hardcode the list * of bus, device, function tuples. */ - devid = pci_cfgregread(0, 4, 2, PCIR_DEVVENDOR, 4); + devid = pci_cfgregread(0, 0, 4, 2, PCIR_DEVVENDOR, 4); if (devid != 0xffffffff && ipmi_pci_match(devid & 0xffff, devid >> 16) != NULL) return; diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c index c869959da73d..71485875ebe3 100644 --- a/sys/dev/pci/pci_subr.c +++ b/sys/dev/pci/pci_subr.c @@ -53,7 +53,7 @@ host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, { uint32_t id; - id = read_config(bus, slot, func, PCIR_DEVVENDOR, 4); + id = read_config(0, bus, slot, func, PCIR_DEVVENDOR, 4); if (id == 0xffffffff) return (0); @@ -61,12 +61,12 @@ host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, case 0x12258086: /* Intel 824?? */ /* XXX This is a guess */ - /* *busnum = read_config(bus, slot, func, 0x41, 1); */ + /* *busnum = read_config(0, bus, slot, func, 0x41, 1); */ *busnum = bus; break; case 0x84c48086: /* Intel 82454KX/GX (Orion) */ - *busnum = read_config(bus, slot, func, 0x4a, 1); + *busnum = read_config(0, bus, slot, func, 0x4a, 1); break; case 0x84ca8086: /* @@ -85,19 +85,19 @@ host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, switch (slot) { case 0x12: /* Intel 82454NX PXB#0, Bus#A */ - *busnum = read_config(bus, 0x10, func, 0xd0, 1); + *busnum = read_config(0, bus, 0x10, func, 0xd0, 1); break; case 0x13: /* Intel 82454NX PXB#0, Bus#B */ - *busnum = read_config(bus, 0x10, func, 0xd1, 1) + 1; + *busnum = read_config(0, bus, 0x10, func, 0xd1, 1) + 1; break; case 0x14: /* Intel 82454NX PXB#1, Bus#A */ - *busnum = read_config(bus, 0x10, func, 0xd3, 1); + *busnum = read_config(0, bus, 0x10, func, 0xd3, 1); break; case 0x15: /* Intel 82454NX PXB#1, Bus#B */ - *busnum = read_config(bus, 0x10, func, 0xd4, 1) + 1; + *busnum = read_config(0, bus, 0x10, func, 0xd4, 1) + 1; break; } break; @@ -116,12 +116,12 @@ host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, case 0x02011166: case 0x02251166: case 0x03021014: - *busnum = read_config(bus, slot, func, 0x44, 1); + *busnum = read_config(0, bus, slot, func, 0x44, 1); break; /* Compaq/HP -- vendor 0x0e11 */ case 0x60100e11: - *busnum = read_config(bus, slot, func, 0xc8, 1); + *busnum = read_config(0, bus, slot, func, 0xc8, 1); break; default: /* Don't know how to read bus number. */ diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h index e1e15caa17e4..cf689026a033 100644 --- a/sys/dev/pci/pcib_private.h +++ b/sys/dev/pci/pcib_private.h @@ -148,7 +148,8 @@ struct pcib_softc #define PCIB_SUPPORTED_ARI_VER 1 -typedef uint32_t pci_read_config_fn(int b, int s, int f, int reg, int width); +typedef uint32_t pci_read_config_fn(int d, int b, int s, int f, int reg, + int width); int host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, uint8_t *busnum); diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index 35710510fbbb..fa7f31c22eb3 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -74,15 +74,15 @@ static int mcfg_enable = 1; SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0, "Enable support for PCI-e memory mapped config access"); -static uint32_t pci_docfgregread(int bus, int slot, int func, int reg, - int bytes); +static uint32_t pci_docfgregread(int domain, int bus, int slot, int func, + int reg, int bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); static int pcireg_cfgopen(void); -static int pciereg_cfgread(int bus, unsigned slot, unsigned func, - unsigned reg, unsigned bytes); -static void pciereg_cfgwrite(int bus, unsigned slot, unsigned func, - unsigned reg, int data, unsigned bytes); +static int pciereg_cfgread(int domain, int bus, unsigned slot, + unsigned func, unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(int domain, int bus, unsigned slot, + unsigned func, unsigned reg, int data, unsigned bytes); /* * Some BIOS writers seem to want to ignore the spec and put @@ -150,22 +150,25 @@ pci_cfgregopen(void) } static uint32_t -pci_docfgregread(int bus, int slot, int func, int reg, int bytes) +pci_docfgregread(int domain, int bus, int slot, int func, int reg, int bytes) { + if (domain == 0 && bus == 0 && (1 << slot & pcie_badslots) != 0) + return (pcireg_cfgread(bus, slot, func, reg, bytes)); if (cfgmech == CFGMECH_PCIE && - (bus >= pcie_minbus && bus <= pcie_maxbus) && - (bus != 0 || !(1 << slot & pcie_badslots))) - return (pciereg_cfgread(bus, slot, func, reg, bytes)); - else + (bus >= pcie_minbus && bus <= pcie_maxbus)) + return (pciereg_cfgread(domain, bus, slot, func, reg, bytes)); + else if (domain == 0) return (pcireg_cfgread(bus, slot, func, reg, bytes)); + else + return (-1); } /* * Read configuration space register */ u_int32_t -pci_cfgregread(int bus, int slot, int func, int reg, int bytes) +pci_cfgregread(int domain, int bus, int slot, int func, int reg, int bytes) { uint32_t line; @@ -175,24 +178,29 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes) * the code uses 255 as an invalid IRQ. */ if (reg == PCIR_INTLINE && bytes == 1) { - line = pci_docfgregread(bus, slot, func, PCIR_INTLINE, 1); + line = pci_docfgregread(domain, bus, slot, func, PCIR_INTLINE, + 1); return (pci_i386_map_intline(line)); } - return (pci_docfgregread(bus, slot, func, reg, bytes)); + return (pci_docfgregread(domain, bus, slot, func, reg, bytes)); } /* * Write configuration space register */ void -pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes) +pci_cfgregwrite(int domain, int bus, int slot, int func, int reg, uint32_t data, + int bytes) { + if (domain == 0 && bus == 0 && (1 << slot & pcie_badslots) != 0) { + pcireg_cfgwrite(bus, slot, func, reg, data, bytes); + return; + } if (cfgmech == CFGMECH_PCIE && - (bus >= pcie_minbus && bus <= pcie_maxbus) && - (bus != 0 || !(1 << slot & pcie_badslots))) - pciereg_cfgwrite(bus, slot, func, reg, data, bytes); - else + (bus >= pcie_minbus && bus <= pcie_maxbus)) + pciereg_cfgwrite(domain, bus, slot, func, reg, data, bytes); + else if (domain == 0) pcireg_cfgwrite(bus, slot, func, reg, data, bytes); } @@ -505,7 +513,7 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) if (val1 == 0xffffffff) continue; - val2 = pciereg_cfgread(0, slot, 0, 0, 4); + val2 = pciereg_cfgread(0, 0, slot, 0, 0, 4); if (val2 != val1) pcie_badslots |= (1 << slot); } @@ -569,14 +577,14 @@ pciereg_findaddr(int bus, unsigned slot, unsigned func, unsigned reg) */ static int -pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, +pciereg_cfgread(int domain, int bus, unsigned slot, unsigned func, unsigned reg, unsigned bytes) { vm_offset_t va; int data = -1; - if (bus < pcie_minbus || bus > pcie_maxbus || slot > PCI_SLOTMAX || - func > PCI_FUNCMAX || reg > PCIE_REGMAX) + if (domain != 0 || bus < pcie_minbus || bus > pcie_maxbus || + slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) return (-1); critical_enter(); @@ -602,13 +610,13 @@ pciereg_cfgread(int bus, unsigned slot, unsigned func, unsigned reg, } static void -pciereg_cfgwrite(int bus, unsigned slot, unsigned func, unsigned reg, int data, - unsigned bytes) +pciereg_cfgwrite(int domain, int bus, unsigned slot, unsigned func, + unsigned reg, int data, unsigned bytes) { vm_offset_t va; - if (bus < pcie_minbus || bus > pcie_maxbus || slot > PCI_SLOTMAX || - func > PCI_FUNCMAX || reg > PCIE_REGMAX) + if (domain != 0 || bus < pcie_minbus || bus > pcie_maxbus || + slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) return; critical_enter(); diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index b9325de01fa6..6750e85deb40 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -264,10 +264,10 @@ pci_pir_search_irq(int bus, int device, int pin) uint8_t func, maxfunc; /* See if we have a valid device at function 0. */ - value = pci_cfgregread(bus, device, 0, PCIR_VENDOR, 2); + value = pci_cfgregread(0, bus, device, 0, PCIR_VENDOR, 2); if (value == PCIV_INVALID) return (PCI_INVALID_IRQ); - value = pci_cfgregread(bus, device, 0, PCIR_HDRTYPE, 1); + value = pci_cfgregread(0, bus, device, 0, PCIR_HDRTYPE, 1); if ((value & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) return (PCI_INVALID_IRQ); if (value & PCIM_MFDEV) @@ -277,10 +277,10 @@ pci_pir_search_irq(int bus, int device, int pin) /* Scan all possible functions at this device. */ for (func = 0; func <= maxfunc; func++) { - value = pci_cfgregread(bus, device, func, PCIR_VENDOR, 2); + value = pci_cfgregread(0, bus, device, func, PCIR_VENDOR, 2); if (value == PCIV_INVALID) continue; - value = pci_cfgregread(bus, device, func, PCIR_INTPIN, 1); + value = pci_cfgregread(0, bus, device, func, PCIR_INTPIN, 1); /* * See if it uses the pin in question. Note that the passed @@ -289,7 +289,7 @@ pci_pir_search_irq(int bus, int device, int pin) */ if (value != pin + 1) continue; - value = pci_cfgregread(bus, device, func, PCIR_INTLINE, 1); + value = pci_cfgregread(0, bus, device, func, PCIR_INTLINE, 1); if (bootverbose) printf( "$PIR: Found matching pin for %d.%d.INT%c at func %d: %d\n", diff --git a/sys/x86/include/pci_cfgreg.h b/sys/x86/include/pci_cfgreg.h index 890d7233f658..370113b9d7bd 100644 --- a/sys/x86/include/pci_cfgreg.h +++ b/sys/x86/include/pci_cfgreg.h @@ -58,8 +58,8 @@ extern int cfgmech; rman_res_t hostb_alloc_start(int type, rman_res_t start, rman_res_t end, rman_res_t count); int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); -u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); -void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); +u_int32_t pci_cfgregread(int domain, int bus, int slot, int func, int reg, int bytes); +void pci_cfgregwrite(int domain, int bus, int slot, int func, int reg, u_int32_t data, int bytes); #ifdef __HAVE_PIR void pci_pir_open(void); int pci_pir_probe(int bus, int require_parse); diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index ebdf24976504..aa3297fef253 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -969,7 +969,7 @@ dmar_path_dev(int segment, int path_len, int busno, dev = pci_find_dbsf(segment, busno, path->Device, path->Function); if (i != path_len - 1) { - busno = pci_cfgregread(busno, path->Device, + busno = pci_cfgregread(segment, busno, path->Device, *** 224 LINES SKIPPED *** From nobody Wed Nov 29 18:34:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgSfX1QDKz534qk; Wed, 29 Nov 2023 18:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgSfW5q0Nz4LZ5; Wed, 29 Nov 2023 18:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701282883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hBSYFaSZuJAUumZe7x60J6Ar/senOxbvJkhI8FQ8kgo=; b=PCqJNqnxD05UqfeUNsZF9tC8uT7DZp8/UK8OcaynF8rMLW5t1ZBrKy2lgrxp9F57KaY8P0 8WN4cZMq3J8t9l6/A+XjBvsUFkLp5lYRa65G/Ph0srjzYPOM1cyHCwqzqLbm6TdcvOhMtO J5Nhvkd5FAZhXn44uluyrRApwNwL9SM8nm3wWEJyoXgE0CTO1j+hO+H+ZVYelJq7mtH09f jLoasUWoL81FQBR6c8qRaoBdM+B6pox6rVFJk7hwp7of4WPck7Z9ZtAEPBWEPr6eeg8aaN XXsqN+DFl1PjSTB03fwrfaV5s//s60kASEiHHQakQbbxrFZacX+P8/En93zcoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701282883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hBSYFaSZuJAUumZe7x60J6Ar/senOxbvJkhI8FQ8kgo=; b=TXSF+qs5fmDRIXlNJVhnz1YqkeyF/NOayaS0ZaSfN5qraW56ScwrD/hfsiFIyHm5uBOQtQ DWOfJmEnliNRuts3eexLHbOlhoqbumL6fg9UYltj5PPSVSGUo0AAZPxzjXQ9n1+pT8ip3t 1p3we9l9L88LNGrW1pSl7Cz5SCm5eqpxxHQIywaasu5N2tWihmW6gZKAopy+SwOozgTunI HnLXKVNKMP/e9BJiY/djrUwln7CSMu+pMSX4Ee8BKffePObchwdNmYePUjxmEdmIdIVPXh okucrfxJjRiRd2T2Rw+kghFH3OlCsU1nXCRu3gn/T7mX+gCX9Ga24Xiexb8QJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701282883; a=rsa-sha256; cv=none; b=iK9U0er+YxZTd3A7vFSRMlYKb64vPGtPfZtcUK0ZaFAHKvc6JdbJ4YJtAIEn1ZB2jPEqL0 4SZxUj97/KnlRc86Y0UfVje7b0JlB+tM0VP2BiNXE/AobiVZlIBBHPL/Im3/Nmrm+jDZvI EC5fUXu9ogpiHSeg8zVmgnJ+OXCb5sHdausF5x3mLdO88fMu+WBCZcgTisK8axU4IkV3fS fVF06FqqA9m9FUWlXJen8vd16PjjoLkHJk3TB6cLkq696ZCPLqZGApBjh+FWPQSWxj1LRZ KtiY2qy19dinUS15bF7PuAbU+MurXz0lj6OvBkXLjHKRRvmEpEteDW5MmAjZKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgSfW4rklz2cQ; Wed, 29 Nov 2023 18:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATIYhZQ048350; Wed, 29 Nov 2023 18:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATIYh3R048347; Wed, 29 Nov 2023 18:34:43 GMT (envelope-from git) Date: Wed, 29 Nov 2023 18:34:43 GMT Message-Id: <202311291834.3ATIYh3R048347@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: 9893a4fd31fa - main - x86: Refactor pcie_cfgregopen List-Id: Commit messages for the main 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: 9893a4fd31fa4b2e19a7b9cf786f49b9de50b407 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9893a4fd31fa4b2e19a7b9cf786f49b9de50b407 commit 9893a4fd31fa4b2e19a7b9cf786f49b9de50b407 Author: John Baldwin AuthorDate: 2023-11-29 18:32:16 +0000 Commit: John Baldwin CommitDate: 2023-11-29 18:32:16 +0000 x86: Refactor pcie_cfgregopen Split out some bits of pcie_cfgregopen that only need to be executed once into helper functions in preparation for supporting multiple MCFG entries. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D42829 --- sys/amd64/pci/pci_cfgreg.c | 43 +++++++++++++++----------- sys/i386/pci/pci_cfgreg.c | 75 ++++++++++++++++++++++++++++------------------ 2 files changed, 71 insertions(+), 47 deletions(-) diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index 452c5898e959..6fd58fdc0e56 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -216,28 +216,12 @@ pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes) mtx_unlock_spin(&pcicfg_mtx); } -int -pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +static void +pcie_init_badslots(void) { uint32_t val1, val2; int slot; - if (!mcfg_enable) - return (0); - - if (minbus != 0) - return (0); - - if (bootverbose) - printf("PCIe: Memory Mapped configuration base @ 0x%lx\n", - base); - - /* XXX: We should make sure this really fits into the direct map. */ - pcie_base = (vm_offset_t)pmap_mapdev_pciecfg(base, (maxbus + 1) << 20); - pcie_minbus = minbus; - pcie_maxbus = maxbus; - cfgmech = CFGMECH_PCIE; - /* * On some AMD systems, some of the devices on bus 0 are * inaccessible using memory-mapped PCI config access. Walk @@ -255,6 +239,29 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) pcie_badslots |= (1 << slot); } } +} + +int +pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +{ + + if (!mcfg_enable) + return (0); + + if (minbus != 0) + return (0); + + if (bootverbose) + printf("PCIe: Memory Mapped configuration base @ 0x%lx\n", + base); + + /* XXX: We should make sure this really fits into the direct map. */ + pcie_base = (vm_offset_t)pmap_mapdev_pciecfg(base, (maxbus + 1) << 20); + pcie_minbus = minbus; + pcie_maxbus = maxbus; + cfgmech = CFGMECH_PCIE; + + pcie_init_badslots(); return (1); } diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index fa7f31c22eb3..e63c510a4c5b 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -436,8 +436,8 @@ pcireg_cfgopen(void) return (cfgmech); } -int -pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +static bool +pcie_init_cache(void) { struct pcie_cfg_list *pcielist; struct pcie_cfg_elem *pcie_array, *elem; @@ -445,26 +445,7 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) struct pcpu *pc; #endif vm_offset_t va; - uint32_t val1, val2; - int i, slot; - - if (!mcfg_enable) - return (0); - - if (minbus != 0) - return (0); - - if (!pae_mode && base >= 0x100000000) { - if (bootverbose) - printf( - "PCI: Memory Mapped PCI configuration area base 0x%jx too high\n", - (uintmax_t)base); - return (0); - } - - if (bootverbose) - printf("PCIe: Memory Mapped configuration base @ 0x%jx\n", - (uintmax_t)base); + int i; #ifdef SMP STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) @@ -473,12 +454,12 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) pcie_array = malloc(sizeof(struct pcie_cfg_elem) * PCIE_CACHE, M_DEVBUF, M_NOWAIT); if (pcie_array == NULL) - return (0); + return (false); va = kva_alloc(PCIE_CACHE * PAGE_SIZE); if (va == 0) { free(pcie_array, M_DEVBUF); - return (0); + return (false); } #ifdef SMP @@ -494,12 +475,14 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) TAILQ_INSERT_HEAD(pcielist, elem, elem); } } + return (true); +} - pcie_base = base; - pcie_minbus = minbus; - pcie_maxbus = maxbus; - cfgmech = CFGMECH_PCIE; - devmax = 32; +static void +pcie_init_badslots(void) +{ + uint32_t val1, val2; + int slot; /* * On some AMD systems, some of the devices on bus 0 are @@ -518,6 +501,40 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) pcie_badslots |= (1 << slot); } } +} + +int +pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +{ + + if (!mcfg_enable) + return (0); + + if (minbus != 0) + return (0); + + if (!pae_mode && base >= 0x100000000) { + if (bootverbose) + printf( + "PCI: Memory Mapped PCI configuration area base 0x%jx too high\n", + (uintmax_t)base); + return (0); + } + + if (bootverbose) + printf("PCIe: Memory Mapped configuration base @ 0x%jx\n", + (uintmax_t)base); + + if (!pcie_init_cache()) + return (0); + + pcie_base = base; + pcie_minbus = minbus; + pcie_maxbus = maxbus; + cfgmech = CFGMECH_PCIE; + devmax = 32; + + pcie_init_badslots(); return (1); } From nobody Wed Nov 29 18:34:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgSfY03srz534hs; Wed, 29 Nov 2023 18:34: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 4SgSfX6qQ3z4LMc; Wed, 29 Nov 2023 18:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701282884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zv7eSbUluyaDarBAQU3qdpmq5rhC7IFcU1F8JLUyaWk=; b=XV41a0kfXGqfsVTLlINzpe3xygugOHvJqVGRxi1vl97gdKy2Cb6iyeJTKoe+CBLzmTpYja uyY5CZ6PKL/Yhng1NG2cdbSz8BzWSRMqMEjAy2hHUgP043hGVmuMzMxDYATcul1VpCsQi6 7JsxmWBtHSHgeKGUHhgIcYKJZEgn9oivHTIeXQv6+Abs74CVbObWlX4H5u6JOeUeCCtcMD CGstJsYl5MS8MUNpa4k/SNoNFq52cygNJtANGsaNkQe8tA+VjhOn/yYBjleOJTnxuDpXnk aOWTN3Rqk6R/PIhTaAz58P1EHTEQ/UkblI8S5iXZ8Taqpavsgjq6z2S11ie1CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701282884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zv7eSbUluyaDarBAQU3qdpmq5rhC7IFcU1F8JLUyaWk=; b=cZ0+teLrcJeOKL4oPMc0EfCIc6jerG3CQu+LhjgruH8h5AasLsdCaxM7Q6RONxeUT8Ij4/ 0pW5a0dmyvH4d3DvJXPwd99waeuD+LKHDw9NOYnQTxuU/rxA3n6+O2KWx8z7cYnm7CVBTP NfoJsu7kKD++0toD6C2vTmM3GxvNcYZlYmCfDRNJpqIcJG6AI9iUG2J6+6EFu8gdqPbibE xvJa49+otoQfzK4SbGY0tGCWvJtXW8PVs2DX1wLQNkKRKSopjz68gQ2M/d86VZ+r/Ieqm+ 9QdcNMNF+td81JhoJIRMMrnpxqEpIQbL9AfBkeo3dvUipsdQXv2x65O26Ncx6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701282884; a=rsa-sha256; cv=none; b=efpyxzvXhksWVjxD3CG/nMWc2kILUrYphbR7Ai5GlgtDFN9mlLZfwjJet5TJ0ocL2dwV6y J1oKpgC4BeTWxDxLXx0mxYNnHtILtBf6sJoCnrX8R7r0bxb9qE/XHi0FkV4oCvWnjt3X4U OIpHmH+6nxsBut711MVOuAXXffOf1gbXfv+PURM6zF2e83zV10Q5lxmrOEsv6BK6LvH4yZ Si/PRWZ9ZDrPf1m9Wkt7uKbg6cfJIiVRU86NpLGhqZzkdbCpmDJUcjmhXXCIIN0NAz7mh5 UJUQhSZyu2/C5c/fGm+tIYihQ8zPeN0yiGgcHcEOKfKX2rdRWzJ0lqib/HBnfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgSfX5t78z2cR; Wed, 29 Nov 2023 18:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATIYini048406; Wed, 29 Nov 2023 18:34:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATIYiGl048403; Wed, 29 Nov 2023 18:34:44 GMT (envelope-from git) Date: Wed, 29 Nov 2023 18:34:44 GMT Message-Id: <202311291834.3ATIYiGl048403@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: f54a3890b1f4 - main - x86: Support multiple PCI MCFG 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: f54a3890b1f419d4a9edc99000efef52b9071b8f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f54a3890b1f419d4a9edc99000efef52b9071b8f commit f54a3890b1f419d4a9edc99000efef52b9071b8f Author: John Baldwin AuthorDate: 2023-11-29 18:32:39 +0000 Commit: John Baldwin CommitDate: 2023-11-29 18:32:39 +0000 x86: Support multiple PCI MCFG regions In particular, this enables support for PCI config access for domains (segments) other than 0. Reported by: cperciva Tested by: cperciva (m7i.metal-48xl AWS instance) Reviewed by: imp Relnotes: yes Differential Revision: https://reviews.freebsd.org/D42828 --- sys/amd64/pci/pci_cfgreg.c | 122 ++++++++++++++++++++++++++------------- sys/dev/acpica/acpi.c | 7 +-- sys/i386/pci/pci_cfgreg.c | 133 ++++++++++++++++++++++++++++++------------- sys/x86/include/pci_cfgreg.h | 2 +- sys/x86/x86/legacy.c | 4 +- 5 files changed, 181 insertions(+), 87 deletions(-) diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index 6fd58fdc0e56..21e8d9c21228 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -41,12 +42,21 @@ #include #include +struct pcie_mcfg_region { + char *base; + uint16_t domain; + uint8_t minbus; + uint8_t maxbus; +}; + static uint32_t pci_docfgregread(int domain, int bus, int slot, int func, int reg, int bytes); -static int pciereg_cfgread(int domain, int bus, unsigned slot, - unsigned func, unsigned reg, unsigned bytes); -static void pciereg_cfgwrite(int domain, int bus, unsigned slot, - unsigned func, unsigned reg, int data, unsigned bytes); +static struct pcie_mcfg_region *pcie_lookup_region(int domain, int bus); +static int pciereg_cfgread(struct pcie_mcfg_region *region, int bus, + unsigned slot, unsigned func, unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(struct pcie_mcfg_region *region, int bus, + unsigned slot, unsigned func, unsigned reg, int data, + unsigned bytes); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); @@ -59,11 +69,12 @@ SYSCTL_DECL(_hw_pci); */ int cfgmech = CFGMECH_1; -static vm_offset_t pcie_base; -static int pcie_minbus, pcie_maxbus; +static struct pcie_mcfg_region *mcfg_regions; +static int mcfg_numregions; static uint32_t pcie_badslots; static struct mtx pcicfg_mtx; MTX_SYSINIT(pcicfg_mtx, &pcicfg_mtx, "pcicfg_mtx", MTX_SPIN); + static int mcfg_enable = 1; SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0, "Enable support for PCI-e memory mapped config access"); @@ -75,16 +86,33 @@ pci_cfgregopen(void) return (1); } +static struct pcie_mcfg_region * +pcie_lookup_region(int domain, int bus) +{ + for (int i = 0; i < mcfg_numregions; i++) + if (mcfg_regions[i].domain == domain && + bus >= mcfg_regions[i].minbus && + bus <= mcfg_regions[i].maxbus) + return (&mcfg_regions[i]); + return (NULL); +} + static uint32_t pci_docfgregread(int domain, int bus, int slot, int func, int reg, int bytes) { if (domain == 0 && bus == 0 && (1 << slot & pcie_badslots) != 0) return (pcireg_cfgread(bus, slot, func, reg, bytes)); - if (cfgmech == CFGMECH_PCIE && - (bus >= pcie_minbus && bus <= pcie_maxbus)) - return (pciereg_cfgread(domain, bus, slot, func, reg, bytes)); - else if (domain == 0) + if (cfgmech == CFGMECH_PCIE) { + struct pcie_mcfg_region *region; + + region = pcie_lookup_region(domain, bus); + if (region != NULL) + return (pciereg_cfgread(region, bus, slot, func, reg, + bytes)); + } + + if (domain == 0) return (pcireg_cfgread(bus, slot, func, reg, bytes)); else return (-1); @@ -128,10 +156,18 @@ pci_cfgregwrite(int domain, int bus, int slot, int func, int reg, uint32_t data, return; } - if (cfgmech == CFGMECH_PCIE && - (bus >= pcie_minbus && bus <= pcie_maxbus)) - pciereg_cfgwrite(domain, bus, slot, func, reg, data, bytes); - else if (domain == 0) + if (cfgmech == CFGMECH_PCIE) { + struct pcie_mcfg_region *region; + + region = pcie_lookup_region(domain, bus); + if (region != NULL) { + pciereg_cfgwrite(region, bus, slot, func, reg, data, + bytes); + return; + } + } + + if (domain == 0) pcireg_cfgwrite(bus, slot, func, reg, data, bytes); } @@ -217,7 +253,7 @@ pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes) } static void -pcie_init_badslots(void) +pcie_init_badslots(struct pcie_mcfg_region *region) { uint32_t val1, val2; int slot; @@ -234,7 +270,7 @@ pcie_init_badslots(void) if (val1 == 0xffffffff) continue; - val2 = pciereg_cfgread(0, 0, slot, 0, 0, 4); + val2 = pciereg_cfgread(region, 0, slot, 0, 0, 4); if (val2 != val1) pcie_badslots |= (1 << slot); } @@ -242,26 +278,34 @@ pcie_init_badslots(void) } int -pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +pcie_cfgregopen(uint64_t base, uint16_t domain, uint8_t minbus, uint8_t maxbus) { + struct pcie_mcfg_region *region; if (!mcfg_enable) return (0); - if (minbus != 0) - return (0); - if (bootverbose) - printf("PCIe: Memory Mapped configuration base @ 0x%lx\n", - base); + printf("PCI: MCFG domain %u bus %u-%u base @ 0x%lx\n", + domain, minbus, maxbus, base); + + /* Resize the array. */ + mcfg_regions = realloc(mcfg_regions, + sizeof(*mcfg_regions) * (mcfg_numregions + 1), M_DEVBUF, M_WAITOK); + + region = &mcfg_regions[mcfg_numregions]; /* XXX: We should make sure this really fits into the direct map. */ - pcie_base = (vm_offset_t)pmap_mapdev_pciecfg(base, (maxbus + 1) << 20); - pcie_minbus = minbus; - pcie_maxbus = maxbus; + region->base = pmap_mapdev_pciecfg(base, (maxbus + 1 - minbus) << 20); + region->domain = domain; + region->minbus = minbus; + region->maxbus = maxbus; + mcfg_numregions++; + cfgmech = CFGMECH_PCIE; - pcie_init_badslots(); + if (domain == 0 && minbus == 0) + pcie_init_badslots(region); return (1); } @@ -282,17 +326,18 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) */ static int -pciereg_cfgread(int domain, int bus, unsigned slot, unsigned func, unsigned reg, - unsigned bytes) +pciereg_cfgread(struct pcie_mcfg_region *region, int bus, unsigned slot, + unsigned func, unsigned reg, unsigned bytes) { - vm_offset_t va; + char *va; int data = -1; - if (domain != 0 || bus < pcie_minbus || bus > pcie_maxbus || - slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) + MPASS(bus >= region->minbus && bus <= region->maxbus); + + if (slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) return (-1); - va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + va = PCIE_VADDR(region->base, reg, bus - region->minbus, slot, func); switch (bytes) { case 4: @@ -313,16 +358,17 @@ pciereg_cfgread(int domain, int bus, unsigned slot, unsigned func, unsigned reg, } static void -pciereg_cfgwrite(int domain, int bus, unsigned slot, unsigned func, - unsigned reg, int data, unsigned bytes) +pciereg_cfgwrite(struct pcie_mcfg_region *region, int bus, unsigned slot, + unsigned func, unsigned reg, int data, unsigned bytes) { - vm_offset_t va; + char *va; + + MPASS(bus >= region->minbus && bus <= region->maxbus); - if (domain != 0 || bus < pcie_minbus || bus > pcie_maxbus || - slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) + if (slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) return; - va = PCIE_VADDR(pcie_base, reg, bus, slot, func); + va = PCIE_VADDR(region->base, reg, bus - region->minbus, slot, func); switch (bytes) { case 4: diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 491eda40b6c4..22d2b10ff905 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2226,11 +2226,8 @@ acpi_enable_pcie(void) end = (ACPI_MCFG_ALLOCATION *)((char *)hdr + hdr->Length); alloc = (ACPI_MCFG_ALLOCATION *)((ACPI_TABLE_MCFG *)hdr + 1); while (alloc < end) { - if (alloc->PciSegment == 0) { - pcie_cfgregopen(alloc->Address, alloc->StartBusNumber, - alloc->EndBusNumber); - return; - } + pcie_cfgregopen(alloc->Address, alloc->PciSegment, + alloc->StartBusNumber, alloc->EndBusNumber); alloc++; } #endif diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index e63c510a4c5b..b2cd23687ccc 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -54,6 +54,13 @@ printf a ; \ } while(0) +struct pcie_mcfg_region { + uint64_t base; + uint16_t domain; + uint8_t minbus; + uint8_t maxbus; +}; + #define PCIE_CACHE 8 struct pcie_cfg_elem { TAILQ_ENTRY(pcie_cfg_elem) elem; @@ -63,26 +70,30 @@ struct pcie_cfg_elem { SYSCTL_DECL(_hw_pci); +static struct pcie_mcfg_region *mcfg_regions; +static int mcfg_numregions; static TAILQ_HEAD(pcie_cfg_list, pcie_cfg_elem) pcie_list[MAXCPU]; -static uint64_t pcie_base; -static int pcie_minbus, pcie_maxbus; +static int pcie_cache_initted; static uint32_t pcie_badslots; int cfgmech; static int devmax; static struct mtx pcicfg_mtx; + static int mcfg_enable = 1; SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0, "Enable support for PCI-e memory mapped config access"); static uint32_t pci_docfgregread(int domain, int bus, int slot, int func, int reg, int bytes); +static struct pcie_mcfg_region *pcie_lookup_region(int domain, int bus); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); static int pcireg_cfgopen(void); -static int pciereg_cfgread(int domain, int bus, unsigned slot, - unsigned func, unsigned reg, unsigned bytes); -static void pciereg_cfgwrite(int domain, int bus, unsigned slot, - unsigned func, unsigned reg, int data, unsigned bytes); +static int pciereg_cfgread(struct pcie_mcfg_region *region, int bus, + unsigned slot, unsigned func, unsigned reg, unsigned bytes); +static void pciereg_cfgwrite(struct pcie_mcfg_region *region, int bus, + unsigned slot, unsigned func, unsigned reg, int data, + unsigned bytes); /* * Some BIOS writers seem to want to ignore the spec and put @@ -149,16 +160,33 @@ pci_cfgregopen(void) return (1); } +static struct pcie_mcfg_region * +pcie_lookup_region(int domain, int bus) +{ + for (int i = 0; i < mcfg_numregions; i++) + if (mcfg_regions[i].domain == domain && + bus >= mcfg_regions[i].minbus && + bus <= mcfg_regions[i].maxbus) + return (&mcfg_regions[i]); + return (NULL); +} + static uint32_t pci_docfgregread(int domain, int bus, int slot, int func, int reg, int bytes) { if (domain == 0 && bus == 0 && (1 << slot & pcie_badslots) != 0) return (pcireg_cfgread(bus, slot, func, reg, bytes)); - if (cfgmech == CFGMECH_PCIE && - (bus >= pcie_minbus && bus <= pcie_maxbus)) - return (pciereg_cfgread(domain, bus, slot, func, reg, bytes)); - else if (domain == 0) + if (cfgmech == CFGMECH_PCIE) { + struct pcie_mcfg_region *region; + + region = pcie_lookup_region(domain, bus); + if (region != NULL) + return (pciereg_cfgread(region, bus, slot, func, reg, + bytes)); + } + + if (domain == 0) return (pcireg_cfgread(bus, slot, func, reg, bytes)); else return (-1); @@ -197,10 +225,18 @@ pci_cfgregwrite(int domain, int bus, int slot, int func, int reg, uint32_t data, return; } - if (cfgmech == CFGMECH_PCIE && - (bus >= pcie_minbus && bus <= pcie_maxbus)) - pciereg_cfgwrite(domain, bus, slot, func, reg, data, bytes); - else if (domain == 0) + if (cfgmech == CFGMECH_PCIE) { + struct pcie_mcfg_region *region; + + region = pcie_lookup_region(domain, bus); + if (region != NULL) { + pciereg_cfgwrite(region, bus, slot, func, reg, data, + bytes); + return; + } + } + + if (domain == 0) pcireg_cfgwrite(bus, slot, func, reg, data, bytes); } @@ -479,7 +515,7 @@ pcie_init_cache(void) } static void -pcie_init_badslots(void) +pcie_init_badslots(struct pcie_mcfg_region *region) { uint32_t val1, val2; int slot; @@ -496,7 +532,7 @@ pcie_init_badslots(void) if (val1 == 0xffffffff) continue; - val2 = pciereg_cfgread(0, 0, slot, 0, 0, 4); + val2 = pciereg_cfgread(region, 0, slot, 0, 0, 4); if (val2 != val1) pcie_badslots |= (1 << slot); } @@ -504,37 +540,51 @@ pcie_init_badslots(void) } int -pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) +pcie_cfgregopen(uint64_t base, uint16_t domain, uint8_t minbus, uint8_t maxbus) { + struct pcie_mcfg_region *region; if (!mcfg_enable) return (0); - if (minbus != 0) - return (0); - if (!pae_mode && base >= 0x100000000) { if (bootverbose) printf( - "PCI: Memory Mapped PCI configuration area base 0x%jx too high\n", - (uintmax_t)base); + "PCI: MCFG domain %u bus %u-%u base 0x%jx too high\n", + domain, minbus, maxbus, (uintmax_t)base); return (0); } if (bootverbose) - printf("PCIe: Memory Mapped configuration base @ 0x%jx\n", - (uintmax_t)base); + printf("PCI: MCFG domain %u bus %u-%u base @ 0x%jx\n", + domain, minbus, maxbus, (uintmax_t)base); + + if (pcie_cache_initted == 0) { + if (!pcie_init_cache()) + pcie_cache_initted = -1; + else + pcie_cache_initted = 1; + } - if (!pcie_init_cache()) + if (pcie_cache_initted == -1) return (0); - pcie_base = base; - pcie_minbus = minbus; - pcie_maxbus = maxbus; + /* Resize the array. */ + mcfg_regions = realloc(mcfg_regions, + sizeof(*mcfg_regions) * (mcfg_numregions + 1), M_DEVBUF, M_WAITOK); + + region = &mcfg_regions[mcfg_numregions]; + region->base = base; + region->domain = domain; + region->minbus = minbus; + region->maxbus = maxbus; + mcfg_numregions++; + cfgmech = CFGMECH_PCIE; devmax = 32; - pcie_init_badslots(); + if (domain == 0 && minbus == 0) + pcie_init_badslots(region); return (1); } @@ -547,13 +597,16 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus) ((reg) & 0xfff))) static __inline vm_offset_t -pciereg_findaddr(int bus, unsigned slot, unsigned func, unsigned reg) +pciereg_findaddr(struct pcie_mcfg_region *region, int bus, unsigned slot, + unsigned func, unsigned reg) { struct pcie_cfg_list *pcielist; struct pcie_cfg_elem *elem; vm_paddr_t pa, papage; - pa = PCIE_PADDR(pcie_base, reg, bus, slot, func); + MPASS(bus >= region->minbus && bus <= region->maxbus); + + pa = PCIE_PADDR(region->base, reg, bus - region->minbus, slot, func); papage = pa & ~PAGE_MASK; /* @@ -594,18 +647,17 @@ pciereg_findaddr(int bus, unsigned slot, unsigned func, unsigned reg) */ static int -pciereg_cfgread(int domain, int bus, unsigned slot, unsigned func, unsigned reg, - unsigned bytes) +pciereg_cfgread(struct pcie_mcfg_region *region, int bus, unsigned slot, + unsigned func, unsigned reg, unsigned bytes) { vm_offset_t va; int data = -1; - if (domain != 0 || bus < pcie_minbus || bus > pcie_maxbus || - slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) + if (slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) return (-1); critical_enter(); - va = pciereg_findaddr(bus, slot, func, reg); + va = pciereg_findaddr(region, bus, slot, func, reg); switch (bytes) { case 4: @@ -627,17 +679,16 @@ pciereg_cfgread(int domain, int bus, unsigned slot, unsigned func, unsigned reg, } static void -pciereg_cfgwrite(int domain, int bus, unsigned slot, unsigned func, - unsigned reg, int data, unsigned bytes) +pciereg_cfgwrite(struct pcie_mcfg_region *region, int bus, unsigned slot, + unsigned func, unsigned reg, int data, unsigned bytes) { vm_offset_t va; - if (domain != 0 || bus < pcie_minbus || bus > pcie_maxbus || - slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) + if (slot > PCI_SLOTMAX || func > PCI_FUNCMAX || reg > PCIE_REGMAX) return; critical_enter(); - va = pciereg_findaddr(bus, slot, func, reg); + va = pciereg_findaddr(region, bus, slot, func, reg); switch (bytes) { case 4: diff --git a/sys/x86/include/pci_cfgreg.h b/sys/x86/include/pci_cfgreg.h index 370113b9d7bd..25cd8028dce4 100644 --- a/sys/x86/include/pci_cfgreg.h +++ b/sys/x86/include/pci_cfgreg.h @@ -56,7 +56,7 @@ enum { extern int cfgmech; rman_res_t hostb_alloc_start(int type, rman_res_t start, rman_res_t end, rman_res_t count); -int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); +int pcie_cfgregopen(uint64_t base, uint16_t domain, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); u_int32_t pci_cfgregread(int domain, int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int domain, int bus, int slot, int func, int reg, u_int32_t data, int bytes); diff --git a/sys/x86/x86/legacy.c b/sys/x86/x86/legacy.c index 4e76e5b674a9..6ece5e085dab 100644 --- a/sys/x86/x86/legacy.c +++ b/sys/x86/x86/legacy.c @@ -133,14 +133,14 @@ legacy_pci_cfgregopen(device_t dev) case 0x3592: /* Intel 7520 or 7320 */ pciebar = pci_cfgregread(0, 0, 0, 0, 0xce, 2) << 16; - pcie_cfgregopen(pciebar, 0, 255); + pcie_cfgregopen(pciebar, 0, 0, 255); break; case 0x2580: case 0x2584: case 0x2590: /* Intel 915, 925, or 915GM */ pciebar = pci_cfgregread(0, 0, 0, 0, 0x48, 4); - pcie_cfgregopen(pciebar, 0, 255); + pcie_cfgregopen(pciebar, 0, 0, 255); break; } } From nobody Wed Nov 29 18:55:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgT6X0nYVz5361k; Wed, 29 Nov 2023 18:55: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 4SgT6X0CT3z4PGR; Wed, 29 Nov 2023 18:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701284132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BpXe4WX5TUqyT1XZ1AB3h95MQbiXzh7t6PdAPqrXu8o=; b=ADrXuA3Unml75Jzk7XO30NTXYGQ+/D9wNgMXb85AIaLIqqhuZDhu5xdOVMuXjGDK+ZNpiO bCsVJEPNwcx8lT3LdF45wF/YxwogOcXmJsFo2wXeCBoCI5aUoUYWIfNr7CR7k/Uxe4YkBM oKAy4TlJVn2Uv1gzWHxOWKeDJx3LxKtawOTE8PvjcGHFKpWZxJBIgD+1F3up0gsv0b79x1 So1QOd5Z1bUf2KJtRecbV7Yr7FJrTeVxu/dnh5DtJWRTSM7PAucJcX79yWP1DujqD3UhK7 nFo+iYa7M4RzaDidABFRTuPtqY5mns5xeq/X/AaOqKHRLSvnLgrRjj3sTMITXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701284132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BpXe4WX5TUqyT1XZ1AB3h95MQbiXzh7t6PdAPqrXu8o=; b=Ycb/9XJM47YbJVEDP1+RIxGfUTAxw3vuX7O6suBjJTXkq26Pljmk4JLYVfZteI2ifQJUJn +mrIziaGAAO5/oSzwpUwz6TbPl6YPFngaZ7CXlujy8Fz5xfdIE//1gykdQ6j2anuUD9ETK CWkJ5Cv/J2AqRkvxbg+GeMdI08RwXG54aIm1o/FPDTLomCNzUF5/ip6+NCYJSU7AJj4xsM NLgJn7O7UZQuFUjSWDPOG6I9XPc1JsP1DXUBDK5jMEQKFFrWfDx+gClgC/qy6eY+RlzxD8 tLtlo0REF3FaWhXQaI8Gg++8dcRLziyRF75MqGOYM30cKVZK5cTe2Rs8wpuZJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701284132; a=rsa-sha256; cv=none; b=MKL3HVdji4mjpTg14ZszqvuRK3AabGLUGE4Qhul+N5E4/sA4sHXm1Xq2C+wPaFuS12Br30 cQQiKVh97go+0FbU/WgNJuCL47q2JBgMEyiYFwfUdFFMnFv+PUsPIOS78HJjcRAtjhYZg1 EwBBgH0lgUh/J2dXd1+IE+8nnwLYWPvn4lo+OVOGmRHLX/Jpe5dSR5Jd8wjQ6zc81Oos/I FSat45fmoXHhWfpGxeI9R4sQwX2UK0FfA0nWSUwLs8plvoB+sWsXXi7wEdzhi0Ar6rmay2 mvvYticDhopsXCP0ts31bEax6cyq1gkxzSzikWUIjIsQztWyS2JZfYhYYMlWIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgT6W6MYwz3TR; Wed, 29 Nov 2023 18:55: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 3ATItVtB081710; Wed, 29 Nov 2023 18:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATItVif081707; Wed, 29 Nov 2023 18:55:31 GMT (envelope-from git) Date: Wed, 29 Nov 2023 18:55:31 GMT Message-Id: <202311291855.3ATItVif081707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: 40c20fc29cad - main - vt(4): Call post-switch callback after replacing the backend List-Id: Commit messages for the main 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: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40c20fc29cad4d38d9a565e9c7ba78612097308e Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=40c20fc29cad4d38d9a565e9c7ba78612097308e commit 40c20fc29cad4d38d9a565e9c7ba78612097308e Author: Jean-Sébastien Pédron AuthorDate: 2023-11-29 18:34:48 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-11-29 18:54:14 +0000 vt(4): Call post-switch callback after replacing the backend [Why] For instance, it gives a chance to the new backend to refresh the screen. This is needed by the vt_drmfb backend and `drm_fb_helper`. This change was lost when I posted changes to reviews.freebsd.org and it broken the amdgpu driver... Thanks to manu@ for reporting the problem and wulf@ to find out the missing change! Tested by: manu Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42834 --- sys/dev/vt/vt_core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index d6268db3537b..92c83aee5967 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -3283,6 +3283,13 @@ vt_replace_backend(const struct vt_driver *drv, void *softc) /* Update windows sizes and initialize last items. */ vt_upgrade(vd); + /* + * Give a chance to the new backend to run the post-switch code, for + * instance to refresh the screen. + */ + if (vd->vd_driver->vd_postswitch) + vd->vd_driver->vd_postswitch(vd); + #ifdef DEV_SPLASH if (vd->vd_flags & VDF_SPLASH) vtterm_splash(vd); From nobody Wed Nov 29 18:55:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgT6Y29Lmz535h9; Wed, 29 Nov 2023 18:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgT6Y1RJHz4PJc; Wed, 29 Nov 2023 18:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701284133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ELYASKHI3m30I2HX2Jah4uz/CtRZ2WfiaUmYxqg90hc=; b=TNfOklseqhXg3M4+fazMoyA+9HuySxLhVpVUQwfAiai2dmAHjeOOGH6KRyN5bWWtMYAlWE 311C6eM+2N4eHaV0dSdYukOCg/XkNgDx+/s/qYWKBYukbuByUTfwvGfQpL59HvhiyhYsmV gTDeeSoaF8ecd0nXGgCYEGtllA9Phdtnk79d1Kr2zlFI+f4mUfR+QYbGrL4Oh3iWFkinrd eXc5qJFSY8nRfhztBNpu2yIvjlBDFewrvwVbb4RFkSUOIJeXVQG+rWFj7wTb7hMKHqR4L7 BbLox2NsoHEIMeFa0ysZtjPi72yzOGMSTeVVJ5AqjV3ACsoTdkFkBUVtPzlj1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701284133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ELYASKHI3m30I2HX2Jah4uz/CtRZ2WfiaUmYxqg90hc=; b=BIkx3z51bSbh5XYNJBBavJqYSS0RMonuP4x1eR2piySxUh5kY4VF54nwo8vS22ubmT9ZAJ bsn/JlUQOusz3YM3TTRk6eXZZ8Og0DDOfxdr0R06VJkgIuKysgS9MmS2wW+dVWDIspT1bd x4/ITGp98IY5Tiu329uiegY+WxUUNpCVegaiyuR4hv9jDd9xzpY84vamrR3rIOa/Uk2rdL XI6ZHXIAsncV3eCcqdHskcwjqL1zFn0Uw6BGxZTXhK/ASJtEz7dN8PRErXxuzwDzkH9E+2 Xoq+95x3X1hwLpP7oNPjS1MeGEbwJ76zdiv/otG3jKAoG0Nl6DVk5FuApUjy9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701284133; a=rsa-sha256; cv=none; b=k3lagW2JvacMwvqMNWscrMq4RpEsNlfwdaqzgv7DOJUAsItyxyGAoHYAfvykjEQKjXUJnf +ItUX2LWTlBeOH61JP9UnpWFY0NMvqTHRt7Jtk3KfJik7NFyR91v3TnH0Kx0rgK6RC0O6C eVJIJwRRgYAVOuvlIvv/CJi2h09lXs+qfE7T5MYpUCXzOdrQGgT9POgchs8F7VTAf235bu ayPG2RPjpaLUjoIatXraa2uZVy+mmC63UXFGq2XqlyxB5v2uS2o+hQtfAO6GFkqLtiSBT3 JmdbTIbl3KVqSVBgyokn5et5iVYS8ShMkRrMQftCcg6/78rGJzQoYm+HdBqjfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgT6Y0FZ4z3Bw; Wed, 29 Nov 2023 18:55: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 3ATItW4n081774; Wed, 29 Nov 2023 18:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATItWTn081771; Wed, 29 Nov 2023 18:55:32 GMT (envelope-from git) Date: Wed, 29 Nov 2023 18:55:32 GMT Message-Id: <202311291855.3ATItWTn081771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: b292c995cfa8 - main - linuxkpi: Include from and List-Id: Commit messages for the main 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: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b292c995cfa88cc73d5d77b6b94ae1b78296793f Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=b292c995cfa88cc73d5d77b6b94ae1b78296793f commit b292c995cfa88cc73d5d77b6b94ae1b78296793f Author: Jean-Sébastien Pédron AuthorDate: 2023-11-29 18:38:54 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-11-29 18:54:48 +0000 linuxkpi: Include from and [Why] Some files in DRM rely on this indirect include to use `struct rb_*`. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D42835 --- sys/compat/linuxkpi/common/include/linux/hrtimer.h | 1 + sys/compat/linuxkpi/common/include/linux/mm_types.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/hrtimer.h b/sys/compat/linuxkpi/common/include/linux/hrtimer.h index 38fc3ce4dc6a..88f9487d0b85 100644 --- a/sys/compat/linuxkpi/common/include/linux/hrtimer.h +++ b/sys/compat/linuxkpi/common/include/linux/hrtimer.h @@ -30,6 +30,7 @@ #include #include +#include #include enum hrtimer_mode { diff --git a/sys/compat/linuxkpi/common/include/linux/mm_types.h b/sys/compat/linuxkpi/common/include/linux/mm_types.h index 446231bd691f..c08e2511725b 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm_types.h +++ b/sys/compat/linuxkpi/common/include/linux/mm_types.h @@ -29,6 +29,7 @@ #include #include +#include #include #include From nobody Wed Nov 29 21:43:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgXrh03vvz52J2M; Wed, 29 Nov 2023 21:43: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 4SgXrg6bQrz4m99; Wed, 29 Nov 2023 21: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=1701294227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l7oZy35A6Pre7/e7PdLB7VVNbh3rXvFZNaDdztLymHE=; b=QYEQuhRPT8rjEfsqj5rglOON3AkBByywQU/dcQLUBV06fF5eKD5FHjxLJoGKRj8DWynGBo myzpcTK7kHJdF7rS9qh1QtmE5LB518YfhClCWgM6EweLT0Y/+WitbydvtVQBznn0Vf56iJ BFNx2BQkUFu6+kKACk9VO3xO/bJKnBTwmkIFLEXgH1++fS8UN69RyNdTDPyx8i1b0vRl7l bOhQqip+CAfFk2iHzoG355fqINaaOAfI2EUZwtcWshuAyMjBKjkoW+xW62UBWMhpYMNVty lroDod4SU68EL8+OoJiKv0pH663GOy/MvpPnj1eQ0QqcGFFlRqpRN0SqRgsi2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701294227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l7oZy35A6Pre7/e7PdLB7VVNbh3rXvFZNaDdztLymHE=; b=Yv/5So8Ih/oRggZ3q8wjiDMvw2wjbErrZlN8Qnte4agaO0EEREwTzMl69DvAvRQk9RYgUd AsdHufNZ+58Y75TNJs6MK5wBIHKuwgi3t1XFIdklZxj86L5Dff+1y+roYA1a+ewdR6VGpt BjMje9K6DNU4ROXN3IGL1BJ5MiVzu3dEiJqrVw4xr0f7XAOlGEtZSZm+em4QxM9BJ90dBt z9j6R93ZCKru4fE8DyuuiQFumFB1CQp1c1vdtQmqQ4iZU0+YaRo3pQG1DvsDRg76+dostB lVJ+cMs//EboLFLqtmE2gbgw2VI1CzdkI+Q5yuaigo1W9pv20nVB0ZysSRTkzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701294227; a=rsa-sha256; cv=none; b=yx8ZdYNl8T1Z+eNA3e2HSSiklbLBPf5SHINIyEA/IfXfobDu/nAt0pPnFwg1CYTH2BMoIB 9LPrB3jirSVm3k4teNIXyQEHoYcKYW6fAbbYsyofLwD49FS+OGBRSp2VwhAnbQ8IqoajI6 onVsCkPDFNu+YDCjESXZ/T0JmQh1wB2sWlVc3BWezlDg+0as9JSr7DdM/jNtIgnar6EXOE SqE1prmYg9sOdtddDvHiAIxhtaqyI32X+wXxBy3F4hoJeZp7ugXpbeG9WOqBX9MLm+inLS qH6djaFrGWTvRTf+8vTHn8Jh/l4f0IaZfZ7ayZiutpslFsgPg/ETYWXoktAYlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgXrg5Kxrz82n; Wed, 29 Nov 2023 21:43: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 3ATLhl1P065748; Wed, 29 Nov 2023 21:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATLhlkQ065745; Wed, 29 Nov 2023 21:43:47 GMT (envelope-from git) Date: Wed, 29 Nov 2023 21:43:47 GMT Message-Id: <202311292143.3ATLhlkQ065745@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: b647615ede46 - main - iwlwififw: add firmware for the Bz/B200 chipset List-Id: Commit messages for the main 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: b647615ede46af66cd0c8bd5a321d4a2cccdabe0 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b647615ede46af66cd0c8bd5a321d4a2cccdabe0 commit b647615ede46af66cd0c8bd5a321d4a2cccdabe0 Author: Bjoern A. Zeeb AuthorDate: 2023-11-29 21:33:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 21:42:36 +0000 iwlwififw: add firmware for the Bz/B200 chipset The iwlwifi driver already supports the chipset as "Bz TBD" (also in 14.0). Add the firmware for it. Successfully tested for 0x8086/0x272b/0x8086/0x00f4 on arm64 thanks to donated hardware [1]. Firmware was obtained from linux-firmware at 9552083a783e5e48b90de674d4e3bf23bb855ab0 . Sponsored by: The FreeBSD Foundation Sponsored by: Martin Hoehne / minipci.biz (B200 card) [1] MFC after: 3 days --- .../dev/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode | Bin 0 -> 1799504 bytes sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm | Bin 0 -> 226668 bytes sys/modules/iwlwififw/Makefile | 3 +++ sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile | 5 +++++ .../iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile | 7 +++++++ 5 files changed, 15 insertions(+) diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode new file mode 100644 index 000000000000..a1444bab2622 Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm new file mode 100644 index 000000000000..3cdb0b522b22 Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm differ diff --git a/sys/modules/iwlwififw/Makefile b/sys/modules/iwlwififw/Makefile index aa3873880b19..756fb2f73af7 100644 --- a/sys/modules/iwlwififw/Makefile +++ b/sys/modules/iwlwififw/Makefile @@ -16,6 +16,8 @@ SUBDIR= \ iwlwifi-QuZ-a0-hr-b0-fw \ iwlwifi-QuZ-a0-jf-b0-fw \ iwlwifi-cc-a0-fw \ + iwlwifi-gl-c0-fm-c0-fw \ + iwlwifi-gl-c0-fm-c0-pnvm \ iwlwifi-so-a0-gf-a0-fw \ iwlwifi-so-a0-gf4-a0-fw \ iwlwifi-so-a0-hr-b0-fw \ @@ -25,4 +27,5 @@ SUBDIR= \ iwlwifi-so-a0-gf4-a0-pnvm \ iwlwifi-ty-a0-gf-a0-pnvm + .include diff --git a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile new file mode 100644 index 000000000000..4a078a28c3b2 --- /dev/null +++ b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile @@ -0,0 +1,5 @@ + +FWVERSION= 83 +NAME= gl-c0-fm-c0 + +.include diff --git a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile new file mode 100644 index 000000000000..8b1f4692271b --- /dev/null +++ b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile @@ -0,0 +1,7 @@ + +FWVERSION= 83 +NAME= gl-c0-fm-c0 +EXT= pnvm +_NAME= iwlwifi-${NAME}.${EXT} + +.include From nobody Wed Nov 29 21:49:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgXzl3j6wz52JBQ; Wed, 29 Nov 2023 21:49: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 4SgXzl3CKRz4mjD; Wed, 29 Nov 2023 21:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701294595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ow0kkl59qs/eODsDObjGOIjiAE1tlQmwevgzg+bOQr0=; b=InDZ62NoJd4EnOefWjOQ+II2AgDreycTdYJmiKBQeGR8L3rCZTkOP3GBgRzxY+S7uqQxQ1 sR7VgruhkAVuFrvEm9olakiVNopO6m/SjKMus6kKW2c965ahHea22vrDUfuP6ahxuiVgUP qjwqnbZs/EpsKeo0J3xhpsgvVBQ3QCPKiDoe3Keh4R8yuADEoH7xprDqNVom7tg8dP33Gd gHyyGWXv0kOZBVlUw5kq3uxlP5LRL6tnC6M+ZyXFJDlD1rV+mSwocjloHwsw6PPqMPb1Ee zo5oTMZNLoRuUFvrIGYDdnC8TK/Suq8BUyFZOb8HdIDDspgMqooYb9N6RKP05w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701294595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ow0kkl59qs/eODsDObjGOIjiAE1tlQmwevgzg+bOQr0=; b=yOTqNbNmAOcegnC4GyoZJnMwjXm7T2lYyn5gDXv1t5oS5rA2JVA2ogUyyvHfCGIcC4lqqZ f1glVZFuQmc6z/eRZC2ZgjslNS3dEnxYf9xNJPFmkNh8UwVanQU/XEJoWVqUOlrNVLxCkT nJNBI29woz7Mmpurh7oY7mnAEEOfSvO2ggsmAK4DO6P/q0f/zBA2oXAjdFIjr1SY9GsA/S 4uWsFoweCPTuUsVB/uo0Wb8LfHeRlEZPv7Yu2h8HSSAPFTOdbJa5Lk0N9HgSsvolzQU52A Bld4g61Eqt9YRNmuSxP0LBlQDXlSJgCX3OIrIYoU/3RvrWjpdRtm+3x84EbnYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701294595; a=rsa-sha256; cv=none; b=wRHsUABhj3Ho960KZmW7aL8273+Q5zzkrY89BhjNDcdI20XfUzX7ITbTN7n9jctTkRMTb9 rL3xmQP4hCwx0knekEAQmdBJwrk+YfuC+Ha7F5NioNZ0uq7OhZyHmOAY/MkajETWZ51Xq2 nxpoyIY6731zqebZL/DvPF8/K73pcQ+k/dFuhZLbWYkqnTiSAcWPDWbOFwch/sV++LzXu9 PoKksjwC4ZB9qhYe+M3espqvZLOI7tW1WY/LZVvh1Jl8+8m6WLToFyWxmuuK0LGZMQziZ9 kON4rE/iEdhuuGaD012BhB5ctIm7cmfFoyd9vYxhjRWH02w0soJEFcqnlmL8ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgXzl2G98z7qQ; Wed, 29 Nov 2023 21:49: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 3ATLntuc066799; Wed, 29 Nov 2023 21:49:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATLntSC066796; Wed, 29 Nov 2023 21:49:55 GMT (envelope-from git) Date: Wed, 29 Nov 2023 21:49:55 GMT Message-Id: <202311292149.3ATLntSC066796@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: 621f45532c58 - main - tail: Fix heap overflow in -F 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: 621f45532c5887c96b708ce232c52878d0053325 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=621f45532c5887c96b708ce232c52878d0053325 commit 621f45532c5887c96b708ce232c52878d0053325 Author: Dag-Erling Smørgrav AuthorDate: 2023-11-29 21:48:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-11-29 21:49:38 +0000 tail: Fix heap overflow in -F case. The number of events we track can vary over time, but we only allocate enough space for the exact number of events we are tracking when we first begin, resulting in a trivially reproducable heap overflow. Fix this by allocating enough space for the greatest possible number of events (two per file) and clean up the code a bit. Also add a test case which triggers the aforementioned heap overflow, although we don't currently have a way to detect it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D42839 --- usr.bin/tail/forward.c | 39 ++++++++++++++++++--------------------- usr.bin/tail/tests/tail_test.sh | 21 ++++++++++++++++++++- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index e8e2cb89ab01..a8f52ed376c4 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -272,7 +272,7 @@ set_events(file_info_t *files) action = USE_KQUEUE; for (i = 0, file = files; i < no_files; i++, file++) { - if (! file->fp) + if (!file->fp) continue; if (fstatfs(fileno(file->fp), &sf) == 0 && @@ -304,27 +304,21 @@ set_events(file_info_t *files) void follow(file_info_t *files, enum STYLE style, off_t off) { - int active, ev_change, i, n = -1; + int active, ev_change, i, n; struct stat sb2; file_info_t *file; FILE *ftmp; struct timespec ts; /* Position each of the files */ - - file = files; active = 0; - n = 0; - for (i = 0; i < no_files; i++, file++) { - if (file->fp) { - active = 1; - n++; - if (vflag || (qflag == 0 && no_files > 1)) - printfn(file->file_name, 1); - forward(file->fp, file->file_name, style, off, &file->st); - if (Fflag && fileno(file->fp) != STDIN_FILENO) - n++; - } + for (i = 0, file = files; i < no_files; i++, file++) { + if (!file->fp) + continue; + active = 1; + if (vflag || (qflag == 0 && no_files > 1)) + printfn(file->file_name, 1); + forward(file->fp, file->file_name, style, off, &file->st); } if (!Fflag && !active) return; @@ -334,9 +328,14 @@ follow(file_info_t *files, enum STYLE style, off_t off) kq = kqueue(); if (kq < 0) err(1, "kqueue"); - ev = malloc(n * sizeof(struct kevent)); - if (! ev) - err(1, "Couldn't allocate memory for kevents."); + /* + * The number of kqueue events we track may vary over time and may + * even grow past its initial value in the -F case, but it will + * never exceed two per file, so just preallocate that. + */ + ev = malloc(no_files * 2 * sizeof(struct kevent)); + if (ev == NULL) + err(1, "Couldn't allocate memory for kevents."); set_events(files); for (;;) { @@ -410,9 +409,7 @@ follow(file_info_t *files, enum STYLE style, off_t off) */ do { n = kevent(kq, NULL, 0, ev, 1, Fflag ? &ts : NULL); - if (n < 0 && errno == EINTR) - continue; - if (n < 0) + if (n < 0 && errno != EINTR) err(1, "kevent"); } while (n < 0); if (n == 0) { diff --git a/usr.bin/tail/tests/tail_test.sh b/usr.bin/tail/tests/tail_test.sh index 8123a310fe67..9c941f8a2c2f 100755 --- a/usr.bin/tail/tests/tail_test.sh +++ b/usr.bin/tail/tests/tail_test.sh @@ -329,10 +329,28 @@ follow_stdin_body() atf_check kill $pid } +atf_test_case follow_create +follow_create_head() +{ + atf_set "descr" "Verify that -F works when a file is created" +} +follow_create_body() +{ + local pid + + rm -f infile + tail -F infile > outfile & + pid=$! + seq 1 5 >infile + sleep 2 + atf_check cmp infile outfile + atf_check kill $pid +} + atf_test_case follow_rename follow_rename_head() { - atf_set "descr" "Verify that -F works" + atf_set "descr" "Verify that -F works when a file is replaced" } follow_rename_body() { @@ -424,6 +442,7 @@ atf_init_test_cases() atf_add_test_case stdin atf_add_test_case follow atf_add_test_case follow_stdin + atf_add_test_case follow_create atf_add_test_case follow_rename atf_add_test_case silent_header atf_add_test_case verbose_header From nobody Wed Nov 29 21:49:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgXzm4SSbz52JQZ; Wed, 29 Nov 2023 21:49: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 4SgXzm3tXYz4n8t; Wed, 29 Nov 2023 21:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701294596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jxZim4aL+p+SokqZzU6u15J9k+f6aPm2WOFShkPThMs=; b=hypD1Kcb/kmgUqu9CnOwm6lEfZwAHyi6OIltXNVdihER8y6NSp3iXr0CN/5TQEtz1BshJX p/m/e6e78h2ADcMhVYXFEcOwOml90ST80RJqN51TAc2Shjwlp7EF+x0WMK3qHPkVBwAW++ 5q1U4iVTtSwhLtiTlqD9CmKmYpEX68ZDYH1nnSL6/2Tr7EITDAeOglKnYckmAOoZzbySsx YG2OVvQ4hVofbKwW3JAyIJfTzv47R8VvEGsP1HDxVx6qIdVsswJ8d7yeOVxsoVsEBNuYMK 9Jaog9A0hCld6D5ItnAifEJ1srkR0d80i/u9KyzBUp5hOWHUVN6EvQHc/iFNVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701294596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jxZim4aL+p+SokqZzU6u15J9k+f6aPm2WOFShkPThMs=; b=E0q6g7HRlGM/DoE2eqhVlz7QV86K7DTvw16JUcC8AsdKTw53Kh0oCdTe9bZgt8XV75LiBL GzcdqlIa22R84ltdhlzwG6a/O4lMGUymZgUP1JRMoQL8ANSCkNhKBUFdW+bqdi51w3M4NA KELLSWmxAaQpIMXgUcZ32CimxjZNQ6z+sh/DFaYy8X6hv5H5PEsquKd098B4un2i3Ia4C+ 0bLI+4vzPhslrfgrk8vQwSzrWiBpvYH1QaPvf5OlJNRBahbAVOBA/x06UHSXeHvpn2Fjsd yixHIsn9hcc37gNMjRKPqNshA9CBaWNOFC55JxI5lytBXlfnjXN6t5+TWjerHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701294596; a=rsa-sha256; cv=none; b=vbev1gbKnOKBV9PuAm9hJJm8WKsgbyjkVBiSSsYhRyMSmT5ATWJHp/j2hWU7Le78O6TtEw 3/HRj7D2teixMAYAbOnCcMLPIIcsQxSDCaMCu1rOQ/2E86RoVluG8OFZg3XneWC5sh6nGK AbeSYdL9LISUoEkyfygyN2fdRJ3SmALSmcgfc3vD7fqHqu2YKqcZBk8blD/3zcuq58yIX/ 8Ihxf/LAmRc82Z1kvPVj9A/eMNOwdGzWr4aqggeFptoht5TGS8bCsEp+scIz/UJEgjbQAj iSFVuoLEobZc020Wq/3G5tOYf9OeSBs1HWS0N6VEerN+439vXGTjyLFEU/zy6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgXzm2z2Tz7Pq; Wed, 29 Nov 2023 21:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATLnuDQ066844; Wed, 29 Nov 2023 21:49:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATLnuKU066841; Wed, 29 Nov 2023 21:49:56 GMT (envelope-from git) Date: Wed, 29 Nov 2023 21:49:56 GMT Message-Id: <202311292149.3ATLnuKU066841@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: b70e57be2cfe - main - tail: Clean up error messages. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: b70e57be2cfe83ec9f410e2f317ea38aaac61a98 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b70e57be2cfe83ec9f410e2f317ea38aaac61a98 commit b70e57be2cfe83ec9f410e2f317ea38aaac61a98 Author: Dag-Erling Smørgrav AuthorDate: 2023-11-29 21:48:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-11-29 21:49:44 +0000 tail: Clean up error messages. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42842 --- usr.bin/tail/forward.c | 2 +- usr.bin/tail/read.c | 8 ++++---- usr.bin/tail/reverse.c | 2 +- usr.bin/tail/tail.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index a8f52ed376c4..800492d2b1f3 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -335,7 +335,7 @@ follow(file_info_t *files, enum STYLE style, off_t off) */ ev = malloc(no_files * 2 * sizeof(struct kevent)); if (ev == NULL) - err(1, "Couldn't allocate memory for kevents."); + err(1, "failed to allocate memory for kevents"); set_events(files); for (;;) { diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c index 6561a235a73d..07db98d0def1 100644 --- a/usr.bin/tail/read.c +++ b/usr.bin/tail/read.c @@ -69,7 +69,7 @@ bytes(FILE *fp, const char *fn, off_t off) char *sp; if ((sp = p = malloc(off)) == NULL) - err(1, "malloc"); + err(1, "failed to allocate memory"); for (wrap = 0, ep = p + off; (ch = getc(fp)) != EOF;) { *p = ch; @@ -143,7 +143,7 @@ lines(FILE *fp, const char *fn, off_t off) int blen, cnt, recno, wrap; if ((llines = calloc(off, sizeof(*llines))) == NULL) - err(1, "calloc"); + err(1, "failed to allocate memory"); p = sp = NULL; blen = cnt = recno = wrap = 0; rc = 0; @@ -151,7 +151,7 @@ lines(FILE *fp, const char *fn, off_t off) while ((ch = getc(fp)) != EOF) { if (++cnt > blen) { if ((sp = realloc(sp, blen += 1024)) == NULL) - err(1, "realloc"); + err(1, "failed to allocate memory"); p = sp + cnt - 1; } *p++ = ch; @@ -160,7 +160,7 @@ lines(FILE *fp, const char *fn, off_t off) llines[recno].blen = cnt + 256; if ((llines[recno].l = realloc(llines[recno].l, llines[recno].blen)) == NULL) - err(1, "realloc"); + err(1, "failed to allocate memory"); } bcopy(sp, llines[recno].l, llines[recno].len = cnt); cnt = 0; diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c index 8be76eff9648..1fa8784dec6d 100644 --- a/usr.bin/tail/reverse.c +++ b/usr.bin/tail/reverse.c @@ -205,7 +205,7 @@ r_buf(FILE *fp, const char *fn) while ((tl = malloc(sizeof(bfelem_t))) == NULL) { first = TAILQ_FIRST(&head); if (TAILQ_EMPTY(&head)) - err(1, "malloc"); + err(1, "failed to allocate memory"); enomem += first->len; TAILQ_REMOVE(&head, first, entries); free(first); diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index ce16e10b1be7..fc60a82287df 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -163,7 +163,7 @@ main(int argc, char *argv[]) cap_rights_set(&rights, CAP_EVENT); if (caph_rights_limit(STDIN_FILENO, &rights) < 0 || caph_limit_stderr() < 0 || caph_limit_stdout() < 0) - err(1, "can't limit stdio rights"); + err(1, "unable to limit stdio rights"); fa = fileargs_init(argc, argv, O_RDONLY, 0, &rights, FA_OPEN); if (fa == NULL) @@ -203,7 +203,7 @@ main(int argc, char *argv[]) if (*argv && fflag) { files = malloc(no_files * sizeof(struct file_info)); if (files == NULL) - err(1, "Couldn't malloc space for file descriptors."); + err(1, "failed to allocate memory for file descriptors"); for (filep = files; (fn = *argv++); filep++) { filep->file_name = fn; @@ -298,7 +298,7 @@ obsolete(char *argv[]) /* Malloc space for dash, new option and argument. */ len = strlen(*argv); if ((start = p = malloc(len + 3)) == NULL) - err(1, "malloc"); + err(1, "failed to allocate memory"); *p++ = '-'; /* From nobody Wed Nov 29 22:09:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgYPs2mqSz52KDY; Wed, 29 Nov 2023 22:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgYPs2XTRz4pZ5; Wed, 29 Nov 2023 22:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701295745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4bkyY9vJtLelFWigdYykrGStoWGpNFK9saYL+QYHwM=; b=RzHhzlZVJD8Y+WN21q9diIEKoLImpJnKu6haslsg5Erfs6XxySuXaVf3l9Ql+C/Y3nrNFE YwxupfvyV9DehPa7BWfTcY3FUUeYIXVmvfjpMVvtpIEX9Z4HOIFB1PIxty/XHgP89Y0ES+ nfF5LQNr2Gj2SU7gObKRP96ZDdD6KSV0yercVzLmyLcwrAlmlBfc0IfeBmUox6ouuFRCLB BB+2WGJc15GutmfgVqErEM3s6KjAZnuZbA8wd4O5M3bbGQ6J0HHFNtwXvv+FG+ONVEFrQJ ZGqSQaALNiaNxlvSwrB6g70AXwSOtlXTRGiHO4wUY7I7MHu9kHf7Rpoetvt6Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701295745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4bkyY9vJtLelFWigdYykrGStoWGpNFK9saYL+QYHwM=; b=LI2pUfQVTC5y+99Y7FzTSGEIJLPN3LLrqrZOovsxY86wdJxW6OyABkAYyFgiA9eIqBPvUL dAfD86TrdOrJNxI3PTkZoVGwNklBIKyb9zsvhofAjk3S8wvFFp+6+TBt172XBr0LVtJYsA uF2eKyTSUGJcEff5JMGHYQoJlkKL6GrD2FUhl0AxmtMkXb76T/SMVRAjSRSo47UhbSc/ML IoYacxUSSO9YkHSR2vpLXeGyJJxh0Y9Q/jxPzl+01VTZvS6Gv84Iz22jo8IVRda0/RCP49 mkw8wrsqzdAlx3if9pFtpjJdNTlXgsQcGfNLNzcjAq0B/VKDMudqktsC4S8lYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701295745; a=rsa-sha256; cv=none; b=gis2Wnu4HlThZQ/7ePcdhrhJE0yVqNCYe1D5V2aixyEvOhrwoyM5PTwmcjS/Z4EDQ+XV8O 2Ln17+i9MqMRm/8jfyUgmyl/CHFK27CVmH4HVqdX2z3W4RaZXIngKhJRh7+5PftEpMvYdP 5QaClRvSBeLPUJh3aw0IX/Ss8CFe3HNAtJ6cnlwjsfw6mzf3pAPr1rWiCaQrlppsBegsd/ g2XX6vSP0o2TQCUFg22U30l5W/TsSTBP7ZwPf8Mhl0TJ5+qw+DATVJr6GYLhO0SIr/ftvH +qXDJCHGrmfQ5ZZH/jrvRoth1o7/su8VQHGeGU0KNpXT0DIr9vbKZtR6IsReSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgYPs1c7xz8Js; Wed, 29 Nov 2023 22:09: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 3ATM95ca000824; Wed, 29 Nov 2023 22:09:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATM94Uk000812; Wed, 29 Nov 2023 22:09:04 GMT (envelope-from git) Date: Wed, 29 Nov 2023 22:09:04 GMT Message-Id: <202311292209.3ATM94Uk000812@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: 525fe93dc748 - main - zfs: merge openzfs/zfs@a03ebd9be List-Id: Commit messages for the main 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: 525fe93dc7487a1e63a90f6a2b956abc601963c1 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=525fe93dc7487a1e63a90f6a2b956abc601963c1 commit 525fe93dc7487a1e63a90f6a2b956abc601963c1 Merge: b70e57be2cfe a03ebd9beec6 Author: Martin Matuska AuthorDate: 2023-11-29 22:07:33 +0000 Commit: Martin Matuska CommitDate: 2023-11-29 22:08:25 +0000 zfs: merge openzfs/zfs@a03ebd9be Notable upstream pull request merges: #15517 2a27fd411 ZIL: Assert record sizes in different places #15557 b94ce4e17 module/icp/asm-arm/sha2: fix compiling on armv5/6 #15557 4340f69be module/icp/asm-arm/sha2: auto detect __ARM_ARCH #15603 a03ebd9be ZIL: Call brt_pending_add() replaying TX_CLONE_RANGE #15606 1c38cdfe9 zdb: fix printf() length for uint64_t devid Obtained from: OpenZFS OpenZFS commit: a03ebd9beec6243682557fa692c12b1061fc58bd sys/contrib/openzfs/config/kernel-inode-times.m4 | 2 +- sys/contrib/openzfs/include/sys/dmu.h | 3 +- sys/contrib/openzfs/lib/libspl/os/linux/zone.c | 8 +-- .../openzfs/module/icp/asm-arm/sha2/sha256-armv7.S | 11 +++- .../openzfs/module/icp/asm-arm/sha2/sha512-armv7.S | 7 ++- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 9 +++- .../openzfs/module/os/linux/zfs/zio_crypt.c | 9 +++- sys/contrib/openzfs/module/zfs/brt.c | 14 ++--- sys/contrib/openzfs/module/zfs/dmu.c | 6 +-- sys/contrib/openzfs/module/zfs/zfs_replay.c | 50 +++++++++++++++--- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 4 +- sys/contrib/openzfs/module/zfs/zil.c | 60 ++++++++++++++-------- sys/contrib/openzfs/module/zfs/zio_checksum.c | 16 +++--- sys/contrib/openzfs/module/zfs/zvol.c | 8 +++ .../openzfs/tests/zfs-tests/include/blkdev.shlib | 2 +- sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 17 files changed, 150 insertions(+), 65 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index aab672a77324,000000000000..24fb572f00b0 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1149 -1,0 +1,1149 @@@ +/* + */ + +/* 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 */ + +/* 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_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 */ + +/* 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 */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* 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_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->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 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 */ + +/* 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 */ + +/* 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 */ + +/* 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 */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->copy_file_range() is available */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* file_operations_extend takes .copy_file_range() and .clone_file_range() */ +/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ + +/* fops->iterate() is available */ +/* #undef HAVE_VFS_ITERATE */ + +/* fops->iterate_shared() is available */ +/* #undef HAVE_VFS_ITERATE_SHARED */ + +/* fops->readdir() is available */ +/* #undef HAVE_VFS_READDIR */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ *** 220 LINES SKIPPED *** From nobody Wed Nov 29 23:16:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgZvG2RSMz52Pdw; Wed, 29 Nov 2023 23:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgZvG1rCBz3CVk; Wed, 29 Nov 2023 23:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701299770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbJwe0bUx7u/tfVzowhNYUiHpok2Lde25+HO6hiBDCA=; b=HpfO5J0cZthE0VmYxSZu5145SM2eK0pOMkPSkcneVhem4r0z69igHdpX4MYFFJUl58uDWY T684WrB14+fi0jKVBCHrLRR28lr4QKyzKfTMgvheERY4S/bHdfPrUQfavdtBqQ4dP1vKgs Oe7LM92nBVfvHL+N7tA0kds8Wi+nEX8mQ4dIltJySvZ/UuGA2E/A2bSef2I+IT4+JPSOxL tVK47USFdMzYScYee+rZauSTtT4a3xZH12ZpoGAPDzVdXq2EO/S4G9z/egS83Qk3XgNTe+ KWPtMsKSFV80skyEnT/cnhNQ13lZoH9FlVfPIsjOJ0UQlqOi2MKtSZykyKLK2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701299770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbJwe0bUx7u/tfVzowhNYUiHpok2Lde25+HO6hiBDCA=; b=k9suXVfO0r8sbf9+aFm1aXw9pEtyoOdSwTI/GSnfsFDd81PK+Zc8ypUqyEip+nbKFFqj9P 1oIwynt/+b03FVwAkWMUlqvYtDl2Y0GPJ3Fre5adMniCtj8eZbMSxBmWjFzRAbX6sYYyNS 9OGCJXo3OFeQ2ApF8Atr0OitX6KhfIvQr/s52FmzztFGIEA+b5QNM1WPHjdxAzIHzBr8ZQ XcLhEb2NB9IfO7NM41/lBQZNkkCaHz7OTGRehpm1oo6PfbFN5B1ihBUk8BT1BFeya+ZyhA QMeYk8/X1MEZaIZWFWfbbHuRPK22FSOJEFoWdHSMv2DFn1MQeihMDOM4JXZ/Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701299770; a=rsa-sha256; cv=none; b=A6IvRt/McOh32Wsg+V9UqULUIi+Js+Rpp0jD3SDYXpEsKqBGOiP4GuBWK5l/EukMAhPvR+ 9WYj10E0AzlkuXkz/Gn6vcKnaRSGQ7hD43qRV1HxDYPGO1M0Rf+Vz7o840E2mUV2bGoYcV WgDzEAG8ZkOtY6UioWx3tv/izQD1KsmQa6x0PWIAR7Jc9LAwba1sxAHxAnOsor7udge8bF 1rsytgrg+YXobrvo2VU2UPXeMnA9cBXCBMz52gkTurg5o9iHikyFF+5BC5Gecrvn++Mrbx LJI980GVvaf6mi81e5xQriSetqFCiGcRVtta173m0fa7fyPWDutktfy1ixNJnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgZvG0vdGz9np; Wed, 29 Nov 2023 23:16: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 3ATNGAfw017748; Wed, 29 Nov 2023 23:16:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATNGAwd017745; Wed, 29 Nov 2023 23:16:10 GMT (envelope-from git) Date: Wed, 29 Nov 2023 23:16:10 GMT Message-Id: <202311292316.3ATNGAwd017745@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: 376330aca184 - main - smbus: add compat32 support for SMB ioctls List-Id: Commit messages for the main 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: 376330aca1846d0f7771c16604b41bd7f6f1f14c Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=376330aca1846d0f7771c16604b41bd7f6f1f14c commit 376330aca1846d0f7771c16604b41bd7f6f1f14c Author: Stephen J. Kiernan AuthorDate: 2023-11-29 19:33:59 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-11-29 23:15:09 +0000 smbus: add compat32 support for SMB ioctls Some of the SMB ioctl request structures contain pointers and need to handle requests from 32-bit applications on 64-bit kernels. Obtained from: Juniper Networks, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42837 --- sys/dev/smbus/smb.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c index f47fc753bbdc..ee323c835f10 100644 --- a/sys/dev/smbus/smb.c +++ b/sys/dev/smbus/smb.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 2001 Nicolas Souchu + * Copyright (c) 2023 Juniper Networks, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +43,44 @@ #include "smbus_if.h" +#ifdef COMPAT_FREEBSD32 +struct smbcmd32 { + u_char cmd; + u_char reserved; + u_short op; + union { + char byte; + char buf[2]; + short word; + } wdata; + union { + char byte; + char buf[2]; + short word; + } rdata; + int slave; + uint32_t wbuf; + int wcount; + uint32_t rbuf; + int rcount; +}; + +#define SMB_QUICK_WRITE32 _IOW('i', 1, struct smbcmd32) +#define SMB_QUICK_READ32 _IOW('i', 2, struct smbcmd32) +#define SMB_SENDB32 _IOW('i', 3, struct smbcmd32) +#define SMB_RECVB32 _IOWR('i', 4, struct smbcmd32) +#define SMB_WRITEB32 _IOW('i', 5, struct smbcmd32) +#define SMB_WRITEW32 _IOW('i', 6, struct smbcmd32) +#define SMB_READB32 _IOWR('i', 7, struct smbcmd32) +#define SMB_READW32 _IOWR('i', 8, struct smbcmd32) +#define SMB_PCALL32 _IOWR('i', 9, struct smbcmd32) +#define SMB_BWRITE32 _IOW('i', 10, struct smbcmd32) +#define SMB_BREAD32 _IOWR('i', 11, struct smbcmd32) +#define SMB_OLD_READB32 _IOW('i', 7, struct smbcmd32) +#define SMB_OLD_READW32 _IOW('i', 8, struct smbcmd32) +#define SMB_OLD_PCALL32 _IOW('i', 9, struct smbcmd32) +#endif + #define SMB_OLD_READB _IOW('i', 7, struct smbcmd) #define SMB_OLD_READW _IOW('i', 8, struct smbcmd) #define SMB_OLD_PCALL _IOW('i', 9, struct smbcmd) @@ -131,11 +171,30 @@ smb_detach(device_t dev) return (0); } +#ifdef COMPAT_FREEBSD32 +static void +smbcopyincmd32(struct smbcmd32 *uaddr, struct smbcmd *kaddr) +{ + CP(*uaddr, *kaddr, cmd); + CP(*uaddr, *kaddr, op); + CP(*uaddr, *kaddr, wdata.word); + CP(*uaddr, *kaddr, slave); + PTRIN_CP(*uaddr, *kaddr, wbuf); + CP(*uaddr, *kaddr, wcount); + PTRIN_CP(*uaddr, *kaddr, rbuf); + CP(*uaddr, *kaddr, rcount); +} +#endif + static int smbioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { char buf[SMB_MAXBLOCKSIZE]; device_t parent; +#ifdef COMPAT_FREEBSD32 + struct smbcmd sswab; + struct smbcmd32 *s32 = (struct smbcmd32 *)data; +#endif struct smbcmd *s = (struct smbcmd *)data; struct smb_softc *sc = dev->si_drv1; device_t smbdev = sc->sc_dev; @@ -162,35 +221,81 @@ smbioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t (flags & O_NONBLOCK) ? SMB_DONTWAIT : (SMB_WAIT | SMB_INTR)))) return (error); +#ifdef COMPAT_FREEBSD32 + switch (cmd) { + case SMB_QUICK_WRITE32: + case SMB_QUICK_READ32: + case SMB_SENDB32: + case SMB_RECVB32: + case SMB_WRITEB32: + case SMB_WRITEW32: + case SMB_OLD_READB32: + case SMB_READB32: + case SMB_OLD_READW32: + case SMB_READW32: + case SMB_OLD_PCALL32: + case SMB_PCALL32: + case SMB_BWRITE32: + case SMB_BREAD32: + smbcopyincmd32(s32, &sswab); + s = &sswab; + break; + default: + break; + } +#endif + switch (cmd) { case SMB_QUICK_WRITE: +#ifdef COMPAT_FREEBSD32 + case SMB_QUICK_WRITE32: +#endif error = smbus_error(smbus_quick(parent, s->slave, SMB_QWRITE)); break; case SMB_QUICK_READ: +#ifdef COMPAT_FREEBSD32 + case SMB_QUICK_READ32: +#endif error = smbus_error(smbus_quick(parent, s->slave, SMB_QREAD)); break; case SMB_SENDB: +#ifdef COMPAT_FREEBSD32 + case SMB_SENDB32: +#endif error = smbus_error(smbus_sendb(parent, s->slave, s->cmd)); break; case SMB_RECVB: +#ifdef COMPAT_FREEBSD32 + case SMB_RECVB32: +#endif error = smbus_error(smbus_recvb(parent, s->slave, &s->cmd)); break; case SMB_WRITEB: +#ifdef COMPAT_FREEBSD32 + case SMB_WRITEB32: +#endif error = smbus_error(smbus_writeb(parent, s->slave, s->cmd, s->wdata.byte)); break; case SMB_WRITEW: +#ifdef COMPAT_FREEBSD32 + case SMB_WRITEW32: +#endif error = smbus_error(smbus_writew(parent, s->slave, s->cmd, s->wdata.word)); break; case SMB_OLD_READB: case SMB_READB: +#ifdef COMPAT_FREEBSD32 + case SMB_OLD_READB32: + case SMB_READB32: +#endif /* NB: for SMB_OLD_READB the read data goes to rbuf only. */ error = smbus_error(smbus_readb(parent, s->slave, s->cmd, &s->rdata.byte)); @@ -204,6 +309,10 @@ smbioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t case SMB_OLD_READW: case SMB_READW: +#ifdef COMPAT_FREEBSD32 + case SMB_OLD_READW32: + case SMB_READW32: +#endif /* NB: for SMB_OLD_READW the read data goes to rbuf only. */ error = smbus_error(smbus_readw(parent, s->slave, s->cmd, &s->rdata.word)); @@ -219,6 +328,10 @@ smbioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t case SMB_OLD_PCALL: case SMB_PCALL: +#ifdef COMPAT_FREEBSD32 + case SMB_OLD_PCALL32: + case SMB_PCALL32: +#endif /* NB: for SMB_OLD_PCALL the read data goes to rbuf only. */ error = smbus_error(smbus_pcall(parent, s->slave, s->cmd, s->wdata.word, &s->rdata.word)); @@ -234,6 +347,9 @@ smbioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t break; case SMB_BWRITE: +#ifdef COMPAT_FREEBSD32 + case SMB_BWRITE32: +#endif if (s->wcount < 0) { error = EINVAL; break; @@ -249,6 +365,9 @@ smbioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t break; case SMB_BREAD: +#ifdef COMPAT_FREEBSD32 + case SMB_BREAD32: +#endif if (s->rcount < 0) { error = EINVAL; break; @@ -268,6 +387,29 @@ smbioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t error = ENOTTY; } +#ifdef COMPAT_FREEBSD32 + switch (cmd) { + case SMB_RECVB32: + CP(*s, *s32, cmd); + break; + case SMB_OLD_READB32: + case SMB_READB32: + case SMB_OLD_READW32: + case SMB_READW32: + case SMB_OLD_PCALL32: + case SMB_PCALL32: + CP(*s, *s32, rdata.word); + break; + case SMB_BREAD32: + if (s->rbuf == NULL) + CP(*s, *s32, rdata.word); + CP(*s, *s32, rcount); + break; + default: + break; + } +#endif + smbus_release_bus(parent, smbdev); return (error); From nobody Wed Nov 29 23:22:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgb2r4lb2z52Q7B for ; Wed, 29 Nov 2023 23:22:44 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sgb2r2srRz3FBd for ; Wed, 29 Nov 2023 23:22:44 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-40859dee28cso2474255e9.0 for ; Wed, 29 Nov 2023 15:22:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701300162; x=1701904962; 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=ST3NP6Aby+ir0T66VWD3RMsKGhlnQpXRacV4a4NyGgw=; b=BYpFJ3YUEH0gKlJuDtZFJKbGtJa/8JWyGM0D185ZljOka1+4gCqDAq2nd3MQoSawAU +aYalUiOJ1PmsxnOSFGCYpti1pAw/8Zm7O/H56FKfMT5VFn0mNmrbq5I0d5sdO7AL/g3 eUIfzfxUMfU1TR9uIDbNjP/0MYImzQYJ5zGgFvarlcvbuzM0dz8qzbkk+D5MWkLMeS16 4d6Dqwi+gqbi3OMCoMD+prpdVe4nthKJfHOsA8UjqfqPywPhhpkKREnjz2vQGj28wx47 u9yenEfjhX85t23fRHijM/vBKfbbl6dIMe3eipCnnskRbGEnkhduRLmmXyyfHuYLdadg F6mQ== X-Gm-Message-State: AOJu0Yww+jIVyU6wYFdY1wWayRgF0w0XV+i1JLmWPOEIG8A7JNkf++ld YavgaKxzG0SzZ+t2rga0vxOX2A== X-Google-Smtp-Source: AGHT+IGojsNKLbbyXTnbizy2/hetd0KGQM4NLAkB1STuFl1V39z/XRL9CYjDb0SVINjmGj7nlvhgog== X-Received: by 2002:a05:600c:1384:b0:40b:41c8:f414 with SMTP id u4-20020a05600c138400b0040b41c8f414mr10468610wmf.31.1701300162478; Wed, 29 Nov 2023 15:22:42 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id v13-20020a05600c444d00b0040b3867a297sm3655913wmn.36.2023.11.29.15.22.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2023 15:22:42 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main 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: 376330aca184 - main - smbus: add compat32 support for SMB ioctls From: Jessica Clarke In-Reply-To: <202311292316.3ATNGAwd017745@gitrepo.freebsd.org> Date: Wed, 29 Nov 2023 23:22:31 +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: <202311292316.3ATNGAwd017745@gitrepo.freebsd.org> To: "Stephen J. Kiernan" X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Sgb2r2srRz3FBd On 29 Nov 2023, at 23:16, Stephen J. Kiernan wrote: >=20 > The branch main has been updated by stevek: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D376330aca1846d0f7771c16604b41bd7= f6f1f14c >=20 > commit 376330aca1846d0f7771c16604b41bd7f6f1f14c > Author: Stephen J. Kiernan > AuthorDate: 2023-11-29 19:33:59 +0000 > Commit: Stephen J. Kiernan > CommitDate: 2023-11-29 23:15:09 +0000 >=20 > smbus: add compat32 support for SMB ioctls >=20 > Some of the SMB ioctl request structures contain pointers and need = to > handle requests from 32-bit applications on 64-bit kernels. >=20 > Obtained from: Juniper Networks, Inc. > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D42837 > --- > sys/dev/smbus/smb.c | 142 = ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 142 insertions(+) >=20 > diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c > index f47fc753bbdc..ee323c835f10 100644 > --- a/sys/dev/smbus/smb.c > +++ b/sys/dev/smbus/smb.c > @@ -2,6 +2,7 @@ > * SPDX-License-Identifier: BSD-2-Clause > * > * Copyright (c) 1998, 2001 Nicolas Souchu > + * Copyright (c) 2023 Juniper Networks, Inc. > * All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > @@ -29,6 +30,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -41,6 +43,44 @@ >=20 > #include "smbus_if.h" >=20 > +#ifdef COMPAT_FREEBSD32 > +struct smbcmd32 { > + u_char cmd; > + u_char reserved; > + u_short op; > + union { > + char byte; > + char buf[2]; > + short word; > + } wdata; > + union { > + char byte; > + char buf[2]; > + short word; > + } rdata; > + int slave; > + uint32_t wbuf; > + int wcount; > + uint32_t rbuf; > + int rcount; > +}; > + > +#define SMB_QUICK_WRITE32 _IOW('i', 1, struct smbcmd32) > +#define SMB_QUICK_READ32 _IOW('i', 2, struct smbcmd32) > +#define SMB_SENDB32 _IOW('i', 3, struct smbcmd32) > +#define SMB_RECVB32 _IOWR('i', 4, struct smbcmd32) > +#define SMB_WRITEB32 _IOW('i', 5, struct smbcmd32) > +#define SMB_WRITEW32 _IOW('i', 6, struct smbcmd32) > +#define SMB_READB32 _IOWR('i', 7, struct smbcmd32) > +#define SMB_READW32 _IOWR('i', 8, struct smbcmd32) > +#define SMB_PCALL32 _IOWR('i', 9, struct smbcmd32) > +#define SMB_BWRITE32 _IOW('i', 10, struct smbcmd32) > +#define SMB_BREAD32 _IOWR('i', 11, struct smbcmd32) > +#define SMB_OLD_READB32 _IOW('i', 7, struct smbcmd32) > +#define SMB_OLD_READW32 _IOW('i', 8, struct smbcmd32) > +#define SMB_OLD_PCALL32 _IOW('i', 9, struct smbcmd32) You can use _IOC_NEWTYPE to avoid duplicating the encodings. Jess From nobody Thu Nov 30 00:22:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgcMx5tydz52T3T; Thu, 30 Nov 2023 00:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgcMx58hsz3Kkj; Thu, 30 Nov 2023 00:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701303757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WmidlHGmSxfwe1URBec4hhNA0833jzZmhoZeARHHe88=; b=ZQMhIl8x5tCuSDzZ3CYmzqJ6NKFbH4Xur3gE7RERW53aIeiPc+fS8X+SeifMTHuN39tRxD 7CYJ3iCqQw0gOZWfe8NNmq5vIn0BmAm84b2MKVDVaFbvREfV7dhRHG2Cqnpr2cg/DNjHC+ hYkPhGWauxNtaCb9aivSonjXeJghACFST5J5FclkGFUg1ipSS6AKbZzmRU7m6FYKLLTkAA 6Zml05ovSkHk4iDYXbxcDkZ05+gmAu17psiF46uMasrgXAxjWcVo+jPI32YLdxX7kdkB3L 6oRse/9ewR1K9ZlSQVXYhLEuXZUf0wUWJe4JlRoc/pBklhiEWdueBGZxqOwanQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701303757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WmidlHGmSxfwe1URBec4hhNA0833jzZmhoZeARHHe88=; b=r8f2ACtptq3ukxrCNbzeVWvSVqGyhadx4jgQqJmWvaOB88vZcRvzsP8JlVWBHxZ9R8GLfR ziGgEmMVeBL8zRVQ9U7APXDel5CszASi/mLjL6w2RskrYyX8gB0fDjhNAyioKLzfOLlJCz 43w1CNt05TNFxnqAt5YsFeLK118gNfRK6f+Va1DnK0pPTpsNe6Q0JqHoNn3a+QHL9lg5Zb GHoXvxajyW05qyf37nACyAP7xuV5SStuCc38puU8PROa3yuvSxbZqE2ruSysGHWat1NF8k 2+oZf7fCceuZogrGGZE8YvxbHp+dazD6bGIppo1uk1jCeXLqEO00Q8QC9IL7wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701303757; a=rsa-sha256; cv=none; b=peIoabO2cjrdcUdH3R6bnV4dD7OnaoWPNfyTOAqncgtZtZ6+cBscI95YVh40fbKcKCXiX5 stiAsrHBUkuVeMmsciBduEwbVd4ekokjj0dM7f7BsyeFql4QeVACIk/dzMDki2cET1h4bh 73iuV03qLdbrbDrRfc/HfqHG82VPl2GNqCuGGvQ05FrqqSb+JGp/WCN/hnctFc3wbKW2cS 3UCuzD0h87pzfymKrPis38ASFSqns7zZ/J2+6YudKxACw4tbUTzGdTsZMtvLDiPV/MJ027 tyTenkC9YRc2i3nTb2laSI/0TXy6WEjH8yTnrjfOV0fSJzag6NbaYPDH0YkYxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgcMx4Cw5zCdg; Thu, 30 Nov 2023 00:22: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 3AU0MbbV034139; Thu, 30 Nov 2023 00:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0Mb3x034136; Thu, 30 Nov 2023 00:22:37 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:22:37 GMT Message-Id: <202311300022.3AU0Mb3x034136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: ed31b3f4a146 - main - jail: Don't allow jail_set(2) to resurrect dying jails. List-Id: Commit messages for the main 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed31b3f4a146b3aa38f416954b6dbffad02efa5d Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=ed31b3f4a146b3aa38f416954b6dbffad02efa5d commit ed31b3f4a146b3aa38f416954b6dbffad02efa5d Author: Jamie Gritton AuthorDate: 2023-11-30 00:12:13 +0000 Commit: Jamie Gritton CommitDate: 2023-11-30 00:12:13 +0000 jail: Don't allow jail_set(2) to resurrect dying jails. Currently, a prison in "dying" state (removed but still holding resources) can be brought back to alive state via "jail -d", or the JAIL_DYING flag to jail_set(2). This seemed like a good idea at the time. Its main use was to improve support for specifying the jid when creating a jail, which also seemed like a good idea at the time. But resurrecting a jail that was partway through thr process of shutting down is trouble waiting to happen. This patch deprecates that flag, leaving it as a no-op for creating jails (but still useful for looking at dying jails). It sill allows creating a new jail with the same jid as a dying one, but will renumber the old one in that case. That's imperfect, but allows for current behavior. Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D28150 --- lib/libc/sys/jail.2 | 6 +- sys/kern/kern_jail.c | 259 ++++++++++++++++++++++++++++----------------------- sys/sys/jail.h | 2 +- usr.sbin/jail/jail.8 | 24 +++-- usr.sbin/jail/jail.c | 86 ++++------------- 5 files changed, 186 insertions(+), 191 deletions(-) diff --git a/lib/libc/sys/jail.2 b/lib/libc/sys/jail.2 index 4bb4a6dde7d2..8f8b9925c712 100644 --- a/lib/libc/sys/jail.2 +++ b/lib/libc/sys/jail.2 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 19, 2021 +.Dd November 29, 2023 .Dt JAIL 2 .Os .Sh NAME @@ -185,7 +185,9 @@ it, as with the .Fn jail_attach system call. .It Dv JAIL_DYING -Allow setting a jail that is in the process of being removed. +This is deprecated in +.Fn jail_set +and has no effect. .El .Pp The diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 66bcd77ca8d2..c7b07d5762fa 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -136,8 +136,10 @@ SX_SYSINIT(allprison_lock, &allprison_lock, "allprison"); struct prisonlist allprison = TAILQ_HEAD_INITIALIZER(allprison); LIST_HEAD(, prison_racct) allprison_racct; int lastprid = 0; +int lastdeadid = 0; static int get_next_prid(struct prison **insprp); +static int get_next_deadid(struct prison **insprp); static int do_jail_attach(struct thread *td, struct prison *pr, int drflags); static void prison_complete(void *context, int pending); static void prison_deref(struct prison *pr, int flags); @@ -977,7 +979,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) #endif struct vfsopt *opt; struct vfsoptlist *opts; - struct prison *pr, *deadpr, *inspr, *mypr, *ppr, *tpr; + struct prison *pr, *deadpr, *dinspr, *inspr, *mypr, *ppr, *tpr; struct vnode *root; char *domain, *errmsg, *host, *name, *namelc, *p, *path, *uuid; char *g_path, *osrelstr; @@ -988,10 +990,10 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) #endif unsigned long hid; size_t namelen, onamelen, pnamelen; - int born, created, cuflags, descend, drflags, enforce; + int created, cuflags, descend, drflags, enforce; int error, errmsg_len, errmsg_pos; int gotchildmax, gotenforce, gothid, gotrsnum, gotslevel; - int jid, jsys, len, level; + int deadid, jid, jsys, len, level; int childmax, osreldt, rsnum, slevel; #ifdef INET int ip4s; @@ -1404,6 +1406,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) */ pr = NULL; inspr = NULL; + deadpr = NULL; if (cuflags == JAIL_CREATE && jid == 0 && name != NULL) { namelc = strrchr(name, '.'); jid = strtoul(namelc != NULL ? namelc + 1 : name, &p, 10); @@ -1433,69 +1436,38 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) continue; if (inspr->pr_id > jid) break; - pr = inspr; - mtx_lock(&pr->pr_mtx); - drflags |= PD_LOCKED; + if (prison_isalive(inspr)) { + pr = inspr; + mtx_lock(&pr->pr_mtx); + drflags |= PD_LOCKED; + } else { + /* Note a dying jail to handle later. */ + deadpr = inspr; + } inspr = NULL; break; } - if (pr != NULL) { - /* Create: jid must not exist. */ - if (cuflags == JAIL_CREATE) { - /* - * Even creators that cannot see the jail will - * get EEXIST. - */ - error = EEXIST; - vfs_opterror(opts, "jail %d already exists", - jid); - goto done_deref; - } - if (!prison_ischild(mypr, pr)) { - /* - * Updaters get ENOENT if they cannot see the - * jail. This is true even for CREATE | UPDATE, - * which normally cannot give this error. - */ - error = ENOENT; - vfs_opterror(opts, "jail %d not found", jid); - goto done_deref; - } - ppr = pr->pr_parent; - if (!prison_isalive(ppr)) { - error = ENOENT; - vfs_opterror(opts, "jail %d is dying", - ppr->pr_id); - goto done_deref; - } - if (!prison_isalive(pr)) { - if (!(flags & JAIL_DYING)) { - error = ENOENT; - vfs_opterror(opts, "jail %d is dying", - jid); - goto done_deref; - } - if ((flags & JAIL_ATTACH) || - (pr_flags & PR_PERSIST)) { - /* - * A dying jail might be resurrected - * (via attach or persist), but first - * it must determine if another jail - * has claimed its name. Accomplish - * this by implicitly re-setting the - * name. - */ - if (name == NULL) - name = prison_name(mypr, pr); - } - } - } else { - /* Update: jid must exist. */ - if (cuflags == JAIL_UPDATE) { - error = ENOENT; - vfs_opterror(opts, "jail %d not found", jid); - goto done_deref; - } + if (cuflags == JAIL_CREATE && pr != NULL) { + /* + * Even creators that cannot see the jail will + * get EEXIST. + */ + error = EEXIST; + vfs_opterror(opts, "jail %d already exists", jid); + goto done_deref; + } + if ((pr == NULL) + ? cuflags == JAIL_UPDATE + : !prison_ischild(mypr, pr)) { + /* + * Updaters get ENOENT for nonexistent jails, + * or for jails they cannot see. The latter + * case is true even for CREATE | UPDATE, + * which normally cannot give this error. + */ + error = ENOENT; + vfs_opterror(opts, "jail %d not found", jid); + goto done_deref; } } /* @@ -1547,54 +1519,35 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) if (namelc[0] != '\0') { pnamelen = (ppr == &prison0) ? 0 : strlen(ppr->pr_name) + 1; - deadpr = NULL; FOREACH_PRISON_CHILD(ppr, tpr) { - if (tpr != pr && - !strcmp(tpr->pr_name + pnamelen, namelc)) { - if (prison_isalive(tpr)) { - if (pr == NULL && - cuflags != JAIL_CREATE) { - /* - * Use this jail - * for updates. - */ - pr = tpr; - mtx_lock(&pr->pr_mtx); - drflags |= PD_LOCKED; - break; - } - /* - * Create, or update(jid): - * name must not exist in an - * active sibling jail. - */ - error = EEXIST; - vfs_opterror(opts, - "jail \"%s\" already exists", - name); - goto done_deref; - } - if (pr == NULL && - cuflags != JAIL_CREATE) { - deadpr = tpr; - } - } - } - /* If no active jail is found, use a dying one. */ - if (deadpr != NULL && pr == NULL) { - if (flags & JAIL_DYING) { - pr = deadpr; - mtx_lock(&pr->pr_mtx); - drflags |= PD_LOCKED; - } else if (cuflags == JAIL_UPDATE) { - error = ENOENT; + if (tpr == pr || !prison_isalive(tpr) || + strcmp(tpr->pr_name + pnamelen, namelc)) + continue; + if (cuflags == JAIL_CREATE || pr != NULL) { + /* + * Create, or update(jid): name must + * not exist in an active sibling jail. + */ + error = EEXIST; vfs_opterror(opts, - "jail \"%s\" is dying", name); + "jail \"%s\" already exists", name); goto done_deref; } + /* Use this jail for updates. */ + pr = tpr; + mtx_lock(&pr->pr_mtx); + drflags |= PD_LOCKED; + break; } - /* Update: name must exist if no jid. */ - else if (cuflags == JAIL_UPDATE && pr == NULL) { + /* + * Update: name must exist if no jid is specified. + * As with the jid case, the jail must be currently + * visible, or else even CREATE | UPDATE will get + * an error. + */ + if ((pr == NULL) + ? cuflags == JAIL_UPDATE + : !prison_isalive(pr)) { error = ENOENT; vfs_opterror(opts, "jail \"%s\" not found", name); @@ -1618,6 +1571,36 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) vfs_opterror(opts, "prison limit exceeded"); goto done_deref; } + + if (deadpr != NULL) { + /* + * The prison being created has the same ID as a dying + * one. Handle this by giving the dying jail a new ID. + * This may cause some confusion to user space, but + * only to those listing dying jails. + */ + deadid = get_next_deadid(&dinspr); + if (deadid == 0) { + error = EAGAIN; + vfs_opterror(opts, "no available jail IDs"); + goto done_deref; + } + mtx_lock(&deadpr->pr_mtx); + deadpr->pr_id = deadid; + mtx_unlock(&deadpr->pr_mtx); + if (dinspr == deadpr) + inspr = deadpr; + else { + inspr = TAILQ_NEXT(deadpr, pr_list); + TAILQ_REMOVE(&allprison, deadpr, pr_list); + if (dinspr != NULL) + TAILQ_INSERT_AFTER(&allprison, dinspr, + deadpr, pr_list); + else + TAILQ_INSERT_HEAD(&allprison, deadpr, + pr_list); + } + } if (jid == 0 && (jid = get_next_prid(&inspr)) == 0) { error = EAGAIN; vfs_opterror(opts, "no available jail IDs"); @@ -2017,14 +2000,13 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * Persistent prisons get an extra reference, and prisons losing their * persist flag lose that reference. */ - born = !prison_isalive(pr); if (ch_flags & PR_PERSIST & (pr_flags ^ pr->pr_flags)) { if (pr_flags & PR_PERSIST) { prison_hold(pr); /* - * This may make a dead prison alive again, but wait - * to label it as such until after OSD calls have had - * a chance to run (and perhaps to fail). + * This may be a new prison's first user reference, + * but wait to call it alive until after OSD calls + * have had a chance to run (and perhaps to fail). */ refcount_acquire(&pr->pr_uref); } else { @@ -2039,7 +2021,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * Any errors past this point will need to de-persist newly created * prisons, as well as call remove methods. */ - if (born) + if (created) drflags |= PD_KILL; #ifdef RACCT @@ -2092,7 +2074,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) #endif /* Let the modules do their work. */ - if (born) { + if (created) { error = osd_jail_call(pr, PR_METHOD_CREATE, opts); if (error) goto done_deref; @@ -2105,7 +2087,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * A new prison is now ready to be seen; either it has gained a user * reference via persistence, or is about to gain one via attachment. */ - if (born) { + if (created) { drflags = prison_lock_xlock(pr, drflags); pr->pr_state = PRISON_STATE_ALIVE; } @@ -2135,7 +2117,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) } #endif - if (born && pr != &prison0 && (pr->pr_allow & PR_ALLOW_NFSD) != 0 && + if (created && pr != &prison0 && (pr->pr_allow & PR_ALLOW_NFSD) != 0 && (pr->pr_root->v_vflag & VV_ROOT) == 0) printf("Warning jail jid=%d: mountd/nfsd requires a separate" " file system\n", pr->pr_id); @@ -2242,6 +2224,55 @@ get_next_prid(struct prison **insprp) return (jid); } +/* + * Find the next available ID for a renumbered dead prison. This is the same + * as get_next_prid, but counting backward from the end of the range. + */ +static int +get_next_deadid(struct prison **dinsprp) +{ + struct prison *dinspr; + int deadid, minid; + + deadid = lastdeadid ? lastdeadid - 1 : JAIL_MAX; + /* + * Take two reverse passes through the allprison list: first + * starting with the proposed deadid, then ending with it. + */ + for (minid = 1; minid != 0; ) { + TAILQ_FOREACH_REVERSE(dinspr, &allprison, prisonlist, pr_list) { + if (dinspr->pr_id > deadid) + continue; + if (dinspr->pr_id < deadid) { + /* Found an opening. */ + minid = 0; + break; + } + if (--deadid < minid) { + if (lastdeadid == minid || lastdeadid == 0) + { + /* + * The entire legal range + * has been traversed + */ + return 0; + } + /* Try again from the end. */ + deadid = JAIL_MAX; + minid = lastdeadid; + break; + } + } + if (dinspr == NULL) { + /* Found room at the beginning of the list. */ + break; + } + } + *dinsprp = dinspr; + lastdeadid = deadid; + return (deadid); +} + /* * struct jail_get_args { * struct iovec *iovp; diff --git a/sys/sys/jail.h b/sys/sys/jail.h index fb8858f73453..6e7b6cc9ad6a 100644 --- a/sys/sys/jail.h +++ b/sys/sys/jail.h @@ -99,7 +99,7 @@ enum prison_state { #define JAIL_UPDATE 0x02 /* Update parameters of existing jail */ #define JAIL_ATTACH 0x04 /* Attach to jail upon creation */ #define JAIL_DYING 0x08 /* Allow getting a dying jail */ -#define JAIL_SET_MASK 0x0f +#define JAIL_SET_MASK 0x0f /* JAIL_DYING is deprecated/ignored here */ #define JAIL_GET_MASK 0x08 #define JAIL_SYS_DISABLE 0 diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 21f395609bb5..1f745caa5e7c 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 1, 2023 +.Dd November 29, 2023 .Dt JAIL 8 .Os .Sh NAME @@ -144,10 +144,6 @@ jail if it does exist. .Pp Other available options are: .Bl -tag -width indent -.It Fl d -Allow making changes to a dying jail, equivalent to the -.Va allow.dying -parameter. .It Fl f Ar conf_file Use configuration file .Ar conf_file @@ -215,6 +211,17 @@ parameter. .It Fl v Print a message on every operation, such as running commands and mounting filesystems. +.It Fl d +This is deprecated and is equivalent to the +.Va allow.dying +parameter, which is also deprecated. +It used to allow making changes to a +.Va dying +jail. +Now such jails are always replaced when a new jail is created with the same +.Va jid +or +.Va name . .El .Pp If no arguments are given after the options, the operation (except @@ -955,9 +962,14 @@ filesystem on the chrooted .Pa /proc directory. .It Va allow.dying -Allow making changes to a +This is deprecated and has no effect. +It used to allow making changes to a .Va dying jail. +Now such jails are always replaced when a new jail is created with the same +.Va jid +or +.Va name . .It Va depend Specify a jail (or jails) that this jail depends on. When this jail is to be created, any jail(s) it depends on must already exist. diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index db5918a32744..ad9505353f63 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -61,7 +61,7 @@ const char *separator = "\t"; static void clear_persist(struct cfjail *j); static int update_jail(struct cfjail *j); static int rdtun_params(struct cfjail *j, int dofail); -static void running_jid(struct cfjail *j, int dflag); +static void running_jid(struct cfjail *j); static void jail_quoted_warnx(const struct cfjail *j, const char *name_msg, const char *noname_msg); static int jailparam_set_note(const struct cfjail *j, struct jailparam *jp, @@ -137,7 +137,7 @@ main(int argc, char **argv) const char *cfname; size_t sysvallen; unsigned op, pi; - int ch, docf, error, i, oldcl, sysval; + int ch, docf, dying_warned, error, i, oldcl, sysval; int dflag, eflag, Rflag; #if defined(INET) || defined(INET6) char *cs, *ncs; @@ -377,6 +377,7 @@ main(int argc, char **argv) * operation on it. When that is done, the jail may be finished, * or it may go back for the next step. */ + dying_warned = 0; while ((j = next_jail())) { if (j->flags & JF_FAILED) { @@ -397,11 +398,13 @@ main(int argc, char **argv) import_params(j) < 0) continue; } + if (j->intparams[IP_ALLOW_DYING] && !dying_warned) { + warnx("%s", "the 'allow.dying' parameter and '-d' flag" + "are deprecated and have no effect."); + dying_warned = 1; + } if (!j->jid) - running_jid(j, - (j->flags & (JF_SET | JF_DEPEND)) == JF_SET - ? dflag || bool_param(j->intparams[IP_ALLOW_DYING]) - : 0); + running_jid(j); if (finish_command(j)) continue; @@ -615,9 +618,9 @@ create_jail(struct cfjail *j) { struct iovec jiov[4]; struct stat st; - struct jailparam *jp, *setparams, *setparams2, *sjp; + struct jailparam *jp, *setparams, *sjp; const char *path; - int dopersist, ns, jid, dying, didfail; + int dopersist, ns; /* * Check the jail's path, with a better error message than jail_set @@ -657,57 +660,8 @@ create_jail(struct cfjail *j) *sjp++ = *jp; ns = sjp - setparams; - didfail = 0; j->jid = jailparam_set_note(j, setparams, ns, JAIL_CREATE); - if (j->jid < 0 && errno == EEXIST && - bool_param(j->intparams[IP_ALLOW_DYING]) && - int_param(j->intparams[KP_JID], &jid) && jid != 0) { - /* - * The jail already exists, but may be dying. - * Make sure it is, in which case an update is appropriate. - */ - jiov[0].iov_base = __DECONST(char *, "jid"); - jiov[0].iov_len = sizeof("jid"); - jiov[1].iov_base = &jid; - jiov[1].iov_len = sizeof(jid); - jiov[2].iov_base = __DECONST(char *, "dying"); - jiov[2].iov_len = sizeof("dying"); - jiov[3].iov_base = &dying; - jiov[3].iov_len = sizeof(dying); - if (jail_get(jiov, 4, JAIL_DYING) < 0) { - /* - * It could be that the jail just barely finished - * dying, or it could be that the jid never existed - * but the name does. In either case, another try - * at creating the jail should do the right thing. - */ - if (errno == ENOENT) - j->jid = jailparam_set_note(j, setparams, ns, - JAIL_CREATE); - } else if (dying) { - j->jid = jid; - if (rdtun_params(j, 1) < 0) { - j->jid = -1; - didfail = 1; - } else { - sjp = setparams2 = alloca((j->njp + dopersist) * - sizeof(struct jailparam)); - for (jp = setparams; jp < setparams + ns; jp++) - if (!JP_RDTUN(jp) || - !strcmp(jp->jp_name, "jid")) - *sjp++ = *jp; - j->jid = jailparam_set_note(j, setparams2, - sjp - setparams2, JAIL_UPDATE | JAIL_DYING); - /* - * Again, perhaps the jail just finished dying. - */ - if (j->jid < 0 && errno == ENOENT) - j->jid = jailparam_set_note(j, - setparams, ns, JAIL_CREATE); - } - } - } - if (j->jid < 0 && !didfail) { + if (j->jid < 0) { jail_warnx(j, "%s", jail_errmsg); failed(j); } @@ -772,9 +726,7 @@ update_jail(struct cfjail *j) if (!JP_RDTUN(jp)) *++sjp = *jp; - jid = jailparam_set_note(j, setparams, ns, - bool_param(j->intparams[IP_ALLOW_DYING]) - ? JAIL_UPDATE | JAIL_DYING : JAIL_UPDATE); + jid = jailparam_set_note(j, setparams, ns, JAIL_UPDATE); if (jid < 0) { jail_warnx(j, "%s", jail_errmsg); failed(j); @@ -815,8 +767,7 @@ rdtun_params(struct cfjail *j, int dofail) rtjp->jp_value = NULL; } rval = 0; - if (jailparam_get(rtparams, nrt, - bool_param(j->intparams[IP_ALLOW_DYING]) ? JAIL_DYING : 0) > 0) { + if (jailparam_get(rtparams, nrt, 0) > 0) { rtjp = rtparams + 1; for (jp = j->jp; rtjp < rtparams + nrt; jp++) { if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) { @@ -863,7 +814,7 @@ rdtun_params(struct cfjail *j, int dofail) * Get the jail's jid if it is running. */ static void -running_jid(struct cfjail *j, int dflag) +running_jid(struct cfjail *j) { struct iovec jiov[2]; const char *pval; @@ -889,7 +840,7 @@ running_jid(struct cfjail *j, int dflag) j->jid = -1; return; } - j->jid = jail_get(jiov, 2, dflag ? JAIL_DYING : 0); + j->jid = jail_get(jiov, 2, 0); } static void @@ -918,10 +869,9 @@ jailparam_set_note(const struct cfjail *j, struct jailparam *jp, unsigned njp, jid = jailparam_set(jp, njp, flags); if (verbose > 0) { - jail_note(j, "jail_set(%s%s)", + jail_note(j, "jail_set(%s)", (flags & (JAIL_CREATE | JAIL_UPDATE)) == JAIL_CREATE - ? "JAIL_CREATE" : "JAIL_UPDATE", - (flags & JAIL_DYING) ? " | JAIL_DYING" : ""); + ? "JAIL_CREATE" : "JAIL_UPDATE"); for (i = 0; i < njp; i++) { printf(" %s", jp[i].jp_name); if (jp[i].jp_value == NULL) From nobody Thu Nov 30 01:29:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SgdsQ3Y7gz52Y5L; Thu, 30 Nov 2023 01:29: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 4SgdsQ32p1z3Xbs; Thu, 30 Nov 2023 01:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701307786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGs1ax6rs3PGGVRxn8IyLSWwa97DE5f/pVYZxeGHEmU=; b=Z1wI77Eb8SIIS+qi4jbuWtnzxOyYNxYcP2PU89FD1Zrc/nK6uBWP365IpObm5bmcon659X s8FeMiLE9A0Xe7CkwvIVzhC7N9OX8xeGa1xIeBDZ/+ky75SmErnqnhLf3/OgMl1twryuXW 0qm26TrXk7T+gacoThdbUMg8SUQ7yo1AB9P+J9SkJdXcZCqk2ABNXqJ7ZMnUTEa112q1KC k+78VGUCin8weuo1YAwbAp5w5xjepIKX4Mn700hy7T1ZHdcGK6dp/007Yq0RE2W2FEsVCU +IayH1HarvLToaO4aDXqokB0JS9zl9NIz6jWD7I/M12KZzWtf2cwfmXTNih9CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701307786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGs1ax6rs3PGGVRxn8IyLSWwa97DE5f/pVYZxeGHEmU=; b=PmoML6gs6X8/dEVwRUHCmEQyQUPkdWAnB1ZQawFqBO5JooTXbg/mScNSLA8HeCDvUM4743 jQZaQxb1gXMZUWxJIqzf/FsgSl7QcfEPoOjTXWaqBttxuF/aFeYTR9MFLC2CAZ6lzajj53 +88HWiZ5n+bIt9V0oaaiYLvRJANlhRvfcXH1QyrS5oI5zj1GCKjjAQgHb1hzi/wF4rUjhz HTrOdkCNvDJpTDOvGBSCGesLICA07h2+M/lW3fJa4cKc679OSACFmBmB/L/itszCWYr4/0 B8jVNDfMT/+KSm8ZCqZAkRUiJmHWixVxV4ei5LcRuJLyHG2Tt/GkSdG9nkaiDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701307786; a=rsa-sha256; cv=none; b=mdk0mBtbBDzSzPWDcNd6i/Y2LqN5Ua5q39+nY7h3Wc059Y877bSH2pOAJ4QcyuZRDG/1s0 mHtiGI1yqBf6+3tFVBYUackGu6ckmrfwoRT4+LKLq+oxzgCGG0kLRZFblK8htRyOTIqo1B 4CTRPzSPP2QjwShcJpwR+GojRXxTZrMrJRcjEaXzqZ7TrOqXPYhnoY2M6mOg1qmKB63K+F Vx0N1bGIlubx3usYeqkIO3eg7fqWoeU8m2Jvtf0ovU49+is1GQ/3O/XvEJ6vzA86Z3E9BV J9g397bvJzlmYGBgYBbPXzSsrB7qIdw/8hqpvLr0uhiIOR8BmS7cNuUI0V3AcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SgdsQ25G9zVbZ; Thu, 30 Nov 2023 01:29: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 3AU1Tkxs036607; Thu, 30 Nov 2023 01:29:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU1TkPf036604; Thu, 30 Nov 2023 01:29:46 GMT (envelope-from git) Date: Thu, 30 Nov 2023 01:29:46 GMT Message-Id: <202311300129.3AU1TkPf036604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 51e7276365ba - main - Unbreak build from ed31b3f4a146 (misapplied diff). List-Id: Commit messages for the main 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51e7276365bad2871257ef121cead2c19bcd7434 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=51e7276365bad2871257ef121cead2c19bcd7434 commit 51e7276365bad2871257ef121cead2c19bcd7434 Author: Jamie Gritton AuthorDate: 2023-11-30 01:27:37 +0000 Commit: Jamie Gritton CommitDate: 2023-11-30 01:27:37 +0000 Unbreak build from ed31b3f4a146 (misapplied diff). Differential Revision: To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8daee410d2c1 - main - vm: Use vmem_xalloc in kva_alloc List-Id: Commit messages for the main 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: 8daee410d2c13b4e8530b00e7877eeecf30bb064 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8daee410d2c13b4e8530b00e7877eeecf30bb064 commit 8daee410d2c13b4e8530b00e7877eeecf30bb064 Author: Andrew Turner AuthorDate: 2023-11-29 12:11:37 +0000 Commit: Andrew Turner CommitDate: 2023-11-30 10:50:03 +0000 vm: Use vmem_xalloc in kva_alloc The kernel_arena used in kva_alloc has the qcache disabled. vmem_alloc will first try to use the qcache before falling back to vmem_xalloc. Rather than trying to use the qcache in vmem_alloc just call vmem_xalloc directly. Reviewed by: alc, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42831 --- sys/vm/vm_kern.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index c2c908b3dc94..6b22a96bf597 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -147,7 +147,8 @@ kva_alloc(vm_size_t size) TSENTER(); size = round_page(size); - if (vmem_alloc(kernel_arena, size, M_BESTFIT | M_NOWAIT, &addr)) + if (vmem_xalloc(kernel_arena, size, 0, 0, 0, VMEM_ADDR_MIN, + VMEM_ADDR_MAX, M_BESTFIT | M_NOWAIT, &addr)) return (0); TSEXIT(); @@ -168,7 +169,7 @@ kva_free(vm_offset_t addr, vm_size_t size) { size = round_page(size); - vmem_free(kernel_arena, addr, size); + vmem_xfree(kernel_arena, addr, size); } /* From nobody Thu Nov 30 11:24:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sgv3h5X4kz53CKD; Thu, 30 Nov 2023 11:24: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 4Sgv3h4nb8z3Ngs; Thu, 30 Nov 2023 11:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701343472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIktAGxp9OIavv0Zpc+VxkuCtCzpQa7UzjtkUbR5Mk0=; b=v6im1rq+L427szwRe63st5h8ANguvKGAv3EuN2zYoKxVW9StqZ4z/1ht2XHZ0CHxT2iIP5 ZGCmOF8GrxQYYF2tCR5URfS4Dif1Y2B4JIAPfOXtjHvonKv71U3foFg28M98J0AySrcZRn jlHxS2rgRJe5nNW/jPW9WZses89EUvfsSrL6xGm5sZtrQoj6wWF7KsRFANrBNc6+8N5hIY M3Ra+XYh6uYZa7t3sbbTXkqozn6WWgLU41wtHNXDqOs4+mOMWtn2LFswgSfoeOT8oxzuxY URh4IKmR1RQf1q3ByJ4WxIu6K9q0eSvqz365hcTIZ7TmBxKsLUuRCg4c9Q2Qbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701343472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIktAGxp9OIavv0Zpc+VxkuCtCzpQa7UzjtkUbR5Mk0=; b=FTKK/lp5vp5+67ZZydj3qjGTWNdnoILcP/WOnXKMMg5rIEE7PYBqC0Rp2/yaKcEpH/sn4v tdj4xSl6WnM8MIRNz38s0VA4lVOjDvPawEff1gXoeSJoIByiaWa4MnaJxVqHbq1M5O5AmH 6SqhwsCOUsH7JRSRKD+LS6TMewVLrYpvxcwpvi+52TzitQD1hflBrfJ9KTqFv7HZe4lSJ2 7RC99sdIrSnAM0VgRMfhjUtKSCdyEUzeTCTRtQdkhoKqV+Eo0dvOIR15CPZBETOHdtR04E ZeA5S65KbIYMP3G3HnmN1rHGeeb40ZqLYn8Pl0Eo2xskCI+wvqvyczfY/lv/2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701343472; a=rsa-sha256; cv=none; b=QGfsCpWuq/i4o6bIynITOMaRrl3aLG5yFYKLYBRovCPvroNqEYRQJgXeuJPXW0SpLqQ9mj 7BN2pfTL5JlIFRzsDYBDYnu3tGvGjPWvr9sRwpNtf5QHGMVFxVjvfCs2NXYPF0kM83zh/Y H3JDd2rZcO0mzduM7DtmedXbsJrz28b4XVxnWvHcnyXDQrbRE7wQ7gXHPDYjxN8lpeQRmX Zt3dGJNdCCs+1gsCT1BKSmTLSeH5r0D0dz1dDncRSBXzg4HxrwOhoI+sheNikGh/w4frwy k1sEkqJAZKt1TJRWfEgZSucf+jujcibqQIVWIxmgc+M2J5jzr3SM+I57KXHdKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sgv3h3lvXznP2; Thu, 30 Nov 2023 11:24: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 3AUBOWdX037324; Thu, 30 Nov 2023 11:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUBOWLi037321; Thu, 30 Nov 2023 11:24:32 GMT (envelope-from git) Date: Thu, 30 Nov 2023 11:24:32 GMT Message-Id: <202311301124.3AUBOWLi037321@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: 839999e7efdc - main - vm: Add kva_alloc_aligned List-Id: Commit messages for the main 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: 839999e7efdc980d5ada92ea93719c7e29765809 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=839999e7efdc980d5ada92ea93719c7e29765809 commit 839999e7efdc980d5ada92ea93719c7e29765809 Author: Andrew Turner AuthorDate: 2023-11-29 12:54:49 +0000 Commit: Andrew Turner CommitDate: 2023-11-30 10:50:03 +0000 vm: Add kva_alloc_aligned Add a function like kva_alloc that allows us to specify the alignment of the virtual address space returned. Reviewed by: alc, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42788 --- sys/vm/vm_extern.h | 1 + sys/vm/vm_kern.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index bcef44012472..2e2bc18a0233 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -47,6 +47,7 @@ struct domainset; /* These operate on kernel virtual addresses only. */ vm_offset_t kva_alloc(vm_size_t); +vm_offset_t kva_alloc_aligned(vm_size_t, vm_size_t); void kva_free(vm_offset_t, vm_size_t); /* These operate on pageable virtual addresses. */ diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 6b22a96bf597..b17b857bd902 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -155,6 +155,27 @@ kva_alloc(vm_size_t size) return (addr); } +/* + * kva_alloc_aligned: + * + * Allocate a virtual address range as in kva_alloc where the base + * address is aligned to align. + */ +vm_offset_t +kva_alloc_aligned(vm_size_t size, vm_size_t align) +{ + vm_offset_t addr; + + TSENTER(); + size = round_page(size); + if (vmem_xalloc(kernel_arena, size, align, 0, 0, VMEM_ADDR_MIN, + VMEM_ADDR_MAX, M_BESTFIT | M_NOWAIT, &addr)) + return (0); + TSEXIT(); + + return (addr); +} + /* * kva_free: * From nobody Thu Nov 30 15:30:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh0Vy6GB1z52CQw; Thu, 30 Nov 2023 15:30: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 4Sh0Vy5jdwz4NbF; Thu, 30 Nov 2023 15:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701358202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVYVsGluNaxGq2AtWkWtRm0HXXedDI5S1N4JGG/6iRE=; b=Jh+joEbbg3vG2zRCTztm8FMMkV7WBSAjXl/FZrqMjx9aAIJj5rYNstowNeexmz3Zacxq0a UPb54qlDO7m2AJ1Iui4pFPfsKIsrHkkq6+LSlZ9F2aKuqM4ZM+ymRwGP6ais3RD3U509UA PbdJHqM0QeY4/gQV/mVJ/V+BnBBRaTd/uASoR+vHhIsk9BPl2PGLzXA6udhEjs305PKaBV CqedWOtUQBtQJvvJ82SePn9H58AQSvIQ4QC+44UASRd+f6QXl2KdAdTS7GZi6hfHWgk7sZ 1HEAZYzK9D2LJ9a7lqiGc2q2QkqHTtS2+XQUEgiFjxnmgNqOJo7TByEiP5uapw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701358202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVYVsGluNaxGq2AtWkWtRm0HXXedDI5S1N4JGG/6iRE=; b=wVypg1DdguDaZNciezPTzf9HPm85K3/2NVoDMFi5lrngtpbI6Bsw8XsmPVUI0QpHjz8JHg nmKOiawfNS4Y8gMDfZDV6kFnhsUGUxWtUCXLBavo5cbXbLyDCsXStLYIsocXTlij5m2Vbo Oamk33IKY2uwEVzUzNuaM7pSzuSt0adZv/ciqpvJ6CxyObjYfHtaoX5dynMTfAfsfZpwfj 8PlO9xr5H03eTtYhmikmJZxWhaZ2MCTWBPdfXNaavtj0h9duaswe/w5ICP0HA+CM+KuCO5 Peyue8qMTcBSYV35IDYQK+ScXiq6+9GUxGdg+p0b4j5LtUglBI4nh9eKGxrang== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701358202; a=rsa-sha256; cv=none; b=wp8na+W7OeZ//IBYSEcl3KhZQ33sANBnwWfyNl37RPuX1iMut7e+5OTBeXNzWOgNNCusSz 4/2+QueF9vOdFSqcXHAGxnUP5854PyRDAfC8YuA4DKD9ToRp8WyUEJo3yP1bplIrTqkRa0 /V8l252fUHfIzGOh80m2v2DK8fePmbwXhW7QycTrqKMwrOMG/A7p7Pal1k2xp3pUPx9q2N nnmY7KbtHXmwxlLmgcj6PRzGuTpS8bwn7bJkTcKavd+YBUIxadmN9p2nb6EoVxyFoPekE8 vm7wrku1RzP1fkSCd3DGNbFNaSSQU2aY3Hnehyl2ePC2OLayYyOFbehpO0iGjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh0Vy4m4RzvfH; Thu, 30 Nov 2023 15:30: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 3AUFU2ij041642; Thu, 30 Nov 2023 15:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUFU25c041637; Thu, 30 Nov 2023 15:30:02 GMT (envelope-from git) Date: Thu, 30 Nov 2023 15:30:02 GMT Message-Id: <202311301530.3AUFU25c041637@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: 34c45bc6a394 - main - tcp: enable LRD by default List-Id: Commit messages for the main 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: 34c45bc6a3940ccfddb60207cb103f73bf87c4a6 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=34c45bc6a3940ccfddb60207cb103f73bf87c4a6 commit 34c45bc6a3940ccfddb60207cb103f73bf87c4a6 Author: Richard Scheffenegger AuthorDate: 2023-11-30 04:33:50 +0000 Commit: Richard Scheffenegger CommitDate: 2023-11-30 04:38:16 +0000 tcp: enable LRD by default Lost Retransmission Detection was added as a feature in May 2021, but disabled by default. Enabling the feature by default to reduce the flow completion time by avoiding RTOs when retransmissions get lost too. Reviewed By: tuexen, #transport, zlei MFC after: 10 weeks Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42845 --- share/man/man4/tcp.4 | 4 ++-- sys/netinet/tcp_input.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 3f54d904abc8..317ee818f3a4 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 17, 2023 +.Dd November 30, 2023 .Dt TCP 4 .Os .Sh NAME @@ -465,7 +465,7 @@ Maximum amount of time, in milliseconds, before a delayed ACK is sent. .It Va delayed_ack Delay ACK to try and piggyback it onto a data packet or another ACK. .It Va do_lrd -Enable Lost Retransmission Detection for SACK-enabled sessions, disabled by +Enable Lost Retransmission Detection for SACK-enabled sessions, enabled by default. Under severe congestion, a retransmission can be lost which then leads to a mandatory Retransmission Timeout (RTO), followed by slow-start. diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index e20c09f981cd..a75dbd1547b0 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -162,7 +162,7 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_prr, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_do_prr), 1, "Enable Proportional Rate Reduction per RFC 6937"); -VNET_DEFINE(int, tcp_do_lrd) = 0; +VNET_DEFINE(int, tcp_do_lrd) = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_lrd, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_do_lrd), 1, "Perform Lost Retransmission Detection"); From nobody Thu Nov 30 16:34:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh1xh10rMz52GYk; Thu, 30 Nov 2023 16:34: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 4Sh1xh0fJNz4WgX; Thu, 30 Nov 2023 16:34:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701362088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXzyuaETvhtH/TM11pMkBxFVinCnkMQYOFuyQMn2RJg=; b=e169c63TvV8QWjWbd9orqzYQWh+kviXOah6YwTuSzocq4VlnQ9+eie63o26/naqhHKV05R ziUGdxv44zUYFq6P6TaWPqvx7qtMPkZbOjpZlXlyHwfsBhZcy+/woZ7hwJBgAA3n2ZFuDC dw6v4Mm3NNeYnAY684wmeLH6TUBSRctsrHlRzWFnPktsNWC9GJbLY8DNOsM0YcbUiY9chE 6NNFPd76WpdmoLX0dhSG+OoTYLxrBmT3ii+oJT0qzGPi0P23KXcgSsBBdgwJoWOblXMY7x UOHDxMNYH/xsTmXNz/juxSaelZckB3vSyn6ZccEitdO7QzpgAncv/GyL7PdggA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701362088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXzyuaETvhtH/TM11pMkBxFVinCnkMQYOFuyQMn2RJg=; b=o29bmoqkivh4owJaZtiyVP8hgm5khaUqww6xw4oQsL5WkW5DUrSuzp/ibc0IlEL3tJEua0 4wlvRdNEwHm1CSLE5C1lvowSgP3Mk3rRl/AnLY8Tzq+9YR/vVdUQKaAqKJm2MwF2I/4QEi G4XeOaFN44TNRAIBdNCdxrkI1uWCCEa+JFVQwaGTnrulVemDHv4wADdFaWLFlzuIbOQTf/ ISOXAi/2rqIcteWivPO9tqqv0+256oQYQyHYYGXzgtrF0ZhuM22K/AulmRtLhCQ8jR1uOI eRwozHk1Gdl+7qSm5VyLCKw5ehDSMRPVTmRQvMBWjpIHyriBLZ1WZ4UKPDRb3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701362088; a=rsa-sha256; cv=none; b=aHkXZmX40A4KxgjZxMQgF0/R04Sq9FZbsgM0+22rluy7NPPM66nbl1iPZKeLko0fDY9K/k 3cEpvnr84gEJPjwNqFyvioHgQVUMecyNKkOM4BMbQPHPwGx67R9c5/wVbrGcCyzOUHAilg USdcRzLHnIzquA2nPMo6PvKrGykLQCOosOJXhG8UNFtBxydE5R+621rKH1ACCWJ8BDRK/Y oSpzNacxQbHdPmxXLFdhBvO4MNBrPFjulhqMG4mYJY9g5yQ2c8gH2PjR3maWQdR3ml6fXt 0fIKoGZ3od0EvbEtVlEVxdB72ZnMFaKSPmJ5M9ToRx9B6TuO+UhnDPWn7bICXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh1xg6qx4zx4k; Thu, 30 Nov 2023 16:34: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 3AUGYlbm055416; Thu, 30 Nov 2023 16:34:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUGYljD055413; Thu, 30 Nov 2023 16:34:47 GMT (envelope-from git) Date: Thu, 30 Nov 2023 16:34:47 GMT Message-Id: <202311301634.3AUGYljD055413@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: cfb1e92912b4 - main - sockets: don't malloc/free sockaddr memory on accept(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: cfb1e92912b4cf75360b7fbe86197cc29bc212c1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cfb1e92912b4cf75360b7fbe86197cc29bc212c1 commit cfb1e92912b4cf75360b7fbe86197cc29bc212c1 Author: Gleb Smirnoff AuthorDate: 2023-11-30 16:30:55 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-30 16:30:55 +0000 sockets: don't malloc/free sockaddr memory on accept(2) Let the accept functions provide stack memory for protocols to fill it in. Generic code should provide sockaddr_storage, specialized code may provide smaller structure. While rewriting accept(2) make 'addrlen' a true in/out parameter, reporting required length in case if provided length was insufficient. Our manual page accept(2) and POSIX don't explicitly require that, but one can read the text as they do. Linux also does that. Update tests accordingly. Reviewed by: rscheff, tuexen, zlei, dchagin Differential Revision: https://reviews.freebsd.org/D42635 --- sys/cam/ctl/ctl_ha.c | 9 +-- sys/compat/linux/linux_socket.c | 32 ++++----- sys/dev/cxgbe/iw_cxgbe/cm.c | 7 +- sys/dev/hyperv/hvsock/hv_sock.c | 7 +- sys/dev/hyperv/hvsock/hv_sock.h | 2 +- sys/dev/iscsi/icl_soft_proxy.c | 10 ++- sys/kern/uipc_domain.c | 2 +- sys/kern/uipc_socket.c | 9 ++- sys/kern/uipc_syscalls.c | 67 +++++++----------- sys/kern/uipc_usrreq.c | 10 +-- sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h | 2 +- .../bluetooth/include/ng_btsocket_rfcomm.h | 2 +- sys/netgraph/bluetooth/include/ng_btsocket_sco.h | 2 +- sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c | 72 +++++++++++-------- sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 62 ++++++++++------- sys/netgraph/bluetooth/socket/ng_btsocket_sco.c | 60 +++++++++------- sys/netgraph/ng_ksocket.c | 12 ++-- sys/netinet/sctp_usrreq.c | 48 +++++-------- sys/netinet/sctp_var.h | 2 +- sys/netinet/tcp_usrreq.c | 80 +++++++++------------- sys/netinet6/in6_pcb.c | 19 ----- sys/netinet6/in6_pcb.h | 2 - sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c | 25 +++---- sys/rpc/svc_vc.c | 12 ++-- sys/sys/protosw.h | 2 +- sys/sys/socketvar.h | 2 +- sys/sys/syscallsubr.h | 8 +-- tests/sys/kern/socket_accept.c | 3 - 28 files changed, 261 insertions(+), 309 deletions(-) diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c index 0828c46c8863..695006ed99e1 100644 --- a/sys/cam/ctl/ctl_ha.c +++ b/sys/cam/ctl/ctl_ha.c @@ -397,7 +397,7 @@ static int ctl_ha_accept(struct ha_softc *softc) { struct socket *lso, *so; - struct sockaddr *sap; + struct sockaddr_in sin = { .sin_len = sizeof(sin) }; int error; lso = softc->ha_lso; @@ -410,16 +410,11 @@ ctl_ha_accept(struct ha_softc *softc) goto out; } - sap = NULL; - error = soaccept(so, &sap); + error = soaccept(so, (struct sockaddr *)&sin); if (error != 0) { printf("%s: soaccept() error %d\n", __func__, error); - if (sap != NULL) - free(sap, M_SONAME); goto out; } - if (sap != NULL) - free(sap, M_SONAME); softc->ha_so = so; ctl_ha_sock_setup(softc); return (0); diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index a5ed5c5c62db..2893e93bbcd7 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1017,31 +1017,29 @@ static int linux_accept_common(struct thread *td, int s, l_uintptr_t addr, l_uintptr_t namelen, int flags) { - struct sockaddr *sa; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; struct file *fp, *fp1; - int bflags, len; struct socket *so; - int error, error1; + socklen_t len; + int bflags, error, error1; bflags = 0; fp = NULL; - sa = NULL; error = linux_set_socket_flags(flags, &bflags); if (error != 0) return (error); - if (PTRIN(addr) == NULL) { - len = 0; - error = kern_accept4(td, s, NULL, NULL, bflags, NULL); - } else { + if (PTRIN(addr) != NULL) { error = copyin(PTRIN(namelen), &len, sizeof(len)); if (error != 0) return (error); if (len < 0) return (EINVAL); - error = kern_accept4(td, s, &sa, &len, bflags, &fp); - } + } else + len = 0; + + error = kern_accept4(td, s, (struct sockaddr *)&ss, bflags, &fp); /* * Translate errno values into ones used by Linux. @@ -1071,11 +1069,14 @@ linux_accept_common(struct thread *td, int s, l_uintptr_t addr, return (error); } - if (len != 0) { - error = linux_copyout_sockaddr(sa, PTRIN(addr), len); - if (error == 0) - error = copyout(&len, PTRIN(namelen), - sizeof(len)); + if (PTRIN(addr) != NULL) { + len = min(ss.ss_len, len); + error = linux_copyout_sockaddr((struct sockaddr *)&ss, + PTRIN(addr), len); + if (error == 0) { + len = ss.ss_len; + error = copyout(&len, PTRIN(namelen), sizeof(len)); + } if (error != 0) { fdclose(td, fp, td->td_retval[0]); td->td_retval[0] = 0; @@ -1083,7 +1084,6 @@ linux_accept_common(struct thread *td, int s, l_uintptr_t addr, } if (fp != NULL) fdrop(fp, td); - free(sa, M_SONAME); return (error); } diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 77158eb855df..84d6df3f2832 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -974,7 +974,7 @@ process_newconn(struct c4iw_listen_ep *master_lep, struct socket *new_so) { struct c4iw_listen_ep *real_lep = NULL; struct c4iw_ep *new_ep = NULL; - struct sockaddr_in *remote = NULL; + struct sockaddr_storage remote = { .ss_len = sizeof(remote) }; int ret = 0; MPASS(new_so != NULL); @@ -1019,19 +1019,16 @@ process_newconn(struct c4iw_listen_ep *master_lep, struct socket *new_so) new_ep->com.state = MPA_REQ_WAIT; setiwsockopt(new_so); - ret = soaccept(new_so, (struct sockaddr **)&remote); + ret = soaccept(new_so, (struct sockaddr *)&remote); if (ret != 0) { CTR4(KTR_IW_CXGBE, "%s:listen sock:%p, new sock:%p, ret:%d", __func__, master_lep->com.so, new_so, ret); - if (remote != NULL) - free(remote, M_SONAME); soclose(new_so); c4iw_put_ep(&new_ep->com); c4iw_put_ep(&real_lep->com); return; } - free(remote, M_SONAME); START_EP_TIMER(new_ep); diff --git a/sys/dev/hyperv/hvsock/hv_sock.c b/sys/dev/hyperv/hvsock/hv_sock.c index 60cdfecf3bee..655cc990876e 100644 --- a/sys/dev/hyperv/hvsock/hv_sock.c +++ b/sys/dev/hyperv/hvsock/hv_sock.c @@ -478,7 +478,7 @@ hvs_trans_listen(struct socket *so, int backlog, struct thread *td) } int -hvs_trans_accept(struct socket *so, struct sockaddr **nam) +hvs_trans_accept(struct socket *so, struct sockaddr *sa) { struct hvs_pcb *pcb = so2hvspcb(so); @@ -488,10 +488,9 @@ hvs_trans_accept(struct socket *so, struct sockaddr **nam) if (pcb == NULL) return (EINVAL); - *nam = sodupsockaddr((struct sockaddr *) &pcb->remote_addr, - M_NOWAIT); + memcpy(sa, &pcb->remote_addr, pcb->remote_addr.sa_len); - return ((*nam == NULL) ? ENOMEM : 0); + return (0); } int diff --git a/sys/dev/hyperv/hvsock/hv_sock.h b/sys/dev/hyperv/hvsock/hv_sock.h index 98a9afb747bf..ee6416a29662 100644 --- a/sys/dev/hyperv/hvsock/hv_sock.h +++ b/sys/dev/hyperv/hvsock/hv_sock.h @@ -100,7 +100,7 @@ void hvs_trans_abort(struct socket *); int hvs_trans_attach(struct socket *, int, struct thread *); int hvs_trans_bind(struct socket *, struct sockaddr *, struct thread *); int hvs_trans_listen(struct socket *, int, struct thread *); -int hvs_trans_accept(struct socket *, struct sockaddr **); +int hvs_trans_accept(struct socket *, struct sockaddr *); int hvs_trans_connect(struct socket *, struct sockaddr *, struct thread *); int hvs_trans_peeraddr(struct socket *, struct sockaddr **); diff --git a/sys/dev/iscsi/icl_soft_proxy.c b/sys/dev/iscsi/icl_soft_proxy.c index ee448116b0e9..db9bf12a688c 100644 --- a/sys/dev/iscsi/icl_soft_proxy.c +++ b/sys/dev/iscsi/icl_soft_proxy.c @@ -205,7 +205,7 @@ icl_accept_thread(void *arg) { struct icl_listen_sock *ils; struct socket *head, *so; - struct sockaddr *sa; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; int error; ils = arg; @@ -231,17 +231,15 @@ icl_accept_thread(void *arg) continue; } - sa = NULL; - error = soaccept(so, &sa); + error = soaccept(so, (struct sockaddr *)&ss); if (error != 0) { ICL_WARN("soaccept error %d", error); - if (sa != NULL) - free(sa, M_SONAME); soclose(so); continue; } - (ils->ils_listen->il_accept)(so, sa, ils->ils_id); + (ils->ils_listen->il_accept)(so, (struct sockaddr *)&ss, + ils->ils_id); } } diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 03e6856b7750..cf9b91511574 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -53,7 +53,7 @@ static struct mtx dom_mtx; /* domain list lock */ MTX_SYSINIT(domain, &dom_mtx, "domain list", MTX_DEF); static int -pr_accept_notsupp(struct socket *so, struct sockaddr **nam) +pr_accept_notsupp(struct socket *so, struct sockaddr *sa) { return (EOPNOTSUPP); } diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index b59051ae3350..d16c0049dc43 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1348,12 +1348,17 @@ soabort(struct socket *so) } int -soaccept(struct socket *so, struct sockaddr **nam) +soaccept(struct socket *so, struct sockaddr *sa) { +#ifdef INVARIANTS + u_char len = sa->sa_len; +#endif int error; CURVNET_SET(so->so_vnet); - error = so->so_proto->pr_accept(so, nam); + error = so->so_proto->pr_accept(so, sa); + KASSERT(sa->sa_len <= len, + ("%s: protocol %p sockaddr overflow", __func__, so->so_proto)); CURVNET_RESTORE(); return (error); } diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index a7ffb6ef3254..0361144f2763 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -277,19 +277,18 @@ static int accept1(struct thread *td, int s, struct sockaddr *uname, socklen_t *anamelen, int flags) { - struct sockaddr *name; - socklen_t namelen; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; + socklen_t addrlen; struct file *fp; int error; - if (uname == NULL) - return (kern_accept4(td, s, NULL, NULL, flags, NULL)); - - error = copyin(anamelen, &namelen, sizeof (namelen)); - if (error != 0) - return (error); + if (uname != NULL) { + error = copyin(anamelen, &addrlen, sizeof(addrlen)); + if (error != 0) + return (error); + } - error = kern_accept4(td, s, &name, &namelen, flags, &fp); + error = kern_accept4(td, s, (struct sockaddr *)&ss, flags, &fp); if (error != 0) return (error); @@ -297,42 +296,40 @@ accept1(struct thread *td, int s, struct sockaddr *uname, socklen_t *anamelen, #ifdef COMPAT_OLDSOCK if (SV_PROC_FLAG(td->td_proc, SV_AOUT) && (flags & ACCEPT4_COMPAT) != 0) - ((struct osockaddr *)name)->sa_family = - name->sa_family; + ((struct osockaddr *)&ss)->sa_family = ss.ss_family; #endif - error = copyout(name, uname, namelen); - if (error == 0) - error = copyout(&namelen, anamelen, - sizeof(namelen)); + if (uname != NULL) { + addrlen = min(ss.ss_len, addrlen); + error = copyout(&ss, uname, addrlen); + if (error == 0) { + addrlen = ss.ss_len; + error = copyout(&addrlen, anamelen, sizeof(addrlen)); + } + } if (error != 0) fdclose(td, fp, td->td_retval[0]); fdrop(fp, td); - free(name, M_SONAME); + return (error); } int -kern_accept(struct thread *td, int s, struct sockaddr **name, - socklen_t *namelen, struct file **fp) +kern_accept(struct thread *td, int s, struct sockaddr *sa, struct file **fp) { - return (kern_accept4(td, s, name, namelen, ACCEPT4_INHERIT, fp)); + return (kern_accept4(td, s, sa, ACCEPT4_INHERIT, fp)); } int -kern_accept4(struct thread *td, int s, struct sockaddr **name, - socklen_t *namelen, int flags, struct file **fp) +kern_accept4(struct thread *td, int s, struct sockaddr *sa, int flags, + struct file **fp) { struct file *headfp, *nfp = NULL; - struct sockaddr *sa = NULL; struct socket *head, *so; struct filecaps fcaps; u_int fflag; pid_t pgid; int error, fd, tmp; - if (name != NULL) - *name = NULL; - AUDIT_ARG_FD(s); error = getsock_cap(td, s, &cap_accept_rights, &headfp, &fcaps); @@ -386,29 +383,15 @@ kern_accept4(struct thread *td, int s, struct sockaddr **name, (void) fo_ioctl(nfp, FIONBIO, &tmp, td->td_ucred, td); tmp = fflag & FASYNC; (void) fo_ioctl(nfp, FIOASYNC, &tmp, td->td_ucred, td); - error = soaccept(so, &sa); - if (error != 0) - goto noconnection; - if (sa == NULL) { - if (name) - *namelen = 0; - goto done; - } - AUDIT_ARG_SOCKADDR(td, AT_FDCWD, sa); - if (name) { - /* check sa_len before it is destroyed */ - if (*namelen > sa->sa_len) - *namelen = sa->sa_len; + + if ((error = soaccept(so, sa)) == 0) { + AUDIT_ARG_SOCKADDR(td, AT_FDCWD, sa); #ifdef KTRACE if (KTRPOINT(td, KTR_STRUCT)) ktrsockaddr(sa); #endif - *name = sa; - sa = NULL; } noconnection: - free(sa, M_SONAME); - /* * close the new descriptor, assuming someone hasn't ripped it * out from under us. diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 53a7c2b2915a..3071a5169b72 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -120,7 +120,10 @@ struct unp_defer { static SLIST_HEAD(, unp_defer) unp_defers; static int unp_defers_count; -static const struct sockaddr sun_noname = { sizeof(sun_noname), AF_LOCAL }; +static const struct sockaddr sun_noname = { + .sa_len = sizeof(sun_noname), + .sa_family = AF_LOCAL, +}; /* * Garbage collection of cyclic file descriptor/socket references occurs @@ -434,7 +437,7 @@ uipc_abort(struct socket *so) } static int -uipc_accept(struct socket *so, struct sockaddr **nam) +uipc_accept(struct socket *so, struct sockaddr *ret) { struct unpcb *unp, *unp2; const struct sockaddr *sa; @@ -446,14 +449,13 @@ uipc_accept(struct socket *so, struct sockaddr **nam) unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_accept: unp == NULL")); - *nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK); UNP_PCB_LOCK(unp); unp2 = unp_pcb_lock_peer(unp); if (unp2 != NULL && unp2->unp_addr != NULL) sa = (struct sockaddr *)unp2->unp_addr; else sa = &sun_noname; - bcopy(sa, *nam, sa->sa_len); + bcopy(sa, ret, sa->sa_len); if (unp2 != NULL) unp_pcb_unlock_pair(unp, unp2); else diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h index baaef9abb736..b512112f8b7d 100644 --- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h +++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h @@ -191,7 +191,7 @@ typedef struct ng_btsocket_l2cap_pcb * ng_btsocket_l2cap_pcb_p; void ng_btsocket_l2cap_abort (struct socket *); void ng_btsocket_l2cap_close (struct socket *); -int ng_btsocket_l2cap_accept (struct socket *, struct sockaddr **); +int ng_btsocket_l2cap_accept (struct socket *, struct sockaddr *); int ng_btsocket_l2cap_attach (struct socket *, int, struct thread *); int ng_btsocket_l2cap_bind (struct socket *, struct sockaddr *, struct thread *); diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h index 88c0f8988587..d40b694ece14 100644 --- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h +++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h @@ -316,7 +316,7 @@ typedef struct ng_btsocket_rfcomm_pcb * ng_btsocket_rfcomm_pcb_p; void ng_btsocket_rfcomm_abort (struct socket *); void ng_btsocket_rfcomm_close (struct socket *); -int ng_btsocket_rfcomm_accept (struct socket *, struct sockaddr **); +int ng_btsocket_rfcomm_accept (struct socket *, struct sockaddr *); int ng_btsocket_rfcomm_attach (struct socket *, int, struct thread *); int ng_btsocket_rfcomm_bind (struct socket *, struct sockaddr *, struct thread *); diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h index 071ddb8d80ef..282980cce881 100644 --- a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h +++ b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h @@ -106,7 +106,7 @@ typedef struct ng_btsocket_sco_pcb * ng_btsocket_sco_pcb_p; void ng_btsocket_sco_abort (struct socket *); void ng_btsocket_sco_close (struct socket *); -int ng_btsocket_sco_accept (struct socket *, struct sockaddr **); +int ng_btsocket_sco_accept (struct socket *, struct sockaddr *); int ng_btsocket_sco_attach (struct socket *, int, struct thread *); int ng_btsocket_sco_bind (struct socket *, struct sockaddr *, struct thread *); diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c index 8fc64bb70929..d221cc34d36a 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c @@ -1967,20 +1967,6 @@ ng_btsocket_l2cap_close(struct socket *so) (void)ng_btsocket_l2cap_disconnect(so); } /* ng_btsocket_l2cap_close */ -/* - * Accept connection on socket. Nothing to do here, socket must be connected - * and ready, so just return peer address and be done with it. - */ - -int -ng_btsocket_l2cap_accept(struct socket *so, struct sockaddr **nam) -{ - if (ng_btsocket_l2cap_node == NULL) - return (EINVAL); - - return (ng_btsocket_l2cap_peeraddr(so, nam)); -} /* ng_btsocket_l2cap_accept */ - /* * Create and attach new socket */ @@ -2523,41 +2509,67 @@ out: return (error); } /* ng_btsocket_listen */ -/* - * Get peer address - */ - -int -ng_btsocket_l2cap_peeraddr(struct socket *so, struct sockaddr **nam) +static int +ng_btsocket_l2cap_peeraddr1(struct socket *so, struct sockaddr_l2cap *sa) { ng_btsocket_l2cap_pcb_p pcb = so2l2cap_pcb(so); - struct sockaddr_l2cap sa; if (pcb == NULL) return (EINVAL); if (ng_btsocket_l2cap_node == NULL) return (EINVAL); - bcopy(&pcb->dst, &sa.l2cap_bdaddr, sizeof(sa.l2cap_bdaddr)); - sa.l2cap_psm = htole16(pcb->psm); - sa.l2cap_len = sizeof(sa); - sa.l2cap_family = AF_BLUETOOTH; + *sa = (struct sockaddr_l2cap ){ + .l2cap_len = sizeof(struct sockaddr_l2cap), + .l2cap_family = AF_BLUETOOTH, + .l2cap_psm = htole16(pcb->psm), + }; + bcopy(&pcb->dst, &sa->l2cap_bdaddr, sizeof(sa->l2cap_bdaddr)); switch(pcb->idtype){ case NG_L2CAP_L2CA_IDTYPE_ATT: - sa.l2cap_cid = NG_L2CAP_ATT_CID; + sa->l2cap_cid = NG_L2CAP_ATT_CID; break; case NG_L2CAP_L2CA_IDTYPE_SMP: - sa.l2cap_cid = NG_L2CAP_SMP_CID; + sa->l2cap_cid = NG_L2CAP_SMP_CID; break; default: - sa.l2cap_cid = 0; + sa->l2cap_cid = 0; break; } - sa.l2cap_bdaddr_type = pcb->dsttype; + sa->l2cap_bdaddr_type = pcb->dsttype; + + return (0); +} + +/* + * Get peer address + */ +int +ng_btsocket_l2cap_peeraddr(struct socket *so, struct sockaddr **nam) +{ + struct sockaddr_l2cap sa; + int error; + + error = ng_btsocket_l2cap_peeraddr1(so, &sa); + if (error != 0) + return (error); *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); -} /* ng_btsocket_l2cap_peeraddr */ +} + +/* + * Accept connection on socket. Nothing to do here, socket must be connected + * and ready, so just return peer address and be done with it. + */ +int +ng_btsocket_l2cap_accept(struct socket *so, struct sockaddr *sa) +{ + if (ng_btsocket_l2cap_node == NULL) + return (EINVAL); + + return (ng_btsocket_l2cap_peeraddr1(so, (struct sockaddr_l2cap *)sa)); +} /* * Send data to socket diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index 00225f8240e9..af542f3c258b 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -370,17 +370,6 @@ ng_btsocket_rfcomm_close(struct socket *so) (void)ng_btsocket_rfcomm_disconnect(so); } /* ng_btsocket_rfcomm_close */ -/* - * Accept connection on socket. Nothing to do here, socket must be connected - * and ready, so just return peer address and be done with it. - */ - -int -ng_btsocket_rfcomm_accept(struct socket *so, struct sockaddr **nam) -{ - return (ng_btsocket_rfcomm_peeraddr(so, nam)); -} /* ng_btsocket_rfcomm_accept */ - /* * Create and attach new socket */ @@ -925,28 +914,51 @@ out: return (error); } /* ng_btsocket_listen */ -/* - * Get peer address - */ - -int -ng_btsocket_rfcomm_peeraddr(struct socket *so, struct sockaddr **nam) +static int +ng_btsocket_rfcomm_peeraddr1(struct socket *so, struct sockaddr_rfcomm *sa) { ng_btsocket_rfcomm_pcb_p pcb = so2rfcomm_pcb(so); - struct sockaddr_rfcomm sa; if (pcb == NULL) return (EINVAL); - bcopy(&pcb->dst, &sa.rfcomm_bdaddr, sizeof(sa.rfcomm_bdaddr)); - sa.rfcomm_channel = pcb->channel; - sa.rfcomm_len = sizeof(sa); - sa.rfcomm_family = AF_BLUETOOTH; + *sa = (struct sockaddr_rfcomm ){ + .rfcomm_len = sizeof(struct sockaddr_rfcomm), + .rfcomm_family = AF_BLUETOOTH, + .rfcomm_channel = pcb->channel, + }; + bcopy(&pcb->dst, &sa->rfcomm_bdaddr, sizeof(sa->rfcomm_bdaddr)); + return (0); +} + +/* + * Get peer address + */ +int +ng_btsocket_rfcomm_peeraddr(struct socket *so, struct sockaddr **nam) +{ + struct sockaddr_rfcomm sa; + int error; + + error = ng_btsocket_rfcomm_peeraddr1(so, &sa); + if (error != 0) + return (error); *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); -} /* ng_btsocket_rfcomm_peeraddr */ +} + +/* + * Accept connection on socket. Nothing to do here, socket must be connected + * and ready, so just return peer address and be done with it. + */ +int +ng_btsocket_rfcomm_accept(struct socket *so, struct sockaddr *sa) +{ + + return (ng_btsocket_rfcomm_peeraddr1(so, (struct sockaddr_rfcomm *)sa)); +} /* * Send data to socket @@ -1407,7 +1419,7 @@ static int ng_btsocket_rfcomm_session_accept(ng_btsocket_rfcomm_session_p s0) { struct socket *l2so; - struct sockaddr_l2cap *l2sa = NULL; + struct sockaddr_l2cap l2sa = { .l2cap_len = sizeof(l2sa) }; ng_btsocket_l2cap_pcb_t *l2pcb = NULL; ng_btsocket_rfcomm_session_p s = NULL; int error; @@ -1425,7 +1437,7 @@ ng_btsocket_rfcomm_session_accept(ng_btsocket_rfcomm_session_p s0) return (error); } - error = soaccept(l2so, (struct sockaddr **) &l2sa); + error = soaccept(l2so, (struct sockaddr *)&l2sa); if (error != 0) { NG_BTSOCKET_RFCOMM_ERR( "%s: soaccept() on L2CAP socket failed, error=%d\n", __func__, error); diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c index 5e198956a829..d9700f91c132 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c @@ -1176,20 +1176,6 @@ ng_btsocket_sco_close(struct socket *so) (void) ng_btsocket_sco_disconnect(so); } /* ng_btsocket_sco_close */ -/* - * Accept connection on socket. Nothing to do here, socket must be connected - * and ready, so just return peer address and be done with it. - */ - -int -ng_btsocket_sco_accept(struct socket *so, struct sockaddr **nam) -{ - if (ng_btsocket_sco_node == NULL) - return (EINVAL); - - return (ng_btsocket_sco_peeraddr(so, nam)); -} /* ng_btsocket_sco_accept */ - /* * Create and attach new socket */ @@ -1623,32 +1609,56 @@ out: return (error); } /* ng_btsocket_listen */ -/* - * Get peer address - */ - -int -ng_btsocket_sco_peeraddr(struct socket *so, struct sockaddr **nam) +static int +ng_btsocket_sco_peeraddr1(struct socket *so, struct sockaddr_sco *sa) { ng_btsocket_sco_pcb_p pcb = so2sco_pcb(so); - struct sockaddr_sco sa; if (pcb == NULL) return (EINVAL); if (ng_btsocket_sco_node == NULL) return (EINVAL); + *sa = (struct sockaddr_sco ){ + .sco_len = sizeof(struct sockaddr_sco), + .sco_family = AF_BLUETOOTH, + }; mtx_lock(&pcb->pcb_mtx); - bcopy(&pcb->dst, &sa.sco_bdaddr, sizeof(sa.sco_bdaddr)); + bcopy(&pcb->dst, &sa->sco_bdaddr, sizeof(sa->sco_bdaddr)); mtx_unlock(&pcb->pcb_mtx); - sa.sco_len = sizeof(sa); - sa.sco_family = AF_BLUETOOTH; + return (0); +} + +/* + * Get peer address + */ +int +ng_btsocket_sco_peeraddr(struct socket *so, struct sockaddr **nam) +{ + struct sockaddr_sco sa; + int error; + error = ng_btsocket_sco_peeraddr1(so, &sa); + if (error != 0) + return (error); *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); return ((*nam == NULL)? ENOMEM : 0); -} /* ng_btsocket_sco_peeraddr */ +} + +/* + * Accept connection on socket. Nothing to do here, socket must be connected + * and ready, so just return peer address and be done with it. + */ +int +ng_btsocket_sco_accept(struct socket *so, struct sockaddr *sa) +{ + if (ng_btsocket_sco_node == NULL) + return (EINVAL); + + return (ng_btsocket_sco_peeraddr1(so, (struct sockaddr_sco *)sa)); +} /* * Send data to socket diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 777f3261356d..23a53528833f 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -1178,7 +1178,7 @@ ng_ksocket_accept(priv_p priv) { struct socket *const head = priv->so; struct socket *so; - struct sockaddr *sa = NULL; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; struct ng_mesg *resp; struct ng_ksocket_accept *resp_data; node_p node; @@ -1196,12 +1196,11 @@ ng_ksocket_accept(priv_p priv) if (error) return (error); - if ((error = soaccept(so, &sa)) != 0) + if ((error = soaccept(so, (struct sockaddr *)&ss)) != 0) return (error); len = OFFSETOF(struct ng_ksocket_accept, addr); - if (sa != NULL) - len += sa->sa_len; + len += ss.ss_len; NG_MKMESSAGE(resp, NGM_KSOCKET_COOKIE, NGM_KSOCKET_ACCEPT, len, M_NOWAIT); @@ -1249,13 +1248,10 @@ ng_ksocket_accept(priv_p priv) /* Fill in the response data and send it or return it to the caller */ resp_data = (struct ng_ksocket_accept *)resp->data; resp_data->nodeid = NG_NODE_ID(node); - if (sa != NULL) - bcopy(sa, &resp_data->addr, sa->sa_len); + bcopy(&ss, &resp_data->addr, ss.ss_len); NG_SEND_MSG_ID(error, node, resp, priv->response_addr, 0); out: - if (sa != NULL) - free(sa, M_SONAME); return (0); } diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 29d63f989e79..8fb96db84f95 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -7271,7 +7271,7 @@ out: static int sctp_defered_wakeup_cnt = 0; int -sctp_accept(struct socket *so, struct sockaddr **addr) +sctp_accept(struct socket *so, struct sockaddr *sa) { struct sctp_tcb *stcb; struct sctp_inpcb *inp; @@ -7338,39 +7338,25 @@ sctp_accept(struct socket *so, struct sockaddr **addr) switch (store.sa.sa_family) { #ifdef INET case AF_INET: - { - struct sockaddr_in *sin; - - SCTP_MALLOC_SONAME(sin, struct sockaddr_in *, sizeof *sin); - if (sin == NULL) - return (ENOMEM); - sin->sin_family = AF_INET; - sin->sin_len = sizeof(*sin); - sin->sin_port = store.sin.sin_port; - sin->sin_addr = store.sin.sin_addr; - *addr = (struct sockaddr *)sin; - break; - } + *(struct sockaddr_in *)sa = (struct sockaddr_in ){ + .sin_family = AF_INET, + .sin_len = sizeof(struct sockaddr_in), + .sin_port = store.sin.sin_port, + .sin_addr = store.sin.sin_addr, + }; + break; #endif #ifdef INET6 case AF_INET6: - { - struct sockaddr_in6 *sin6; - - SCTP_MALLOC_SONAME(sin6, struct sockaddr_in6 *, sizeof *sin6); - if (sin6 == NULL) - return (ENOMEM); - sin6->sin6_family = AF_INET6; - sin6->sin6_len = sizeof(*sin6); - sin6->sin6_port = store.sin6.sin6_port; - sin6->sin6_addr = store.sin6.sin6_addr; - if ((error = sa6_recoverscope(sin6)) != 0) { - SCTP_FREE_SONAME(sin6); - return (error); - } - *addr = (struct sockaddr *)sin6; - break; - } + *(struct sockaddr_in6 *)sa = (struct sockaddr_in6 ){ + .sin6_family = AF_INET6, + .sin6_len = sizeof(struct sockaddr_in6), + .sin6_port = store.sin6.sin6_port, + .sin6_addr = store.sin6.sin6_addr, + }; + if ((error = sa6_recoverscope((struct sockaddr_in6 *)sa)) != 0) + return (error); + break; #endif default: /* TSNH */ diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h index 3a649a1860e2..ff6672bd0248 100644 --- a/sys/netinet/sctp_var.h +++ b/sys/netinet/sctp_var.h @@ -341,7 +341,7 @@ int sctp_peeloff(struct socket *, struct socket *, int, caddr_t, int *); int sctp_ingetaddr(struct socket *, struct sockaddr **); int sctp_peeraddr(struct socket *, struct sockaddr **); int sctp_listen(struct socket *, int, struct thread *); -int sctp_accept(struct socket *, struct sockaddr **); +int sctp_accept(struct socket *, struct sockaddr *); #endif /* _KERNEL */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index f89e60cce8cd..14e0b814dec9 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -717,13 +717,11 @@ out: * just return the address of the peer, storing through addr. */ static int -tcp_usr_accept(struct socket *so, struct sockaddr **nam) +tcp_usr_accept(struct socket *so, struct sockaddr *sa) { - int error = 0; struct inpcb *inp; struct tcpcb *tp; - struct in_addr addr; - in_port_t port = 0; + int error = 0; inp = sotoinpcb(so); KASSERT(inp != NULL, ("tcp_usr_accept: inp == NULL")); @@ -734,39 +732,30 @@ tcp_usr_accept(struct socket *so, struct sockaddr **nam) } tp = intotcpcb(inp); - if (so->so_state & SS_ISDISCONNECTED) { + if (so->so_state & SS_ISDISCONNECTED) error = ECONNABORTED; - goto out; - } - /* - * We inline in_getpeeraddr and COMMON_END here, so that we can - * copy the data of interest and defer the malloc until after we - * release the lock. - */ - port = inp->inp_fport; - addr = inp->inp_faddr; - -out: + else + *(struct sockaddr_in *)sa = (struct sockaddr_in ){ + .sin_family = AF_INET, + .sin_len = sizeof(struct sockaddr_in), + .sin_port = inp->inp_fport, + .sin_addr = inp->inp_faddr, + }; tcp_bblog_pru(tp, PRU_ACCEPT, error); TCP_PROBE2(debug__user, tp, PRU_ACCEPT); INP_WUNLOCK(inp); - if (error == 0) - *nam = in_sockaddr(port, &addr); - return error; + *** 273 LINES SKIPPED *** From nobody Thu Nov 30 16:34:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh1xj27llz52GYl; Thu, 30 Nov 2023 16:34: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 4Sh1xj1TJlz4Wjn; Thu, 30 Nov 2023 16:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701362089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yr8RdVSjFJs51jrTXVHQ9Ak3+ocY1mEpGtvUR8jlrfg=; b=GT4fK991vlghM4NcrSYJeoY+h/gvCg1CeLVbzfTtJBmT5LlqPtkuOJ+hpcTIN+CgLcdCn1 oonHm44UkJORDzPYZPlmEoVc/nrfCKQiJbzje/A6TZy1FiKd4rqYNm+J3kpkeCT1LBZbkr YgOFhOzwx0LQwL3E3/Gy4TJjY3ouXEfV/IgntvJyn7s2GH2B3W8SgTBcw/J5HobY53Wnvd V1Th7VSrUycaPRe61yZyvPfehxutq2AjNZYp0DdXZn/fC3pJrBuG5ENEIbnqyT40HVjSig VTZysPZPa0Yz2Urj3TpIPlmG7qUgJ7ltIslOImy3rjhKU77zoYIDSop+bWWAJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701362089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yr8RdVSjFJs51jrTXVHQ9Ak3+ocY1mEpGtvUR8jlrfg=; b=qPYrslPHStqYUZSoxur90m47bg2GHWBwWx7cKOjdmPodCobMR6kdRlGz/LxQjcJs28Vl4L L/rHWiMhb4MCt+kYwOzWIEiJ/SAdsOWQqgB+y9PbX8Y9dcEnnFuMH5xH4aKdUcIlZ9qcV1 pCHCMAgqnLY/XvO1FcGxbV69p+Q+eWOopSjOI6RnAsoOAG96t56B1VfBSOOZyjm4DHZHWp Z+i91N57o/Ha7P69m5mxcie/xBjaU23xIBgBpVfOixZBcohjDn69gjx+zffy+y//sUeqeg ckCjyMrnqS+L+UhaxGk0I5boQ0uSlPIG5l2/Qu+Jj4g7DcCfUpvV+k9vyWdnYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701362089; a=rsa-sha256; cv=none; b=o+trf1+vREs7Hm73rjENrxU8T/k49DFjwPICVzk3IkN3Hn4Z9nqlAeZvxBLLp8brvcaxLW nSpWfW0vjaPtuywsRpiFFWiAxou4fzwA+Tp5LEnlQEpvTaVszDcWWJFx1J0bgi2/ubqMPX OV9YuZSpOzT40Hm10CEU50U/IOdgjf9IwojuisK+e8eo1CUGNCg4evkqn/vROpk36LkruK Dv9VYjE7D1S7WKlkGXWNmbJUlcmfBUuUwRZNLG8yxrT8rSotYae2Iap2z0kBAi6iz7lXi0 H1/Dfg9ezcgVy34SDH6I7emG18pfV60zzK6B1nvNcRMVyVKG4A7Jgvdm0h9L9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh1xj0X5Wzwsm; Thu, 30 Nov 2023 16:34: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 3AUGYnBc055465; Thu, 30 Nov 2023 16:34:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUGYm9O055462; Thu, 30 Nov 2023 16:34:48 GMT (envelope-from git) Date: Thu, 30 Nov 2023 16:34:48 GMT Message-Id: <202311301634.3AUGYm9O055462@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: 0fac350c54d0 - main - sockets: don't malloc/free sockaddr memory on getpeername/getsockname List-Id: Commit messages for the main 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: 0fac350c54d0a72f5341e15021efcde63eb58a4b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0fac350c54d0a72f5341e15021efcde63eb58a4b commit 0fac350c54d0a72f5341e15021efcde63eb58a4b Author: Gleb Smirnoff AuthorDate: 2023-11-30 16:30:55 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-30 16:31:10 +0000 sockets: don't malloc/free sockaddr memory on getpeername/getsockname Just like it was done for accept(2) in cfb1e92912b4, use same approach for two simplier syscalls that return socket addresses. Although, these two syscalls aren't performance critical, this change generalizes some code between 3 syscalls trimming code size. Following example of accept(2), provide VNET-aware and INVARIANT-checking wrappers sopeeraddr() and sosockaddr() around protosw methods. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D42694 --- sys/compat/linux/linux_socket.c | 45 +++++------ sys/compat/linuxkpi/common/include/linux/net.h | 17 +++-- sys/dev/cxgbe/iw_cxgbe/cm.c | 14 +--- sys/dev/hyperv/hvsock/hv_sock.c | 12 +-- sys/dev/hyperv/hvsock/hv_sock.h | 4 +- sys/dev/wg/if_wg.c | 24 +++--- sys/kern/sys_socket.c | 17 ++--- sys/kern/uipc_domain.c | 4 +- sys/kern/uipc_socket.c | 34 +++++++++ sys/kern/uipc_syscalls.c | 86 +++++++--------------- sys/kern/uipc_usrreq.c | 48 +++--------- sys/net/if_ovpn.c | 12 +-- .../bluetooth/include/ng_btsocket_hci_raw.h | 3 +- sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h | 9 +-- .../bluetooth/include/ng_btsocket_rfcomm.h | 4 +- sys/netgraph/bluetooth/include/ng_btsocket_sco.h | 4 +- sys/netgraph/bluetooth/socket/ng_btsocket.c | 8 +- .../bluetooth/socket/ng_btsocket_hci_raw.c | 29 +++----- sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c | 75 ++++++------------- .../bluetooth/socket/ng_btsocket_l2cap_raw.c | 47 ++++++------ sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 61 +++++---------- sys/netgraph/bluetooth/socket/ng_btsocket_sco.c | 62 +++++----------- sys/netgraph/ng_ksocket.c | 28 +++---- sys/netgraph/ng_socket.c | 23 ++---- sys/netinet/in_pcb.c | 49 ++++-------- sys/netinet/in_pcb.h | 6 +- sys/netinet/sctp_os.h | 3 - sys/netinet/sctp_os_bsd.h | 7 -- sys/netinet/sctp_usrreq.c | 40 ++++------ sys/netinet/sctp_var.h | 4 +- sys/netinet6/in6.c | 14 ---- sys/netinet6/in6.h | 1 - sys/netinet6/in6_pcb.c | 74 ++++++++----------- sys/netinet6/in6_pcb.h | 10 +-- sys/netinet6/sctp6_usrreq.c | 84 +++++++-------------- sys/netlink/netlink_domain.c | 27 +++---- sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c | 36 ++++----- sys/rpc/rpc_generic.c | 45 ++++------- sys/rpc/svc_dg.c | 9 +-- sys/rpc/svc_vc.c | 27 ++----- sys/sys/protosw.h | 4 +- sys/sys/socketvar.h | 2 + sys/sys/syscallsubr.h | 6 +- 43 files changed, 420 insertions(+), 698 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 2893e93bbcd7..f474ea06440a 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1106,48 +1106,50 @@ linux_accept4(struct thread *td, struct linux_accept4_args *args) int linux_getsockname(struct thread *td, struct linux_getsockname_args *args) { - struct sockaddr *sa; - int len, error; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; + socklen_t len; + int error; error = copyin(PTRIN(args->namelen), &len, sizeof(len)); if (error != 0) return (error); - error = kern_getsockname(td, args->s, &sa, &len); + error = kern_getsockname(td, args->s, (struct sockaddr *)&ss); if (error != 0) return (error); - if (len != 0) - error = linux_copyout_sockaddr(sa, PTRIN(args->addr), len); - - free(sa, M_SONAME); - if (error == 0) + len = min(ss.ss_len, len); + error = linux_copyout_sockaddr((struct sockaddr *)&ss, + PTRIN(args->addr), len); + if (error == 0) { + len = ss.ss_len; error = copyout(&len, PTRIN(args->namelen), sizeof(len)); + } return (error); } int linux_getpeername(struct thread *td, struct linux_getpeername_args *args) { - struct sockaddr *sa; - int len, error; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; + socklen_t len; + int error; error = copyin(PTRIN(args->namelen), &len, sizeof(len)); if (error != 0) return (error); - if (len < 0) - return (EINVAL); - error = kern_getpeername(td, args->s, &sa, &len); + error = kern_getpeername(td, args->s, (struct sockaddr *)&ss); if (error != 0) return (error); - if (len != 0) - error = linux_copyout_sockaddr(sa, PTRIN(args->addr), len); - - free(sa, M_SONAME); - if (error == 0) + len = min(ss.ss_len, len); + error = linux_copyout_sockaddr((struct sockaddr *)&ss, + PTRIN(args->addr), len); + if (error == 0) { + len = ss.ss_len; error = copyout(&len, PTRIN(args->namelen), sizeof(len)); + } return (error); } @@ -1348,6 +1350,7 @@ static int linux_sendmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, l_uint flags) { + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; struct cmsghdr *cmsg; struct mbuf *control; struct msghdr msg; @@ -1356,7 +1359,6 @@ linux_sendmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, struct l_msghdr linux_msghdr; struct iovec *iov; socklen_t datalen; - struct sockaddr *sa; struct socket *so; sa_family_t sa_family; struct file *fp; @@ -1395,11 +1397,10 @@ linux_sendmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, control = NULL; - error = kern_getsockname(td, s, &sa, &datalen); + error = kern_getsockname(td, s, (struct sockaddr *)&ss); if (error != 0) goto bad; - sa_family = sa->sa_family; - free(sa, M_SONAME); + sa_family = ss.ss_family; if (flags & LINUX_MSG_OOB) { error = EOPNOTSUPP; diff --git a/sys/compat/linuxkpi/common/include/linux/net.h b/sys/compat/linuxkpi/common/include/linux/net.h index f750de8c5cf3..dc0b46df9c99 100644 --- a/sys/compat/linuxkpi/common/include/linux/net.h +++ b/sys/compat/linuxkpi/common/include/linux/net.h @@ -45,26 +45,27 @@ sock_create_kern(int family, int type, int proto, struct socket **res) } static inline int -sock_getname(struct socket *so, struct sockaddr *addr, int *sockaddr_len, +sock_getname(struct socket *so, struct sockaddr *sa, int *sockaddr_len, int peer) { - struct sockaddr *nam; int error; - nam = NULL; + /* + * XXXGL: we can't use sopeeraddr()/sosockaddr() here since with + * INVARIANTS they would check if supplied sockaddr has enough + * length. Such notion doesn't even exist in Linux KPI. + */ if (peer) { if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0) return (-ENOTCONN); - error = so->so_proto->pr_peeraddr(so, &nam); + error = so->so_proto->pr_peeraddr(so, sa); } else - error = so->so_proto->pr_sockaddr(so, &nam); + error = so->so_proto->pr_sockaddr(so, sa); if (error) return (-error); - *addr = *nam; - *sockaddr_len = addr->sa_len; + *sockaddr_len = sa->sa_len; - free(nam, M_SONAME); return (0); } diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 84d6df3f2832..e0e48fdff9ba 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -145,30 +145,24 @@ static void process_newconn(struct c4iw_listen_ep *master_lep, #define GET_LOCAL_ADDR(pladdr, so) \ do { \ - struct sockaddr_storage *__a = NULL; \ struct inpcb *__inp = sotoinpcb(so); \ KASSERT(__inp != NULL, \ ("GET_LOCAL_ADDR(%s):so:%p, inp = NULL", __func__, so)); \ if (__inp->inp_vflag & INP_IPV4) \ - in_getsockaddr(so, (struct sockaddr **)&__a); \ + in_getsockaddr(so, (struct sockaddr *)pladdr); \ else \ - in6_getsockaddr(so, (struct sockaddr **)&__a); \ - *(pladdr) = *__a; \ - free(__a, M_SONAME); \ + in6_getsockaddr(so, (struct sockaddr *)pladdr); \ } while (0) #define GET_REMOTE_ADDR(praddr, so) \ do { \ - struct sockaddr_storage *__a = NULL; \ struct inpcb *__inp = sotoinpcb(so); \ KASSERT(__inp != NULL, \ ("GET_REMOTE_ADDR(%s):so:%p, inp = NULL", __func__, so)); \ if (__inp->inp_vflag & INP_IPV4) \ - in_getpeeraddr(so, (struct sockaddr **)&__a); \ + in_getpeeraddr(so, (struct sockaddr *)praddr); \ else \ - in6_getpeeraddr(so, (struct sockaddr **)&__a); \ - *(praddr) = *__a; \ - free(__a, M_SONAME); \ + in6_getpeeraddr(so, (struct sockaddr *)praddr); \ } while (0) static char *states[] = { diff --git a/sys/dev/hyperv/hvsock/hv_sock.c b/sys/dev/hyperv/hvsock/hv_sock.c index 655cc990876e..78ec520f1bb3 100644 --- a/sys/dev/hyperv/hvsock/hv_sock.c +++ b/sys/dev/hyperv/hvsock/hv_sock.c @@ -876,7 +876,7 @@ out: } int -hvs_trans_peeraddr(struct socket *so, struct sockaddr **nam) +hvs_trans_peeraddr(struct socket *so, struct sockaddr *sa) { struct hvs_pcb *pcb = so2hvspcb(so); @@ -886,13 +886,13 @@ hvs_trans_peeraddr(struct socket *so, struct sockaddr **nam) if (pcb == NULL) return (EINVAL); - *nam = sodupsockaddr((struct sockaddr *) &pcb->remote_addr, M_NOWAIT); + memcpy(sa, &pcb->remote_addr, pcb->remote_addr.sa_len); - return ((*nam == NULL)? ENOMEM : 0); + return (0); } int -hvs_trans_sockaddr(struct socket *so, struct sockaddr **nam) +hvs_trans_sockaddr(struct socket *so, struct sockaddr *sa) { struct hvs_pcb *pcb = so2hvspcb(so); @@ -902,9 +902,9 @@ hvs_trans_sockaddr(struct socket *so, struct sockaddr **nam) if (pcb == NULL) return (EINVAL); - *nam = sodupsockaddr((struct sockaddr *) &pcb->local_addr, M_NOWAIT); + memcpy(sa, &pcb->local_addr, pcb->local_addr.sa_len); - return ((*nam == NULL)? ENOMEM : 0); + return (0); } void diff --git a/sys/dev/hyperv/hvsock/hv_sock.h b/sys/dev/hyperv/hvsock/hv_sock.h index ee6416a29662..e11621d76dbc 100644 --- a/sys/dev/hyperv/hvsock/hv_sock.h +++ b/sys/dev/hyperv/hvsock/hv_sock.h @@ -103,8 +103,8 @@ int hvs_trans_listen(struct socket *, int, struct thread *); int hvs_trans_accept(struct socket *, struct sockaddr *); int hvs_trans_connect(struct socket *, struct sockaddr *, struct thread *); -int hvs_trans_peeraddr(struct socket *, struct sockaddr **); -int hvs_trans_sockaddr(struct socket *, struct sockaddr **); +int hvs_trans_peeraddr(struct socket *, struct sockaddr *); +int hvs_trans_sockaddr(struct socket *, struct sockaddr *); int hvs_trans_soreceive(struct socket *, struct sockaddr **, struct uio *, struct mbuf **, struct mbuf **, int *); int hvs_trans_sosend(struct socket *, struct sockaddr *, struct uio *, diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 0ea40b763416..71c80c8b5f77 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -806,14 +806,15 @@ wg_socket_bind(struct socket **in_so4, struct socket **in_so6, in_port_t *reques if (ret4 && ret4 != EADDRNOTAVAIL) return (ret4); if (!ret4 && !sin.sin_port) { - struct sockaddr_in *bound_sin; - int ret = so4->so_proto->pr_sockaddr(so4, - (struct sockaddr **)&bound_sin); + struct sockaddr_in bound_sin = + { .sin_len = sizeof(bound_sin) }; + int ret; + + ret = sosockaddr(so4, (struct sockaddr *)&bound_sin); if (ret) return (ret); - port = ntohs(bound_sin->sin_port); - sin6.sin6_port = bound_sin->sin_port; - free(bound_sin, M_SONAME); + port = ntohs(bound_sin.sin_port); + sin6.sin6_port = bound_sin.sin_port; } } @@ -822,13 +823,14 @@ wg_socket_bind(struct socket **in_so4, struct socket **in_so6, in_port_t *reques if (ret6 && ret6 != EADDRNOTAVAIL) return (ret6); if (!ret6 && !sin6.sin6_port) { - struct sockaddr_in6 *bound_sin6; - int ret = so6->so_proto->pr_sockaddr(so6, - (struct sockaddr **)&bound_sin6); + struct sockaddr_in6 bound_sin6 = + { .sin6_len = sizeof(bound_sin6) }; + int ret; + + ret = sosockaddr(so6, (struct sockaddr *)&bound_sin6); if (ret) return (ret); - port = ntohs(bound_sin6->sin6_port); - free(bound_sin6, M_SONAME); + port = ntohs(bound_sin6.sin6_port); } } diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 7169805a0d3f..314576281d6e 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -355,7 +355,7 @@ soo_close(struct file *fp, struct thread *td) static int soo_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) { - struct sockaddr *sa; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; struct inpcb *inpcb; struct unpcb *unpcb; struct socket *so; @@ -404,17 +404,16 @@ soo_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) } break; } - error = so->so_proto->pr_sockaddr(so, &sa); + error = sosockaddr(so, (struct sockaddr *)&ss); if (error == 0 && - sa->sa_len <= sizeof(kif->kf_un.kf_sock.kf_sa_local)) { - bcopy(sa, &kif->kf_un.kf_sock.kf_sa_local, sa->sa_len); - free(sa, M_SONAME); + ss.ss_len <= sizeof(kif->kf_un.kf_sock.kf_sa_local)) { + bcopy(&ss, &kif->kf_un.kf_sock.kf_sa_local, ss.ss_len); } - error = so->so_proto->pr_peeraddr(so, &sa); + ss.ss_len = sizeof(ss); + error = sopeeraddr(so, (struct sockaddr *)&ss); if (error == 0 && - sa->sa_len <= sizeof(kif->kf_un.kf_sock.kf_sa_peer)) { - bcopy(sa, &kif->kf_un.kf_sock.kf_sa_peer, sa->sa_len); - free(sa, M_SONAME); + ss.ss_len <= sizeof(kif->kf_un.kf_sock.kf_sa_peer)) { + bcopy(&ss, &kif->kf_un.kf_sock.kf_sa_peer, ss.ss_len); } strncpy(kif->kf_path, so->so_proto->pr_domain->dom_name, sizeof(kif->kf_path)); diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index cf9b91511574..435b13842041 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -116,7 +116,7 @@ pr_listen_notsupp(struct socket *so, int backlog, struct thread *td) } static int -pr_peeraddr_notsupp(struct socket *so, struct sockaddr **nam) +pr_peeraddr_notsupp(struct socket *so, struct sockaddr *nam) { return (EOPNOTSUPP); } @@ -157,7 +157,7 @@ pr_shutdown_notsupp(struct socket *so) } static int -pr_sockaddr_notsupp(struct socket *so, struct sockaddr **nam) +pr_sockaddr_notsupp(struct socket *so, struct sockaddr *nam) { return (EOPNOTSUPP); } diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index d16c0049dc43..efa349d140ff 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1363,6 +1363,40 @@ soaccept(struct socket *so, struct sockaddr *sa) return (error); } +int +sopeeraddr(struct socket *so, struct sockaddr *sa) +{ +#ifdef INVARIANTS + u_char len = sa->sa_len; +#endif + int error; + + CURVNET_SET(so->so_vnet); + error = so->so_proto->pr_peeraddr(so, sa); + KASSERT(sa->sa_len <= len, + ("%s: protocol %p sockaddr overflow", __func__, so->so_proto)); + CURVNET_RESTORE(); + + return (error); +} + +int +sosockaddr(struct socket *so, struct sockaddr *sa) +{ +#ifdef INVARIANTS + u_char len = sa->sa_len; +#endif + int error; + + CURVNET_SET(so->so_vnet); + error = so->so_proto->pr_sockaddr(so, sa); + KASSERT(sa->sa_len <= len, + ("%s: protocol %p sockaddr overflow", __func__, so->so_proto)); + CURVNET_RESTORE(); + + return (error); +} + int soconnect(struct socket *so, struct sockaddr *nam, struct thread *td) { diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 0361144f2763..e46fdef84fc9 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1308,7 +1308,7 @@ static int user_getsockname(struct thread *td, int fdes, struct sockaddr *asa, socklen_t *alen, bool compat) { - struct sockaddr *sa; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; socklen_t len; int error; @@ -1316,30 +1316,28 @@ user_getsockname(struct thread *td, int fdes, struct sockaddr *asa, if (error != 0) return (error); - error = kern_getsockname(td, fdes, &sa, &len); + error = kern_getsockname(td, fdes, (struct sockaddr *)&ss); if (error != 0) return (error); - if (len != 0) { #ifdef COMPAT_OLDSOCK - if (compat && SV_PROC_FLAG(td->td_proc, SV_AOUT)) - ((struct osockaddr *)sa)->sa_family = sa->sa_family; + if (compat && SV_PROC_FLAG(td->td_proc, SV_AOUT)) + ((struct osockaddr *)&ss)->sa_family = ss.ss_family; #endif - error = copyout(sa, asa, len); - } - free(sa, M_SONAME); - if (error == 0) + len = min(ss.ss_len, len); + error = copyout(&ss, asa, len); + if (error == 0) { + len = ss.ss_len; error = copyout(&len, alen, sizeof(len)); + } return (error); } int -kern_getsockname(struct thread *td, int fd, struct sockaddr **sa, - socklen_t *alen) +kern_getsockname(struct thread *td, int fd, struct sockaddr *sa) { struct socket *so; struct file *fp; - socklen_t len; int error; AUDIT_ARG_FD(fd); @@ -1347,27 +1345,12 @@ kern_getsockname(struct thread *td, int fd, struct sockaddr **sa, if (error != 0) return (error); so = fp->f_data; - *sa = NULL; - CURVNET_SET(so->so_vnet); - error = so->so_proto->pr_sockaddr(so, sa); - CURVNET_RESTORE(); - if (error != 0) - goto bad; - if (*sa == NULL) - len = 0; - else - len = MIN(*alen, (*sa)->sa_len); - *alen = len; + error = sosockaddr(so, sa); #ifdef KTRACE - if (KTRPOINT(td, KTR_STRUCT)) - ktrsockaddr(*sa); + if (error == 0 && KTRPOINT(td, KTR_STRUCT)) + ktrsockaddr(sa); #endif -bad: fdrop(fp, td); - if (error != 0 && *sa != NULL) { - free(*sa, M_SONAME); - *sa = NULL; - } return (error); } @@ -1389,7 +1372,7 @@ static int user_getpeername(struct thread *td, int fdes, struct sockaddr *asa, socklen_t *alen, bool compat) { - struct sockaddr *sa; + struct sockaddr_storage ss = { .ss_len = sizeof(ss) }; socklen_t len; int error; @@ -1397,30 +1380,28 @@ user_getpeername(struct thread *td, int fdes, struct sockaddr *asa, if (error != 0) return (error); - error = kern_getpeername(td, fdes, &sa, &len); + error = kern_getpeername(td, fdes, (struct sockaddr *)&ss); if (error != 0) return (error); - if (len != 0) { #ifdef COMPAT_OLDSOCK - if (compat && SV_PROC_FLAG(td->td_proc, SV_AOUT)) - ((struct osockaddr *)sa)->sa_family = sa->sa_family; + if (compat && SV_PROC_FLAG(td->td_proc, SV_AOUT)) + ((struct osockaddr *)&ss)->sa_family = ss.ss_family; #endif - error = copyout(sa, asa, len); - } - free(sa, M_SONAME); - if (error == 0) + len = min(ss.ss_len, len); + error = copyout(&ss, asa, len); + if (error == 0) { + len = ss.ss_len; error = copyout(&len, alen, sizeof(len)); + } return (error); } int -kern_getpeername(struct thread *td, int fd, struct sockaddr **sa, - socklen_t *alen) +kern_getpeername(struct thread *td, int fd, struct sockaddr *sa) { struct socket *so; struct file *fp; - socklen_t len; int error; AUDIT_ARG_FD(fd); @@ -1432,26 +1413,11 @@ kern_getpeername(struct thread *td, int fd, struct sockaddr **sa, error = ENOTCONN; goto done; } - *sa = NULL; - CURVNET_SET(so->so_vnet); - error = so->so_proto->pr_peeraddr(so, sa); - CURVNET_RESTORE(); - if (error != 0) - goto bad; - if (*sa == NULL) - len = 0; - else - len = MIN(*alen, (*sa)->sa_len); - *alen = len; + error = sopeeraddr(so, sa); #ifdef KTRACE - if (KTRPOINT(td, KTR_STRUCT)) - ktrsockaddr(*sa); + if (error == 0 && KTRPOINT(td, KTR_STRUCT)) + ktrsockaddr(sa); #endif -bad: - if (error != 0 && *sa != NULL) { - free(*sa, M_SONAME); - *sa = NULL; - } done: fdrop(fp, td); return (error); diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 3071a5169b72..069294e1c963 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -436,33 +436,6 @@ uipc_abort(struct socket *so) UNP_PCB_UNLOCK(unp); } -static int -uipc_accept(struct socket *so, struct sockaddr *ret) -{ - struct unpcb *unp, *unp2; - const struct sockaddr *sa; - - /* - * Pass back name of connected socket, if it was bound and we are - * still connected (our peer may have closed already!). - */ - unp = sotounpcb(so); - KASSERT(unp != NULL, ("uipc_accept: unp == NULL")); - - UNP_PCB_LOCK(unp); - unp2 = unp_pcb_lock_peer(unp); - if (unp2 != NULL && unp2->unp_addr != NULL) - sa = (struct sockaddr *)unp2->unp_addr; - else - sa = &sun_noname; - bcopy(sa, ret, sa->sa_len); - if (unp2 != NULL) - unp_pcb_unlock_pair(unp, unp2); - else - UNP_PCB_UNLOCK(unp); - return (0); -} - static int uipc_attach(struct socket *so, int proto, struct thread *td) { @@ -874,7 +847,7 @@ uipc_listen(struct socket *so, int backlog, struct thread *td) } static int -uipc_peeraddr(struct socket *so, struct sockaddr **nam) +uipc_peeraddr(struct socket *so, struct sockaddr *ret) { struct unpcb *unp, *unp2; const struct sockaddr *sa; @@ -882,8 +855,6 @@ uipc_peeraddr(struct socket *so, struct sockaddr **nam) unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_peeraddr: unp == NULL")); - *nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK); - UNP_PCB_LOCK(unp); unp2 = unp_pcb_lock_peer(unp); if (unp2 != NULL) { @@ -891,12 +862,12 @@ uipc_peeraddr(struct socket *so, struct sockaddr **nam) sa = (struct sockaddr *)unp2->unp_addr; else sa = &sun_noname; - bcopy(sa, *nam, sa->sa_len); + bcopy(sa, ret, sa->sa_len); unp_pcb_unlock_pair(unp, unp2); } else { - sa = &sun_noname; - bcopy(sa, *nam, sa->sa_len); UNP_PCB_UNLOCK(unp); + sa = &sun_noname; + bcopy(sa, ret, sa->sa_len); } return (0); } @@ -1704,7 +1675,7 @@ uipc_shutdown(struct socket *so) } static int -uipc_sockaddr(struct socket *so, struct sockaddr **nam) +uipc_sockaddr(struct socket *so, struct sockaddr *ret) { struct unpcb *unp; const struct sockaddr *sa; @@ -1712,13 +1683,12 @@ uipc_sockaddr(struct socket *so, struct sockaddr **nam) unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_sockaddr: unp == NULL")); - *nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK); UNP_PCB_LOCK(unp); if (unp->unp_addr != NULL) sa = (struct sockaddr *) unp->unp_addr; else sa = &sun_noname; - bcopy(sa, *nam, sa->sa_len); + bcopy(sa, ret, sa->sa_len); UNP_PCB_UNLOCK(unp); return (0); } @@ -3322,7 +3292,7 @@ static struct protosw streamproto = { PR_CAPATTACH, .pr_ctloutput = &uipc_ctloutput, .pr_abort = uipc_abort, - .pr_accept = uipc_accept, + .pr_accept = uipc_peeraddr, .pr_attach = uipc_attach, .pr_bind = uipc_bind, .pr_bindat = uipc_bindat, @@ -3349,7 +3319,7 @@ static struct protosw dgramproto = { PR_SOCKBUF, .pr_ctloutput = &uipc_ctloutput, .pr_abort = uipc_abort, - .pr_accept = uipc_accept, + .pr_accept = uipc_peeraddr, .pr_attach = uipc_attach, .pr_bind = uipc_bind, .pr_bindat = uipc_bindat, @@ -3378,7 +3348,7 @@ static struct protosw seqpacketproto = { PR_WANTRCVD|PR_RIGHTS|PR_CAPATTACH, .pr_ctloutput = &uipc_ctloutput, .pr_abort = uipc_abort, - .pr_accept = uipc_accept, + .pr_accept = uipc_peeraddr, .pr_attach = uipc_attach, .pr_bind = uipc_bind, .pr_bindat = uipc_bindat, diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 1b5d419fe58b..fb9596069101 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -508,7 +508,6 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) struct sockaddr_storage remote; struct ovpn_kpeer *peer = NULL; struct file *fp = NULL; - struct sockaddr *name = NULL; struct ovpn_softc *sc = ifp->if_softc; struct thread *td = curthread; struct socket *so = NULL; @@ -574,23 +573,21 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) callout_init_rm(&peer->ping_send, &sc->lock, CALLOUT_SHAREDLOCK); callout_init_rm(&peer->ping_rcv, &sc->lock, 0); - ret = so->so_proto->pr_sockaddr(so, &name); + peer->local.ss_len = sizeof(peer->local); + ret = sosockaddr(so, (struct sockaddr *)&peer->local); if (ret) goto error; - if (ovpn_get_port((struct sockaddr_storage *)name) == 0) { + if (ovpn_get_port(&peer->local) == 0) { ret = EINVAL; goto error; } - if (name->sa_family != remote.ss_family) { + if (peer->local.ss_family != remote.ss_family) { ret = EINVAL; goto error; } - memcpy(&peer->local, name, name->sa_len); memcpy(&peer->remote, &remote, sizeof(remote)); - free(name, M_SONAME); - name = NULL; if (peer->local.ss_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&TO_IN6(&peer->remote)->sin6_addr)) { @@ -656,7 +653,6 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) error_locked: OVPN_WUNLOCK(sc); error: - free(name, M_SONAME); COUNTER_ARRAY_FREE(peer->counters, OVPN_PEER_COUNTER_SIZE); uma_zfree_pcpu(pcpu_zone_4, peer->last_active); free(peer, M_OVPN); diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h index 05c109df1570..b55c95b29ee3 100644 --- a/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h +++ b/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h @@ -78,11 +78,10 @@ int ng_btsocket_hci_raw_control (struct socket *, u_long, void *, int ng_btsocket_hci_raw_ctloutput (struct socket *, struct sockopt *); void ng_btsocket_hci_raw_detach (struct socket *); int ng_btsocket_hci_raw_disconnect (struct socket *); -int ng_btsocket_hci_raw_peeraddr (struct socket *, struct sockaddr **); int ng_btsocket_hci_raw_send (struct socket *, int, struct mbuf *, struct sockaddr *, struct mbuf *, struct thread *); -int ng_btsocket_hci_raw_sockaddr (struct socket *, struct sockaddr **); +int ng_btsocket_hci_raw_sockaddr (struct socket *, struct sockaddr *); #endif /* _KERNEL */ diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h index b512112f8b7d..7181e369119d 100644 --- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h +++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h @@ -105,11 +105,11 @@ int ng_btsocket_l2cap_raw_control (struct socket *, u_long, void *, struct ifnet *, struct thread *); void ng_btsocket_l2cap_raw_detach (struct socket *); int ng_btsocket_l2cap_raw_disconnect (struct socket *); -int ng_btsocket_l2cap_raw_peeraddr (struct socket *, struct sockaddr **); +int ng_btsocket_l2cap_raw_peeraddr (struct socket *, struct sockaddr *); int ng_btsocket_l2cap_raw_send (struct socket *, int, struct mbuf *, struct sockaddr *, struct mbuf *, struct thread *); -int ng_btsocket_l2cap_raw_sockaddr (struct socket *, struct sockaddr **); +int ng_btsocket_l2cap_raw_sockaddr (struct socket *, struct sockaddr *); #endif /* _KERNEL */ @@ -191,7 +191,6 @@ typedef struct ng_btsocket_l2cap_pcb * ng_btsocket_l2cap_pcb_p; void ng_btsocket_l2cap_abort (struct socket *); void ng_btsocket_l2cap_close (struct socket *); -int ng_btsocket_l2cap_accept (struct socket *, struct sockaddr *); int ng_btsocket_l2cap_attach (struct socket *, int, struct thread *); int ng_btsocket_l2cap_bind (struct socket *, struct sockaddr *, struct thread *); @@ -203,11 +202,11 @@ int ng_btsocket_l2cap_ctloutput (struct socket *, struct sockopt *); void ng_btsocket_l2cap_detach (struct socket *); int ng_btsocket_l2cap_disconnect (struct socket *); int ng_btsocket_l2cap_listen (struct socket *, int, struct thread *); -int ng_btsocket_l2cap_peeraddr (struct socket *, struct sockaddr **); +int ng_btsocket_l2cap_peeraddr (struct socket *, struct sockaddr *); int ng_btsocket_l2cap_send (struct socket *, int, struct mbuf *, struct sockaddr *, struct mbuf *, struct thread *); -int ng_btsocket_l2cap_sockaddr (struct socket *, struct sockaddr **); +int ng_btsocket_l2cap_sockaddr (struct socket *, struct sockaddr *); #endif /* _KERNEL */ diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h index d40b694ece14..a5448ed943a2 100644 --- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h +++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h @@ -328,11 +328,11 @@ int ng_btsocket_rfcomm_ctloutput (struct socket *, struct sockopt *); void ng_btsocket_rfcomm_detach (struct socket *); int ng_btsocket_rfcomm_disconnect (struct socket *); int ng_btsocket_rfcomm_listen (struct socket *, int, struct thread *); -int ng_btsocket_rfcomm_peeraddr (struct socket *, struct sockaddr **); +int ng_btsocket_rfcomm_peeraddr (struct socket *, struct sockaddr *); int ng_btsocket_rfcomm_send (struct socket *, int, struct mbuf *, struct sockaddr *, struct mbuf *, struct thread *); -int ng_btsocket_rfcomm_sockaddr (struct socket *, struct sockaddr **); +int ng_btsocket_rfcomm_sockaddr (struct socket *, struct sockaddr *); #endif /* _KERNEL */ diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h index 282980cce881..4b131dab4223 100644 --- a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h +++ b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h @@ -118,11 +118,11 @@ int ng_btsocket_sco_ctloutput (struct socket *, struct sockopt *); void ng_btsocket_sco_detach (struct socket *); int ng_btsocket_sco_disconnect (struct socket *); int ng_btsocket_sco_listen (struct socket *, int, struct thread *); -int ng_btsocket_sco_peeraddr (struct socket *, struct sockaddr **); +int ng_btsocket_sco_peeraddr (struct socket *, struct sockaddr *); int ng_btsocket_sco_send (struct socket *, int, struct mbuf *, struct sockaddr *, struct mbuf *, struct thread *); -int ng_btsocket_sco_sockaddr (struct socket *, struct sockaddr **); +int ng_btsocket_sco_sockaddr (struct socket *, struct sockaddr *); #endif /* _KERNEL */ diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket.c b/sys/netgraph/bluetooth/socket/ng_btsocket.c index 03fa322e7775..a90256595911 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket.c @@ -79,7 +79,7 @@ static struct protosw ng_btsocket_hci_raw_protosw = { .pr_control = ng_btsocket_hci_raw_control, .pr_detach = ng_btsocket_hci_raw_detach, .pr_disconnect = ng_btsocket_hci_raw_disconnect, - .pr_peeraddr = ng_btsocket_hci_raw_peeraddr, + .pr_peeraddr = ng_btsocket_hci_raw_sockaddr, .pr_send = ng_btsocket_hci_raw_send, .pr_sockaddr = ng_btsocket_hci_raw_sockaddr, .pr_close = ng_btsocket_hci_raw_close, @@ -110,7 +110,7 @@ static struct protosw ng_btsocket_l2cap_protosw = { .pr_flags = PR_ATOMIC|PR_CONNREQUIRED, .pr_ctloutput = ng_btsocket_l2cap_ctloutput, .pr_abort = ng_btsocket_l2cap_abort, - .pr_accept = ng_btsocket_l2cap_accept, + .pr_accept = ng_btsocket_l2cap_peeraddr, .pr_attach = ng_btsocket_l2cap_attach, .pr_bind = ng_btsocket_l2cap_bind, .pr_connect = ng_btsocket_l2cap_connect, @@ -131,7 +131,7 @@ static struct protosw ng_btsocket_rfcomm_protosw = { .pr_flags = PR_CONNREQUIRED, .pr_ctloutput = ng_btsocket_rfcomm_ctloutput, .pr_abort = ng_btsocket_rfcomm_abort, - .pr_accept = ng_btsocket_rfcomm_accept, + .pr_accept = ng_btsocket_rfcomm_peeraddr, .pr_attach = ng_btsocket_rfcomm_attach, .pr_bind = ng_btsocket_rfcomm_bind, .pr_connect = ng_btsocket_rfcomm_connect, @@ -152,7 +152,7 @@ static struct protosw ng_btsocket_sco_protosw = { .pr_flags = PR_ATOMIC|PR_CONNREQUIRED, .pr_ctloutput = ng_btsocket_sco_ctloutput, .pr_abort = ng_btsocket_sco_abort, - .pr_accept = ng_btsocket_sco_accept, + .pr_accept = ng_btsocket_sco_peeraddr, .pr_attach = ng_btsocket_sco_attach, .pr_bind = ng_btsocket_sco_bind, .pr_connect = ng_btsocket_sco_connect, diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c index 935991696929..5d015b2eac6e 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c @@ -1556,16 +1556,6 @@ ng_btsocket_hci_raw_disconnect(struct socket *so) return (0); } /* ng_btsocket_hci_raw_disconnect */ -/* - * Get socket peer's address - */ - -int -ng_btsocket_hci_raw_peeraddr(struct socket *so, struct sockaddr **nam) -{ - return (ng_btsocket_hci_raw_sockaddr(so, nam)); -} /* ng_btsocket_hci_raw_peeraddr */ - /* * Send data */ @@ -1656,25 +1646,24 @@ drop: */ int -ng_btsocket_hci_raw_sockaddr(struct socket *so, struct sockaddr **nam) +ng_btsocket_hci_raw_sockaddr(struct socket *so, struct sockaddr *sa) { ng_btsocket_hci_raw_pcb_p pcb = so2hci_raw_pcb(so); - struct sockaddr_hci sa; + struct sockaddr_hci *hci = (struct sockaddr_hci *)sa; if (pcb == NULL) return (EINVAL); if (ng_btsocket_hci_raw_node == NULL) return (EINVAL); - bzero(&sa, sizeof(sa)); - sa.hci_len = sizeof(sa); - sa.hci_family = AF_BLUETOOTH; + *hci = (struct sockaddr_hci ){ + .hci_len = sizeof(struct sockaddr_hci), + .hci_family = AF_BLUETOOTH, + }; mtx_lock(&pcb->pcb_mtx); - strlcpy(sa.hci_node, pcb->addr.hci_node, sizeof(sa.hci_node)); + strlcpy(hci->hci_node, pcb->addr.hci_node, sizeof(hci->hci_node)); mtx_unlock(&pcb->pcb_mtx); - *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); - - return ((*nam == NULL)? ENOMEM : 0); -} /* ng_btsocket_hci_raw_sockaddr */ + return (0); +} diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c index d221cc34d36a..ae5405529667 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c @@ -2509,68 +2509,43 @@ out: *** 1566 LINES SKIPPED *** From nobody Thu Nov 30 16:56:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh2Qd416bz52JDy; Thu, 30 Nov 2023 16:56:25 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sh2Qd2DKPz4YCw; Thu, 30 Nov 2023 16:56:25 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 3AUGuOPZ046204; Thu, 30 Nov 2023 10:56:24 -0600 (CST) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1701363384; bh=QoUnDySg55qfMDCS721eKsNBSCTh077VH6LrAeBeyM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SNBOUxgpSzFeR+l2gqfuw7MK2kdGUiC4w3SEffnm8cfqU7Y4sz2X6d1+5fdMTUh2C YkXr9U2XAzT34ScK0KOypqX75TyYmCeA3hAXKPl4KoQVgsPtiWaTvWwLtlvaPqF7hH dd3Zw27hjV/qebKzIwNKXkTIMZeU4NUgH7gOEZwlszjhrsvuZgQQWWe6uw+DFri06p F0YHaZsUDSRBxeJzWSgBwXfPCrIohQRvmkWanGGELo1jNko7VcUCHcJurCaIKXq692 /2bA3CpXZcCASn491BXAAMf+1WIL9RDMJvKuxMzS75JagBpRUL1d79itT0gZ6IcNzC h9Tp+mdV2TeLw== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id AXbvBbi+aGV6tAAAs/W3XQ (envelope-from ); Thu, 30 Nov 2023 10:56:24 -0600 From: Mike Karels To: Gleb Smirnoff Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: cfb1e92912b4 - main - sockets: don't malloc/free sockaddr memory on accept(2) Date: Thu, 30 Nov 2023 10:56:23 -0600 X-Mailer: MailMate (1.14r5964) Message-ID: In-Reply-To: <202311301634.3AUGYljD055413@gitrepo.freebsd.org> References: <202311301634.3AUGYljD055413@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 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Queue-Id: 4Sh2Qd2DKPz4YCw On 30 Nov 2023, at 10:34, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dcfb1e92912b4cf75360b7fbe= 86197cc29bc212c1 > > commit cfb1e92912b4cf75360b7fbe86197cc29bc212c1 > Author: Gleb Smirnoff > AuthorDate: 2023-11-30 16:30:55 +0000 > Commit: Gleb Smirnoff > CommitDate: 2023-11-30 16:30:55 +0000 > > sockets: don't malloc/free sockaddr memory on accept(2) > > Let the accept functions provide stack memory for protocols to fill= it in. > Generic code should provide sockaddr_storage, specialized code may = provide > smaller structure. Does this mean that families cannot support sockaddrs bigger than sockadd= r_storage? In particular, does local domain (aka unix domain)? Did it before? Mike > While rewriting accept(2) make 'addrlen' a true in/out parameter, r= eporting > required length in case if provided length was insufficient. Our m= anual > page accept(2) and POSIX don't explicitly require that, but one can= read > the text as they do. Linux also does that. Update tests accordingl= y. > > Reviewed by: rscheff, tuexen, zlei, dchagin > Differential Revision: https://reviews.freebsd.org/D42635 > --- > sys/cam/ctl/ctl_ha.c | 9 +-- > sys/compat/linux/linux_socket.c | 32 ++++----- > sys/dev/cxgbe/iw_cxgbe/cm.c | 7 +- > sys/dev/hyperv/hvsock/hv_sock.c | 7 +- > sys/dev/hyperv/hvsock/hv_sock.h | 2 +- > sys/dev/iscsi/icl_soft_proxy.c | 10 ++- > sys/kern/uipc_domain.c | 2 +- > sys/kern/uipc_socket.c | 9 ++- > sys/kern/uipc_syscalls.c | 67 +++++++-------= ---- > sys/kern/uipc_usrreq.c | 10 +-- > sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h | 2 +- > .../bluetooth/include/ng_btsocket_rfcomm.h | 2 +- > sys/netgraph/bluetooth/include/ng_btsocket_sco.h | 2 +- > sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c | 72 +++++++++++---= ----- > sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 62 ++++++++++----= --- > sys/netgraph/bluetooth/socket/ng_btsocket_sco.c | 60 +++++++++-----= -- > sys/netgraph/ng_ksocket.c | 12 ++-- > sys/netinet/sctp_usrreq.c | 48 +++++-------- > sys/netinet/sctp_var.h | 2 +- > sys/netinet/tcp_usrreq.c | 80 +++++++++-----= -------- > sys/netinet6/in6_pcb.c | 19 ----- > sys/netinet6/in6_pcb.h | 2 - > sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c | 25 +++---- > sys/rpc/svc_vc.c | 12 ++-- > sys/sys/protosw.h | 2 +- > sys/sys/socketvar.h | 2 +- > sys/sys/syscallsubr.h | 8 +-- > tests/sys/kern/socket_accept.c | 3 - > 28 files changed, 261 insertions(+), 309 deletions(-) > > diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c > index 0828c46c8863..695006ed99e1 100644 > --- a/sys/cam/ctl/ctl_ha.c > +++ b/sys/cam/ctl/ctl_ha.c > @@ -397,7 +397,7 @@ static int > ctl_ha_accept(struct ha_softc *softc) > { > struct socket *lso, *so; > - struct sockaddr *sap; > + struct sockaddr_in sin =3D { .sin_len =3D sizeof(sin) }; > int error; > > lso =3D softc->ha_lso; > @@ -410,16 +410,11 @@ ctl_ha_accept(struct ha_softc *softc) > goto out; > } > > - sap =3D NULL; > - error =3D soaccept(so, &sap); > + error =3D soaccept(so, (struct sockaddr *)&sin); > if (error !=3D 0) { > printf("%s: soaccept() error %d\n", __func__, error); > - if (sap !=3D NULL) > - free(sap, M_SONAME); > goto out; > } > - if (sap !=3D NULL) > - free(sap, M_SONAME); > softc->ha_so =3D so; > ctl_ha_sock_setup(softc); > return (0); > diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_s= ocket.c > index a5ed5c5c62db..2893e93bbcd7 100644 > --- a/sys/compat/linux/linux_socket.c > +++ b/sys/compat/linux/linux_socket.c > @@ -1017,31 +1017,29 @@ static int > linux_accept_common(struct thread *td, int s, l_uintptr_t addr, > l_uintptr_t namelen, int flags) > { > - struct sockaddr *sa; > + struct sockaddr_storage ss =3D { .ss_len =3D sizeof(ss) }; > struct file *fp, *fp1; > - int bflags, len; > struct socket *so; > - int error, error1; > + socklen_t len; > + int bflags, error, error1; > > bflags =3D 0; > fp =3D NULL; > - sa =3D NULL; > > error =3D linux_set_socket_flags(flags, &bflags); > if (error !=3D 0) > return (error); > > - if (PTRIN(addr) =3D=3D NULL) { > - len =3D 0; > - error =3D kern_accept4(td, s, NULL, NULL, bflags, NULL); > - } else { > + if (PTRIN(addr) !=3D NULL) { > error =3D copyin(PTRIN(namelen), &len, sizeof(len)); > if (error !=3D 0) > return (error); > if (len < 0) > return (EINVAL); > - error =3D kern_accept4(td, s, &sa, &len, bflags, &fp); > - } > + } else > + len =3D 0; > + > + error =3D kern_accept4(td, s, (struct sockaddr *)&ss, bflags, &fp); > > /* > * Translate errno values into ones used by Linux. > @@ -1071,11 +1069,14 @@ linux_accept_common(struct thread *td, int s, l= _uintptr_t addr, > return (error); > } > > - if (len !=3D 0) { > - error =3D linux_copyout_sockaddr(sa, PTRIN(addr), len); > - if (error =3D=3D 0) > - error =3D copyout(&len, PTRIN(namelen), > - sizeof(len)); > + if (PTRIN(addr) !=3D NULL) { > + len =3D min(ss.ss_len, len); > + error =3D linux_copyout_sockaddr((struct sockaddr *)&ss, > + PTRIN(addr), len); > + if (error =3D=3D 0) { > + len =3D ss.ss_len; > + error =3D copyout(&len, PTRIN(namelen), sizeof(len)); > + } > if (error !=3D 0) { > fdclose(td, fp, td->td_retval[0]); > td->td_retval[0] =3D 0; > @@ -1083,7 +1084,6 @@ linux_accept_common(struct thread *td, int s, l_u= intptr_t addr, > } > if (fp !=3D NULL) > fdrop(fp, td); > - free(sa, M_SONAME); > return (error); > } > > diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c > index 77158eb855df..84d6df3f2832 100644 > --- a/sys/dev/cxgbe/iw_cxgbe/cm.c > +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c > @@ -974,7 +974,7 @@ process_newconn(struct c4iw_listen_ep *master_lep, = struct socket *new_so) > { > struct c4iw_listen_ep *real_lep =3D NULL; > struct c4iw_ep *new_ep =3D NULL; > - struct sockaddr_in *remote =3D NULL; > + struct sockaddr_storage remote =3D { .ss_len =3D sizeof(remote) }; > int ret =3D 0; > > MPASS(new_so !=3D NULL); > @@ -1019,19 +1019,16 @@ process_newconn(struct c4iw_listen_ep *master_l= ep, struct socket *new_so) > new_ep->com.state =3D MPA_REQ_WAIT; > > setiwsockopt(new_so); > - ret =3D soaccept(new_so, (struct sockaddr **)&remote); > + ret =3D soaccept(new_so, (struct sockaddr *)&remote); > if (ret !=3D 0) { > CTR4(KTR_IW_CXGBE, > "%s:listen sock:%p, new sock:%p, ret:%d", > __func__, master_lep->com.so, new_so, ret); > - if (remote !=3D NULL) > - free(remote, M_SONAME); > soclose(new_so); > c4iw_put_ep(&new_ep->com); > c4iw_put_ep(&real_lep->com); > return; > } > - free(remote, M_SONAME); > > START_EP_TIMER(new_ep); > > diff --git a/sys/dev/hyperv/hvsock/hv_sock.c b/sys/dev/hyperv/hvsock/hv= _sock.c > index 60cdfecf3bee..655cc990876e 100644 > --- a/sys/dev/hyperv/hvsock/hv_sock.c > +++ b/sys/dev/hyperv/hvsock/hv_sock.c > @@ -478,7 +478,7 @@ hvs_trans_listen(struct socket *so, int backlog, st= ruct thread *td) > } > > int > -hvs_trans_accept(struct socket *so, struct sockaddr **nam) > +hvs_trans_accept(struct socket *so, struct sockaddr *sa) > { > struct hvs_pcb *pcb =3D so2hvspcb(so); > > @@ -488,10 +488,9 @@ hvs_trans_accept(struct socket *so, struct sockadd= r **nam) > if (pcb =3D=3D NULL) > return (EINVAL); > > - *nam =3D sodupsockaddr((struct sockaddr *) &pcb->remote_addr, > - M_NOWAIT); > + memcpy(sa, &pcb->remote_addr, pcb->remote_addr.sa_len); > > - return ((*nam =3D=3D NULL) ? ENOMEM : 0); > + return (0); > } > > int > diff --git a/sys/dev/hyperv/hvsock/hv_sock.h b/sys/dev/hyperv/hvsock/hv= _sock.h > index 98a9afb747bf..ee6416a29662 100644 > --- a/sys/dev/hyperv/hvsock/hv_sock.h > +++ b/sys/dev/hyperv/hvsock/hv_sock.h > @@ -100,7 +100,7 @@ void hvs_trans_abort(struct socket *); > int hvs_trans_attach(struct socket *, int, struct thread *); > int hvs_trans_bind(struct socket *, struct sockaddr *, struct thread *= ); > int hvs_trans_listen(struct socket *, int, struct thread *); > -int hvs_trans_accept(struct socket *, struct sockaddr **); > +int hvs_trans_accept(struct socket *, struct sockaddr *); > int hvs_trans_connect(struct socket *, > struct sockaddr *, struct thread *); > int hvs_trans_peeraddr(struct socket *, struct sockaddr **); > diff --git a/sys/dev/iscsi/icl_soft_proxy.c b/sys/dev/iscsi/icl_soft_pr= oxy.c > index ee448116b0e9..db9bf12a688c 100644 > --- a/sys/dev/iscsi/icl_soft_proxy.c > +++ b/sys/dev/iscsi/icl_soft_proxy.c > @@ -205,7 +205,7 @@ icl_accept_thread(void *arg) > { > struct icl_listen_sock *ils; > struct socket *head, *so; > - struct sockaddr *sa; > + struct sockaddr_storage ss =3D { .ss_len =3D sizeof(ss) }; > int error; > > ils =3D arg; > @@ -231,17 +231,15 @@ icl_accept_thread(void *arg) > continue; > } > > - sa =3D NULL; > - error =3D soaccept(so, &sa); > + error =3D soaccept(so, (struct sockaddr *)&ss); > if (error !=3D 0) { > ICL_WARN("soaccept error %d", error); > - if (sa !=3D NULL) > - free(sa, M_SONAME); > soclose(so); > continue; > } > > - (ils->ils_listen->il_accept)(so, sa, ils->ils_id); > + (ils->ils_listen->il_accept)(so, (struct sockaddr *)&ss, > + ils->ils_id); > } > } > > diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c > index 03e6856b7750..cf9b91511574 100644 > --- a/sys/kern/uipc_domain.c > +++ b/sys/kern/uipc_domain.c > @@ -53,7 +53,7 @@ static struct mtx dom_mtx; /* domain list lock */ > MTX_SYSINIT(domain, &dom_mtx, "domain list", MTX_DEF); > > static int > -pr_accept_notsupp(struct socket *so, struct sockaddr **nam) > +pr_accept_notsupp(struct socket *so, struct sockaddr *sa) > { > return (EOPNOTSUPP); > } > diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c > index b59051ae3350..d16c0049dc43 100644 > --- a/sys/kern/uipc_socket.c > +++ b/sys/kern/uipc_socket.c > @@ -1348,12 +1348,17 @@ soabort(struct socket *so) > } > > int > -soaccept(struct socket *so, struct sockaddr **nam) > +soaccept(struct socket *so, struct sockaddr *sa) > { > +#ifdef INVARIANTS > + u_char len =3D sa->sa_len; > +#endif > int error; > > CURVNET_SET(so->so_vnet); > - error =3D so->so_proto->pr_accept(so, nam); > + error =3D so->so_proto->pr_accept(so, sa); > + KASSERT(sa->sa_len <=3D len, > + ("%s: protocol %p sockaddr overflow", __func__, so->so_proto)); > CURVNET_RESTORE(); > return (error); > } > diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c > index a7ffb6ef3254..0361144f2763 100644 > --- a/sys/kern/uipc_syscalls.c > +++ b/sys/kern/uipc_syscalls.c > @@ -277,19 +277,18 @@ static int > accept1(struct thread *td, int s, struct sockaddr *uname, socklen_t *a= namelen, > int flags) > { > - struct sockaddr *name; > - socklen_t namelen; > + struct sockaddr_storage ss =3D { .ss_len =3D sizeof(ss) }; > + socklen_t addrlen; > struct file *fp; > int error; > > - if (uname =3D=3D NULL) > - return (kern_accept4(td, s, NULL, NULL, flags, NULL)); > - > - error =3D copyin(anamelen, &namelen, sizeof (namelen)); > - if (error !=3D 0) > - return (error); > + if (uname !=3D NULL) { > + error =3D copyin(anamelen, &addrlen, sizeof(addrlen)); > + if (error !=3D 0) > + return (error); > + } > > - error =3D kern_accept4(td, s, &name, &namelen, flags, &fp); > + error =3D kern_accept4(td, s, (struct sockaddr *)&ss, flags, &fp); > > if (error !=3D 0) > return (error); > @@ -297,42 +296,40 @@ accept1(struct thread *td, int s, struct sockaddr= *uname, socklen_t *anamelen, > #ifdef COMPAT_OLDSOCK > if (SV_PROC_FLAG(td->td_proc, SV_AOUT) && > (flags & ACCEPT4_COMPAT) !=3D 0) > - ((struct osockaddr *)name)->sa_family =3D > - name->sa_family; > + ((struct osockaddr *)&ss)->sa_family =3D ss.ss_family; > #endif > - error =3D copyout(name, uname, namelen); > - if (error =3D=3D 0) > - error =3D copyout(&namelen, anamelen, > - sizeof(namelen)); > + if (uname !=3D NULL) { > + addrlen =3D min(ss.ss_len, addrlen); > + error =3D copyout(&ss, uname, addrlen); > + if (error =3D=3D 0) { > + addrlen =3D ss.ss_len; > + error =3D copyout(&addrlen, anamelen, sizeof(addrlen)); > + } > + } > if (error !=3D 0) > fdclose(td, fp, td->td_retval[0]); > fdrop(fp, td); > - free(name, M_SONAME); > + > return (error); > } > > int > -kern_accept(struct thread *td, int s, struct sockaddr **name, > - socklen_t *namelen, struct file **fp) > +kern_accept(struct thread *td, int s, struct sockaddr *sa, struct file= **fp) > { > - return (kern_accept4(td, s, name, namelen, ACCEPT4_INHERIT, fp)); > + return (kern_accept4(td, s, sa, ACCEPT4_INHERIT, fp)); > } > > int > -kern_accept4(struct thread *td, int s, struct sockaddr **name, > - socklen_t *namelen, int flags, struct file **fp) > +kern_accept4(struct thread *td, int s, struct sockaddr *sa, int flags,= > + struct file **fp) > { > struct file *headfp, *nfp =3D NULL; > - struct sockaddr *sa =3D NULL; > struct socket *head, *so; > struct filecaps fcaps; > u_int fflag; > pid_t pgid; > int error, fd, tmp; > > - if (name !=3D NULL) > - *name =3D NULL; > - > AUDIT_ARG_FD(s); > error =3D getsock_cap(td, s, &cap_accept_rights, > &headfp, &fcaps); > @@ -386,29 +383,15 @@ kern_accept4(struct thread *td, int s, struct soc= kaddr **name, > (void) fo_ioctl(nfp, FIONBIO, &tmp, td->td_ucred, td); > tmp =3D fflag & FASYNC; > (void) fo_ioctl(nfp, FIOASYNC, &tmp, td->td_ucred, td); > - error =3D soaccept(so, &sa); > - if (error !=3D 0) > - goto noconnection; > - if (sa =3D=3D NULL) { > - if (name) > - *namelen =3D 0; > - goto done; > - } > - AUDIT_ARG_SOCKADDR(td, AT_FDCWD, sa); > - if (name) { > - /* check sa_len before it is destroyed */ > - if (*namelen > sa->sa_len) > - *namelen =3D sa->sa_len; > + > + if ((error =3D soaccept(so, sa)) =3D=3D 0) { > + AUDIT_ARG_SOCKADDR(td, AT_FDCWD, sa); > #ifdef KTRACE > if (KTRPOINT(td, KTR_STRUCT)) > ktrsockaddr(sa); > #endif > - *name =3D sa; > - sa =3D NULL; > } > noconnection: > - free(sa, M_SONAME); > - > /* > * close the new descriptor, assuming someone hasn't ripped it > * out from under us. > diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c > index 53a7c2b2915a..3071a5169b72 100644 > --- a/sys/kern/uipc_usrreq.c > +++ b/sys/kern/uipc_usrreq.c > @@ -120,7 +120,10 @@ struct unp_defer { > static SLIST_HEAD(, unp_defer) unp_defers; > static int unp_defers_count; > > -static const struct sockaddr sun_noname =3D { sizeof(sun_noname), AF_L= OCAL }; > +static const struct sockaddr sun_noname =3D { > + .sa_len =3D sizeof(sun_noname), > + .sa_family =3D AF_LOCAL, > +}; > > /* > * Garbage collection of cyclic file descriptor/socket references occu= rs > @@ -434,7 +437,7 @@ uipc_abort(struct socket *so) > } > > static int > -uipc_accept(struct socket *so, struct sockaddr **nam) > +uipc_accept(struct socket *so, struct sockaddr *ret) > { > struct unpcb *unp, *unp2; > const struct sockaddr *sa; > @@ -446,14 +449,13 @@ uipc_accept(struct socket *so, struct sockaddr **= nam) > unp =3D sotounpcb(so); > KASSERT(unp !=3D NULL, ("uipc_accept: unp =3D=3D NULL")); > > - *nam =3D malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK); > UNP_PCB_LOCK(unp); > unp2 =3D unp_pcb_lock_peer(unp); > if (unp2 !=3D NULL && unp2->unp_addr !=3D NULL) > sa =3D (struct sockaddr *)unp2->unp_addr; > else > sa =3D &sun_noname; > - bcopy(sa, *nam, sa->sa_len); > + bcopy(sa, ret, sa->sa_len); > if (unp2 !=3D NULL) > unp_pcb_unlock_pair(unp, unp2); > else > diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/sys/n= etgraph/bluetooth/include/ng_btsocket_l2cap.h > index baaef9abb736..b512112f8b7d 100644 > --- a/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h > +++ b/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h > @@ -191,7 +191,7 @@ typedef struct ng_btsocket_l2cap_pcb * ng_btsocket_= l2cap_pcb_p; > > void ng_btsocket_l2cap_abort (struct socket *); > void ng_btsocket_l2cap_close (struct socket *); > -int ng_btsocket_l2cap_accept (struct socket *, struct sockaddr **= ); > +int ng_btsocket_l2cap_accept (struct socket *, struct sockaddr *)= ; > int ng_btsocket_l2cap_attach (struct socket *, int, struct thread= *); > int ng_btsocket_l2cap_bind (struct socket *, struct sockaddr *,= > struct thread *); > diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/= netgraph/bluetooth/include/ng_btsocket_rfcomm.h > index 88c0f8988587..d40b694ece14 100644 > --- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h > +++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h > @@ -316,7 +316,7 @@ typedef struct ng_btsocket_rfcomm_pcb * ng_btsocket= _rfcomm_pcb_p; > > void ng_btsocket_rfcomm_abort (struct socket *); > void ng_btsocket_rfcomm_close (struct socket *); > -int ng_btsocket_rfcomm_accept (struct socket *, struct sockaddr *= *); > +int ng_btsocket_rfcomm_accept (struct socket *, struct sockaddr *= ); > int ng_btsocket_rfcomm_attach (struct socket *, int, struct threa= d *); > int ng_btsocket_rfcomm_bind (struct socket *, struct sockaddr *= , > struct thread *); > diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h b/sys/net= graph/bluetooth/include/ng_btsocket_sco.h > index 071ddb8d80ef..282980cce881 100644 > --- a/sys/netgraph/bluetooth/include/ng_btsocket_sco.h > +++ b/sys/netgraph/bluetooth/include/ng_btsocket_sco.h > @@ -106,7 +106,7 @@ typedef struct ng_btsocket_sco_pcb * ng_btsocket_sc= o_pcb_p; > > void ng_btsocket_sco_abort (struct socket *); > void ng_btsocket_sco_close (struct socket *); > -int ng_btsocket_sco_accept (struct socket *, struct sockaddr **);= > +int ng_btsocket_sco_accept (struct socket *, struct sockaddr *); > int ng_btsocket_sco_attach (struct socket *, int, struct thread *= ); > int ng_btsocket_sco_bind (struct socket *, struct sockaddr *, > struct thread *); > diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/ne= tgraph/bluetooth/socket/ng_btsocket_l2cap.c > index 8fc64bb70929..d221cc34d36a 100644 > --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c > +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c > @@ -1967,20 +1967,6 @@ ng_btsocket_l2cap_close(struct socket *so) > (void)ng_btsocket_l2cap_disconnect(so); > } /* ng_btsocket_l2cap_close */ > > -/* > - * Accept connection on socket. Nothing to do here, socket must be con= nected > - * and ready, so just return peer address and be done with it. > - */ > - > -int > -ng_btsocket_l2cap_accept(struct socket *so, struct sockaddr **nam) > -{ > - if (ng_btsocket_l2cap_node =3D=3D NULL) > - return (EINVAL); > - > - return (ng_btsocket_l2cap_peeraddr(so, nam)); > -} /* ng_btsocket_l2cap_accept */ > - > /* > * Create and attach new socket > */ > @@ -2523,41 +2509,67 @@ out: > return (error); > } /* ng_btsocket_listen */ > > -/* > - * Get peer address > - */ > - > -int > -ng_btsocket_l2cap_peeraddr(struct socket *so, struct sockaddr **nam) > +static int > +ng_btsocket_l2cap_peeraddr1(struct socket *so, struct sockaddr_l2cap *= sa) > { > ng_btsocket_l2cap_pcb_p pcb =3D so2l2cap_pcb(so); > - struct sockaddr_l2cap sa; > > if (pcb =3D=3D NULL) > return (EINVAL); > if (ng_btsocket_l2cap_node =3D=3D NULL) > return (EINVAL); > > - bcopy(&pcb->dst, &sa.l2cap_bdaddr, sizeof(sa.l2cap_bdaddr)); > - sa.l2cap_psm =3D htole16(pcb->psm); > - sa.l2cap_len =3D sizeof(sa); > - sa.l2cap_family =3D AF_BLUETOOTH; > + *sa =3D (struct sockaddr_l2cap ){ > + .l2cap_len =3D sizeof(struct sockaddr_l2cap), > + .l2cap_family =3D AF_BLUETOOTH, > + .l2cap_psm =3D htole16(pcb->psm), > + }; > + bcopy(&pcb->dst, &sa->l2cap_bdaddr, sizeof(sa->l2cap_bdaddr)); > switch(pcb->idtype){ > case NG_L2CAP_L2CA_IDTYPE_ATT: > - sa.l2cap_cid =3D NG_L2CAP_ATT_CID; > + sa->l2cap_cid =3D NG_L2CAP_ATT_CID; > break; > case NG_L2CAP_L2CA_IDTYPE_SMP: > - sa.l2cap_cid =3D NG_L2CAP_SMP_CID; > + sa->l2cap_cid =3D NG_L2CAP_SMP_CID; > break; > default: > - sa.l2cap_cid =3D 0; > + sa->l2cap_cid =3D 0; > break; > } > - sa.l2cap_bdaddr_type =3D pcb->dsttype; > + sa->l2cap_bdaddr_type =3D pcb->dsttype; > + > + return (0); > +} > + > +/* > + * Get peer address > + */ > +int > +ng_btsocket_l2cap_peeraddr(struct socket *so, struct sockaddr **nam) > +{ > + struct sockaddr_l2cap sa; > + int error; > + > + error =3D ng_btsocket_l2cap_peeraddr1(so, &sa); > + if (error !=3D 0) > + return (error); > *nam =3D sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); > > return ((*nam =3D=3D NULL)? ENOMEM : 0); > -} /* ng_btsocket_l2cap_peeraddr */ > +} > + > +/* > + * Accept connection on socket. Nothing to do here, socket must be con= nected > + * and ready, so just return peer address and be done with it. > + */ > +int > +ng_btsocket_l2cap_accept(struct socket *so, struct sockaddr *sa) > +{ > + if (ng_btsocket_l2cap_node =3D=3D NULL) > + return (EINVAL); > + > + return (ng_btsocket_l2cap_peeraddr1(so, (struct sockaddr_l2cap *)sa))= ; > +} > > /* > * Send data to socket > diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/n= etgraph/bluetooth/socket/ng_btsocket_rfcomm.c > index 00225f8240e9..af542f3c258b 100644 > --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c > +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c > @@ -370,17 +370,6 @@ ng_btsocket_rfcomm_close(struct socket *so) > (void)ng_btsocket_rfcomm_disconnect(so); > } /* ng_btsocket_rfcomm_close */ > > -/* > - * Accept connection on socket. Nothing to do here, socket must be con= nected > - * and ready, so just return peer address and be done with it. > - */ > - > -int > -ng_btsocket_rfcomm_accept(struct socket *so, struct sockaddr **nam) > -{ > - return (ng_btsocket_rfcomm_peeraddr(so, nam)); > -} /* ng_btsocket_rfcomm_accept */ > - > /* > * Create and attach new socket > */ > @@ -925,28 +914,51 @@ out: > return (error); > } /* ng_btsocket_listen */ > > -/* > - * Get peer address > - */ > - > -int > -ng_btsocket_rfcomm_peeraddr(struct socket *so, struct sockaddr **nam) > +static int > +ng_btsocket_rfcomm_peeraddr1(struct socket *so, struct sockaddr_rfcomm= *sa) > { > ng_btsocket_rfcomm_pcb_p pcb =3D so2rfcomm_pcb(so); > - struct sockaddr_rfcomm sa; > > if (pcb =3D=3D NULL) > return (EINVAL); > > - bcopy(&pcb->dst, &sa.rfcomm_bdaddr, sizeof(sa.rfcomm_bdaddr)); > - sa.rfcomm_channel =3D pcb->channel; > - sa.rfcomm_len =3D sizeof(sa); > - sa.rfcomm_family =3D AF_BLUETOOTH; > + *sa =3D (struct sockaddr_rfcomm ){ > + .rfcomm_len =3D sizeof(struct sockaddr_rfcomm), > + .rfcomm_family =3D AF_BLUETOOTH, > + .rfcomm_channel =3D pcb->channel, > + }; > + bcopy(&pcb->dst, &sa->rfcomm_bdaddr, sizeof(sa->rfcomm_bdaddr)); > > + return (0); > +} > + > +/* > + * Get peer address > + */ > +int > +ng_btsocket_rfcomm_peeraddr(struct socket *so, struct sockaddr **nam) > +{ > + struct sockaddr_rfcomm sa; > + int error; > + > + error =3D ng_btsocket_rfcomm_peeraddr1(so, &sa); > + if (error !=3D 0) > + return (error); > *nam =3D sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); > > return ((*nam =3D=3D NULL)? ENOMEM : 0); > -} /* ng_btsocket_rfcomm_peeraddr */ > +} > + > +/* > + * Accept connection on socket. Nothing to do here, socket must be con= nected > + * and ready, so just return peer address and be done with it. > + */ > +int > +ng_btsocket_rfcomm_accept(struct socket *so, struct sockaddr *sa) > +{ > + > + return (ng_btsocket_rfcomm_peeraddr1(so, (struct sockaddr_rfcomm *)sa= )); > +} > > /* > * Send data to socket > @@ -1407,7 +1419,7 @@ static int > ng_btsocket_rfcomm_session_accept(ng_btsocket_rfcomm_session_p s0) > { > struct socket *l2so; > - struct sockaddr_l2cap *l2sa =3D NULL; > + struct sockaddr_l2cap l2sa =3D { .l2cap_len =3D sizeof(l2sa) }; > ng_btsocket_l2cap_pcb_t *l2pcb =3D NULL; > ng_btsocket_rfcomm_session_p s =3D NULL; > int error; > @@ -1425,7 +1437,7 @@ ng_btsocket_rfcomm_session_accept(ng_btsocket_rfc= omm_session_p s0) > return (error); > } > > - error =3D soaccept(l2so, (struct sockaddr **) &l2sa); > + error =3D soaccept(l2so, (struct sockaddr *)&l2sa); > if (error !=3D 0) { > NG_BTSOCKET_RFCOMM_ERR( > "%s: soaccept() on L2CAP socket failed, error=3D%d\n", __func__, error= ); > diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netg= raph/bluetooth/socket/ng_btsocket_sco.c > index 5e198956a829..d9700f91c132 100644 > --- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c > +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c > @@ -1176,20 +1176,6 @@ ng_btsocket_sco_close(struct socket *so) > (void) ng_btsocket_sco_disconnect(so); > } /* ng_btsocket_sco_close */ > > -/* > - * Accept connection on socket. Nothing to do here, socket must be con= nected > - * and ready, so just return peer address and be done with it. > - */ > - > -int > -ng_btsocket_sco_accept(struct socket *so, struct sockaddr **nam) > -{ > - if (ng_btsocket_sco_node =3D=3D NULL) > - return (EINVAL); > - > - return (ng_btsocket_sco_peeraddr(so, nam)); > -} /* ng_btsocket_sco_accept */ > - > /* > * Create and attach new socket > */ > @@ -1623,32 +1609,56 @@ out: > return (error); > } /* ng_btsocket_listen */ > > -/* > - * Get peer address > - */ > - > -int > -ng_btsocket_sco_peeraddr(struct socket *so, struct sockaddr **nam) > +static int > +ng_btsocket_sco_peeraddr1(struct socket *so, struct sockaddr_sco *sa) > { > ng_btsocket_sco_pcb_p pcb =3D so2sco_pcb(so); > - struct sockaddr_sco sa; > > if (pcb =3D=3D NULL) > return (EINVAL); > if (ng_btsocket_sco_node =3D=3D NULL) > return (EINVAL); > > + *sa =3D (struct sockaddr_sco ){ > + .sco_len =3D sizeof(struct sockaddr_sco), > + .sco_family =3D AF_BLUETOOTH, > + }; > mtx_lock(&pcb->pcb_mtx); > - bcopy(&pcb->dst, &sa.sco_bdaddr, sizeof(sa.sco_bdaddr)); > + bcopy(&pcb->dst, &sa->sco_bdaddr, sizeof(sa->sco_bdaddr)); > mtx_unlock(&pcb->pcb_mtx); > > - sa.sco_len =3D sizeof(sa); > - sa.sco_family =3D AF_BLUETOOTH; > + return (0); > +} > + > +/* > + * Get peer address > + */ > +int > +ng_btsocket_sco_peeraddr(struct socket *so, struct sockaddr **nam) > +{ > + struct sockaddr_sco sa; > + int error; > > + error =3D ng_btsocket_sco_peeraddr1(so, &sa); > + if (error !=3D 0) > + return (error); > *nam =3D sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT); > > return ((*nam =3D=3D NULL)? ENOMEM : 0); > -} /* ng_btsocket_sco_peeraddr */ > +} > + > +/* > + * Accept connection on socket. Nothing to do here, socket must be con= nected > + * and ready, so just return peer address and be done with it. > + */ > +int > +ng_btsocket_sco_accept(struct socket *so, struct sockaddr *sa) > +{ > + if (ng_btsocket_sco_node =3D=3D NULL) > + return (EINVAL); > + > + return (ng_btsocket_sco_peeraddr1(so, (struct sockaddr_sco *)sa)); > +} > > /* > * Send data to socket > diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c > index 777f3261356d..23a53528833f 100644 > --- a/sys/netgraph/ng_ksocket.c > +++ b/sys/netgraph/ng_ksocket.c > @@ -1178,7 +1178,7 @@ ng_ksocket_accept(priv_p priv) > { > struct socket *const head =3D priv->so; > struct socket *so; > - struct sockaddr *sa =3D NULL; > + struct sockaddr_storage ss =3D { .ss_len =3D sizeof(ss) }; > struct ng_mesg *resp; > struct ng_ksocket_accept *resp_data; > node_p node; > @@ -1196,12 +1196,11 @@ ng_ksocket_accept(priv_p priv) > if (error) > return (error); > > - if ((error =3D soaccept(so, &sa)) !=3D 0) > + if ((error =3D soaccept(so, (struct sockaddr *)&ss)) !=3D 0) > return (error); > > len =3D OFFSETOF(struct ng_ksocket_accept, addr); > - if (sa !=3D NULL) > - len +=3D sa->sa_len; > + len +=3D ss.ss_len; > > NG_MKMESSAGE(resp, NGM_KSOCKET_COOKIE, NGM_KSOCKET_ACCEPT, len, > M_NOWAIT); > @@ -1249,13 +1248,10 @@ ng_ksocket_accept(priv_p priv) > /* Fill in the response data and send it or return it to the caller *= / > resp_data =3D (struct ng_ksocket_accept *)resp->data; > resp_data->nodeid =3D NG_NODE_ID(node); > - if (sa !=3D NULL) > - bcopy(sa, &resp_data->addr, sa->sa_len); > + bcopy(&ss, &resp_data->addr, ss.ss_len); > NG_SEND_MSG_ID(error, node, resp, priv->response_addr, 0); > > out: > - if (sa !=3D NULL) > - free(sa, M_SONAME); > > return (0); > } > diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c > index 29d63f989e79..8fb96db84f95 100644 > --- a/sys/netinet/sctp_usrreq.c > +++ b/sys/netinet/sctp_usrreq.c > @@ -7271,7 +7271,7 @@ out: > static int sctp_defered_wakeup_cnt =3D 0; > > int > -sctp_accept(struct socket *so, struct sockaddr **addr) > +sctp_accept(struct socket *so, struct sockaddr *sa) > { > struct sctp_tcb *stcb; > struct sctp_inpcb *inp; > @@ -7338,39 +7338,25 @@ sctp_accept(struct socket *so, struct sockaddr = **addr) > switch (store.sa.sa_family) { > #ifdef INET > case AF_INET: > - { > - struct sockaddr_in *sin; > - > - SCTP_MALLOC_SONAME(sin, struct sockaddr_in *, sizeof *sin); > - if (sin =3D=3D NULL) > - return (ENOMEM); > - sin->sin_family =3D AF_INET; > - sin->sin_len =3D sizeof(*sin); > - sin->sin_port =3D store.sin.sin_port; > - sin->sin_addr =3D store.sin.sin_addr; > - *addr =3D (struct sockaddr *)sin; > - break; > - } > + *(struct sockaddr_in *)sa =3D (struct sockaddr_in ){ > + .sin_family =3D AF_INET, > + .sin_len =3D sizeof(struct sockaddr_in), > + .sin_port =3D store.sin.sin_port, > + .sin_addr =3D store.sin.sin_addr, > + }; > + break; > #endif > #ifdef INET6 > case AF_INET6: > - { > - struct sockaddr_in6 *sin6; > - > - SCTP_MALLOC_SONAME(sin6, struct sockaddr_in6 *, sizeof *sin6); > - if (sin6 =3D=3D NULL) > - return (ENOMEM); > - sin6->sin6_family =3D AF_INET6; > - sin6->sin6_len =3D sizeof(*sin6); > - sin6->sin6_port =3D store.sin6.sin6_port; > - sin6->sin6_addr =3D store.sin6.sin6_addr; > - if ((error =3D sa6_recoverscope(sin6)) !=3D 0) { > - SCTP_FREE_SONAME(sin6); > - return (error); > - } > - *addr =3D (struct sockaddr *)sin6; > - break; > - } > + *(struct sockaddr_in6 *)sa =3D (struct sockaddr_in6 ){ > + .sin6_family =3D AF_INET6, > + .sin6_len =3D sizeof(struct sockaddr_in6), > + .sin6_port =3D store.sin6.sin6_port, > + .sin6_addr =3D store.sin6.sin6_addr, > + }; > + if ((error =3D sa6_recoverscope((struct sockaddr_in6 *)sa)) !=3D 0) > + return (error); > + break; > #endif > default: > /* TSNH */ > diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h > index 3a649a1860e2..ff6672bd0248 100644 > --- a/sys/netinet/sctp_var.h > +++ b/sys/netinet/sctp_var.h > @@ -341,7 +341,7 @@ int sctp_peeloff(struct socket *, struct socket *, = int, caddr_t, int *); > int sctp_ingetaddr(struct socket *, struct sockaddr **); > int sctp_peeraddr(struct socket *, struct sockaddr **); > int sctp_listen(struct socket *, int, struct thread *); > -int sctp_accept(struct socket *, struct sockaddr **); > +int sctp_accept(struct socket *, struct sockaddr *); > > #endif /* _KERNEL */ > > diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c > index f89e60cce8cd..14e0b814dec9 100644 > --- a/sys/netinet/tcp_usrreq.c > +++ b/sys/netinet/tcp_usrreq.c > @@ -717,13 +717,11 @@ out: > * just return the address of the peer, storing through addr. > */ > static int > -tcp_usr_accept(struct socket *so, struct sockaddr **nam) > +tcp_usr_accept(struct socket *so, struct sockaddr *sa) > { > - int error =3D 0; > struct inpcb *inp; > struct tcpcb *tp; > - struct in_addr addr; > - in_port_t port =3D 0; > + int error =3D 0; > > inp =3D sotoinpcb(so); > KASSERT(inp !=3D NULL, ("tcp_usr_accept: inp =3D=3D NULL")); > @@ -734,39 +732,30 @@ tcp_usr_accept(struct socket *so, struct sockaddr= **nam) > } > tp =3D intotcpcb(inp); > > - if (so->so_state & SS_ISDISCONNECTED) { > + if (so->so_state & SS_ISDISCONNECTED) > error =3D ECONNABORTED; > - goto out; > - } > - /* > - * We inline in_getpeeraddr and COMMON_END here, so that we can > - * copy the data of interest and defer the malloc until after we > - * release the lock. > - */ > - port =3D inp->inp_fport; > - addr =3D inp->inp_faddr; > - > -out: > + else > + *(struct sockaddr_in *)sa =3D (struct sockaddr_in ){ > + .sin_family =3D AF_INET, > + .sin_len =3D sizeof(struct sockaddr_in), > + .sin_port =3D inp->inp_fport, > + .sin_addr =3D inp->inp_faddr, > + }; > tcp_bblog_pru(tp, PRU_ACCEPT, error); > TCP_PROBE2(debug__user, tp, PRU_ACCEPT); > INP_WUNLOCK(inp); > - if (error =3D=3D 0) > - *nam =3D in_sockaddr(port, &addr); > - return error; > + > *** 273 LINES SKIPPED *** From nobody Thu Nov 30 17:01:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh2X60ph5z52JHq; Thu, 30 Nov 2023 17:01:10 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4Sh2X55yLZz4Yhp; Thu, 30 Nov 2023 17:01:09 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id BABF374F9C; Thu, 30 Nov 2023 09:01:02 -0800 (PST) Date: Thu, 30 Nov 2023 09:01:02 -0800 From: Gleb Smirnoff To: Mike Karels Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cfb1e92912b4 - main - sockets: don't malloc/free sockaddr memory on accept(2) Message-ID: References: <202311301634.3AUGYljD055413@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-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4Sh2X55yLZz4Yhp On Thu, Nov 30, 2023 at 10:56:23AM -0600, Mike Karels wrote: M> On 30 Nov 2023, at 10:34, Gleb Smirnoff wrote: M> M> > The branch main has been updated by glebius: M> > M> > URL: https://cgit.FreeBSD.org/src/commit/?id=cfb1e92912b4cf75360b7fbe86197cc29bc212c1 M> > M> > commit cfb1e92912b4cf75360b7fbe86197cc29bc212c1 M> > Author: Gleb Smirnoff M> > AuthorDate: 2023-11-30 16:30:55 +0000 M> > Commit: Gleb Smirnoff M> > CommitDate: 2023-11-30 16:30:55 +0000 M> > M> > sockets: don't malloc/free sockaddr memory on accept(2) M> > M> > Let the accept functions provide stack memory for protocols to fill it in. M> > Generic code should provide sockaddr_storage, specialized code may provide M> > smaller structure. M> M> Does this mean that families cannot support sockaddrs bigger than sockaddr_storage? M> In particular, does local domain (aka unix domain)? Did it before? Yes, but I assume sockaddr_storage should cover anything: (kgdb) p sizeof(struct sockaddr_un) $1 = 106 (kgdb) p sizeof(struct sockaddr_storage) $2 = 128 Please correct me if I'm wrong. -- Gleb Smirnoff From nobody Thu Nov 30 17:51:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh3dj3MC6z52Lxl; Thu, 30 Nov 2023 17:51: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 4Sh3dj1bgwz4dwm; Thu, 30 Nov 2023 17:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701366665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DUkh8g9psFR6qadW+eDkobWAug1IEYwWXVPgniojoF4=; b=ZciOP6OjDnnPvckW1JWRz8iU0IUMVSCk0iZGe+/FsUEjP+dXxgDNHoG9Qahie23V4jE8X6 YR6vySQ25Bmgs8NCSXQcE5RLYlLj9zbRQLQG7c9yEk+l3gvhRu5iN4VvE5s+d/jsw4pYIy YjxS6vlqwJJ9VIqCcV3Lin1haaspRlvW0Iw90RzrG7uYVidaYT2HCb0TPLxLF0QysfoqHB dOQsyTqT2ahNLreV4byzUmXS6cL1Wz/KnnhNwR223os/FKp+LEwwAH+GQSWWNlpRAE9IfL PUHzws1wqTOfr0g2gg9AbLC7comWvkf6rdNfz6HslSBr8qXrBJ/6p8Tt6irKpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701366665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DUkh8g9psFR6qadW+eDkobWAug1IEYwWXVPgniojoF4=; b=sSRStFQ5D3IBk1zvyIAzZrZaH3vd1RSvs24KLmLheST8MckHt2ieVxY8+1GoGSIi3OuSqU zTQqUREe6VOtkdDwrx3HpOqpjV0SoQ6nm6kcO+FsML7IJnopjvy+BDOT8UIqOi7QiN6l1w WO1fhi+WyPvgWBtLHRJ3uB9nuk2MEoiQah6H5b5msAIvXbEDjKw9s8C/TztTsMJ45NSrUR vmbe3EBZlrX7YIl3XoFEC52uBrxNLWp0vzTDQwDHne2kd1mD7vZs+SiykbEcBAcx+0707L grKR+z8dn2B8cOubmL+X1vTCgByjJoaR2asOyajPHFW1j4zub7VhkrQJgS33UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701366665; a=rsa-sha256; cv=none; b=DZR+tRp38/gkzMytDZwIf3NXa4tSg1j7t3lk1vTH/kbM7TLAWZlDl0lUYHNEMZIaZykuKl uScRngtJizQnPxb4m1oNcValgptxElguwvyjam0XNpGljaNHYjWbxfCzDgAKszLxCcdMSd s4edBrtAPaYeRDDGNd4cZJMbHT2KLPaVqL1KZo5DNFE+ZQ7CX7pF+ey0Nd1wJ7imZ1ywPa 6/hbvXVDjZpNLCFC3rLFrDf7Djuektg1FngKpzrFvPTvuavefMZTzhqvGLxfOeDkdhmV0k KYfKvKU2WnZCp0uUEBzivXBCXW/lQCqehdrZmATHqkZ0JUEOAUXONeS48bVYHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh3dj0f2Gz10LR; Thu, 30 Nov 2023 17:51: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 3AUHp49r081798; Thu, 30 Nov 2023 17:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUHp41U081795; Thu, 30 Nov 2023 17:51:04 GMT (envelope-from git) Date: Thu, 30 Nov 2023 17:51:04 GMT Message-Id: <202311301751.3AUHp41U081795@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: 47d767dab548 - main - ossl: Fix some bugs in the fallback AES-GCM 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47d767dab54895f3ba8abac6ab2295797394659e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=47d767dab54895f3ba8abac6ab2295797394659e commit 47d767dab54895f3ba8abac6ab2295797394659e Author: Mark Johnston AuthorDate: 2023-11-29 20:08:12 +0000 Commit: Mark Johnston CommitDate: 2023-11-30 17:49:47 +0000 ossl: Fix some bugs in the fallback AES-GCM implementation gcm_*_aesni() are used when the AVX512 implementation is not available. Fix two bugs which manifest when handling operations spanning multiple segments: - Avoid underflow when the length of the input is smaller than the residual. - In gcm_decrypt_aesni(), ensure that we begin the operation at the right offset into the input and output buffers. Reviewed by: jhb Fixes: 9b1d87286c78 ("ossl: Add a fallback AES-GCM implementation using AES-NI") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42838 --- sys/crypto/openssl/amd64/ossl_aes_gcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/amd64/ossl_aes_gcm.c b/sys/crypto/openssl/amd64/ossl_aes_gcm.c index 0d205ec3ff90..d08b2ac8a759 100644 --- a/sys/crypto/openssl/amd64/ossl_aes_gcm.c +++ b/sys/crypto/openssl/amd64/ossl_aes_gcm.c @@ -459,7 +459,7 @@ gcm_encrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_encrypt(ctx, in, out, res)) != 0) return error; @@ -621,12 +621,12 @@ gcm_decrypt_aesni(struct ossl_gcm_context *ctx, const unsigned char *in, size_t bulk = 0, res; int error; - res = (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN; + res = MIN(len, (AES_BLOCK_LEN - ctx->gcm.mres) % AES_BLOCK_LEN); if ((error = gcm_decrypt(ctx, in, out, res)) != 0) return error; - bulk = aesni_gcm_decrypt(in, out, len, &ctx->aes_ks, ctx->gcm.Yi.c, - ctx->gcm.Xi.u); + bulk = aesni_gcm_decrypt(in + res, out + res, len - res, &ctx->aes_ks, + ctx->gcm.Yi.c, ctx->gcm.Xi.u); ctx->gcm.len.u[1] += bulk; bulk += res; From nobody Thu Nov 30 17:51:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh3dk36B7z52M3Z; Thu, 30 Nov 2023 17:51: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 4Sh3dk2ZLPz4ds7; Thu, 30 Nov 2023 17:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701366666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBA7iA/7Nc+Sl5+6oNo8L44unlyG8+lu7QRlL3UDHL8=; b=yMvklgILfnah2VleFtbSfS5o7IEawMQjO/9jzJTiPKEVioJFJPW3SnXHmQAuy0/M0Xjkzz 25UulXUnv9YbOx+NMSdVJE0DeSJqUh9AUsr2nZUo4x/LcFf4ndch2RQv3Bi4GTWz8ftrFy 4kBbtW2L4xmMgHioXP21YMV9WkExgVOLJ6nQ/FTv1LXkzrBs3981ffyaL2IGLghUcnyyxp MP+clx2kEg/gXFjTPjiiLUMmKt7e6dmR3CeHSqAfnqmZ6N1hOvkZFYWmPgsjmaIOfZ7ylq GbspREJ2tQ4V7/N5hjcK4viddcdMN/PXoPggOHt4YMgATcWD6Dmn+2I2hFcYPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701366666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HBA7iA/7Nc+Sl5+6oNo8L44unlyG8+lu7QRlL3UDHL8=; b=OZ/xgE6giRvtEFE313youHS5C1qhO/7KJx6jgD4cACIG4Dg467yUb1RHFwrLC/QWl2j1jm nC4JaejHs7jnElZpPIQeH7UoP+boSK/vXiZOUOBJO4KBUDAliGwP0HJtxD/2NQT2FuhOZ/ 3D2iJJMtheSlsy3Ovvs2xPWq9Fyi/XKW3YpsGI5qqELLeu50+pWl84soI058/h5wkuIhZI JrD/VKyWecGufZhBWcfNiWSKysvbTO9pSK5LQP7yYO9WN/IU7ErliZ28j3Rp6cjaY8Lcbb ZCtNoN4tNwKj++bdT0KnHK4IfhnPgrw5LxB3zkuTCwgTIpNLoY83251pAcgXVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701366666; a=rsa-sha256; cv=none; b=dSXqS8Kzyvclgz6QBp8DkGfyv/2uha7bUfIDtHvwL1OttqaWhMbUw3M53loKCVFQyotufX 0kHw3D8osXOislKRb6tD+gbi31Wjz4/FZh5sb8XxTt9bSXG88kfTE1v5raEJJ/9FK2uuhB M65DwsGN5lnI7rD5+4viEVf38V87fbIOtu4iiRYNBsx9yfBGo5C93D+oKn2vFDyBNqHcXS 6byCJd3uoDt0DU/HWcoyy4AJpsHCElDDpsTO7JWx/7ZTGkBFEWpmdoFjUYJQQydhXhbEin 4avEBG3IZDGd9bocorEgEEfeu+llcW9tdEP4/fmTeXWTYl1K7qE8PFx6T3uo/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 4Sh3dk1ZBlz1083; Thu, 30 Nov 2023 17:51: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 3AUHp6U9081845; Thu, 30 Nov 2023 17:51:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUHp6cv081842; Thu, 30 Nov 2023 17:51:06 GMT (envelope-from git) Date: Thu, 30 Nov 2023 17:51:06 GMT Message-Id: <202311301751.3AUHp6cv081842@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: 44f8e1e8530e - main - ossl: Add support for armv7 List-Id: Commit messages for the main 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: 44f8e1e8530e1d2e95e84bbbe3d22ac9cb2557fe Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=44f8e1e8530e1d2e95e84bbbe3d22ac9cb2557fe commit 44f8e1e8530e1d2e95e84bbbe3d22ac9cb2557fe Author: Mark Johnston AuthorDate: 2023-11-30 17:46:08 +0000 Commit: Mark Johnston CommitDate: 2023-11-30 17:49:47 +0000 ossl: Add support for armv7 OpenSSL provides implementations of several AES modes which use bitslicing and can be accelerated on CPUs which support the NEON extension. This patch adds arm platform support to ossl(4) and provides an AES-CBC implementation, though bsaes_cbc_encrypt() only implements decryption. The real goal is to provide an accelerated AES-GCM implementation; this will be added in a subsequent patch. Initially derived from https://reviews.freebsd.org/D37420. Reviewed by: jhb Sponsored by: Klara, Inc. Sponsored by: Stormshield MFC after: 3 months Differential Revision: https://reviews.freebsd.org/D41304 --- sys/conf/files.arm | 10 +++++ sys/crypto/openssl/arm/arm_arch.h | 84 ++++++++++++++++++++++++++++++++++ sys/crypto/openssl/ossl_aes.c | 2 + sys/crypto/openssl/ossl_aes_gcm.h | 6 +-- sys/crypto/openssl/ossl_arm.c | 59 ++++++++++++++++++++++++ sys/crypto/openssl/ossl_arm.h | 94 +++++++++++++++++++++++++++++++++++++++ sys/crypto/openssl/ossl_cipher.h | 8 ++++ sys/modules/Makefile | 6 ++- sys/modules/ossl/Makefile | 12 +++++ 9 files changed, 275 insertions(+), 6 deletions(-) diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 772bbb8b0e3b..3643f90b1440 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -135,6 +135,16 @@ libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard +crypto/openssl/ossl_arm.c optional ossl +crypto/openssl/arm/aes-armv4.S optional ossl +crypto/openssl/arm/bsaes-armv7.S optional ossl \ + compile-with "${CC} -D__KERNEL__ -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" +crypto/openssl/arm/chacha-armv4.S optional ossl +crypto/openssl/arm/poly1305-armv4.S optional ossl +crypto/openssl/arm/sha1-armv4-large.S optional ossl +crypto/openssl/arm/sha256-armv4.S optional ossl +crypto/openssl/arm/sha512-armv4.S optional ossl + # Annapurna support arm/annapurna/alpine/alpine_ccu.c optional al_ccu fdt arm/annapurna/alpine/alpine_nb_service.c optional al_nb_service fdt diff --git a/sys/crypto/openssl/arm/arm_arch.h b/sys/crypto/openssl/arm/arm_arch.h new file mode 100644 index 000000000000..8b7105571d78 --- /dev/null +++ b/sys/crypto/openssl/arm/arm_arch.h @@ -0,0 +1,84 @@ +/* + * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef OSSL_CRYPTO_ARM_ARCH_H +# define OSSL_CRYPTO_ARM_ARCH_H + +# if !defined(__ARM_ARCH__) +# if defined(__CC_ARM) +# define __ARM_ARCH__ __TARGET_ARCH_ARM +# if defined(__BIG_ENDIAN) +# define __ARMEB__ +# else +# define __ARMEL__ +# endif +# elif defined(__GNUC__) +# if defined(__aarch64__) +# define __ARM_ARCH__ 8 +# if __BYTE_ORDER__==__ORDER_BIG_ENDIAN__ +# define __ARMEB__ +# else +# define __ARMEL__ +# endif + /* + * Why doesn't gcc define __ARM_ARCH__? Instead it defines + * bunch of below macros. See all_architectures[] table in + * gcc/config/arm/arm.c. On a side note it defines + * __ARMEL__/__ARMEB__ for little-/big-endian. + */ +# elif defined(__ARM_ARCH) +# define __ARM_ARCH__ __ARM_ARCH +# elif defined(__ARM_ARCH_8A__) +# define __ARM_ARCH__ 8 +# elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ + defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__) || \ + defined(__ARM_ARCH_7EM__) +# define __ARM_ARCH__ 7 +# elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ + defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__) || \ + defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__) || \ + defined(__ARM_ARCH_6T2__) +# define __ARM_ARCH__ 6 +# elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ + defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__) || \ + defined(__ARM_ARCH_5TEJ__) +# define __ARM_ARCH__ 5 +# elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) +# define __ARM_ARCH__ 4 +# else +# error "unsupported ARM architecture" +# endif +# endif +# endif + +# if !defined(__ARM_MAX_ARCH__) +# define __ARM_MAX_ARCH__ __ARM_ARCH__ +# endif + +# if __ARM_MAX_ARCH__<__ARM_ARCH__ +# error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__" +# elif __ARM_MAX_ARCH__!=__ARM_ARCH__ +# if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__) +# error "can't build universal big-endian binary" +# endif +# endif + +# ifndef __ASSEMBLER__ +extern unsigned int OPENSSL_armcap_P; +# endif + +# define ARMV7_NEON (1<<0) +# define ARMV7_TICK (1<<1) +# define ARMV8_AES (1<<2) +# define ARMV8_SHA1 (1<<3) +# define ARMV8_SHA256 (1<<4) +# define ARMV8_PMULL (1<<5) +# define ARMV8_SHA512 (1<<6) + +#endif diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index 65b6f126736e..b6425035f031 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -39,6 +39,8 @@ #include #elif defined (__aarch64__) #include +#elif defined (__arm__) +#include #endif static ossl_cipher_process_t ossl_aes_cbc; diff --git a/sys/crypto/openssl/ossl_aes_gcm.h b/sys/crypto/openssl/ossl_aes_gcm.h index cd0c1e324354..90511318da6c 100644 --- a/sys/crypto/openssl/ossl_aes_gcm.h +++ b/sys/crypto/openssl/ossl_aes_gcm.h @@ -28,7 +28,6 @@ #define _OSSL_AES_GCM_H_ #include -#include struct ossl_gcm_context; @@ -64,10 +63,7 @@ struct ossl_gcm_context { unsigned int mres, ares; } gcm; - struct { - uint32_t ks[4 * (RIJNDAEL_MAXNR + 1)]; - int rounds; - } aes_ks; + struct ossl_aes_keysched aes_ks; const struct ossl_aes_gcm_ops *ops; }; diff --git a/sys/crypto/openssl/ossl_arm.c b/sys/crypto/openssl/ossl_arm.c new file mode 100644 index 000000000000..1ec95acd74cd --- /dev/null +++ b/sys/crypto/openssl/ossl_arm.c @@ -0,0 +1,59 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Stormshield + * Copyright (c) 2023 Semihalf + * + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any + * redistribution must be conditioned upon including a substantially + * similar Disclaimer requirement for further binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +#include +#include + +#include +#include +#include + +ossl_cipher_setkey_t AES_set_encrypt_key; +ossl_cipher_setkey_t AES_set_decrypt_key; + +unsigned int OPENSSL_armcap_P; + +void +ossl_cpuid(struct ossl_softc *sc) +{ + if (elf_hwcap & HWCAP_NEON) { + OPENSSL_armcap_P |= ARMV7_NEON; + + sc->has_aes = true; + ossl_cipher_aes_cbc.set_encrypt_key = AES_set_encrypt_key; + ossl_cipher_aes_cbc.set_decrypt_key = AES_set_decrypt_key; + } +} diff --git a/sys/crypto/openssl/ossl_arm.h b/sys/crypto/openssl/ossl_arm.h new file mode 100644 index 000000000000..56772feb43f2 --- /dev/null +++ b/sys/crypto/openssl/ossl_arm.h @@ -0,0 +1,94 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Stormshield + * Copyright (c) 2023 Semihalf + * + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any + * redistribution must be conditioned upon including a substantially + * similar Disclaimer requirement for further binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. + */ + +#ifndef __OSSL_ARM__ +#define __OSSL_ARM__ + +#include +#include + +#include + +struct bsaes_key { + struct ossl_aes_keysched ks; + int converted; +#define BSAES_KEY_SIZE (128 * (RIJNDAEL_MAXNR - 1) + 2 * AES_BLOCK_LEN) + uint8_t bitslice[BSAES_KEY_SIZE] __aligned(8); +} __aligned(8); + +ossl_cipher_encrypt_t ossl_bsaes_cbc_encrypt; + +void AES_encrypt(const void *, void *, const void *); + +static inline void +AES_CBC_ENCRYPT(const unsigned char *in, unsigned char *out, + size_t length, const void *key, unsigned char *iv, int encrypt) +{ + struct bsaes_key bsks; + uint32_t iv32[4], scratch[4]; + + /* + * bsaes_cbc_encrypt has some special requirements w.r.t input data. + * The key buffer, that normally holds round keys is used as a scratch + * space. 128 bytes per round of extra space is required. + * Another thing is that only decryption is supported. + * In the case of encryption block chaining has to be done in C. + */ + if (!encrypt) { + memcpy(&bsks.ks, key, sizeof(bsks.ks)); + bsks.converted = 0; + ossl_bsaes_cbc_encrypt(in, out, length, &bsks, iv, false); + return; + } + + length /= AES_BLOCK_LEN; + memcpy(iv32, iv, AES_BLOCK_LEN); + + while (length-- > 0) { + memcpy(scratch, in, AES_BLOCK_LEN); + + /* XOR plaintext with IV. */ + scratch[0] ^= iv32[0]; + scratch[1] ^= iv32[1]; + scratch[2] ^= iv32[2]; + scratch[3] ^= iv32[3]; + + AES_encrypt(scratch, out, key); + + memcpy(iv32, out, AES_BLOCK_LEN); + in += AES_BLOCK_LEN; + out += AES_BLOCK_LEN; + } + + memcpy(iv, iv32, AES_BLOCK_LEN); +} + +#endif /* __OSSL_ARM__ */ diff --git a/sys/crypto/openssl/ossl_cipher.h b/sys/crypto/openssl/ossl_cipher.h index 6599524a707f..886fd9f83350 100644 --- a/sys/crypto/openssl/ossl_cipher.h +++ b/sys/crypto/openssl/ossl_cipher.h @@ -28,6 +28,9 @@ #ifndef __OSSL_CIPHER_H__ #define __OSSL_CIPHER_H__ +#include +#include + struct ossl_session_cipher; struct cryptop; struct crypto_session_params; @@ -50,4 +53,9 @@ struct ossl_cipher { ossl_cipher_process_t *process; }; +struct ossl_aes_keysched { + uint32_t ks[4 * (RIJNDAEL_MAXNR + 1)]; + int rounds; +}; + #endif diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f9079498dc1f..112a2f345c94 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -565,11 +565,15 @@ _iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif -_ossl= ossl _rtw88= rtw88 _vmware= vmware .endif +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "i386" || ${MACHINE_ARCH} == "armv7" +_ossl= ossl +.endif + # MAC framework .if ${KERN_OPTS:MMAC} || defined(ALL_MODULES) _mac_biba= mac_biba diff --git a/sys/modules/ossl/Makefile b/sys/modules/ossl/Makefile index 7f70f19db76c..d26aabf7bff2 100644 --- a/sys/modules/ossl/Makefile +++ b/sys/modules/ossl/Makefile @@ -16,6 +16,16 @@ SRCS= bus_if.h \ ossl_sha512.c \ ${SRCS.${MACHINE_CPUARCH}} +SRCS.arm= \ + aes-armv4.S \ + bsaes-armv7.S \ + chacha-armv4.S \ + poly1305-armv4.S \ + sha1-armv4-large.S \ + sha256-armv4.S \ + sha512-armv4.S \ + ossl_arm.c + SRCS.aarch64= \ chacha-armv8.S \ poly1305-armv8.S \ @@ -47,6 +57,8 @@ SRCS.i386= \ sha512-586.S \ ossl_x86.c +CFLAGS.bsaes-armv7.S+= -D__KERNEL__ + # For arm64, we are forced to rewrite the compiler invocation for the assembly # files, to remove -mgeneral-regs-only. ${SRCS.aarch64:M*.S:S/S/o/}: ${.TARGET:R}.S From nobody Thu Nov 30 17:51:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh3dl4FfMz52MCv; Thu, 30 Nov 2023 17:51: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 4Sh3dl3Kt7z4f4m; Thu, 30 Nov 2023 17:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701366667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bBjYQzPSGJnSyWrfMjJLJ83CC/JA7+4ke/dBuIrFwuY=; b=NNdXhFqx1be9LjsNbAenp8mINjkL43wVJC7S4tVo69LMxbDVXO7LGdNNVWPK/oPB0BrZ+4 IgnMdNQuanf/mvxOvp5Na61Vk0a/YRyg9LivQeJcA94r/ipo85/x24Qg12f5I2oDaXIT7a sQ/I8MQfXFATNFVKjidcNUS3J5MMWLxrE3DSJPkMlTVnlseYpvk2NWrfiDNbkmwnDqkQth EWj6ZnkUntImh9IPEf3/7ywi5D0+yRepwpgu3pHViBUmUDP9le5WpwoOhSedeef0Oqr176 T517YJikERrAEr05IEz0Y2I1A365fT8EoaXWMEZCB/Hvjyr25kmP0cSPtyz7kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701366667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bBjYQzPSGJnSyWrfMjJLJ83CC/JA7+4ke/dBuIrFwuY=; b=Vl66/nJio7lS3h9W4MwtZ9Jpj3i7FA4KrWMeXzvlUhnlvarF1gJA6zVoE+WTfSjSSEjf3W tpZHsNvIxotipz7N+vxKmqdIwuJF5sML8BCg38pMs+4G7SVIPJNj4Dt0KSWAOdN6heoz4F NxyN2569MMHKdvUi/y3YHhajtdIq+vezcEn8tlfddNZ4zrlQRhuHK9TP9owMHGqPTjfXBK wCjMs6X3qt5U+WJV0IfvjhsRWvdzWyBf4ticwhr+QNtnHsrDF6OUDl8Gq3IecC3Sd0VQ4S Rnf9WVK80SYhXYowmgAjuT7r4fyAKruTXc9/O+h9lRlVutz0haiTYUNy2u2HTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701366667; a=rsa-sha256; cv=none; b=JsdnMz7rS7cc5XdKU9iPCjVKE9aqX5tWxFpOBqbLTqxPM2SODDg3dUGMhlJ49qTHQ3hh+C Xp1f0416kuRTajykqT8R2xCCcze+STMiOb7V5SxOs2RK4Au/rKykTUDmVxlxSIjVsrA6bW Eq42KZ9cKRP2Jl8q3WUQmxwGRWu2sj0htGCHv23xy9RG/6U+2VQrbdekMQv6xbqdW6TjZm /YVtV97L3xtQI8M/2jUHi4pS1pA3luB7/lbMxB4y25j2avWYmQ2rRCI8EwlEBF633bnD3d wn0jhAMoNIzhqLcrSqmPzRspcyX6tH9CG4Aj8efTGmtDAiNdRuZSZa8r5Yftyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh3dl2QPmz1084; Thu, 30 Nov 2023 17:51: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 3AUHp7aJ081896; Thu, 30 Nov 2023 17:51:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUHp7SZ081893; Thu, 30 Nov 2023 17:51:07 GMT (envelope-from git) Date: Thu, 30 Nov 2023 17:51:07 GMT Message-Id: <202311301751.3AUHp7SZ081893@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: 629a72376d51 - main - ossl: Add AES-GCM support for NEON-enabled armv7 List-Id: Commit messages for the main 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: 629a72376d51aad812d6f1279403bc81c38c35d2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=629a72376d51aad812d6f1279403bc81c38c35d2 commit 629a72376d51aad812d6f1279403bc81c38c35d2 Author: Mark Johnston AuthorDate: 2023-11-30 17:46:54 +0000 Commit: Mark Johnston CommitDate: 2023-11-30 17:49:48 +0000 ossl: Add AES-GCM support for NEON-enabled armv7 This provides substantially higher throughput than the fallback implementation. Reviewed by: jhb MFC after: 3 months Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D41305 --- sys/conf/files.arm | 2 + sys/crypto/openssl/arm/ossl_aes_gcm.c | 359 ++++++++++++++++++++++++++++++++++ sys/crypto/openssl/ossl_arm.c | 6 + sys/modules/ossl/Makefile | 4 +- 4 files changed, 370 insertions(+), 1 deletion(-) diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 3643f90b1440..4dcbd18bdeb9 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -136,10 +136,12 @@ libkern/udivdi3.c standard libkern/umoddi3.c standard crypto/openssl/ossl_arm.c optional ossl +crypto/openssl/arm/ossl_aes_gcm.c optional ossl crypto/openssl/arm/aes-armv4.S optional ossl crypto/openssl/arm/bsaes-armv7.S optional ossl \ compile-with "${CC} -D__KERNEL__ -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" crypto/openssl/arm/chacha-armv4.S optional ossl +crypto/openssl/arm/ghash-armv4.S optional ossl crypto/openssl/arm/poly1305-armv4.S optional ossl crypto/openssl/arm/sha1-armv4-large.S optional ossl crypto/openssl/arm/sha256-armv4.S optional ossl diff --git a/sys/crypto/openssl/arm/ossl_aes_gcm.c b/sys/crypto/openssl/arm/ossl_aes_gcm.c new file mode 100644 index 000000000000..71a977c446ae --- /dev/null +++ b/sys/crypto/openssl/arm/ossl_aes_gcm.c @@ -0,0 +1,359 @@ +/* + * Copyright 2010-2022 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +_Static_assert( + sizeof(struct ossl_gcm_context) <= sizeof(struct ossl_cipher_context), + "ossl_gcm_context too large"); + +void AES_encrypt(const void *in, void *out, const void *ks); +void AES_set_encrypt_key(const void *key, int keylen, void *ks); + +void gcm_init_neon(__uint128_t Htable[16], const uint64_t Xi[2]); +void gcm_gmult_neon(uint64_t Xi[2], const __uint128_t Htable[16]); +void gcm_ghash_neon(uint64_t Xi[2], const __uint128_t Htable[16], + const void *in, size_t len); + +void ossl_bsaes_ctr32_encrypt_blocks(const unsigned char *in, + unsigned char *out, size_t blocks, void *ks, const unsigned char *iv); + +static void +gcm_init(struct ossl_gcm_context *ctx, const void *key, size_t keylen) +{ + memset(&ctx->gcm, 0, sizeof(ctx->gcm)); + memset(&ctx->aes_ks, 0, sizeof(ctx->aes_ks)); + + AES_set_encrypt_key(key, keylen, &ctx->aes_ks); + AES_encrypt(ctx->gcm.H.c, ctx->gcm.H.c, &ctx->aes_ks); + +#if BYTE_ORDER == LITTLE_ENDIAN + ctx->gcm.H.u[0] = bswap64(ctx->gcm.H.u[0]); + ctx->gcm.H.u[1] = bswap64(ctx->gcm.H.u[1]); +#endif + + gcm_init_neon(ctx->gcm.Htable, ctx->gcm.H.u); +} + +static void +gcm_setiv(struct ossl_gcm_context *ctx, const unsigned char *iv, size_t len) +{ + uint32_t ctr; + + KASSERT(len == AES_GCM_IV_LEN, + ("%s: invalid IV length %zu", __func__, len)); + + ctx->gcm.len.u[0] = 0; + ctx->gcm.len.u[1] = 0; + ctx->gcm.ares = ctx->gcm.mres = 0; + + memcpy(ctx->gcm.Yi.c, iv, len); + ctx->gcm.Yi.c[12] = 0; + ctx->gcm.Yi.c[13] = 0; + ctx->gcm.Yi.c[14] = 0; + ctx->gcm.Yi.c[15] = 1; + ctr = 1; + + ctx->gcm.Xi.u[0] = 0; + ctx->gcm.Xi.u[1] = 0; + + AES_encrypt(ctx->gcm.Yi.c, ctx->gcm.EK0.c, &ctx->aes_ks); + ctr++; + +#if BYTE_ORDER == LITTLE_ENDIAN + ctx->gcm.Yi.d[3] = bswap32(ctr); +#else + ctx->gcm.Yi.d[3] = ctr; +#endif +} + +static int +gcm_finish(struct ossl_gcm_context *ctx, const unsigned char *tag, size_t len) +{ + uint64_t alen = ctx->gcm.len.u[0] << 3; + uint64_t clen = ctx->gcm.len.u[1] << 3; + + if (ctx->gcm.mres || ctx->gcm.ares) + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + +#if BYTE_ORDER == LITTLE_ENDIAN + alen = bswap64(alen); + clen = bswap64(clen); +#endif + + ctx->gcm.Xi.u[0] ^= alen; + ctx->gcm.Xi.u[1] ^= clen; + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + + ctx->gcm.Xi.u[0] ^= ctx->gcm.EK0.u[0]; + ctx->gcm.Xi.u[1] ^= ctx->gcm.EK0.u[1]; + + if (tag != NULL) + return timingsafe_bcmp(ctx->gcm.Xi.c, tag, len); + return 0; +} + +static int +gcm_aad(struct ossl_gcm_context *ctx, const unsigned char *aad, size_t len) +{ + size_t i; + unsigned int n; + uint64_t alen = ctx->gcm.len.u[0]; + + if (ctx->gcm.len.u[1]) + return -2; + + alen += len; + if (alen > ((uint64_t)1 << 61) || (sizeof(len) == 8 && alen < len)) + return -1; + ctx->gcm.len.u[0] = alen; + + n = ctx->gcm.ares; + if (n) { + while (n && len) { + ctx->gcm.Xi.c[n] ^= *(aad++); + --len; + n = (n + 1) % 16; + } + if (n == 0) + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + else { + ctx->gcm.ares = n; + return 0; + } + } + if ((i = (len & (size_t)-AES_BLOCK_LEN))) { + gcm_ghash_neon(ctx->gcm.Xi.u, ctx->gcm.Htable, aad, i); + aad += i; + len -= i; + } + if (len) { + n = (unsigned int)len; + for (i = 0; i < len; ++i) + ctx->gcm.Xi.c[i] ^= aad[i]; + } + + ctx->gcm.ares = n; + return 0; +} + +static int +gcm_encrypt(struct ossl_gcm_context *ctx, const unsigned char *in, + unsigned char *out, size_t len) +{ + struct bsaes_key bsks; + unsigned int n, ctr, mres; + size_t i; + uint64_t mlen = ctx->gcm.len.u[1]; + + mlen += len; + if (mlen > (((uint64_t)1 << 36) - 32) || + (sizeof(len) == 8 && mlen < len)) + return -1; + ctx->gcm.len.u[1] = mlen; + + mres = ctx->gcm.mres; + + if (ctx->gcm.ares) { + /* First call to encrypt finalizes GHASH(AAD) */ + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + ctx->gcm.ares = 0; + } + +#if BYTE_ORDER == LITTLE_ENDIAN + ctr = bswap32(ctx->gcm.Yi.d[3]); +#else + ctr = ctx->gcm.Yi.d[3]; +#endif + + n = mres % 16; + if (n) { + while (n && len) { + ctx->gcm.Xi.c[n] ^= *(out++) = *(in++) ^ ctx->gcm.EKi.c[n]; + --len; + n = (n + 1) % 16; + } + if (n == 0) { + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + mres = 0; + } else { + ctx->gcm.mres = n; + return 0; + } + } + if ((i = (len & (size_t)-16))) { + size_t j = i / 16; + + memcpy(&bsks.ks, &ctx->aes_ks, sizeof(bsks.ks)); + bsks.converted = 0; + ossl_bsaes_ctr32_encrypt_blocks(in, out, j, &bsks, + ctx->gcm.Yi.c); + ctr += (unsigned int)j; +#if BYTE_ORDER == LITTLE_ENDIAN + ctx->gcm.Yi.d[3] = bswap32(ctr); +#else + ctx->gcm.Yi.d[3] = ctr; +#endif + in += i; + len -= i; + while (j--) { + for (i = 0; i < 16; ++i) + ctx->gcm.Xi.c[i] ^= out[i]; + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + out += 16; + } + } + if (len) { + AES_encrypt(ctx->gcm.Yi.c, ctx->gcm.EKi.c, &ctx->aes_ks); + ++ctr; +#if BYTE_ORDER == LITTLE_ENDIAN + ctx->gcm.Yi.d[3] = bswap32(ctr); +#else + ctx->gcm.Yi.d[3] = ctr; +#endif + while (len--) { + ctx->gcm.Xi.c[mres++] ^= out[n] = in[n] ^ ctx->gcm.EKi.c[n]; + ++n; + } + } + + ctx->gcm.mres = mres; + return 0; +} + +static int +gcm_decrypt(struct ossl_gcm_context *ctx, const unsigned char *in, + unsigned char *out, size_t len) +{ + struct bsaes_key bsks; + unsigned int n, ctr, mres; + size_t i; + uint64_t mlen = ctx->gcm.len.u[1]; + + mlen += len; + if (mlen > ((1ull << 36) - 32) || (sizeof(len) == 8 && mlen < len)) + return -1; + ctx->gcm.len.u[1] = mlen; + + mres = ctx->gcm.mres; + + if (ctx->gcm.ares) { + /* First call to decrypt finalizes GHASH(AAD) */ + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + ctx->gcm.ares = 0; + } + +#if BYTE_ORDER == LITTLE_ENDIAN + ctr = bswap32(ctx->gcm.Yi.d[3]); +#else + ctr = ctx->gcm.Yi.d[3]; +#endif + + n = mres % 16; + if (n) { + while (n && len) { + uint8_t c = *(in++); + *(out++) = c ^ ctx->gcm.EKi.c[n]; + ctx->gcm.Xi.c[n] ^= c; + --len; + n = (n + 1) % 16; + } + if (n == 0) { + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + mres = 0; + } else { + ctx->gcm.mres = n; + return 0; + } + } + if ((i = (len & (size_t)-16))) { + size_t j = i / 16; + + while (j--) { + size_t k; + for (k = 0; k < 16; ++k) + ctx->gcm.Xi.c[k] ^= in[k]; + gcm_gmult_neon(ctx->gcm.Xi.u, ctx->gcm.Htable); + in += 16; + } + j = i / 16; + in -= i; + memcpy(&bsks.ks, &ctx->aes_ks, sizeof(bsks.ks)); + bsks.converted = 0; + ossl_bsaes_ctr32_encrypt_blocks(in, out, j, &bsks, + ctx->gcm.Yi.c); + ctr += (unsigned int)j; +#if BYTE_ORDER == LITTLE_ENDIAN + ctx->gcm.Yi.d[3] = bswap32(ctr); +#else + ctx->gcm.Yi.d[3] = ctr; +#endif + out += i; + in += i; + len -= i; + } + if (len) { + AES_encrypt(ctx->gcm.Yi.c, ctx->gcm.EKi.c, &ctx->aes_ks); + ++ctr; +#if BYTE_ORDER == LITTLE_ENDIAN + ctx->gcm.Yi.d[3] = bswap32(ctr); +#else + ctx->gcm.Yi.d[3] = ctr; +#endif + while (len--) { + uint8_t c = in[n]; + ctx->gcm.Xi.c[mres++] ^= c; + out[n] = c ^ ctx->gcm.EKi.c[n]; + ++n; + } + } + + ctx->gcm.mres = mres; + return 0; +} + +static void +gcm_tag(struct ossl_gcm_context *ctx, unsigned char *tag, size_t len) +{ + gcm_finish(ctx, NULL, 0); + memcpy(tag, ctx->gcm.Xi.c, len); +} + +static const struct ossl_aes_gcm_ops gcm_ops_neon = { + .init = gcm_init, + .setiv = gcm_setiv, + .aad = gcm_aad, + .encrypt = gcm_encrypt, + .decrypt = gcm_decrypt, + .finish = gcm_finish, + .tag = gcm_tag, +}; + +int ossl_aes_gcm_setkey(const unsigned char *key, int klen, void *_ctx); + +int +ossl_aes_gcm_setkey(const unsigned char *key, int klen, void *_ctx) +{ + struct ossl_gcm_context *ctx; + + ctx = _ctx; + ctx->ops = &gcm_ops_neon; + gcm_init(ctx, key, klen); + return (0); +} diff --git a/sys/crypto/openssl/ossl_arm.c b/sys/crypto/openssl/ossl_arm.c index 1ec95acd74cd..74dc25586464 100644 --- a/sys/crypto/openssl/ossl_arm.c +++ b/sys/crypto/openssl/ossl_arm.c @@ -44,6 +44,8 @@ __FBSDID("$FreeBSD$"); ossl_cipher_setkey_t AES_set_encrypt_key; ossl_cipher_setkey_t AES_set_decrypt_key; +ossl_cipher_setkey_t ossl_aes_gcm_setkey; + unsigned int OPENSSL_armcap_P; void @@ -55,5 +57,9 @@ ossl_cpuid(struct ossl_softc *sc) sc->has_aes = true; ossl_cipher_aes_cbc.set_encrypt_key = AES_set_encrypt_key; ossl_cipher_aes_cbc.set_decrypt_key = AES_set_decrypt_key; + + sc->has_aes_gcm = true; + ossl_cipher_aes_gcm.set_encrypt_key = ossl_aes_gcm_setkey; + ossl_cipher_aes_gcm.set_decrypt_key = ossl_aes_gcm_setkey; } } diff --git a/sys/modules/ossl/Makefile b/sys/modules/ossl/Makefile index d26aabf7bff2..804ffb5e1b70 100644 --- a/sys/modules/ossl/Makefile +++ b/sys/modules/ossl/Makefile @@ -20,11 +20,13 @@ SRCS.arm= \ aes-armv4.S \ bsaes-armv7.S \ chacha-armv4.S \ + ghash-armv4.S \ poly1305-armv4.S \ sha1-armv4-large.S \ sha256-armv4.S \ sha512-armv4.S \ - ossl_arm.c + ossl_arm.c \ + ossl_aes_gcm.c SRCS.aarch64= \ chacha-armv8.S \ From nobody Thu Nov 30 18:22:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh4L00KWXz52PDN; Thu, 30 Nov 2023 18:22: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 4Sh4Kz6XLqz3DPG; Thu, 30 Nov 2023 18:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701368551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I2uNsjkyN+oULCO1uL/XlkyjIvW3yZ5YvymZaxwNKKc=; b=vUYC6oxwMsKRoADmhBdXlUOcupkKijAV4XWOCFo9LLSFvsZP+rBg5aOvFJQL7VSSFRjJGD Rt5Cw6vbEdJZYlaDfC96gaelVkgXCMu9UPYaB4wxvnIAoZxVp7slmvs7wiveuf9TM8exl+ nTjbsaHeiaVwa+RZH/ZTnPODyf7aseWMZA1OFvzoC4dFZOxr+qH/dswFyBqnLrLk+69h6Q 0codFeANYJayFs8H1OV+9XFztWbpIniXfytKG0UJojOCRz06ujIzQEKbtl6thrHRdgy6F+ zjQhEWeHdOVTRhlH8lJvm0beqa0fttfDi+8eXZjlVOlBhgqD50pNcubicjMRew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701368551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I2uNsjkyN+oULCO1uL/XlkyjIvW3yZ5YvymZaxwNKKc=; b=Gohcg1PP8jK6dlpWkd2iRn8FjYQNcQ6ozuAtOui5pxyVFSN9hurQtb8TMbt4Ydb5M6A3zo H+D2QaDbVK8VGWusN8KeA+2shfsA2PbwugC+wOEdQsuF6bRaCARERIIT9ZAhv6CG4xwJAd rHRHPLI+SlJE/h2FNbV0ls/9X5NkB35AIbuSryyKkaQP4xrHO8lQ6LQvi9Ys5yOwpJQWhk lM3nYDH5iDOOtUkKTCOj6ggZJ8T7e8rUTPnIYHx9oRHbyCpM2mEMt9GbJ2K+5q8PH227me iKpCkRDRMvjx195PUjfIUUIhPP2Zhr3xMtgw20OlusV2VTujBlcoTtKmuW5v1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701368551; a=rsa-sha256; cv=none; b=YHTT8lSeQJrgqnSFqIS4rLb10HOWRwj6GRCBuNW2iHCHxtvvKx3LLR/Ot4oWvL5azPScep z0eSbO9uWk9PJOeegt4+lHE4GYuOVSvq9evQYzf95NcZPYvLAZrw1OQea1kQhyjg/Tuzie FnYH2PDGhMJaWR0GPjoKXQJvUFw7J9s2c2D7dl5q1SjzvcsZ9EouvL7Q+KjDA9Srq9XcYk JRRwfrukKeX/cBf2+sp3KtOaSCaVBH3gxzRySu/U3wzMKmufvVnOKr6bBqKjuM/4N+qcsE McRR48KS/fBGWZW3hhIcVJ+H8mgCvQUcEghAVdPZYIN9mEpAOtFmIYXxOR2Klw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh4Kz5bNrz10wS; Thu, 30 Nov 2023 18:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AUIMVQE039113; Thu, 30 Nov 2023 18:22:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUIMVJW039110; Thu, 30 Nov 2023 18:22:31 GMT (envelope-from git) Date: Thu, 30 Nov 2023 18:22:31 GMT Message-Id: <202311301822.3AUIMVJW039110@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: c93be3079be5 - main - net80211: ieee80211_dump_node() check for channel to be 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c93be3079be5f07fe3596ec389826e45f5dc82bd Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c93be3079be5f07fe3596ec389826e45f5dc82bd commit c93be3079be5f07fe3596ec389826e45f5dc82bd Author: Bjoern A. Zeeb AuthorDate: 2023-11-30 18:20:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 18:21:49 +0000 net80211: ieee80211_dump_node() check for channel to be set Avoid panics in case ieee80211_dump_node() gets called before a channel context is set. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/net80211/ieee80211_node.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index f277293ceb14..123da34ad3f1 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2647,7 +2647,8 @@ ieee80211_dump_node(struct ieee80211_node_table *nt __unused, printf("\tbssid %s essid \"%.*s\" channel %u:0x%x\n", ether_sprintf(ni->ni_bssid), ni->ni_esslen, ni->ni_essid, - ni->ni_chan->ic_freq, ni->ni_chan->ic_flags); + (ni->ni_chan != IEEE80211_CHAN_ANYC) ? ni->ni_chan->ic_freq : 0, + (ni->ni_chan != IEEE80211_CHAN_ANYC) ? ni->ni_chan->ic_flags : 0); printf("\tinact %u inact_reload %u txrate %u\n", ni->ni_inact, ni->ni_inact_reload, ni->ni_txrate); printf("\thtcap %x htparam %x htctlchan %u ht2ndchan %u\n", From nobody Thu Nov 30 19:03:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh5F36RxVz52R8y; Thu, 30 Nov 2023 19:03:19 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sh5F34M6hz3HJd; Thu, 30 Nov 2023 19:03:19 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 3AUJ3IhB046892; Thu, 30 Nov 2023 13:03:18 -0600 (CST) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1701370998; bh=hQAIT0ka1xicdyWj8jx7I4JhLTQRVlNmc8Dch1EEttQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=e7A8P2eEwebwAzWcvU5NYveVFkh6yT7I0Mb5vwzXSRizNe4jKWNPNZBuebE/ZpzLp n5vgGPN2Kng2VqpX8UOGVv0f1HippX269viSQ419Yn0drrvVJwBv6qsiY5UcPMeYQm Mb/0+gLlcyC7MljGvb8Ml5MK635vh2HbHM6SH1K9xj88fvwcAib4Ui8qAciqohdNgd ySeoV/OCNiHrAbQnZEroNi/wovXcHuz8JqHhx46Zf8aE+5BAG2suZS4hRZ8NRQ6MPw uuGcx1OSnhKop/yJ6h0rpUwq6o907HYZfwBOKRDnxhIraad4+/XWgb10GudKqrCspp wG0i2TX5Ytekg== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id 6K4YIXbcaGUqtwAAs/W3XQ (envelope-from ); Thu, 30 Nov 2023 13:03:18 -0600 From: Mike Karels To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cfb1e92912b4 - main - sockets: don't malloc/free sockaddr memory on accept(2) Date: Thu, 30 Nov 2023 13:03:17 -0600 X-Mailer: MailMate (1.14r5964) Message-ID: <46D00D21-64D9-4265-9055-29FDE87F6961@karels.net> In-Reply-To: References: <202311301634.3AUGYljD055413@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 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Queue-Id: 4Sh5F34M6hz3HJd On 30 Nov 2023, at 11:01, Gleb Smirnoff wrote: > On Thu, Nov 30, 2023 at 10:56:23AM -0600, Mike Karels wrote: > M> On 30 Nov 2023, at 10:34, Gleb Smirnoff wrote: > M> > M> > The branch main has been updated by glebius: > M> > > M> > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dcfb1e92912b4cf75360= b7fbe86197cc29bc212c1 > M> > > M> > commit cfb1e92912b4cf75360b7fbe86197cc29bc212c1 > M> > Author: Gleb Smirnoff > M> > AuthorDate: 2023-11-30 16:30:55 +0000 > M> > Commit: Gleb Smirnoff > M> > CommitDate: 2023-11-30 16:30:55 +0000 > M> > > M> > sockets: don't malloc/free sockaddr memory on accept(2) > M> > > M> > Let the accept functions provide stack memory for protocols to= fill it in. > M> > Generic code should provide sockaddr_storage, specialized code= may provide > M> > smaller structure. > M> > M> Does this mean that families cannot support sockaddrs bigger than so= ckaddr_storage? > M> In particular, does local domain (aka unix domain)? Did it before? > > Yes, but I assume sockaddr_storage should cover anything: > > (kgdb) p sizeof(struct sockaddr_un) > $1 =3D 106 > (kgdb) p sizeof(struct sockaddr_storage) > $2 =3D 128 > > Please correct me if I'm wrong. > > -- = > Gleb Smirnoff Looks like local domain doesn't support anything larger than sockaddr_un;= it uses that structure for everything. The original theory was that it woul= d actually be variable, but sockaddr_un was made to be the size of an mbuf (less overhead) for convenience. I don't know if the theory was ever implemented. I like the idea of having the lower level be able to control the length of the address arbitrarily, rather than enforcing a global maximum. But the sockaddr would have to be copied anyway, and it is nice to avoid the malloc/free. So I won't object to this change. At this point, we could just as well increase the size of sockaddr_un to agree with sockaddr_storage. On the other hand, most uses seem to fill and/or copy the whole sockaddr, so that would increase overhead slightly,= and historical usage obviously fits in the current size. Mike From nobody Thu Nov 30 19:34:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh5xY1bdjz52SRp; Thu, 30 Nov 2023 19:34:57 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4Sh5xX6ZgKz3KWH; Thu, 30 Nov 2023 19:34:56 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id EA436752CE; Thu, 30 Nov 2023 11:34:54 -0800 (PST) Date: Thu, 30 Nov 2023 11:34:54 -0800 From: Gleb Smirnoff To: Mike Karels Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cfb1e92912b4 - main - sockets: don't malloc/free sockaddr memory on accept(2) Message-ID: References: <202311301634.3AUGYljD055413@gitrepo.freebsd.org> <46D00D21-64D9-4265-9055-29FDE87F6961@karels.net> List-Id: Commit messages for the main 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: <46D00D21-64D9-4265-9055-29FDE87F6961@karels.net> X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4Sh5xX6ZgKz3KWH On Thu, Nov 30, 2023 at 01:03:17PM -0600, Mike Karels wrote: M> > M> > Let the accept functions provide stack memory for protocols to fill it in. M> > M> > Generic code should provide sockaddr_storage, specialized code may provide M> > M> > smaller structure. M> > M> M> > M> Does this mean that families cannot support sockaddrs bigger than sockaddr_storage? M> > M> In particular, does local domain (aka unix domain)? Did it before? M> > M> > Yes, but I assume sockaddr_storage should cover anything: M> > M> > (kgdb) p sizeof(struct sockaddr_un) M> > $1 = 106 M> > (kgdb) p sizeof(struct sockaddr_storage) M> > $2 = 128 M> > M> > Please correct me if I'm wrong. M> > M> > -- M> > Gleb Smirnoff M> M> Looks like local domain doesn't support anything larger than sockaddr_un; it M> uses that structure for everything. The original theory was that it would M> actually be variable, but sockaddr_un was made to be the size of an mbuf M> (less overhead) for convenience. I don't know if the theory was ever M> implemented. M> M> I like the idea of having the lower level be able to control the length M> of the address arbitrarily, rather than enforcing a global maximum. M> But the sockaddr would have to be copied anyway, and it is nice to avoid M> the malloc/free. So I won't object to this change. M> M> At this point, we could just as well increase the size of sockaddr_un to M> agree with sockaddr_storage. On the other hand, most uses seem to fill M> and/or copy the whole sockaddr, so that would increase overhead slightly, M> and historical usage obviously fits in the current size. Exactly matches my evaluation. :) Looks like everybody is happy with existing sockaddr_un. Thanks for reviewing, Mike! -- Gleb Smirnoff From nobody Thu Nov 30 19:35:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh5xm1lCdz52Spd; Thu, 30 Nov 2023 19:35: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 4Sh5xm04Jwz3Kkr; Thu, 30 Nov 2023 19:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701372908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ssncpJcupK8H0+eII1tjGvYNor5G9yHf/1JOgfH1iyU=; b=HaJxld/iOwBOUt9egZhBzJQTBick1mCOgzy0HFcFyUK+BcN761ArUeQhC5FB/pxDuhVHkZ HIa2HSuabndv3OqlllcuUJ1i2sq0g+sCbMS8hTeFYUrMjthgst3B+eSjCX3r4EHec1gRIf MGI50npvCRvrdevY1uK+kFGHED8/nioq7QtYzMN9jB8Wnnr9PakNuFZAVtSFWtZrpise9o 2Hl7ZVSKiXCViqSDsx23cK9725ORQhsak0EIPHDTJieZ8hKsIhqcpCNIK2l93lUo9odW+t OvuWfEAUtnDY7XCtNNeB8tQFRah9Q6feoowE3Xz8kBUPl0F/KTBEYavyTEHmgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701372908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ssncpJcupK8H0+eII1tjGvYNor5G9yHf/1JOgfH1iyU=; b=KJ0q+4+vgFIrC2WhoWXqcygyZE5IvyaiJSDYvZSIlmO1HK3/B6fqGJKjXemajXcg2Zq6aI dOEof6mNo+Ma+hasDmRcEnyqJBeABcFQ64R+rRBdR5HU9MfSrHZR7gzxNRS4k/qhQPwjUt jiZOodq547XkFjFllVpPE4oAeIMSTPD/MCdUOSIdR0DVpubvko9nuRxdpoO27tSWgwAg/n haGMfrUynW9A/UR7+Q4fjAlmk4qcaIO+Z+NQMYrc26ZWntI9YtX5mz0liucEW/y88L0z5t 876ft/b8yYHblUf6BMLXC6vDfWrtzckvfmhkYeAS96J95E4kx0ho5/CCaEgV4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701372908; a=rsa-sha256; cv=none; b=Wh1aOEUDIIeSm4V5qF+PXVOILRzfbk6cDc4sgHSKpuMfrddSGBrVClVbOkll2G8yV3Qtp0 kUMXddhaY/nh9XHYz/TGfKV7PEA4YxX17t9bdYXfOSArDsafxoytALcArsAM24WdZ9zdOB OX5PFdUyjX+rk/Al6+JwJG2lPd2y1ulx3qdkmcTujYq1z464uVdwt2DsxgEy2dc2EL/Znb aaCFePxRqJgHSgj8vjEVChR2P6QLu/B1nb7/JGjVfGiJVFDoZElilOpykv6gus+PgFS2iz MxiFMPNQtFLUZuIn3BEg/LelY6hFt6uQUTzbe1P2Dnd0Li+3LiXl5TPkIe8nBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh5xl61LXz136n; Thu, 30 Nov 2023 19:35: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 3AUJZ7WE055457; Thu, 30 Nov 2023 19:35:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUJZ7FD055454; Thu, 30 Nov 2023 19:35:07 GMT (envelope-from git) Date: Thu, 30 Nov 2023 19:35:07 GMT Message-Id: <202311301935.3AUJZ7FD055454@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: 9daf6cd0f464 - main - RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs List-Id: Commit messages for the main 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: 9daf6cd0f46416d9c6eb0411ea6042cd42b8a9bc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9daf6cd0f46416d9c6eb0411ea6042cd42b8a9bc commit 9daf6cd0f46416d9c6eb0411ea6042cd42b8a9bc Author: Konstantin Belousov AuthorDate: 2023-11-29 18:30:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-30 19:34:36 +0000 RTLD_DEEPBIND: make lookup not just symbolic, but walk all refobj' DAGs before starting the walk over the global list. Effectively we visit needed objects first as well, instead of just the object itself. This seems to better match the semantic offered by the glibc flag. Reported by: kevans PR: 275393 Reviewed by: kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42841 --- libexec/rtld-elf/rtld.c | 8 ++++++-- libexec/rtld-elf/rtld.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 49de41f81583..2c4111cc457a 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3755,7 +3755,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, if (!obj->init_done) { /* We loaded something new and have to init something. */ if ((lo_flags & RTLD_LO_DEEPBIND) != 0) - obj->symbolic = true; + obj->deepbind = true; result = 0; if ((lo_flags & (RTLD_LO_EARLY | RTLD_LO_IGNSTLS)) == 0 && obj->static_tls && !allocate_tls_offset(obj)) { @@ -4581,7 +4581,8 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) if (refobj->symbolic || req->defobj_out != NULL) donelist_check(&donelist, refobj); - symlook_global(req, &donelist); + if (!refobj->deepbind) + symlook_global(req, &donelist); /* Search all dlopened DAGs containing the referencing object. */ STAILQ_FOREACH(elm, &refobj->dldags, link) { @@ -4597,6 +4598,9 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) } } + if (refobj->deepbind) + symlook_global(req, &donelist); + /* * Search the dynamic linker itself, and possibly resolve the * symbol from there. This is how the application links to diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index c7c17426b38a..e8b15095812b 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -240,6 +240,7 @@ typedef struct Struct_Obj_Entry { bool ver_checked : 1; /* True if processed by rtld_verify_object_versions */ bool textrel : 1; /* True if there are relocations to text seg */ bool symbolic : 1; /* True if generated with "-Bsymbolic" */ + bool deepbind : 1; /* True if loaded with RTLD_DEEPBIND" */ bool bind_now : 1; /* True if all relocations should be made first */ bool traced : 1; /* Already printed in ldd trace output */ bool jmpslots_done : 1; /* Already have relocated the jump slots */ From nobody Thu Nov 30 18:00:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh5xv0bwVz52Sdt for ; Thu, 30 Nov 2023 19:35:15 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sh5xt5sMRz3LB8 for ; Thu, 30 Nov 2023 19:35:14 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-33318b866a0so1173313f8f.3 for ; Thu, 30 Nov 2023 11:35:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701372912; x=1701977712; 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=3ZAC1mMLdnw0854qR3v165PyjVRNpo/xBYZVOVs1b74=; b=AdfqBXwCsveaPPUkky6apjWUsSO+UUd2LeNoPfgwrIFtbUEAmL2Ji36iYkSQDxbjUW KU0Mk2HIPJuI3B3WBF9J0n7Gw/LoqenkSn0IJrVGWl1fNDE11Q0htJS4E0ncBlIskS+L i3VZOQqc+tPnMPs/CoOzmGTuavAvqvjlDh2S66x5DSRcjvwcno6fIgA0cXdtvo5piJT2 ygtQZvzeQrW4TKLj/tgIQOh6RcvGOx3ARIyxKDNRKokAQ05pbOz9DPkluobqP1rYghFa +GVlH7zAKrAsrNDJxhMU+pwq7/6bsgvuHNYl6ZQ+8gIR9OSi6Aw4U2Jk3CpPxXbTC+Nk lkCQ== X-Gm-Message-State: AOJu0YwFv4gkcEAZrgzlW3S7Rj1zQl23dEl1WxZH7NYZ9x/MDKv9FyGo FrZSu54JM/hhEtzb6QXhbuusBmQ0+WZHFDxH6B8= X-Google-Smtp-Source: AGHT+IHbnxrHLc5MAYwstd6P3y2/yWp7BLhscPrj6+TCJrzb7umRwRuELesnDCHftV4y0iNioNIcJQ== X-Received: by 2002:ac2:561c:0:b0:50b:d764:64ad with SMTP id v28-20020ac2561c000000b0050bd76464admr2270lfd.98.1701367263882; Thu, 30 Nov 2023 10:01:03 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id e13-20020adff34d000000b00332f95ab44esm2130007wrp.57.2023.11.30.10.01.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2023 10:01:03 -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: 44f8e1e8530e - main - ossl: Add support for armv7 From: Jessica Clarke In-Reply-To: <202311301751.3AUHp6cv081842@gitrepo.freebsd.org> Date: Thu, 30 Nov 2023 18:00:52 +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: <13EF2B1A-05F0-4D45-A735-7573FC94A071@freebsd.org> References: <202311301751.3AUHp6cv081842@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Sh5xt5sMRz3LB8 On 30 Nov 2023, at 17:51, Mark Johnston wrote: >=20 > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D44f8e1e8530e1d2e95e84bbbe3d22ac9= cb2557fe >=20 > commit 44f8e1e8530e1d2e95e84bbbe3d22ac9cb2557fe > Author: Mark Johnston > AuthorDate: 2023-11-30 17:46:08 +0000 > Commit: Mark Johnston > CommitDate: 2023-11-30 17:49:47 +0000 >=20 > ossl: Add support for armv7 >=20 > OpenSSL provides implementations of several AES modes which use > bitslicing and can be accelerated on CPUs which support the NEON > extension. This patch adds arm platform support to ossl(4) and = provides > an AES-CBC implementation, though bsaes_cbc_encrypt() only = implements > decryption. The real goal is to provide an accelerated AES-GCM > implementation; this will be added in a subsequent patch. >=20 > Initially derived from https://reviews.freebsd.org/D37420. >=20 > Reviewed by: jhb > Sponsored by: Klara, Inc. > Sponsored by: Stormshield > MFC after: 3 months > Differential Revision: https://reviews.freebsd.org/D41304 > --- > sys/conf/files.arm | 10 +++++ > sys/crypto/openssl/arm/arm_arch.h | 84 = ++++++++++++++++++++++++++++++++++ Upstream has just the one copy of this in an MI directory. Can we avoid duplicating it in sys/crypto, whether by moving it into the MI directory (since it has an MD name already so collisions aren=E2=80=99t = an issue) or having a shared MD directory between armv7 and aarch64? Jess From nobody Thu Nov 30 20:40:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sh7PR31vnz52XcQ; Thu, 30 Nov 2023 20:40: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 4Sh7PR0F90z3SJn; Thu, 30 Nov 2023 20:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701376843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7U6eiFauXxMtnmyAcRTkbPHKsSnyiAvfxGtH/F5GG0M=; b=S/U0tI//g1QZ2UNd3eyEoyCzCoZ8Bc9tVAVFAMujIJV2lbOHwoviFMprrTpoD82DeP4yK1 3CLphLKqcDLUEpX8HOWYlj9UYiSD1UqU6XYUqZYvS+dP1ahukynoGr6bO3GlPUnQDl6taC RSXZQu/o6/OaG+diXFjidRt8SFeySooV5tXdShdczhDt1iJxrTLDoAyfK4Py8DnIC1jtEm fN1+Seca5cQlwI/0/xBPxZpXCM/dPUtBRaCfJXuMMYsEvebLmYU8+SvvvPQj48ZuJnjApc 4bFZxSn/QhliI0w43L8i3i7PrOX6fCkg9e5Sw30c46nWiJ+gV6+xF1z6YXJ8sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701376843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7U6eiFauXxMtnmyAcRTkbPHKsSnyiAvfxGtH/F5GG0M=; b=wQ5G6r8jlhTuQx3oVe8Zx7eHGgIzy5jgRp29JPO4UZDn1mcMUpdirgSg5lqvQ58+9tPN0y P9J2nGDdJZe8Ug1Ozvx1DP6xd3FgnXXurGQQwTth8Y+gsmqdaOSskmc0xWbCng8FUUz7Vw T6V8MN3fv3QHYbjyg43CkUIDko0ekokO4YgGMjBSnLBHj9YlS/aOnB2uIeTTKBSp4Wa5Sj nSPXGuHDhlV0/nsqvIgwbYNZr0jAPWmQ0ylMB4yVYTQubjdpch06/igIyBpYiDR0R626iB FvZbMs0Y4e9h6X+fPHcP9JpZX4uXQb4fBqsBmHKdbUrw8S7NsjmmCwhX47m87A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701376843; a=rsa-sha256; cv=none; b=wgsV6fovuFM9ijK4hbuI24YtyyveGMNtbWaOoRkH2zr5ldFKe/Lj+q2J9KZz2AMHaYEhjD pijKR0Q1bpwy8ousLwfaAeNM/K6J5mUiEyTrLbSr7b+LJ6lXweCrh6G9wuQhdSbvnyNdth D2HfliJK/W+wlzPykKeNBR73WhtYHnCeoYQmq7jq8KN7tNpsu8P0Ob7b7esHUiycr2+WM4 gYx77dsicHFhj2Xm/menv4N3D1vLqXoB5USiN7FA/Vu6G9JaHO7bpOJiC1Fco24KA/Emic F1UuLtJjSDANgR908hSI4fZ9qMDnjey60SnAzOxAVxEA0+SNuwULDlgTCDd5hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sh7PQ6QPdz14Q4; Thu, 30 Nov 2023 20:40: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 3AUKegdk065907; Thu, 30 Nov 2023 20:40:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUKegfx065904; Thu, 30 Nov 2023 20:40:42 GMT (envelope-from git) Date: Thu, 30 Nov 2023 20:40:42 GMT Message-Id: <202311302040.3AUKegfx065904@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: f42518ff1250 - main - tcp: for LRD move sysctl from tcp.do_lrd tp tcp.sack.lrd, remove sockopt List-Id: Commit messages for the main 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: f42518ff1250fcc76a0a1eed9f411edbbb172541 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=f42518ff1250fcc76a0a1eed9f411edbbb172541 commit f42518ff1250fcc76a0a1eed9f411edbbb172541 Author: Richard Scheffenegger AuthorDate: 2023-11-30 20:10:14 +0000 Commit: Richard Scheffenegger CommitDate: 2023-11-30 20:11:45 +0000 tcp: for LRD move sysctl from tcp.do_lrd tp tcp.sack.lrd, remove sockopt Moving lrd sysctl to the tcp.sack branch, since LRD only works with SACK. Remove the sockopt to programmatically control LRD per session. Reviewed By: #transport, tuexen, rrs Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42851 --- share/man/man4/tcp.4 | 14 +++++++------- sys/netinet/tcp.h | 1 - sys/netinet/tcp_input.c | 5 ----- sys/netinet/tcp_sack.c | 5 +++++ sys/netinet/tcp_usrreq.c | 9 --------- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 317ee818f3a4..4ebdbac3a3ca 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -464,13 +464,6 @@ See Maximum amount of time, in milliseconds, before a delayed ACK is sent. .It Va delayed_ack Delay ACK to try and piggyback it onto a data packet or another ACK. -.It Va do_lrd -Enable Lost Retransmission Detection for SACK-enabled sessions, enabled by -default. -Under severe congestion, a retransmission can be lost which then leads to a -mandatory Retransmission Timeout (RTO), followed by slow-start. -LRD will try to resend the repeatedly lost packet, preventing the time-consuming -RTO and performance reducing slow-start. .It Va do_prr Perform SACK loss recovery using the Proportional Rate Reduction (PRR) algorithm described in RFC6937. @@ -901,6 +894,13 @@ Global number of TCP SACK holes currently allocated. .It Va sack.globalmaxholes Maximum number of SACK holes per system, across all connections. Defaults to 65536. +.It Va sack.lrd +Enable Lost Retransmission Detection for SACK-enabled sessions, enabled by +default. +Under severe congestion, a retransmission can be lost which then leads to a +mandatory Retransmission Timeout (RTO), followed by slow-start. +LRD will try to resend the repeatedly lost packet, preventing the time-consuming +RTO and performance reducing slow-start or purge of the SACK scoreboard. .It Va sack.maxholes Maximum number of SACK holes per connection. Defaults to 128. diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 70fab2c6a2d2..44f8a67a1e64 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -200,7 +200,6 @@ struct tcphdr { #define TCP_PROC_ACCOUNTING 76 /* Do accounting on tcp cpu usage and counts */ #define TCP_USE_CMP_ACKS 77 /* The transport can handle the Compressed mbuf acks */ #define TCP_PERF_INFO 78 /* retrieve accounting counters */ -#define TCP_LRD 79 /* toggle Lost Retransmission Detection for A/B testing */ #define TCP_KEEPINIT 128 /* N, time to establish connection */ #define TCP_KEEPIDLE 256 /* L,N,X start keeplives after this period */ #define TCP_KEEPINTVL 512 /* L,N interval between keepalives */ diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index a75dbd1547b0..b26ae92a767e 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -162,11 +162,6 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_prr, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_do_prr), 1, "Enable Proportional Rate Reduction per RFC 6937"); -VNET_DEFINE(int, tcp_do_lrd) = 1; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_lrd, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(tcp_do_lrd), 1, - "Perform Lost Retransmission Detection"); - VNET_DEFINE(int, tcp_do_newcwv) = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, newcwv, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_do_newcwv), 0, diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 2d2be7ff922f..e8ed3c52fd67 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -132,6 +132,11 @@ SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, revised, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_do_newsack), 0, "Use revised SACK loss recovery per RFC 6675"); +VNET_DEFINE(int, tcp_do_lrd) = 1; +SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, lrd, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(tcp_do_lrd), 1, + "Perform Lost Retransmission Detection"); + VNET_DEFINE(int, tcp_sack_maxholes) = 128; SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, maxholes, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_sack_maxholes), 0, diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 14e0b814dec9..93fdedc03c7b 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2118,7 +2118,6 @@ tcp_default_ctloutput(struct tcpcb *tp, struct sockopt *sopt) case TCP_NODELAY: case TCP_NOOPT: - case TCP_LRD: INP_WUNLOCK(inp); error = sooptcopyin(sopt, &optval, sizeof optval, sizeof optval); @@ -2133,9 +2132,6 @@ tcp_default_ctloutput(struct tcpcb *tp, struct sockopt *sopt) case TCP_NOOPT: opt = TF_NOOPT; break; - case TCP_LRD: - opt = TF_LRD; - break; default: opt = 0; /* dead code to fool gcc */ break; @@ -2657,11 +2653,6 @@ unhold: sizeof(optval)); break; #endif - case TCP_LRD: - optval = tp->t_flags & TF_LRD; - INP_WUNLOCK(inp); - error = sooptcopyout(sopt, &optval, sizeof optval); - break; default: INP_WUNLOCK(inp); error = ENOPROTOOPT; From nobody Fri Dec 1 00:31:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShDWL5bLjz531dH; Fri, 1 Dec 2023 00:31: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 4ShDWL55Rcz4KkH; Fri, 1 Dec 2023 00:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701390670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=koqhtHBpMQFXX6O1lDDdfebXAPoi5713LZc8tqVb1us=; b=BZEO/a1rktEtmZDPOS0k1UCE/wlDWGOiaie2MczhuRkttH6zCuqBLEhJmZXj+Xtadjf3bw hI1/68fNf4fCUdkwS/7vpzCPuGRkU5tvjFucFi4NuQ2z9Yn7DpehQOdGTnvdV5CdxCSUQ2 a00hbeeygIDWTAqhr4oqRW0LcqNahxRlpUnZ2sRfasOS7/beVrsxqIpTOm1+y2Zxg4VeiN /ehQjrJQvEk9xC0Yh/hzwmkhriN3et0u9S4kBMbPFAmJ6Ejl3t3JXvrHxTRutuAlcy1L0U Srfre3lcCzxXcJSAsvOIPJQC79zSdzDoEJzCUbWSCltMEFgs4eeVZK6qmILCfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701390670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=koqhtHBpMQFXX6O1lDDdfebXAPoi5713LZc8tqVb1us=; b=REpqCdPbES4tg9WTsrm4y91ffX9e5sELnuEdXCf3CpCp0FPTwzkTWXF/a5sk8EUj4U8FZP LHkYGmqu/etzZHyofy0P/HU46ivI30BM/MuMY6lynV490mq00OecNx7vNIdjh5DultRghG VeomZvdgUK8UNJKcijMre8IYNdvfCr+IQBnqodikndT4ggzztHvN0O4YKUWoIPRaTHsdg1 0QLIzqYP1nisyxlpAiay6Qcj+fP+/TVI1NFDY9IMeRSqDfji8jxeYiv2xTyVuo3UsYntPJ 4yq5qmya5+EZ4mIdRmAj+2Z6jPjJi9Vq6VzCw4UotFXCLMumoSdvRSdQFbGoTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701390670; a=rsa-sha256; cv=none; b=vbSbJTcaXV6rhzrKdkLzpPZ537dQyYXeMdYfWqtV9bi/4GUaBnDdq4P1Rk9QzRFnaYceWs mJvjohdqLOhuT/199yQogbXimlaf39hWY1t5KrEsbPV0n3ytXAmQGGhguDVUo8hW9at8GM BjpfjkSB3cCYYrDvsYKcxYrbgeRQz6cvBEmvDef2hzVPTG3tLiQtOItpB2Xm6v5ieCNvyi BSzPGWwiQpPQvQQzJtqLpoR2o+soUdmXoTP76r6TSJjx55HhQQhjovZadV+gILITKn1ZNO hVQkBk7ZEh+nkDodBgZBWB574alc8sOXOT4YaM+t2AdZJX5RMHkQwkKb5fP/sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShDWL48FRz1B8b; Fri, 1 Dec 2023 00:31: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 3B10VAaV054576; Fri, 1 Dec 2023 00:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10VAxS054573; Fri, 1 Dec 2023 00:31:10 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:31:10 GMT Message-Id: <202312010031.3B10VAxS054573@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: 3d44dce90a69 - main - sort: test against all month formats in month-sort List-Id: Commit messages for the main 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: 3d44dce90a6946e2ef2ab30ffbf8e2930acf888b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3d44dce90a6946e2ef2ab30ffbf8e2930acf888b commit 3d44dce90a6946e2ef2ab30ffbf8e2930acf888b Author: Christos Margiolis AuthorDate: 2023-12-01 00:30:10 +0000 Commit: Christos Margiolis CommitDate: 2023-12-01 00:30:10 +0000 sort: test against all month formats in month-sort The CLDR specification [1] defines three possible month formats: - Abbreviation (e.g Jan, Ιαν) - Full (e.g January, Ιανουαρίου) - Standalone (e.g January, Ιανουάριος) Many languages use different case endings depending on whether the month is referenced as a standalone word (nominative case), or in date context (genitive, partitive, etc.). sort(1)'s -M option currently sorts months by testing input against only the abbrevation format, which is essentially a substring of the full format. While this works fine for languages like English, where there are no cases, for languages where there is a different case ending between the abbreviation/full and standalone formats, it is not sufficient. For example, in Greek, "May" can take the following forms: Abbreviation: Μαΐ (genitive case) Full: Μαΐου (genitive case) Standalone: Μάιος (nominative case) If we use the standalone format in Greek, sort(1) will not able to match "Μαΐ" to "Μάιος" and the sort will fail. This change makes sort(1) test against all three formats. It also works when the input contains mixed formats. [1] https://cldr.unicode.org/translation/date-time/date-time-patterns Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42847 --- usr.bin/sort/bwstring.c | 144 +++++++++++++++++++-------- usr.bin/sort/sort.1.in | 4 +- usr.bin/sort/tests/Makefile | 1 + usr.bin/sort/tests/sort_monthsort_test.sh | 159 ++++++++++++++++++++++++++++++ 4 files changed, 263 insertions(+), 45 deletions(-) diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c index fc1b50cb78ac..b0c14e996b23 100644 --- a/usr.bin/sort/bwstring.c +++ b/usr.bin/sort/bwstring.c @@ -43,63 +43,114 @@ bool byte_sort; -static wchar_t **wmonths; -static char **cmonths; +struct wmonth { + wchar_t *mon; + wchar_t *ab; + wchar_t *alt; +}; -/* initialise months */ +struct cmonth { + char *mon; + char *ab; + char *alt; +}; + +static struct wmonth *wmonths; +static struct cmonth *cmonths; + +static int +populate_cmonth(char **field, const nl_item item, int idx) +{ + char *tmp, *m; + size_t i, len; + + tmp = nl_langinfo(item); + if (debug_sort) + printf("month[%d]=%s\n", idx, tmp); + if (*tmp == '\0') + return (0); + m = sort_strdup(tmp); + len = strlen(tmp); + for (i = 0; i < len; i++) + m[i] = toupper(m[i]); + *field = m; + + return (1); +} + +static int +populate_wmonth(wchar_t **field, const nl_item item, int idx) +{ + wchar_t *m; + char *tmp; + size_t i, len; + + tmp = nl_langinfo(item); + if (debug_sort) + printf("month[%d]=%s\n", idx, tmp); + if (*tmp == '\0') + return (0); + len = strlen(tmp); + m = sort_malloc(SIZEOF_WCHAR_STRING(len + 1)); + if (mbstowcs(m, tmp, len) == ((size_t) - 1)) { + sort_free(m); + return (0); + } + m[len] = L'\0'; + for (i = 0; i < len; i++) + m[i] = towupper(m[i]); + *field = m; + + return (1); +} void initialise_months(void) { - const nl_item item[12] = { ABMON_1, ABMON_2, ABMON_3, ABMON_4, + const nl_item mon_item[12] = { MON_1, MON_2, MON_3, MON_4, + MON_5, MON_6, MON_7, MON_8, MON_9, MON_10, + MON_11, MON_12 }; + const nl_item ab_item[12] = { ABMON_1, ABMON_2, ABMON_3, ABMON_4, ABMON_5, ABMON_6, ABMON_7, ABMON_8, ABMON_9, ABMON_10, ABMON_11, ABMON_12 }; - char *tmp; - size_t len; - + const nl_item alt_item[12] = { ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, + ALTMON_5, ALTMON_6, ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, + ALTMON_11, ALTMON_12 }; + int i; + + /* + * Handle all possible month formats: abbrevation, full name, + * standalone name (without case ending). + */ if (mb_cur_max == 1) { if (cmonths == NULL) { - char *m; - - cmonths = sort_malloc(sizeof(char*) * 12); - for (int i = 0; i < 12; i++) { - cmonths[i] = NULL; - tmp = nl_langinfo(item[i]); - if (debug_sort) - printf("month[%d]=%s\n", i, tmp); - if (*tmp == '\0') + cmonths = sort_malloc(sizeof(struct cmonth) * 12); + for (i = 0; i < 12; i++) { + if (!populate_cmonth(&cmonths[i].mon, + mon_item[i], i)) + continue; + if (!populate_cmonth(&cmonths[i].ab, + ab_item[i], i)) + continue; + if (!populate_cmonth(&cmonths[i].alt, + alt_item[i], i)) continue; - m = sort_strdup(tmp); - len = strlen(tmp); - for (unsigned int j = 0; j < len; j++) - m[j] = toupper(m[j]); - cmonths[i] = m; } } } else { if (wmonths == NULL) { - wchar_t *m; - - wmonths = sort_malloc(sizeof(wchar_t *) * 12); - for (int i = 0; i < 12; i++) { - wmonths[i] = NULL; - tmp = nl_langinfo(item[i]); - if (debug_sort) - printf("month[%d]=%s\n", i, tmp); - if (*tmp == '\0') + wmonths = sort_malloc(sizeof(struct wmonth) * 12); + for (i = 0; i < 12; i++) { + if (!populate_wmonth(&wmonths[i].mon, + mon_item[i], i)) continue; - len = strlen(tmp); - m = sort_malloc(SIZEOF_WCHAR_STRING(len + 1)); - if (mbstowcs(m, tmp, len) == - ((size_t) - 1)) { - sort_free(m); + if (!populate_wmonth(&wmonths[i].ab, + ab_item[i], i)) + continue; + if (!populate_wmonth(&wmonths[i].alt, + alt_item[i], i)) continue; - } - m[len] = L'\0'; - for (unsigned int j = 0; j < len; j++) - m[j] = towupper(m[j]); - wmonths[i] = m; } } } @@ -754,8 +805,11 @@ bws_month_score(const struct bwstring *s0) ++s; for (int i = 11; i >= 0; --i) { - if (cmonths[i] && - (s == strstr(s, cmonths[i]))) + if (cmonths[i].mon && (s == strstr(s, cmonths[i].mon))) + return (i); + if (cmonths[i].ab && (s == strstr(s, cmonths[i].ab))) + return (i); + if (cmonths[i].alt && (s == strstr(s, cmonths[i].alt))) return (i); } @@ -769,7 +823,11 @@ bws_month_score(const struct bwstring *s0) ++s; for (int i = 11; i >= 0; --i) { - if (wmonths[i] && (s == wcsstr(s, wmonths[i]))) + if (wmonths[i].ab && (s == wcsstr(s, wmonths[i].ab))) + return (i); + if (wmonths[i].mon && (s == wcsstr(s, wmonths[i].mon))) + return (i); + if (wmonths[i].alt && (s == wcsstr(s, wmonths[i].alt))) return (i); } } diff --git a/usr.bin/sort/sort.1.in b/usr.bin/sort/sort.1.in index b9cd3c2b8121..80cc1dcb0282 100644 --- a/usr.bin/sort/sort.1.in +++ b/usr.bin/sort/sort.1.in @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 4, 2019 +.Dd November 30, 2023 .Dt SORT 1 .Os .Sh NAME @@ -179,7 +179,7 @@ options (human-readable). .It Fl i , Fl Fl ignore-nonprinting Ignore all non-printable characters. .It Fl M , Fl Fl month-sort , Fl Fl sort=month -Sort by month abbreviations. +Sort by month. Unknown strings are considered smaller than the month names. .It Fl n , Fl Fl numeric-sort , Fl Fl sort=numeric Sort fields numerically by arithmetic value. diff --git a/usr.bin/sort/tests/Makefile b/usr.bin/sort/tests/Makefile index 1982fd1cee0a..752dec06bbff 100644 --- a/usr.bin/sort/tests/Makefile +++ b/usr.bin/sort/tests/Makefile @@ -2,6 +2,7 @@ PACKAGE= tests NETBSD_ATF_TESTS_SH= sort_test +ATF_TESTS_SH= sort_monthsort_test ${PACKAGE}FILES+= d_any_char_dflag_out.txt ${PACKAGE}FILES+= d_any_char_fflag_out.txt diff --git a/usr.bin/sort/tests/sort_monthsort_test.sh b/usr.bin/sort/tests/sort_monthsort_test.sh new file mode 100755 index 000000000000..db42981fb107 --- /dev/null +++ b/usr.bin/sort/tests/sort_monthsort_test.sh @@ -0,0 +1,159 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Christos Margiolis +# + +get_months_fmt() +{ + rm -f in + for i in $(seq 12 1); do + printf "2000-%02d-01\n" ${i} | xargs -I{} \ + date -jf "%Y-%m-%d" {} "${1}" >>in + done +} + +atf_test_case monthsort_english +monthsort_english_head() +{ + atf_set "descr" "Test the -M flag with English months" +} +monthsort_english_body() +{ + export LC_TIME="en_US.UTF-8" + + cat >expout <expout <expout <expout <in <expout < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: de607e3c230b - main - net80211: move net_epoch into net80211 List-Id: Commit messages for the main 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: de607e3c230be88f6232b9c9fd6c37199648dc8c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=de607e3c230be88f6232b9c9fd6c37199648dc8c commit de607e3c230be88f6232b9c9fd6c37199648dc8c Author: Bjoern A. Zeeb AuthorDate: 2023-10-29 14:25:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 00:46:10 +0000 net80211: move net_epoch into net80211 Move the net_epoch into net80211 around the if_input calls and out of the driver (in this first case LinuxKPI). This reduces coverage but also allows us to alloc in calls like (*ampdu_rx_start) which do not actually pass data up the stack. The follow-up commits will revert b65f813c1ab99448278961c5ca80dc422b1eae29, 21c4082de9e2cf9a0fd81a9a981ab06022956847, 17c328b6aebfa03cd1c2cbfbbc617e3b341bf1e4, af2441fbc7fa9e522e7f8697e5a181bdd4ff9e00, and 6c3e93cb5a4aa4b8a2d8d4d326f2a7c34d3a4458 for ath. Sponsored by: The FreeBSD Foundation MFC after: 3 days Tested by: few (rtwn, ath, iwlwifi, ...) Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D42427 --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 --- sys/net80211/ieee80211_hostap.c | 4 ++++ sys/net80211/ieee80211_input.c | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 458a5825639a..448f417d1224 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4154,7 +4154,6 @@ linuxkpi_ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, struct ieee80211_sta *sta, struct napi_struct *napi __unused, struct list_head *list __unused) { - struct epoch_tracker et; struct lkpi_hw *lhw; struct ieee80211com *ic; struct mbuf *m; @@ -4371,7 +4370,6 @@ skip_device_ts: } #endif - NET_EPOCH_ENTER(et); if (ni != NULL) { ok = ieee80211_input_mimo(ni, m); ieee80211_free_node(ni); @@ -4381,7 +4379,6 @@ skip_device_ts: ok = ieee80211_input_mimo_all(ic, m); /* mbuf got consumed. */ } - NET_EPOCH_EXIT(et); #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_RX) diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index f738c97076ca..c1196961ad54 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -419,6 +419,8 @@ hostap_deliver_data(struct ieee80211vap *vap, (void) ieee80211_vap_xmitpkt(vap, mcopy); } if (m != NULL) { + struct epoch_tracker et; + /* * Mark frame as coming from vap's interface. */ @@ -435,7 +437,9 @@ hostap_deliver_data(struct ieee80211vap *vap, m->m_pkthdr.ether_vtag = ni->ni_vlan; m->m_flags |= M_VLANTAG; } + NET_EPOCH_ENTER(et); ifp->if_input(ifp, m); + NET_EPOCH_EXIT(et); } } diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 0cc6902ae28e..a4bfe49bd8c4 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -274,6 +274,7 @@ void ieee80211_deliver_data(struct ieee80211vap *vap, struct ieee80211_node *ni, struct mbuf *m) { + struct epoch_tracker et; struct ether_header *eh = mtod(m, struct ether_header *); struct ifnet *ifp = vap->iv_ifp; @@ -304,7 +305,9 @@ ieee80211_deliver_data(struct ieee80211vap *vap, m->m_pkthdr.ether_vtag = ni->ni_vlan; m->m_flags |= M_VLANTAG; } + NET_EPOCH_ENTER(et); ifp->if_input(ifp, m); + NET_EPOCH_EXIT(et); } struct mbuf * From nobody Fri Dec 1 00:56:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShF416RBmz5331h; Fri, 1 Dec 2023 00:56: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 4ShF414BL6z4Pkl; Fri, 1 Dec 2023 00:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=shtPxVgBRZSuYHG1CcF6r0mq2Gqntdefcc02MYaQ4f0=; b=aSciAmzoNhEJe53I8abZwwYwXjzJZ3wvqudOuCVEVaMX9W8yIfOIXF6nBM2D453DeNVDTm YTaLp7vAqert5DR18sy61GdUus5aFb5tXJ32FBSVvVD/gbQsXyBzFD1X30HukYPbH4nz3S 5X82p9Bl0ZclxfSvNH9XqFyXVzF2yPfrPgPksWxpJVlBRASbmuO0b5oyQ6k13FphsvxPDt 0AfQwFiFdLxYymOAn664vFKabjNjLKUvzcF4R9hA2SY4J6n7cxwBRKWDdeqGzi3PyykXwQ SMnhYHiwqqceI0hfBLzlyVRWWcuD7OVyr8tzWCHODBGy7ccevW1BQEkkm+eBzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=shtPxVgBRZSuYHG1CcF6r0mq2Gqntdefcc02MYaQ4f0=; b=T97A7yXzFwSzI49P8lBMFTR6fZZlC5dgh+uO54IfC8srSFv04DJ/2fRSrP+ToRt12vZd2q pMBCiWwQuxi6UaPZax+zWDl+8Sj7c3BwoCQckfYGzqmBzd+GMlxpynAszAVOz84DuNgX4R wnbdC9kcQskrE1+SzclWSnT+Dgenlf+PxJ5+lLdhESLTP9lH3QIA4P9BTgJ7kazeCkkl0X eDEUYNiAI2X5xTwATQgLBPhJwyyLzkuYTI0LgcG7RR2UsoLVwEgY3S6E+NPuGd99ot1PXq DgKx/6e+o2skJpmIRzYHFzQ+qc9KQ5x3lSc7LRmDnBWAfHK5vp+lYsFwCY1eiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701392161; a=rsa-sha256; cv=none; b=Mq1pVct2tzn1gAaIueCpamydaueGehctbyDpTPR2+z1UI3QhnBP30WDzGmgcqeRcHMiwkX rZnA8pavRibqOnrKmWpxV2b9Vb2Q5/3YMTNsqL9ilmMtuf5ByIkNyDCbsPjh/22rqnV8MQ 5jhfdtgBYlMu7GFYFc4oGCxPLiqfeMvyW8kvCYyrubL+jKCFDpLu8MmykMiX0Maiu4xu37 3ooqJQKMGOLuoqEHEcbV19erHuVGUZFMmK2D4D4IlfH6oj8c8U7H7ILwOBxirG9B8VgJgm QX+pFJLjeOdQHQUOk+XmXsUASoQJqQMPgRa1oJMWuJUUwQkRo2raqcKyoM0JSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShF4134R4z1BZR; Fri, 1 Dec 2023 00:56: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 3B10u11E090482; Fri, 1 Dec 2023 00:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10u12H090479; Fri, 1 Dec 2023 00:56:01 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:56:01 GMT Message-Id: <202312010056.3B10u12H090479@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: 1c6dd33d26eb - main - Revert "Widen EPOCH(9) usage in PCI WLAN drivers." List-Id: Commit messages for the main 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: 1c6dd33d26eb02c6145383a49150965eeca61120 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1c6dd33d26eb02c6145383a49150965eeca61120 commit 1c6dd33d26eb02c6145383a49150965eeca61120 Author: Bjoern A. Zeeb AuthorDate: 2023-11-03 21:19:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 00:48:54 +0000 Revert "Widen EPOCH(9) usage in PCI WLAN drivers." This reverts commit b65f813c1ab99448278961c5ca80dc422b1eae29. As a side effect this also seems to fix wtap which seems to have lost the epoch over the input path in between. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/dev/bwi/if_bwi.c | 3 --- sys/dev/bwn/if_bwn.c | 3 --- sys/dev/ipw/if_ipw.c | 3 --- sys/dev/iwi/if_iwi.c | 3 --- sys/dev/iwm/if_iwm.c | 5 ----- sys/dev/iwn/if_iwn.c | 3 --- sys/dev/malo/if_malo.c | 3 --- sys/dev/mwl/if_mwl.c | 4 ---- sys/dev/ral/rt2560.c | 4 +--- sys/dev/ral/rt2661.c | 3 --- sys/dev/ral/rt2860.c | 3 --- sys/dev/rtwn/pci/rtwn_pci_rx.c | 5 ----- sys/dev/wpi/if_wpi.c | 3 --- sys/dev/wtap/if_wtap.c | 5 +---- 14 files changed, 2 insertions(+), 48 deletions(-) diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c index 702df2e1e76b..f9a6b2357cc0 100644 --- a/sys/dev/bwi/if_bwi.c +++ b/sys/dev/bwi/if_bwi.c @@ -1503,7 +1503,6 @@ bwi_stop_locked(struct bwi_softc *sc, int statechg) void bwi_intr(void *xsc) { - struct epoch_tracker et; struct bwi_softc *sc = xsc; struct bwi_mac *mac; uint32_t intr_status; @@ -1623,9 +1622,7 @@ bwi_intr(void *xsc) device_printf(sc->sc_dev, "intr noise\n"); if (txrx_intr_status[0] & BWI_TXRX_INTR_RX) { - NET_EPOCH_ENTER(et); rx_data = sc->sc_rxeof(sc); - NET_EPOCH_EXIT(et); if (sc->sc_flags & BWI_F_STOP) { BWI_UNLOCK(sc); return; diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c index e157c491f18e..501bcc1e958e 100644 --- a/sys/dev/bwn/if_bwn.c +++ b/sys/dev/bwn/if_bwn.c @@ -5075,7 +5075,6 @@ bwn_intr(void *arg) static void bwn_intrtask(void *arg, int npending) { - struct epoch_tracker et; struct bwn_mac *mac = arg; struct bwn_softc *sc = mac->mac_sc; uint32_t merged = 0; @@ -5136,7 +5135,6 @@ bwn_intrtask(void *arg, int npending) if (mac->mac_reason_intr & BWN_INTR_NOISESAMPLE_OK) bwn_intr_noise(mac); - NET_EPOCH_ENTER(et); if (mac->mac_flags & BWN_MAC_FLAG_DMA) { if (mac->mac_reason[0] & BWN_DMAINTR_RX_DONE) { bwn_dma_rx(mac->mac_method.dma.rx); @@ -5144,7 +5142,6 @@ bwn_intrtask(void *arg, int npending) } } else rx = bwn_pio_rx(&mac->mac_method.pio.rx); - NET_EPOCH_EXIT(et); KASSERT(!(mac->mac_reason[1] & BWN_DMAINTR_RX_DONE), ("%s", __func__)); KASSERT(!(mac->mac_reason[2] & BWN_DMAINTR_RX_DONE), ("%s", __func__)); diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c index b39df82507e9..051f046d26ad 100644 --- a/sys/dev/ipw/if_ipw.c +++ b/sys/dev/ipw/if_ipw.c @@ -1156,7 +1156,6 @@ static void ipw_rx_data_intr(struct ipw_softc *sc, struct ipw_status *status, struct ipw_soft_bd *sbd, struct ipw_soft_buf *sbuf) { - struct epoch_tracker et; struct ieee80211com *ic = &sc->sc_ic; struct mbuf *mnew, *m; struct ieee80211_node *ni; @@ -1228,13 +1227,11 @@ ipw_rx_data_intr(struct ipw_softc *sc, struct ipw_status *status, IPW_UNLOCK(sc); ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, rssi - nf, nf); ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi - nf, nf); - NET_EPOCH_EXIT(et); IPW_LOCK(sc); bus_dmamap_sync(sc->rbd_dmat, sc->rbd_map, BUS_DMASYNC_PREWRITE); diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c index 1f1faa061409..4d71550f512e 100644 --- a/sys/dev/iwi/if_iwi.c +++ b/sys/dev/iwi/if_iwi.c @@ -1177,7 +1177,6 @@ static void iwi_frame_intr(struct iwi_softc *sc, struct iwi_rx_data *data, int i, struct iwi_frame *frame) { - struct epoch_tracker et; struct ieee80211com *ic = &sc->sc_ic; struct mbuf *mnew, *m; struct ieee80211_node *ni; @@ -1267,13 +1266,11 @@ iwi_frame_intr(struct iwi_softc *sc, struct iwi_rx_data *data, int i, IWI_UNLOCK(sc); ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); - NET_EPOCH_ENTER(et); if (ni != NULL) { type = ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); } else type = ieee80211_input_all(ic, m, rssi, nf); - NET_EPOCH_EXIT(et); IWI_LOCK(sc); if (sc->sc_softled) { diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 62347d6efbff..c8eb46ed9795 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -3375,7 +3375,6 @@ static bool iwm_rx_mpdu(struct iwm_softc *sc, struct mbuf *m, uint32_t offset, bool stolen) { - struct epoch_tracker et; struct ieee80211com *ic; struct ieee80211_frame *wh; struct ieee80211_node *ni; @@ -3395,8 +3394,6 @@ iwm_rx_mpdu(struct iwm_softc *sc, struct mbuf *m, uint32_t offset, ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); IWM_UNLOCK(sc); - - NET_EPOCH_ENTER(et); if (ni != NULL) { IWM_DPRINTF(sc, IWM_DEBUG_RECV, "input m %p\n", m); ieee80211_input_mimo(ni, m); @@ -3405,8 +3402,6 @@ iwm_rx_mpdu(struct iwm_softc *sc, struct mbuf *m, uint32_t offset, IWM_DPRINTF(sc, IWM_DEBUG_RECV, "inputall m %p\n", m); ieee80211_input_mimo_all(ic, m); } - NET_EPOCH_EXIT(et); - IWM_LOCK(sc); return true; diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c index 0838cbb5cdd0..3b1d879914b6 100644 --- a/sys/dev/iwn/if_iwn.c +++ b/sys/dev/iwn/if_iwn.c @@ -3019,7 +3019,6 @@ static void iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, struct iwn_rx_data *data) { - struct epoch_tracker et; struct iwn_ops *ops = &sc->ops; struct ieee80211com *ic = &sc->sc_ic; struct iwn_rx_ring *ring = &sc->rxq; @@ -3179,7 +3178,6 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, } IWN_UNLOCK(sc); - NET_EPOCH_ENTER(et); /* Send the frame to the 802.11 layer. */ if (ni != NULL) { @@ -3191,7 +3189,6 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, } else (void)ieee80211_input_all(ic, m, rssi - nf, nf); - NET_EPOCH_EXIT(et); IWN_LOCK(sc); DPRINTF(sc, IWN_DEBUG_TRACE, "->%s: end\n",__func__); diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c index b863113017bd..56310085ef5f 100644 --- a/sys/dev/malo/if_malo.c +++ b/sys/dev/malo/if_malo.c @@ -1928,7 +1928,6 @@ malo_set_channel(struct ieee80211com *ic) static void malo_rx_proc(void *arg, int npending) { - struct epoch_tracker et; struct malo_softc *sc = arg; struct ieee80211com *ic = &sc->malo_ic; struct malo_rxbuf *bf; @@ -2061,13 +2060,11 @@ malo_rx_proc(void *arg, int npending) /* dispatch */ ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, rssi, ds->nf); ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi, ds->nf); - NET_EPOCH_EXIT(et); rx_next: /* NB: ignore ENOMEM so we process more descriptors */ (void) malo_rxbuf_init(sc, bf); diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index 95655aa33e2f..479f3144dce3 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -2603,7 +2603,6 @@ cvtrssi(uint8_t ssi) static void mwl_rx_proc(void *arg, int npending) { - struct epoch_tracker et; struct mwl_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; struct mwl_rxbuf *bf; @@ -2792,8 +2791,6 @@ mwl_rx_proc(void *arg, int npending) /* dispatch */ ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) wh); - - NET_EPOCH_ENTER(et); if (ni != NULL) { mn = MWL_NODE(ni); #ifdef MWL_ANT_INFO_SUPPORT @@ -2809,7 +2806,6 @@ mwl_rx_proc(void *arg, int npending) ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi, nf); - NET_EPOCH_EXIT(et); rx_next: /* NB: ignore ENOMEM so we process more descriptors */ (void) mwl_rxbuf_init(sc, bf); diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c index 4ae46b66ae49..d7cafe1994c9 100644 --- a/sys/dev/ral/rt2560.c +++ b/sys/dev/ral/rt2560.c @@ -1083,7 +1083,6 @@ rt2560_prio_intr(struct rt2560_softc *sc) static void rt2560_decryption_intr(struct rt2560_softc *sc) { - struct epoch_tracker et; struct ieee80211com *ic = &sc->sc_ic; struct rt2560_rx_desc *desc; struct rt2560_rx_data *data; @@ -1194,13 +1193,12 @@ rt2560_decryption_intr(struct rt2560_softc *sc) wh = mtod(m, struct ieee80211_frame *); ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi, nf); - NET_EPOCH_EXIT(et); + RAL_LOCK(sc); sc->sc_flags &= ~RT2560_F_INPUT_RUNNING; skip: desc->flags = htole32(RT2560_RX_BUSY); diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c index 14bd808a6a7f..1194ef12189f 100644 --- a/sys/dev/ral/rt2661.c +++ b/sys/dev/ral/rt2661.c @@ -955,7 +955,6 @@ rt2661_tx_dma_intr(struct rt2661_softc *sc, struct rt2661_tx_ring *txq) static void rt2661_rx_intr(struct rt2661_softc *sc) { - struct epoch_tracker et; struct ieee80211com *ic = &sc->sc_ic; struct rt2661_rx_desc *desc; struct rt2661_rx_data *data; @@ -1072,13 +1071,11 @@ rt2661_rx_intr(struct rt2661_softc *sc) /* send the frame to the 802.11 layer */ ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi, nf); - NET_EPOCH_EXIT(et); RAL_LOCK(sc); sc->sc_flags &= ~RAL_INPUT_RUNNING; diff --git a/sys/dev/ral/rt2860.c b/sys/dev/ral/rt2860.c index 0dbb1aa79959..ab5b32b4e026 100644 --- a/sys/dev/ral/rt2860.c +++ b/sys/dev/ral/rt2860.c @@ -1176,7 +1176,6 @@ rt2860_maxrssi_chain(struct rt2860_softc *sc, const struct rt2860_rxwi *rxwi) static void rt2860_rx_intr(struct rt2860_softc *sc) { - struct epoch_tracker et; struct rt2860_rx_radiotap_header *tap; struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_frame *wh; @@ -1324,13 +1323,11 @@ rt2860_rx_intr(struct rt2860_softc *sc) /* send the frame to the 802.11 layer */ ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); - NET_EPOCH_ENTER(et); if (ni != NULL) { (void)ieee80211_input(ni, m, rssi - nf, nf); ieee80211_free_node(ni); } else (void)ieee80211_input_all(ic, m, rssi - nf, nf); - NET_EPOCH_EXIT(et); RAL_LOCK(sc); diff --git a/sys/dev/rtwn/pci/rtwn_pci_rx.c b/sys/dev/rtwn/pci/rtwn_pci_rx.c index 3bc033716a9e..7f06725afb0e 100644 --- a/sys/dev/rtwn/pci/rtwn_pci_rx.c +++ b/sys/dev/rtwn/pci/rtwn_pci_rx.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -83,7 +82,6 @@ rtwn_pci_setup_rx_desc(struct rtwn_pci_softc *pc, static void rtwn_pci_rx_frame(struct rtwn_pci_softc *pc) { - struct epoch_tracker et; struct rtwn_softc *sc = &pc->pc_sc; struct rtwn_rx_ring *ring = &pc->rx_ring; struct rtwn_rx_stat_pci *rx_desc = &ring->desc[ring->cur]; @@ -163,15 +161,12 @@ rtwn_pci_rx_frame(struct rtwn_pci_softc *pc) /* Send the frame to the 802.11 layer. */ RTWN_UNLOCK(sc); - - NET_EPOCH_ENTER(et); if (ni != NULL) { (void)ieee80211_input_mimo(ni, m); /* Node is no longer needed. */ ieee80211_free_node(ni); } else (void)ieee80211_input_mimo_all(ic, m); - NET_EPOCH_EXIT(et); RTWN_LOCK(sc); diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index 5ceb037803b8..fc5cf02f3a25 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -1906,7 +1906,6 @@ static void wpi_rx_done(struct wpi_softc *sc, struct wpi_rx_desc *desc, struct wpi_rx_data *data) { - struct epoch_tracker et; struct ieee80211com *ic = &sc->sc_ic; struct wpi_rx_ring *ring = &sc->rxq; struct wpi_rx_stat *stat; @@ -2026,7 +2025,6 @@ wpi_rx_done(struct wpi_softc *sc, struct wpi_rx_desc *desc, } WPI_UNLOCK(sc); - NET_EPOCH_ENTER(et); /* Send the frame to the 802.11 layer. */ if (ni != NULL) { @@ -2036,7 +2034,6 @@ wpi_rx_done(struct wpi_softc *sc, struct wpi_rx_desc *desc, } else (void)ieee80211_input_all(ic, m, stat->rssi, WPI_RSSI_OFFSET); - NET_EPOCH_EXIT(et); WPI_LOCK(sc); return; diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 529de1d53728..040fc340cb13 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -493,7 +493,6 @@ wtap_inject(struct wtap_softc *sc, struct mbuf *m) static void wtap_rx_proc(void *arg, int npending) { - struct epoch_tracker et; struct wtap_softc *sc = (struct wtap_softc *)arg; struct ieee80211com *ic = &sc->sc_ic; struct mbuf *m; @@ -540,7 +539,6 @@ wtap_rx_proc(void *arg, int npending) ni = ieee80211_find_rxnode_withkey(ic, mtod(m, const struct ieee80211_frame_min *), IEEE80211_KEYIX_NONE); - NET_EPOCH_ENTER(et); if (ni != NULL) { /* * Sending station is known, dispatch directly. @@ -550,8 +548,7 @@ wtap_rx_proc(void *arg, int npending) } else { ieee80211_input_all(ic, m, 1<<7, 10); } - NET_EPOCH_EXIT(et); - + /* The mbufs are freed by the Net80211 stack */ free(bf, M_WTAP_RXBUF); } From nobody Fri Dec 1 00:56:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShF426MgYz532st; Fri, 1 Dec 2023 00:56: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 4ShF425cKJz4PhT; Fri, 1 Dec 2023 00:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZjX9AeQCWmfA0qbnDrLS+QpkywLmnsYKOylKJ44yaI=; b=qRSWMGV0uKX9aO5DnX87quM9ss9o1ERiH1B1z+3yEDQcMvxvdxqJ24KnwydeS18356/SMp bYRQwlKUXNtWk7nIEB9JG3/HrPvsdhdVxv3zLQQUWaUAWFMwwlgbbIOQG99VRZDObpfkuK 9aGiQq9aeeDH57P1/KvZt+ClycTYDwH+gp4mHviDUbDO2O6rbXuOixGpudflfX8b2sLve4 LvSabKpySSDuL9PSfC5/WJ9UDcCwcuVnyHxEdhe5pIzytJANQ5BU826JkJ7tM1B1t4DBIm xZdwr0VlJ2o5oiok0dQSM1N9WIG24vZ0i3V9Kem0UIbjeTOtU0PkkSfJHMAQfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZjX9AeQCWmfA0qbnDrLS+QpkywLmnsYKOylKJ44yaI=; b=Jv8wsjQUMATuSudjUw2Eq/lONpOtr8RdFvd7H5QpHFnxqscJ7ULpsLO3P58aTC+e0vZLbA y0mMZX86PzwaGa5MBjHSug4wlJoQzDwfU/nKHABIVCWA0sSRmi7pNdniwIu8KKz1NUvqhG UzwwODv/xpY0Zcxl95v5uZu2LbVSuv1uKmtoyTFKiFg3IVUr5iBP5xLvoJlerqAFT1R5dP Loc0YgOjv6S5+ZFTJC4S9+mR/EaLyylv5dQDgGuuLLIeo1FvilqHXxAlUL/6cUGVbMLYYE Ae4xXybYTh/oZWx6Tpv0cShA1uMAZOyBGvuJJuxINAipyeYNm93aU/dOZ/6RpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701392162; a=rsa-sha256; cv=none; b=b80jfS6pjO9JsFqmVqhnq3ToCP4ryLF0vL/JLeaVg2boSX3bY1rZOiLhZCrn/06TtAi1mO P7UpY3nhuOoGue13fAxM1o1UVqeAgBXhkm1TchlMZ8Btp3l17pFiArQPJR3v03oZMz5Evv iD5CdXIUOVroFUlTnVw3lJgcnIe0CHJo+7BkDi32g82Iw+f5HGN1PAnoPTLfH3dRETbadr 2kmTSkn+d10w+k0F3KvIehyUebr1Xmi6ks+MA7XjApdyalow2RXnvLD6nxf7EuExe1yuHr v1EBqnyLCH6HDn8UobZwL/NGUJRzekLFonp/e13Uakd6ezlbQFlBk8/i0iH2pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShF424VP3z1BgJ; Fri, 1 Dec 2023 00:56: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 3B10u2al090536; Fri, 1 Dec 2023 00:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10u237090533; Fri, 1 Dec 2023 00:56:02 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:56:02 GMT Message-Id: <202312010056.3B10u237090533@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: 39b702797994 - main - Revert "Widen EPOCH(9) usage in USB WLAN drivers." List-Id: Commit messages for the main 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: 39b702797994fbd62a21dd3af6d4cd7045fded23 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=39b702797994fbd62a21dd3af6d4cd7045fded23 commit 39b702797994fbd62a21dd3af6d4cd7045fded23 Author: Bjoern A. Zeeb AuthorDate: 2023-11-03 21:27:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 00:48:54 +0000 Revert "Widen EPOCH(9) usage in USB WLAN drivers." This reverts commit 21c4082de9e2cf9a0fd81a9a981ab06022956847. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/dev/usb/wlan/if_rum.c | 3 --- sys/dev/usb/wlan/if_run.c | 3 --- sys/dev/usb/wlan/if_uath.c | 3 --- sys/dev/usb/wlan/if_upgt.c | 3 --- sys/dev/usb/wlan/if_ural.c | 3 --- sys/dev/usb/wlan/if_urtw.c | 3 --- sys/dev/usb/wlan/if_zyd.c | 3 --- 7 files changed, 21 deletions(-) diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index a110dc563c2a..4e053c1c2433 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -1166,7 +1166,6 @@ rum_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_frame_min *wh; struct ieee80211_node *ni; - struct epoch_tracker et; struct mbuf *m = NULL; struct usb_page_cache *pc; uint32_t flags; @@ -1285,7 +1284,6 @@ tr_setup: else ni = NULL; - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, rssi, RT2573_NOISE_FLOOR); @@ -1293,7 +1291,6 @@ tr_setup: } else (void) ieee80211_input_all(ic, m, rssi, RT2573_NOISE_FLOOR); - NET_EPOCH_EXIT(et); } RUM_LOCK(sc); rum_start(sc); diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c index 2503881597cb..e2ea78f78b13 100644 --- a/sys/dev/usb/wlan/if_run.c +++ b/sys/dev/usb/wlan/if_run.c @@ -2870,7 +2870,6 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen) struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_frame *wh; struct ieee80211_node *ni; - struct epoch_tracker et; struct rt2870_rxd *rxd; struct rt2860_rxwi *rxwi; uint32_t flags; @@ -2993,14 +2992,12 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen) } } - NET_EPOCH_ENTER(et); if (ni != NULL) { (void)ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); } else { (void)ieee80211_input_all(ic, m, rssi, nf); } - NET_EPOCH_EXIT(et); return; diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index 04190821d9b9..e78003bc250a 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -2703,7 +2703,6 @@ uath_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_frame *wh; struct ieee80211_node *ni; - struct epoch_tracker et; struct mbuf *m = NULL; struct uath_data *data; struct uath_rx_desc *desc = NULL; @@ -2750,7 +2749,6 @@ setup: ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); nf = -95; /* XXX */ - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, (int)be32toh(desc->rssi), nf); @@ -2759,7 +2757,6 @@ setup: } else (void) ieee80211_input_all(ic, m, (int)be32toh(desc->rssi), nf); - NET_EPOCH_EXIT(et); m = NULL; desc = NULL; } diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index 8be29b7cfcdf..55d231e2c655 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -2205,7 +2205,6 @@ upgt_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_frame *wh; struct ieee80211_node *ni; - struct epoch_tracker et; struct mbuf *m = NULL; struct upgt_data *data; int8_t nf; @@ -2243,14 +2242,12 @@ setup: ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); nf = -95; /* XXX */ - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, rssi, nf); /* node is no longer needed */ ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi, nf); - NET_EPOCH_EXIT(et); m = NULL; } UPGT_LOCK(sc); diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c index 7a9adb075199..1acae6d84b53 100644 --- a/sys/dev/usb/wlan/if_ural.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -846,7 +846,6 @@ ural_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) struct ural_softc *sc = usbd_xfer_softc(xfer); struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; - struct epoch_tracker et; struct mbuf *m = NULL; struct usb_page_cache *pc; uint32_t flags; @@ -927,13 +926,11 @@ tr_setup: if (m) { ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi, nf); - NET_EPOCH_EXIT(et); } RAL_LOCK(sc); ural_start(sc); diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c index 7a3ba4c97e5e..d08a3237e9b2 100644 --- a/sys/dev/usb/wlan/if_urtw.c +++ b/sys/dev/usb/wlan/if_urtw.c @@ -4040,7 +4040,6 @@ urtw_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) struct urtw_softc *sc = usbd_xfer_softc(xfer); struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; - struct epoch_tracker et; struct mbuf *m = NULL; struct urtw_data *data; int8_t nf = -95; @@ -4084,14 +4083,12 @@ setup: } else ni = NULL; - NET_EPOCH_ENTER(et); if (ni != NULL) { (void) ieee80211_input(ni, m, rssi, nf); /* node is no longer needed */ ieee80211_free_node(ni); } else (void) ieee80211_input_all(ic, m, rssi, nf); - NET_EPOCH_EXIT(et); m = NULL; } URTW_LOCK(sc); diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 596cf63faef2..a4dc6b972c96 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -2219,7 +2219,6 @@ zyd_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) struct zyd_softc *sc = usbd_xfer_softc(xfer); struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; - struct epoch_tracker et; struct zyd_rx_desc desc; struct mbuf *m; struct usb_page_cache *pc; @@ -2275,7 +2274,6 @@ tr_setup: * "ieee80211_input" here, and not some lines up! */ ZYD_UNLOCK(sc); - NET_EPOCH_ENTER(et); for (i = 0; i < sc->sc_rx_count; i++) { rssi = sc->sc_rx_data[i].rssi; m = sc->sc_rx_data[i].m; @@ -2291,7 +2289,6 @@ tr_setup: } else (void)ieee80211_input_all(ic, m, rssi, nf); } - NET_EPOCH_EXIT(et); ZYD_LOCK(sc); zyd_start(sc); break; From nobody Fri Dec 1 00:56:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShF436wJlz5333t; Fri, 1 Dec 2023 00: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 4ShF435vxsz4Plr; Fri, 1 Dec 2023 00: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=1701392163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5dr+aRjBuiXCFPWdqfpw93MU/HpZY2ZE0UeGYaBgT4=; b=K/NZzoE4Nbd0kyMiOlx/zyNbHn94sqs05uP969An0aChbu26cZm3I8ijAgclR/1sa3mXoe +FZG+c+MC0pcVvQKbGEWkQ7iAu19hB2dG3h59+Xi6npviG8tvLmpwiNcczQuOBuYakJaD2 6GJ8C7Ge42cLCm286I7cwidP4ohmcFAZvoJRdwN3uksHh0dEE2JH+2bdcidlUsuJ8aO+mF AfxBJ5b36hSByNq6B5M+L3FZ3u2IOIg3pHw6EQUNFWj916dkuJ/MVkTn2JitGidD1RexpA 3fxpnRgVSAqeM4s7yurxFemK+kCQG0/hzCacIbjG5FTmme0tuvEW+gib9NDioA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5dr+aRjBuiXCFPWdqfpw93MU/HpZY2ZE0UeGYaBgT4=; b=Qe6dhjPCahA/eKHLK/nlX+9fFnpa2fAUdYTxDKZP8FGL+S5qK65VXXF9AjJuNv9MZqce+M 4fUVsh2vKSgCoTN3vD3TyfXhOIL/7ytfZq/Rey5klTJHpYTW0mkAVjimHmm2TpPhD+jlq/ hax8TCodJ+MMCw/GMq0sdKdO6NsWqDC4E11Gd36sci2A3uArfnJckhUAN+785uAPoPn0r5 mx4htez4JRwlUJGDrp/MNsONgNF+0ht/79vxbpi2igNSqn5md5xHw+YHoFxBqSFqM4Me+A wK3e0wOpdJ/zlYLOQG3AICmdwmArCQbPB8hv16TLircwd54y8bG2XEWfhNQ8kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701392163; a=rsa-sha256; cv=none; b=kfuaMX9u2wITRWwHKgu9XJLviut+96kjKiRvhp07XSyAklfULPibpodOXkGaWz/DZXqlXz 9bnGihX1Heif/pLwmMAIGhixp/nJdlxKBFCUgZyitvI48PkF1gFTQs4gAG1V3iZM8qbVzy jDs5DXAnlQ9PNgnCYpPnV8MMXqbzdVGkcnPhLxiPBb2fJh0OXcRUy9GLmNngqJxGNMj5R0 xYqEZRdVOH4kByiyVWh7JOVAudOXSA4EyuZu5h39wjfXqUYiP+KpbQ/a41E3YlPOL/O7sZ jZYNo+QSqtEaD4xbpru+0T4ohg4H5bRqjOLAexDlOqu7Qiww0xCvzlBIIE2q4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShF434z3Nz1BdT; Fri, 1 Dec 2023 00: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 3B10u3HA090611; Fri, 1 Dec 2023 00: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 3B10u3Eq090608; Fri, 1 Dec 2023 00:56:03 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:56:03 GMT Message-Id: <202312010056.3B10u3Eq090608@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: 75f298492a12 - main - Revert "Enter the network epoch in USB WiFi drivers when processing input" List-Id: Commit messages for the main 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: 75f298492a12d53df97c26963ec9f2dc0b052878 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=75f298492a12d53df97c26963ec9f2dc0b052878 commit 75f298492a12d53df97c26963ec9f2dc0b052878 Author: Bjoern A. Zeeb AuthorDate: 2023-11-03 21:31:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 00:48:54 +0000 Revert "Enter the network epoch in USB WiFi drivers when processing input" This reverts commit 17c328b6aebfa03cd1c2cbfbbc617e3b341bf1e4. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/dev/otus/if_otus.c | 3 --- sys/dev/rtwn/usb/rtwn_usb_rx.c | 3 --- sys/dev/usb/wlan/if_rsu.c | 3 --- 3 files changed, 9 deletions(-) diff --git a/sys/dev/otus/if_otus.c b/sys/dev/otus/if_otus.c index c27b982d2d6e..dbb913d83ae8 100644 --- a/sys/dev/otus/if_otus.c +++ b/sys/dev/otus/if_otus.c @@ -1802,7 +1802,6 @@ otus_rxeof(struct usb_xfer *xfer, struct otus_data *data, struct mbufq *rxq) static void otus_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) { - struct epoch_tracker et; struct otus_softc *sc = usbd_xfer_softc(xfer); struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_frame *wh; @@ -1853,7 +1852,6 @@ tr_setup: * callback and safe to unlock. */ OTUS_UNLOCK(sc); - NET_EPOCH_ENTER(et); while ((m = mbufq_dequeue(&scrx)) != NULL) { wh = mtod(m, struct ieee80211_frame *); ni = ieee80211_find_rxnode(ic, @@ -1866,7 +1864,6 @@ tr_setup: } else (void)ieee80211_input_mimo_all(ic, m); } - NET_EPOCH_EXIT(et); #ifdef IEEE80211_SUPPORT_SUPERG ieee80211_ff_age_all(ic, 100); #endif diff --git a/sys/dev/rtwn/usb/rtwn_usb_rx.c b/sys/dev/rtwn/usb/rtwn_usb_rx.c index 30921bdc2101..5db967ddcc18 100644 --- a/sys/dev/rtwn/usb/rtwn_usb_rx.c +++ b/sys/dev/rtwn/usb/rtwn_usb_rx.c @@ -361,7 +361,6 @@ rtwn_rx_frame(struct rtwn_softc *sc, struct mbuf *m) void rtwn_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) { - struct epoch_tracker et; struct rtwn_usb_softc *uc = usbd_xfer_softc(xfer); struct rtwn_softc *sc = &uc->uc_sc; struct ieee80211com *ic = &sc->sc_ic; @@ -404,7 +403,6 @@ tr_setup: m->m_pkthdr.PH_loc.ptr = rtwn_rx_frame(sc, m); m = m->m_nextpkt; } - NET_EPOCH_ENTER(et); RTWN_UNLOCK(sc); m = m0; while (m != NULL) { @@ -422,7 +420,6 @@ tr_setup: m = next; } RTWN_LOCK(sc); - NET_EPOCH_EXIT(et); break; default: /* needs it to the inactive queue due to a error. */ diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c index 7a1e85f652a2..e000d1fb5992 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -2553,7 +2553,6 @@ rsu_rxeof(struct usb_xfer *xfer, struct rsu_data *data) static void rsu_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) { - struct epoch_tracker et; struct rsu_softc *sc = usbd_xfer_softc(xfer); struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; @@ -2588,7 +2587,6 @@ tr_setup: * ieee80211_input() because here is at the end of a USB * callback and safe to unlock. */ - NET_EPOCH_ENTER(et); while (m != NULL) { next = m->m_next; m->m_next = NULL; @@ -2607,7 +2605,6 @@ tr_setup: RSU_LOCK(sc); m = next; } - NET_EPOCH_EXIT(et); break; default: /* needs it to the inactive queue due to a error. */ From nobody Fri Dec 1 00:56:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShF450Mlsz532wW; Fri, 1 Dec 2023 00:56: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 4ShF4472hZz4Q9H; Fri, 1 Dec 2023 00:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BDI7NaMDxcJ05fr9u5BGApsaTs/Hj17ParBIsKCm0i8=; b=hjSIT6IOCyVwrnum0tr0j/6dIrPdfqKZLKrnKZJ44Us9Kv7R+XxZ285QEo8LCPdbB4PhyJ ECwaDOoYEFEp3JuaHgNwm7GpzPLQeA+Lyu7p2Do0ktRMa+BYT9xqUQ3RAKtWmf92+23ahW jxPQWzIQ8s4JlwdyjhqNSWCajU5CSLSfFEp283kKnrhASJ5MZr/7GFCXrf0RCkb95Ejt0u gsVcgOiC6DtZSAf/8M9c9dNMtOeEmv3EqQqftX6klMGoKVIqWLXDiKr3CezDEkBPtfjVo7 eAE5Vs2o772Rfe2spyNO2QhdEbiJjot1Kmldx2kodWU63iyZU/grOZuu/pTINw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BDI7NaMDxcJ05fr9u5BGApsaTs/Hj17ParBIsKCm0i8=; b=S4s7BnRrn5LGcRqCauvARVxQBQE5MdphCzApaXeJND2zKuE6+g+OD3llyEuSTM33qXHhtr o8nnAyVeSlQ+d9IdUn79Th6uKLzHvk+k9InyxrV3gmd7zTQFRtC2xnaGRcmkO4w9BHuwev zv6BBaxKwToaRPSUw5AWLV83CbBN+Bc9zeOS64UOeO+REfevQwDcgsedc3JjUhBBdHA8GS KQNK58lTQ6w4IxqSGPpaxA2OM3Lrf5LxWd+8aFJvc7V9Hg9HCPyGYP572+LN2QLTXCIBtW j/Zp5okPU5APHWSDmvayc1kS4bNw2lS+88+Kp8+ubKoSzFesUgeScHuRDdr0tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701392165; a=rsa-sha256; cv=none; b=k/TPc4tu86mDo2YS1MNta0dv5tONEhL/iP/4mbF1lGaPKE5ujyeog3zktkK2EqkEy87KN0 SWmemP5pq9lwDZHCfvZReSXEqtna5WctCO4NT+X9GXPbuLjoqbe8YhA32YRfq/ksDw4DKB w5UejcydmJhvlyvyQpG/hc6AwfLKzNfCvdrIv17PfIdPcgeMnUwFrjHTiWZyDBHBO1Xy8C 9ZxjK64DNpRiG6nUSitLKFegfhmr6NfgNwsce2DCwOpS7gq4izqbfkedMbsvvIix3+6qij Qbgy5pBqhzdy267VNW25UQ0eBRR0AIV+EcgQQDdwSGekEavcJ4u0mnyoITkHrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShF445vP1z1BdV; Fri, 1 Dec 2023 00:56: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 3B10u43R090668; Fri, 1 Dec 2023 00:56:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10u4k9090665; Fri, 1 Dec 2023 00:56:04 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:56:04 GMT Message-Id: <202312010056.3B10u4k9090665@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: eb3821e6d92f - main - Revert "[ath] Attempt to fix epoch 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb3821e6d92fa45ece7ec08efde45e35be1bdc95 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=eb3821e6d92fa45ece7ec08efde45e35be1bdc95 commit eb3821e6d92fa45ece7ec08efde45e35be1bdc95 Author: Bjoern A. Zeeb AuthorDate: 2023-11-03 21:50:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 00:48:55 +0000 Revert "[ath] Attempt to fix epoch handling." This reverts commit af2441fbc7fa9e522e7f8697e5a181bdd4ff9e00. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/dev/ath/if_ath.c | 2 +- sys/dev/ath/if_ath_rx.c | 11 +---------- sys/dev/ath/if_ath_rx_edma.c | 4 ---- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 094517da5689..31bfa1108592 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -758,7 +758,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->sc_dev)); - TASK_INIT(&sc->sc_rxtask, 0, sc->sc_rx.recv_tasklet, sc); + NET_TASK_INIT(&sc->sc_rxtask, 0, sc->sc_rx.recv_tasklet, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_tsfoortask, 0, ath_tsfoor_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); diff --git a/sys/dev/ath/if_ath_rx.c b/sys/dev/ath/if_ath_rx.c index c0af0b59ccb5..cd22d9c683dc 100644 --- a/sys/dev/ath/if_ath_rx.c +++ b/sys/dev/ath/if_ath_rx.c @@ -667,8 +667,6 @@ ath_rx_pkt(struct ath_softc *sc, struct ath_rx_status *rs, HAL_STATUS status, int is_good = 0; struct ath_rx_edma *re = &sc->sc_rxedma[qtype]; - NET_EPOCH_ASSERT(); - /* * Calculate the correct 64 bit TSF given * the TSF64 register value and rs_tstamp. @@ -1090,8 +1088,6 @@ ath_rx_proc(struct ath_softc *sc, int resched) int kickpcu = 0; int ret; - NET_EPOCH_ASSERT(); - /* XXX we must not hold the ATH_LOCK here */ ATH_UNLOCK_ASSERT(sc); ATH_PCU_UNLOCK_ASSERT(sc); @@ -1311,7 +1307,6 @@ static void ath_legacy_rx_tasklet(void *arg, int npending) { struct ath_softc *sc = arg; - struct epoch_tracker et; ATH_KTR(sc, ATH_KTR_RXPROC, 1, "ath_rx_proc: pending=%d", npending); DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s: pending %u\n", __func__, npending); @@ -1324,18 +1319,14 @@ ath_legacy_rx_tasklet(void *arg, int npending) } ATH_PCU_UNLOCK(sc); - NET_EPOCH_ENTER(et); ath_rx_proc(sc, 1); - NET_EPOCH_EXIT(et); } static void ath_legacy_flushrecv(struct ath_softc *sc) { - struct epoch_tracker et; - NET_EPOCH_ENTER(et); + ath_rx_proc(sc, 0); - NET_EPOCH_EXIT(et); } static void diff --git a/sys/dev/ath/if_ath_rx_edma.c b/sys/dev/ath/if_ath_rx_edma.c index 6c722ca8275f..fb25fb77b062 100644 --- a/sys/dev/ath/if_ath_rx_edma.c +++ b/sys/dev/ath/if_ath_rx_edma.c @@ -555,7 +555,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype, int16_t nf; ath_bufhead rxlist; struct mbuf *m; - struct epoch_tracker et; TAILQ_INIT(&rxlist); @@ -572,8 +571,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype, TAILQ_CONCAT(&rxlist, &sc->sc_rx_rxlist[qtype], bf_list); ATH_RX_UNLOCK(sc); - NET_EPOCH_ENTER(et); - /* Handle the completed descriptors */ /* * XXX is this SAFE call needed? The ath_buf entries @@ -597,7 +594,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype, if (ngood) { sc->sc_lastrx = tsf; } - NET_EPOCH_EXIT(et); ATH_KTR(sc, ATH_KTR_INTERRUPTS, 1, "ath edma rx deferred proc: ngood=%d\n", From nobody Fri Dec 1 00:56:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShF461wHKz5333x; Fri, 1 Dec 2023 00:56: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 4ShF460sXPz4Q19; Fri, 1 Dec 2023 00:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fLiiKfQSWFCfs7zRbV+atwkm49IcYDIF1reR3DMHMlw=; b=y02iMZR3OdeogYn7ip1lfPkFTyBVX1ML+g1KdKx7kl2Ifr72zOFzHLZmHaR2L/ITOzo6pZ fnfY4edHwIgCSJL5k/MrxaUCiyqY/ErXCY0rGSyfFGhx/RxaIf7qewublAqBDY3zr9EBGA kzacOxKx9iqAzS2hvCsvXqhZcWhyz02Kmw+WHQzQa45EsvgpHZ0+PRL3oUGZa3WYTmz+bj nxg/k/VWuoaoRlXkXU/v3sjj0HCpYDP1xeR+ST43b4AiyPw9Kh06qD/DN7GuVbCTTyzEPw pUW0GHno4RVKRvh93Nb9RKEgdtAHbwguFWnKFL42H0edpqDdLWx9uuJrQT/NxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fLiiKfQSWFCfs7zRbV+atwkm49IcYDIF1reR3DMHMlw=; b=fzBCc37byCjNU+HYNPflyb0rfZwvELibdcdI4q8A+F8P1CuUAOH5d3QSGUZeRENYAdo5/N CwuVj46dmajO+ZtDadknLfVylAI15AQQZagGodPBoZwXWgGMpIZ3JTajETVTrHV9jih5RO Rmjyl5SYGn0QwNCTvuE+SpH5unIOGWe4xILUtGVB5a1raV+T0s0hwuKA1z0y47HkZ4fziX am41MmBKYzl+zTAEAHe42U1E/CxiRoTs5sDDyNhJotsfgFGjtB9k8z1fSx7d3jne5vXY5t 3ItEaY0q6JUS+8yYLkRIOGzjYV0U4vaSsduDtk0gq4vfrIzMa26hEslSQad7qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701392166; a=rsa-sha256; cv=none; b=JKXhrzQiiJGRKtyortYtHFOThthH2OzyymfVXfH7fjq909oGxaUrtXMEQBu9ri44VDArym KYEQJBQ+2kqbqucSyuNWuVGRjvcxvydn5qReta1TTJIY1It5CgQowuvPD8FzWhlUfVWltd Cw5EKw/3N6R9kMcfa2f7/V6C05v+qy7fUlUV7tFs2XVi5B8WBZ/94LC3F5F5LIjcIU0ONS lsh148yBkFRn0l1Kv9zD+7CSM1hMzc5QIZn2ayFN7wfHqy/SkvlAD7hXNxD9yehx+fMNuA XzQSOTX5S/HoKxqi6Y5MohtZSSQMDQkJ6uFviHfYUdcsVZe6QvEH+ntVi/QmvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShF456y2gz1C3K; Fri, 1 Dec 2023 00:56: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 3B10u5md090729; Fri, 1 Dec 2023 00:56:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10u5wZ090727; Fri, 1 Dec 2023 00:56:05 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:56:05 GMT Message-Id: <202312010056.3B10u5wZ090727@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: 82506f26c03a - main - ath: Revert "Use NET_TASK_INIT() and NET_GROUPTASK_INIT() for drivers that process" List-Id: Commit messages for the main 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: 82506f26c03aa312b91e01a797f31e061749a76d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=82506f26c03aa312b91e01a797f31e061749a76d commit 82506f26c03aa312b91e01a797f31e061749a76d Author: Bjoern A. Zeeb AuthorDate: 2023-11-03 21:52:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 00:48:55 +0000 ath: Revert "Use NET_TASK_INIT() and NET_GROUPTASK_INIT() for drivers that process" This reverts commit 6c3e93cb5a4aa4b8a2d8d4d326f2a7c34d3a4458 for sys/dev/ath/if_ath.c only. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/dev/ath/if_ath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 31bfa1108592..094517da5689 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -758,7 +758,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->sc_dev)); - NET_TASK_INIT(&sc->sc_rxtask, 0, sc->sc_rx.recv_tasklet, sc); + TASK_INIT(&sc->sc_rxtask, 0, sc->sc_rx.recv_tasklet, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_tsfoortask, 0, ath_tsfoor_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); From nobody Fri Dec 1 01:26:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShFl93K8Zz534Vt; Fri, 1 Dec 2023 01:26: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 4ShFl92d1Tz4V8j; Fri, 1 Dec 2023 01:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701393989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WjbdTRlyBV86ToXa7Ui4U9CsBYK4dARAodVK+iaSQ4A=; b=KnCy/h50kDBqkdlyD3QwX+uPSl/OfaqwGrbo89noh/5/NOoIOF6PmGyQCWCPV/mP4pG0UJ XAo/2i0Bjtzzc5ZXSjDBseJwoV4vw1XvALDJtGhi3kke0l5/I/E88yKhKPk0BhWrGTlXsB Flh7j88pNZyEo1EWkBrbgglnQ5ODFwjQNs72ZA1BVH57G2YBt4kvBLhHK47vCtMP7uMfFO fwxqNJdcMYuup4l37AFZyyr+urcCbU8L8Wl3yB29uVrOdUP+uoLz8YMbye2GQFL/m6WVKm IRD5l/ZzriyaZ2hdxKRXAXsaVlmTW5bHjcK2ZE2wkOs1YEfh3oO0mQir/eX85g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701393989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WjbdTRlyBV86ToXa7Ui4U9CsBYK4dARAodVK+iaSQ4A=; b=PIGUHcTvWKjWhWBQuJ+dymgavKQizq5uMzpuyaj5uGqJAMUECUFgEXAXqFd5v6UoRBsxhP kaql9vxJBBcNRu6Fskitg/z9kkdlu/VBIi4abFMcCUlG3XI/bc782UpfNe1yObqhSmqpuM xTPd4EQqg4Cys+QWYd7MWInedqs4T54BGp9R1DCgTJ26w6clakGTRK9ADOM1Hcw02A4w8T p//9GRZXchSpFjCfRWMNQfU7TVxDdxtQFSHOVWMdF3Tnu1ZsmF5BGSQUPIkK5AqFynq/X2 Lwtqj9yOzmNp2YxpmxLK0mtE8j5vvckuzU75NIV1tvMNJ+BdpnxECWKUT9YqpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701393989; a=rsa-sha256; cv=none; b=AaivTkeO19k/C9MZ1fGSdIPN0tSGN3OB/NKDs3mPQ/9dolYk6PjkcoZbUgbFAFcjUjUMgV 7zp6MGUZBuY3p+iWLf2p9cJUI28sZhIMG/rgdr1tC7/qgqfkdWKX+csQqxIDygymJlezh+ n1DAUzF+P+6T0iPXU6Yx8jU6lTryVMPPH1h81jltRLOM1TT93I8zhnFyJpIkudLJTgLwOQ oZhNHW5BOdJI0Zg0b0Sc6JzTRmnKe41khGb9HZ5Ju+LH15T3qAo1gbAi2JIMW/JiIhvc/1 nQVeIcwJxqMgCQkBbFjq3bMkitSgMaiUIPxebUFYTcxBgEg+UTA/995i7cvEtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShFl91Ztvz1Ctt; Fri, 1 Dec 2023 01:26: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 3B11QTZq041164; Fri, 1 Dec 2023 01:26:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B11QTNd041161; Fri, 1 Dec 2023 01:26:29 GMT (envelope-from git) Date: Fri, 1 Dec 2023 01:26:29 GMT Message-Id: <202312010126.3B11QTNd041161@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: d9c543b6b0ca - main - rtld: add a test for RTLD_DEEPBIND List-Id: Commit messages for the main 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: d9c543b6b0cabea6e6679d70b4e701018e7eab80 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d9c543b6b0cabea6e6679d70b4e701018e7eab80 commit d9c543b6b0cabea6e6679d70b4e701018e7eab80 Author: Kyle Evans AuthorDate: 2023-12-01 01:26:09 +0000 Commit: Kyle Evans CommitDate: 2023-12-01 01:26:09 +0000 rtld: add a test for RTLD_DEEPBIND This tests that with RTLD_DEEPBIND, symbols are looked up in all of the object's needed objects before the global object. PR: 275393 Reviewed by: kib Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42843 --- etc/mtree/BSD.tests.dist | 2 + libexec/rtld-elf/tests/Makefile | 5 +- libexec/rtld-elf/tests/Makefile.inc | 3 + libexec/rtld-elf/tests/libdeep/Makefile | 15 +++++ libexec/rtld-elf/tests/libdeep/libdeep.c | 28 ++++++++++ libexec/rtld-elf/tests/libval/Makefile | 10 ++++ libexec/rtld-elf/tests/libval/libval.c | 26 +++++++++ libexec/rtld-elf/tests/libval2/Makefile | 8 +++ libexec/rtld-elf/tests/rtld_deepbind/Makefile | 10 ++++ .../rtld-elf/tests/rtld_deepbind/rtld_deepbind.c | 65 ++++++++++++++++++++++ libexec/rtld-elf/tests/target/Makefile | 2 +- 11 files changed, 172 insertions(+), 2 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index bc3dcda60913..68320ec1229b 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -436,6 +436,8 @@ rc .. rtld-elf + rtld_deepbind + .. .. tftpd .. diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index 7eacfb899699..06e143a441a1 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -1,6 +1,9 @@ -SUBDIR+= libpythagoras target +SUBDIR+= libpythagoras libdeep libval libval2 target +TESTS_SUBDIRS+= rtld_deepbind +SUBDIR_DEPEND_libdeep= libval2 +SUBDIR_DEPEND_rtld_deepbind= libval SUBDIR_DEPEND_target= libpythagoras ATF_TESTS_C= ld_library_pathfds diff --git a/libexec/rtld-elf/tests/Makefile.inc b/libexec/rtld-elf/tests/Makefile.inc new file mode 100644 index 000000000000..dfba72a51ce7 --- /dev/null +++ b/libexec/rtld-elf/tests/Makefile.inc @@ -0,0 +1,3 @@ + +PACKAGE?= tests +TESTSDIR?= ${TESTSBASE}/libexec/rtld-elf diff --git a/libexec/rtld-elf/tests/libdeep/Makefile b/libexec/rtld-elf/tests/libdeep/Makefile new file mode 100644 index 000000000000..9324b6f25efe --- /dev/null +++ b/libexec/rtld-elf/tests/libdeep/Makefile @@ -0,0 +1,15 @@ + +SHLIB?= deep +SHLIB_MAJOR= 0 + +LIBDIR= ${TESTSBASE}/libexec/rtld-elf/rtld_deepbind +SHLIBDIR= ${TESTSBASE}/libexec/rtld-elf/rtld_deepbind + +SRCS= libdeep.c + +LIBVAL2= ${.OBJDIR}/../libval2 +LDFLAGS+= -L${LIBVAL2} -Wl,-rpath,'$$ORIGIN' +DPADD+= -lval2 +LDADD+= -lval2 + +.include diff --git a/libexec/rtld-elf/tests/libdeep/libdeep.c b/libexec/rtld-elf/tests/libdeep/libdeep.c new file mode 100644 index 000000000000..e570769300cf --- /dev/null +++ b/libexec/rtld-elf/tests/libdeep/libdeep.c @@ -0,0 +1,28 @@ +/*- + * + * Copyright (C) 2023 NetApp, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +#include + +int get_value(void); +int proxy_get_value(void); +void set_value(int); +void proxy_set_value(int); + +int +proxy_get_value(void) +{ + + return (get_value()); +} + +void +proxy_set_value(int val) +{ + + return (set_value(val)); +} diff --git a/libexec/rtld-elf/tests/libval/Makefile b/libexec/rtld-elf/tests/libval/Makefile new file mode 100644 index 000000000000..66728c01dc9b --- /dev/null +++ b/libexec/rtld-elf/tests/libval/Makefile @@ -0,0 +1,10 @@ + +SHLIB?= val +SHLIB_MAJOR= 0 + +LIBDIR= ${TESTSBASE}/libexec/rtld-elf/rtld_deepbind +SHLIBDIR= ${TESTSBASE}/libexec/rtld-elf/rtld_deepbind + +SRCS= libval.c + +.include diff --git a/libexec/rtld-elf/tests/libval/libval.c b/libexec/rtld-elf/tests/libval/libval.c new file mode 100644 index 000000000000..97c97a0310a7 --- /dev/null +++ b/libexec/rtld-elf/tests/libval/libval.c @@ -0,0 +1,26 @@ +/*- + * + * Copyright (C) 2023 NetApp, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +static int val; + +int get_value(void); +void set_value(int); + +int +get_value(void) +{ + + return (val); +} + +void +set_value(int nval) +{ + + val = nval; +} diff --git a/libexec/rtld-elf/tests/libval2/Makefile b/libexec/rtld-elf/tests/libval2/Makefile new file mode 100644 index 000000000000..2b5cf5342092 --- /dev/null +++ b/libexec/rtld-elf/tests/libval2/Makefile @@ -0,0 +1,8 @@ + +LIBVAL= ${.CURDIR}/../libval + +# Just rebuild libval +.PATH: ${LIBVAL:tA} +SHLIB?= val2 + +.include "${LIBVAL}/Makefile" diff --git a/libexec/rtld-elf/tests/rtld_deepbind/Makefile b/libexec/rtld-elf/tests/rtld_deepbind/Makefile new file mode 100644 index 000000000000..bcc55d945c7e --- /dev/null +++ b/libexec/rtld-elf/tests/rtld_deepbind/Makefile @@ -0,0 +1,10 @@ + +TESTSDIR?= ${TESTSBASE}/libexec/rtld-elf/rtld_deepbind +ATF_TESTS_C= rtld_deepbind + +LIBVAL= ${.OBJDIR}/../libval +LDFLAGS.rtld_deepbind+= -L${LIBVAL} -Wl,-rpath,'$$ORIGIN' +DPADD+= -lval +LDADD+= -lval + +.include diff --git a/libexec/rtld-elf/tests/rtld_deepbind/rtld_deepbind.c b/libexec/rtld-elf/tests/rtld_deepbind/rtld_deepbind.c new file mode 100644 index 000000000000..4fe3c185982a --- /dev/null +++ b/libexec/rtld-elf/tests/rtld_deepbind/rtld_deepbind.c @@ -0,0 +1,65 @@ +/*- + * + * Copyright (C) 2023 NetApp, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +#include + +#include + +int get_value(void); +void set_value(int); + +#define APP_VALUE 5 +#define LIB_VALUE 20 + +ATF_TC_WITHOUT_HEAD(deepbind_simple); +ATF_TC_BODY(deepbind_simple, tc) +{ + void *hdl; + void (*proxy_set_value)(int); + int (*proxy_get_value)(void); + int app_value, lib_value; + + set_value(APP_VALUE); + + /* + * libdeep has a dependency on libval2.so, which is a rebuild of + * libval.so that provides get_value() and set_value() for both us and + * the lib. The lib's get_value() and set_value() should bind to the + * versions in libval2 instead of libval with RTLD_DEEPBIND. + */ + hdl = dlopen("$ORIGIN/libdeep.so", RTLD_LAZY | RTLD_DEEPBIND); + ATF_REQUIRE(hdl != NULL); + + proxy_set_value = dlsym(hdl, "proxy_set_value"); + ATF_REQUIRE(proxy_set_value != NULL); + + proxy_get_value = dlsym(hdl, "proxy_get_value"); + ATF_REQUIRE(proxy_get_value != NULL); + + (*proxy_set_value)(LIB_VALUE); + + lib_value = (*proxy_get_value)(); + app_value = get_value(); + + /* + * In the initial implementation or if libdeep.so is *not* linked + * against its own libval2, then these both return the later set + * LIB_VALUE (20) as they bind to the symbol provided by libval and + * use its .bss val. + */ + ATF_REQUIRE_INTEQ(lib_value, LIB_VALUE); + ATF_REQUIRE_INTEQ(app_value, APP_VALUE); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, deepbind_simple); + + return atf_no_error(); +} diff --git a/libexec/rtld-elf/tests/target/Makefile b/libexec/rtld-elf/tests/target/Makefile index f63d8072ae3c..aa4875b6748d 100644 --- a/libexec/rtld-elf/tests/target/Makefile +++ b/libexec/rtld-elf/tests/target/Makefile @@ -2,7 +2,7 @@ .include PROG= target -BINDIR= ${TESTSBASE}/libexec/rtld-elf +BINDIR= ${TESTSDIR} WARNS?= 3 CFLAGS+= -I${.CURDIR}/../libpythagoras From nobody Fri Dec 1 01:33:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShFv514n5z534bp; Fri, 1 Dec 2023 01:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShFv50YnCz4Vml; Fri, 1 Dec 2023 01:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701394401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nt1vinS8wuKW3NAIObtCSOXXUF2iAN04mx9IAe2KaA4=; b=qRpTfqpT6Oh2oSpT3epbFLSqJxoIPZgfWFkXRBUD2B/l37bofXT+XPb5GzdNL6DXOY45V0 fY+j8I1n46/7MBXNQZ3yjZVSXoisA9NcknrWSl26AVfJ1c2JJZC95V3fjmKRctKlPR3YMQ brHfXAszj4xiaWYoUFArvQvjHtxGTgC5rvwVzkidcvglR/OFSPOaH5gIxfbpmh2mzaR6Z5 t9Fp23Duipgyn9xiVjB3+YEVj6ZPxjy4AuqhmHPrEfTRiU5PcwVuXXZLmJI1qKRM9/o2jo ei3wiAWdRaycyHV7cthIFOa1x6/tVMZ3ra1fFh8ehL91iuWBVVJbJYzkbv8PcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701394401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nt1vinS8wuKW3NAIObtCSOXXUF2iAN04mx9IAe2KaA4=; b=CLSS0tmGmn15Ew47a3RNmiUA1P98JV54lnOiLudt3ULPzOCcLadD8sRUedcXEePKTDJ9pB vxrVZvsE5OEpZW0pfTrch6+Gld9VFb6q6lf6FT2wz7se4q0fPsoKW6ew5BbbdJ0RN8LSLb y2sGryh37w0cGatSsQ8FHxBaMhVfSFu/lmDU/erk6D/6xv5QeEyoZQXXAtyuZtjIFG7wht tp/VBd52NTs/E+g9D2GC990Q4cpEoJVOcS+uK6ZzI5N4HvLV1VYtYonLTT9RzGiZkyXQPa m747PlbWKpZuwYeYbth+h6BYR/A4+sqEyaWCPCay0/V8o5Idw12a5QOYsOymKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701394401; a=rsa-sha256; cv=none; b=P3ErPv+Z64Dt7Q0OE131jhJ/jSkCMxgj6aE14A26sW3k7n6ynFSHNOYo6lTPAaOAT4v/TL dEIIv4v7DvJ5EB3Xax8cOWDBCrdWFK7Kds85J0nwe/W6tw59xyuE4lL9qXAiyrp/lxsexh +7tdhVS0kQfkucGHzG8z84es/MUjWdmBWDnc57kcwYTjcTMTDenvFUHGxmyBxcuKffNQNa GmoZNbeJuDbEYQSCy5C7gj8NA7pFIZjNCXU3Ye8rnIKQx8bEftpwmezxPkeMNfdiTmZIwZ y9ohif2XUZUekDdpEOeIwEO1AgQ0pd+LD9YQgA47Du3IF9WEODA3TdxYEFZdJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShFv46kDZz1Cxf; Fri, 1 Dec 2023 01:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B11XK4g057068; Fri, 1 Dec 2023 01:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B11XKAK057065; Fri, 1 Dec 2023 01:33:20 GMT (envelope-from git) Date: Fri, 1 Dec 2023 01:33:20 GMT Message-Id: <202312010133.3B11XKAK057065@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: 54521a6fe672 - main - cam: Remove prototype for cam_sim_alloc_dev List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: 54521a6fe672d1c3ff79951bba71e6e3827b4d55 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=54521a6fe672d1c3ff79951bba71e6e3827b4d55 commit 54521a6fe672d1c3ff79951bba71e6e3827b4d55 Author: Warner Losh AuthorDate: 2023-12-01 01:17:30 +0000 Commit: Warner Losh CommitDate: 2023-12-01 01:32:39 +0000 cam: Remove prototype for cam_sim_alloc_dev The implementation was removed in dcd5dea96509, but the prototype was not. Correct that oversight. Fixes: dcd5dea96509 Sponsored by: Netflix --- sys/cam/cam_sim.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h index 142409b918a4..d668b9b86c21 100644 --- a/sys/cam/cam_sim.h +++ b/sys/cam/cam_sim.h @@ -60,15 +60,6 @@ struct cam_sim * cam_sim_alloc(sim_action_func sim_action, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue); -struct cam_sim * cam_sim_alloc_dev(sim_action_func sim_action, - sim_poll_func sim_poll, - const char *sim_name, - void *softc, - device_t dev, - struct mtx *mtx, - int max_dev_transactions, - int max_tagged_dev_transactions, - struct cam_devq *queue); void cam_sim_free(struct cam_sim *sim, int free_devq); void cam_sim_hold(struct cam_sim *sim); void cam_sim_release(struct cam_sim *sim); From nobody Fri Dec 1 01:33:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShFv62TzTz534YT; Fri, 1 Dec 2023 01:33: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 4ShFv61cT8z4WL7; Fri, 1 Dec 2023 01:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701394402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZuEt56uCzjufUJZWKop/q/HtX1I/X86sOMo0DEhSuwM=; b=rH3SyACUBCTlu2N+pCnKBLVSinR5/nuEI1zRjKGZwXoaiMDepbtJmRwA+RGGIuy1bo5tzN Ay+ufZbrYH4N4NdcZp2XRGSYCnbBnWop4cRv5qqAf+WXNGMqrvQp6eH8pHlQPI6slgVnPf GvVFRzznbrwicaAZg9+O3wNqftL2XmaVdtpLnxCj/Ah4wthBvTxP5rEb7I+60X/4ZIfg6r kVyOcK9UL8GeYx8vWdp0ntBp9InYQmk4yCbDV12DyknNagPzPP7Sr3K/lGlVvd3AbVMFcf J336vK2ZqdolT+Eu4fP8WqQ4zVwY4FAKCrSpMw/ADH6+DLXt2FlEUaAVwc9pgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701394402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZuEt56uCzjufUJZWKop/q/HtX1I/X86sOMo0DEhSuwM=; b=XLmskdVvxKrIwbb6qBwwtwakw9HrHC/rVmqNg2576o04HQHnZXvq05JWz6Muho0merge4l iLdID8jVoUYlh9eC/TSYBrU932xVlOfyKTFra6E1/A+uLN8l+e+PyuZMjOTVVHFUjoKsCl Y88K0OqAhno4vSjYeLTaFiaeSpNIE01iVf8z5ldNF+qBXBMgv7um8wDfnYh64ZCf2c7IQL MwB/cv5OPY5Som4XUotK/c/pTIpys0y1rRNEVOfa9JK2tYdf0+Q0MaODHoKkuaItAmhiyL uQFaxx6qi0uWNSsh/1BdNMqUCzff+h0241ASiKn2N+B9/ZDNgS8mLU5vnE4AUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701394402; a=rsa-sha256; cv=none; b=yUSZSjCtus+FmypDprllthEUL67RUd66B1HDTm0EfiuDOn402LEFOOznIGMbkitMbRVb9f wqIcyxuk3UkKOQfGAaAoAlma+53HkROxEBbKFbSzhCcG4klIr5D99HIKPkoW1JG9LVI71O qO8ZlQmhtK0j9lhQTz2lzWkNJPoxQNNrXCuH7Hf+AGfST4SeE2RD2MbctoIvKDLIjSjeO9 AY6ceFLGnNHSpreM/2ZaT/ubFlD6yJC+81rUZVKXj2AvadQqkvZdQ0bD1TVp9nkB+e15FR NeOV12HB1FpkUvjCUBQysHf3ESKJshFjTwXQ7i9KPrZPyaAJwGjrSwmQ0FJSXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShFv60ZNHz1Cxg; Fri, 1 Dec 2023 01:33: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 3B11XL4Z057119; Fri, 1 Dec 2023 01:33:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B11XLue057116; Fri, 1 Dec 2023 01:33:21 GMT (envelope-from git) Date: Fri, 1 Dec 2023 01:33:21 GMT Message-Id: <202312010133.3B11XLue057116@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: 0f83811158e8 - main - cam: Make cam.h self-contained for userland List-Id: Commit messages for the main 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: 0f83811158e8bc0ac4a9ab5808abecfb2ad6c0e6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0f83811158e8bc0ac4a9ab5808abecfb2ad6c0e6 commit 0f83811158e8bc0ac4a9ab5808abecfb2ad6c0e6 Author: Warner Losh AuthorDate: 2023-12-01 01:18:59 +0000 Commit: Warner Losh CommitDate: 2023-12-01 01:32:39 +0000 cam: Make cam.h self-contained for userland We reference FILE * here, but don't include stdio.h. Do so (both of these are in !_KERNEL blocks). Sponsored by: Netflix --- sys/cam/cam.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/cam.h b/sys/cam/cam.h index 692f515aa1aa..963c9798ddbc 100644 --- a/sys/cam/cam.h +++ b/sys/cam/cam.h @@ -37,6 +37,7 @@ #ifndef _KERNEL #include +#include #endif typedef u_int path_id_t; From nobody Fri Dec 1 01:33:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShFvm14K2z5352v; Fri, 1 Dec 2023 01:33: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 4ShFvm0V6cz4WcC; Fri, 1 Dec 2023 01:33:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701394436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltbGgvs1mFoDF1XfRjf8ehXTTbHIa4X9VeSx2PUI1S8=; b=tU7kPIWZsothLTiKxoJLDPhDStpLtWqbKj3b/KgDgZjZbJl3LrmV3fl82TvpMH1TP7WKqx gKpEyqJz796eKyEwxV97+SdhHy8JLX7Pp0uRpkRV6SSQa3DhWhR1PCa89drWnVQjAMRryE C09628wF83qrb0rMwkTrVWghDlJDGuzxmugIH8nsf1yakjNULnM5VvZvQGs9jksQqGEnNm XpxbHyzbTj8gAnWUTsbKo2W1B6apVaW2Mmd1SLcL3Pzm5QyssliBstPHM1qwj/1gDbxbjM x+x2mydAIrcw3Q2v5sHoU+lynuGvihwEqyAqhS1NxggmbZkth1qD75WeZ4M8tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701394436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltbGgvs1mFoDF1XfRjf8ehXTTbHIa4X9VeSx2PUI1S8=; b=O7rPU/+ILmXYKC9HNceTMH3AXtte7iGaugdyt0lQVFXE/azhCqSNymmtk3HjyUAkoivLsk nVlZD9EZQXbNfMdSUNwAyb+BzC5OGHcJ1s3X+9b3TX5pgURYmoqaqNuRs9gekAUtBWGtS4 kIRMdx73yZd+W1ZvbULtY7XXRnidi+RrXXjo2h1wwIki0pFa3OsUmxMdn1P+/ay3062sA4 O8JEfRBp1Nd0R1UWb7k+Pi6yQ25/GrnSSwrPafNvVhOcu7UZJTzNrNfUg/PuWv/gA0kRiX yk85YwOkyuufI8uFLYLBl9esS6ifOsyXgv9jWWmqvlJ2bPa6n/bGbasIMDI2hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701394436; a=rsa-sha256; cv=none; b=auny8Zf7vswlP48XY8QOx8aMhy3F8KNl/uNNK3kZYnvN86FVblxPfCdbifowBMEuY8rPMA naQI70TU1hIyqi2xIq4mpgoHcXsWGY7aUjW14Wojl1NWnhHhNKmFXuzYUH09CCfq8Kz2Mc 5UV6tWoykvyOH81/PDD15HvwNNGALChdjRYbiF11hsBcC97z1wFVjY58AAX8FrXY9g4X90 xBd4IDYF0Mr0MCtuRq0hEKIbfIxqwebvQXltN3a08b9zfddOrPjcoS6MdNJeaMwQGohoIS rhvXYV36LE6IfRCXTePksCjyFxI9UST5skVhop96d+5AlSkwB4ZCLzdMeGTj+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 4ShFvl6gR5z1CSk; Fri, 1 Dec 2023 01:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B11XtIw057329; Fri, 1 Dec 2023 01:33:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B11XtOU057326; Fri, 1 Dec 2023 01:33:55 GMT (envelope-from git) Date: Fri, 1 Dec 2023 01:33:55 GMT Message-Id: <202312010133.3B11XtOU057326@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: 682b069c5c56 - main - iicbus: add compat32 support for I2C ioctls List-Id: Commit messages for the main 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: 682b069c5c5643d26199cc1b65717f99c98bce9d Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=682b069c5c5643d26199cc1b65717f99c98bce9d commit 682b069c5c5643d26199cc1b65717f99c98bce9d Author: Stephen J. Kiernan AuthorDate: 2023-11-29 19:20:45 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-12-01 01:33:46 +0000 iicbus: add compat32 support for I2C ioctls Some of the I2C ioctl request structures contain pointers and need to handle requests from 32-bit applications on 64-bit kernels. Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D42836 --- sys/dev/iicbus/iic.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 108 insertions(+), 3 deletions(-) diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c index baaa7a096a14..8c9dbb6bc145 100644 --- a/sys/dev/iicbus/iic.c +++ b/sys/dev/iicbus/iic.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 2001 Nicolas Souchu + * Copyright (c) 2023 Juniper Networks, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,6 +28,7 @@ * */ #include +#include #include #include #include @@ -57,6 +59,30 @@ struct iic_cdevpriv { uint8_t addr; }; +#ifdef COMPAT_FREEBSD32 +struct iic_msg32 { + uint16_t slave; + uint16_t flags; + uint16_t len; + uint32_t buf; +}; + +struct iiccmd32 { + u_char slave; + uint32_t count; + uint32_t last; + uint32_t buf; +}; + +struct iic_rdwr_data32 { + uint32_t msgs; + uint32_t nmsgs; +}; + +#define I2CWRITE32 _IOW('i', 4, struct iiccmd32) +#define I2CREAD32 _IOW('i', 5, struct iiccmd32) +#define I2CRDWR32 _IOW('i', 6, struct iic_rdwr_data32) +#endif #define IIC_LOCK(cdp) sx_xlock(&(cdp)->lock) #define IIC_UNLOCK(cdp) sx_xunlock(&(cdp)->lock) @@ -70,7 +96,7 @@ static void iic_identify(driver_t *driver, device_t parent); static void iicdtor(void *data); static int iicuio_move(struct iic_cdevpriv *priv, struct uio *uio, int last); static int iicuio(struct cdev *dev, struct uio *uio, int ioflag); -static int iicrdwr(struct iic_cdevpriv *priv, struct iic_rdwr_data *d, int flags); +static int iicrdwr(struct iic_cdevpriv *priv, struct iic_rdwr_data *d, int flags, bool compat32); static device_method_t iic_methods[] = { /* device interface */ @@ -285,9 +311,36 @@ iicuio(struct cdev *dev, struct uio *uio, int ioflag) return (error); } +#ifdef COMPAT_FREEBSD32 +static int +iic_copyinmsgs32(struct iic_rdwr_data *d, struct iic_msg *buf) +{ + struct iic_msg32 msg32; + struct iic_msg32 *m32; + int error, i; + + m32 = (struct iic_msg32 *)d->msgs; + for (i = 0; i < d->nmsgs; i++) { + error = copyin(&m32[i], &msg32, sizeof(msg32)); + if (error != 0) + return (error); + CP(msg32, buf[i], slave); + CP(msg32, buf[i], flags); + CP(msg32, buf[i], len); + PTRIN_CP(msg32, buf[i], buf); + } + return (0); +} +#endif + static int -iicrdwr(struct iic_cdevpriv *priv, struct iic_rdwr_data *d, int flags) +iicrdwr(struct iic_cdevpriv *priv, struct iic_rdwr_data *d, int flags, + bool compat32 __unused) { +#ifdef COMPAT_FREEBSD32 + struct iic_rdwr_data dswab; + struct iic_rdwr_data32 *d32; +#endif struct iic_msg *buf, *m; void **usrbufs; device_t iicdev, parent; @@ -297,12 +350,25 @@ iicrdwr(struct iic_cdevpriv *priv, struct iic_rdwr_data *d, int flags) iicdev = priv->sc->sc_dev; parent = device_get_parent(iicdev); error = 0; +#ifdef COMPAT_FREEBSD32 + if (compat32) { + d32 = (struct iic_rdwr_data32 *)d; + PTRIN_CP(*d32, dswab, msgs); + CP(*d32, dswab, nmsgs); + d = &dswab; + } +#endif if (d->nmsgs > IIC_RDRW_MAX_MSGS) return (EINVAL); buf = malloc(sizeof(*d->msgs) * d->nmsgs, M_IIC, M_WAITOK); +#ifdef COMPAT_FREEBSD32 + if (compat32) + error = iic_copyinmsgs32(d, buf); + else +#endif error = copyin(d->msgs, buf, sizeof(*d->msgs) * d->nmsgs); if (error != 0) { free(buf, M_IIC); @@ -355,14 +421,24 @@ iicrdwr(struct iic_cdevpriv *priv, struct iic_rdwr_data *d, int flags) static int iicioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { +#ifdef COMPAT_FREEBSD32 + struct iiccmd iicswab; +#endif device_t parent, iicdev; struct iiccmd *s; +#ifdef COMPAT_FREEBSD32 + struct iiccmd32 *s32; +#endif struct uio ubuf; struct iovec uvec; struct iic_cdevpriv *priv; int error; + bool compat32; s = (struct iiccmd *)data; +#ifdef COMPAT_FREEBSD32 + s32 = (struct iiccmd32 *)data; +#endif error = devfs_get_cdevpriv((void**)&priv); if (error != 0) return (error); @@ -373,6 +449,20 @@ iicioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t parent = device_get_parent(iicdev); IIC_LOCK(priv); +#ifdef COMPAT_FREEBSD32 + switch (cmd) { + case I2CWRITE32: + case I2CREAD32: + CP(*s32, iicswab, slave); + CP(*s32, iicswab, count); + CP(*s32, iicswab, last); + PTRIN_CP(*s32, iicswab, buf); + s = &iicswab; + break; + default: + break; + } +#endif switch (cmd) { case I2CSTART: @@ -428,6 +518,9 @@ iicioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t break; case I2CWRITE: +#ifdef COMPAT_FREEBSD32 + case I2CWRITE32: +#endif if (!priv->started) { error = EINVAL; break; @@ -445,6 +538,9 @@ iicioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t break; case I2CREAD: +#ifdef COMPAT_FREEBSD32 + case I2CREAD32: +#endif if (!priv->started) { error = EINVAL; break; @@ -461,6 +557,9 @@ iicioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t error = iicuio_move(priv, &ubuf, s->last); break; +#ifdef COMPAT_FREEBSD32 + case I2CRDWR32: +#endif case I2CRDWR: /* * The rdwr list should be a self-contained set of @@ -471,7 +570,13 @@ iicioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t break; } - error = iicrdwr(priv, (struct iic_rdwr_data *)data, flags); +#ifdef COMPAT_FREEBSD32 + compat32 = (cmd == I2CRDWR32); +#else + compat32 = false; +#endif + error = iicrdwr(priv, (struct iic_rdwr_data *)data, flags, + compat32); break; From nobody Fri Dec 1 01:48:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShGDw4VlSz535Z9; Fri, 1 Dec 2023 01:48: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 4ShGDw3lmXz4Xd6; Fri, 1 Dec 2023 01:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701395328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFJ37nGX0FNYGHwOPJm3+cmIueKjO+UJ0sWs6EwqFbo=; b=mX09J3lzFuxqrVNaSL3344xNJ7lrnr5Pk8tiP26jw+FbcewM5faz54d6vgRAdlwaf8X1g7 lTrLR4Rd6DfRSowPjMgJrWDmkARMnZeEpiuJ5//bJeWc586kGjTEBCK6COiqtHMe5xdqLe F9LSoFAK2vuOWCMkE9eGDMbR81ReniJWfBjotBeMLBoplq9j0pOJ17tPcBZIU3BkjrI3Ic ONtnULBplPyzTohynEKd0sb6dzXAhY1AyvpUaDDKoQmK7GamS69UBSUkJcScfX/WKRhYES bvSITKQ4MXp7OeaHVSyKmNJJjoGhgrTbs+TEUwTkAjzpO3AuED+F+AB1cpau6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701395328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lFJ37nGX0FNYGHwOPJm3+cmIueKjO+UJ0sWs6EwqFbo=; b=CSPMRa9YwNXApVLyzGrYGaCsz8K4BJSrnICD/riU4suLHNpIFT8fddLKzcL7Cq+TMI/du7 MpWJMMckMkcEgFJy9RJcTr0abNBYtkOLJoND0e59iT2ekpR53dAaJK4taSC9EcR4tVFpmD 85wD2BBDyNwQWyUimyFgA9Sq4sz0bwZDdzbRMHtQrWjwo5kAyC9M/VScrKBcVPb+feSMVi txtGXPyibIqTGHxcOJdBPEuLouzcxjeoKy3M3exWw9uKg2bvj6W64Su2DNRY67kERMF0j3 vZiO/mZx0HwninDwrQJc7hXupeEmhcIYTfuynWyuddbwWlZndGnVpGctQIKk+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701395328; a=rsa-sha256; cv=none; b=bTbl69aUj8OR4YGFYQbqnFDkp/Oy+exh+RXZnE22aR3ygyGWHURNCedf26Io3PabwT42qJ huIf4WbR/VMItGlhJOQD0uUUrk28LOnVsn0tuNvWZH5jH2D9/RnfrOI/mhM150VBJ2ZH1T xllZKjBinYCyX0XkDL8r/HDRHLKy54WBjsZKKli7DxywFM45xU4bnSl8oJuqCsTLnunSr3 j5B8Hi0Hp8UaDX9ug4u0I3ZtOxN7ITs3a4gSuymPD4hbNiDQzOtawuXkfyxRK0N7VdNKS1 DPj6DzelvnPJbVH6py5lJbOJI00juvD+eVm6vkUJ9wanG9/tciJV+FNCOXbkcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShGDw2pXpz9Q; Fri, 1 Dec 2023 01:48: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 3B11mmRN074188; Fri, 1 Dec 2023 01:48:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B11mm99074185; Fri, 1 Dec 2023 01:48:48 GMT (envelope-from git) Date: Fri, 1 Dec 2023 01:48:48 GMT Message-Id: <202312010148.3B11mm99074185@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: 643d6dce6c1e - main - tools/net80211: add mlme_assoc List-Id: Commit messages for the main 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: 643d6dce6c1e39f067f8d0feea8615913b324891 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=643d6dce6c1e39f067f8d0feea8615913b324891 commit 643d6dce6c1e39f067f8d0feea8615913b324891 Author: Bjoern A. Zeeb AuthorDate: 2023-12-01 01:37:25 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 01:48:34 +0000 tools/net80211: add mlme_assoc mlme_assoc is a tool to trigger net80211::ieee80211_sta_join1() calls which in certain conditions cause problems to the LinuxKPI 802.11 compat code (but also believed to possibly cause problems in case of race to other firmware based drivers). This has proven to be a good reproducer for the problem even on setups which otherwise could run for days without hitting it. Sponsored by: The FreeBSD Foundation PR: 271979 --- tools/tools/net80211/mlme_assoc/Makefile | 7 + tools/tools/net80211/mlme_assoc/README | 51 +++++++ tools/tools/net80211/mlme_assoc/mlme_assoc.c | 200 +++++++++++++++++++++++++++ 3 files changed, 258 insertions(+) diff --git a/tools/tools/net80211/mlme_assoc/Makefile b/tools/tools/net80211/mlme_assoc/Makefile new file mode 100644 index 000000000000..580fb045ac52 --- /dev/null +++ b/tools/tools/net80211/mlme_assoc/Makefile @@ -0,0 +1,7 @@ +PROG= mlme_assoc +BINDIR= /usr/bin +MAN= + +SRCS= mlme_assoc.c + +.include diff --git a/tools/tools/net80211/mlme_assoc/README b/tools/tools/net80211/mlme_assoc/README new file mode 100644 index 000000000000..fc5e754a58d6 --- /dev/null +++ b/tools/tools/net80211/mlme_assoc/README @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 The FreeBSD Foundation +# +# This documentation was written by Björn Zeeb under sponsorship from +# the FreeBSD Foundation. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +This is a simple program to drive net80211::ieee80211_sta_join1() calls from +user space. + +The program optionally accepts an interface name (e.g., wlan42), or an +interface name, an SSID and a BSSID. + +In the former case of no SSID/BSSID passed it will query the scan results and +then try to join each entry from the scan with a short delay. + +In the lastter case giving the SSID/BSSID one can trigger the "canreassoc" case +in ieee80211_sta_join1() or not depending on whether one passes the currently +associated SSID/BSSID or not. + +The tool is useful to trigger net80211::newstate() changes while other +newstate() changes are pending or being executed. + +I was specifically developed to show a problem with the LinuxKPI 802.11 compat +code. The reason is that ieee80211_sta_join1() also calls in (*iv_update_bss)() +swapping nodes before initiating the state changes and in LinuxKPI state is on +the sta and not the vif causing all kinds of troubles, especially if we lose +a state transition before the taskq is run or if the iv_bss node gets swapped +before a task is executed. diff --git a/tools/tools/net80211/mlme_assoc/mlme_assoc.c b/tools/tools/net80211/mlme_assoc/mlme_assoc.c new file mode 100644 index 000000000000..c26aaa03fe87 --- /dev/null +++ b/tools/tools/net80211/mlme_assoc/mlme_assoc.c @@ -0,0 +1,200 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Björn Zeeb under sponsorship from + * the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * First get scan results in a hurry. + * Pick a random BSSID and try to assoc. + * Hopefully this is enough to trigger the newstate race along with the + * (*iv_update_bss)() logic. + * + * Alternatively pass IF SSID BSSID in and just try that. + */ + +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include +#include + +static int +if_up(int sd, const char *ifnam) +{ + struct ifreq ifr; + int error; + + memset(&ifr, 0, sizeof(ifr)); + strlcpy(ifr.ifr_name, ifnam, sizeof(ifr.ifr_name)); + + error = ioctl(sd, SIOCGIFFLAGS, &ifr); + if (error == -1) { + warn("SIOCGIFFLAGS"); + return (error); + } + + if (ifr.ifr_flags & IFF_UP) + return (0); + + ifr.ifr_flags |= IFF_UP; + + error = ioctl(sd, SIOCSIFFLAGS, &ifr); + if (error == -1) { + warn("SIOCSIFFLAGS"); + return (error); + } + + return (0); +} + +static int +try_mlme_assoc(int sd, const char *ifnam, uint8_t *ssid, uint8_t ssid_len, uint8_t *bssid) +{ + struct ieee80211req ireq; + struct ieee80211req_mlme mlme; + int error; + + memset(&mlme, 0, sizeof(mlme)); + mlme.im_op = IEEE80211_MLME_ASSOC; + if (ssid != NULL) + memcpy(mlme.im_ssid, ssid, ssid_len); + mlme.im_ssid_len = ssid_len; + if (bssid != NULL) + memcpy(mlme.im_macaddr, bssid, IEEE80211_ADDR_LEN); + + memset(&ireq, 0, sizeof(ireq)); + strlcpy(ireq.i_name, ifnam, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_MLME; + ireq.i_val = 0; + ireq.i_data = (void *)&mlme; + ireq.i_len = sizeof(mlme); + + error = ioctl(sd, SIOCS80211, &ireq); + if (error == -1) { + warn("SIOCS80211, %#x", ireq.i_type); + return (error); + } + + return (0); +} + +static int +mlme_assoc_scan_results(int sd, const char *ifnam) +{ + struct ieee80211req ireq; + struct ieee80211req_scan_result *sr; + uint8_t buf[32 * 1024], *p; + ssize_t len; + int error; + + memset(&ireq, 0, sizeof(ireq)); + strlcpy(ireq.i_name, ifnam, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_SCAN_RESULTS; + ireq.i_data = (void *)buf; + ireq.i_len = sizeof(buf); + + error = ioctl(sd, SIOCG80211, &ireq); + if (error == -1 || ireq.i_len < 0) { + warn("SIOCG80211, %#x", ireq.i_type); + return (error); + } + + p = buf; + len = ireq.i_len; + while (len > (ssize_t)sizeof(*sr)) { + sr = (struct ieee80211req_scan_result *)(void *)p; + p += sr->isr_len; + len -= sr->isr_len; + + error = try_mlme_assoc(sd, ifnam, (void *)(sr + 1), sr->isr_ssid_len, + sr->isr_bssid); + if (error != 0) { + warnx("try_mlme_assoc"); + return (error); + } + + usleep(100000); + } + + return (0); +} + +int +main(int argc, char *argv[]) +{ + const char *ifnam; + uint8_t *ssid, *bssid; + struct ether_addr ea; + int error, sd; + + ifnam = "wlan0"; + ssid = NULL; + bssid = NULL; + + if (argc == 4) { + ifnam = argv[1]; + ssid = (uint8_t *)argv[2]; + bssid = (uint8_t *)ether_aton_r(argv[3], &ea); + if (bssid == NULL) + warnx("ether_aton_r, ignoring BSSID"); + } else if (argc == 2) { + ifnam = argv[1]; + } + + sd = socket(AF_LOCAL, SOCK_DGRAM, 0); + if (sd == -1) + errx(EX_UNAVAILABLE, "socket"); + + error = if_up(sd, ifnam); + if (error != 0) + errx(EX_UNAVAILABLE, "if_up"); + + if (argc == 4) { + error = try_mlme_assoc(sd, ifnam, ssid, strlen((const char *)ssid), bssid); + if (error != 0) + errx(EX_UNAVAILABLE, "try_mlme_assoc"); + + } else { + error = mlme_assoc_scan_results(sd, ifnam); + if (error != 0) + errx(EX_UNAVAILABLE, "mlme_assoc_scan_results"); + } + + close(sd); + + return (0); +} From nobody Fri Dec 1 02:01:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShGWT4Gmcz536Fr for ; Fri, 1 Dec 2023 02:01:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShGWT2Rflz4Ytp for ; Fri, 1 Dec 2023 02:01:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-40b4746ae51so15273395e9.2 for ; Thu, 30 Nov 2023 18:01:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701396083; x=1702000883; 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=QKFd+Jxb0oXuHlwMiZtBLmOy7Uzh2MUg43CKQyVFyFU=; b=B3qIRFDI/T1bol6YzIvpqEZ3WZdPUpWC1bsg3kI224AZqCNeOEqxhkT3EyCP2xKUDc pUnhiuEccM18/qdrkO5hP0MtrQ3qXavLdxQcxFOjgjbS9ufqSdBKBzCOYpL5iXRQkAZ9 pt2weHxjot+iw5IKtGZi4q1If4JJnS5L6MC8ugkCBy8RHd02mnkKf1IGhjFhlQjSQy7+ 7b8UaZUPVITd4Bhh0QnOm99pce3fs9mSwZyWZDUCZ/EYx5G33LENAfrJUIcAHCu4giUX m1OTtRUAswTDiAux57HqmGqdmhi8+HLvvS2EGAhwUr9jMegInbQp7wKyOOIMP3S5tYgt Rn0w== X-Gm-Message-State: AOJu0YzJkvotuRRa4K3Y0G+/5w/nMNwGB9nb0AVZjF+PrXgpK3Q7yp4v Kn33QBZ/u8wTLNJf3Urhas8TNtRYbItXu9aLzl0= X-Google-Smtp-Source: AGHT+IEv4OR2T6WsXuENHWdjiqPi6UwI9IP30RTISwJEoxSXFGuNJQFx9TRiOK/8wMKNV4+G8V1dtw== X-Received: by 2002:a05:600c:b59:b0:40b:5e59:c55c with SMTP id k25-20020a05600c0b5900b0040b5e59c55cmr147555wmr.134.1701396083366; Thu, 30 Nov 2023 18:01:23 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id v9-20020a05600c470900b004063cd8105csm7404644wmo.22.2023.11.30.18.01.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2023 18:01:22 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main 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: 682b069c5c56 - main - iicbus: add compat32 support for I2C ioctls From: Jessica Clarke In-Reply-To: <202312010133.3B11XtOU057326@gitrepo.freebsd.org> Date: Fri, 1 Dec 2023 02:01:12 +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: <40E00B2E-E8C1-4980-896D-D9620E685108@freebsd.org> References: <202312010133.3B11XtOU057326@gitrepo.freebsd.org> To: "Stephen J. Kiernan" X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4ShGWT2Rflz4Ytp On 1 Dec 2023, at 01:33, Stephen J. Kiernan wrote: >=20 > The branch main has been updated by stevek: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D682b069c5c5643d26199cc1b65717f99= c98bce9d >=20 > commit 682b069c5c5643d26199cc1b65717f99c98bce9d > Author: Stephen J. Kiernan > AuthorDate: 2023-11-29 19:20:45 +0000 > Commit: Stephen J. Kiernan > CommitDate: 2023-12-01 01:33:46 +0000 >=20 > iicbus: add compat32 support for I2C ioctls >=20 > Some of the I2C ioctl request structures contain pointers and need = to > handle requests from 32-bit applications on 64-bit kernels. >=20 > Obtained from: Juniper Networks, Inc. > Differential Revision: https://reviews.freebsd.org/D42836 > --- > sys/dev/iicbus/iic.c | 111 = +++++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 108 insertions(+), 3 deletions(-) >=20 > diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c > index baaa7a096a14..8c9dbb6bc145 100644 > --- a/sys/dev/iicbus/iic.c > +++ b/sys/dev/iicbus/iic.c > @@ -2,6 +2,7 @@ > * SPDX-License-Identifier: BSD-2-Clause > * > * Copyright (c) 1998, 2001 Nicolas Souchu > + * Copyright (c) 2023 Juniper Networks, Inc. > * All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > @@ -27,6 +28,7 @@ > * > */ > #include > +#include > #include > #include > #include > @@ -57,6 +59,30 @@ struct iic_cdevpriv { > uint8_t addr; > }; >=20 > +#ifdef COMPAT_FREEBSD32 > +struct iic_msg32 { > + uint16_t slave; > + uint16_t flags; > + uint16_t len; > + uint32_t buf; > +}; > + > +struct iiccmd32 { > + u_char slave; > + uint32_t count; > + uint32_t last; > + uint32_t buf; > +}; > + > +struct iic_rdwr_data32 { > + uint32_t msgs; > + uint32_t nmsgs; > +}; > + > +#define I2CWRITE32 _IOW('i', 4, struct iiccmd32) > +#define I2CREAD32 _IOW('i', 5, struct iiccmd32) > +#define I2CRDWR32 _IOW('i', 6, struct iic_rdwr_data32) > +#endif Like I said for smbus, please use _IOC_NEWTYPE. Jess From nobody Fri Dec 1 05:50:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShMbj4Pf6z53Ksb; Fri, 1 Dec 2023 05:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ShMbj32Ndz3XqJ; Fri, 1 Dec 2023 05:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701409825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kRWTQiueqrMG5xeU3rqpcurSYRZi/RyIB5XGH4U13hM=; b=vwp/C3gu0hzw4//u+tqmA3lXYaz0K2I0Kafx1Aea+70zbimaaMo+zB4mej6RyIFXFtUxQa JO2yPsxLKt16ECZ7wgH8Wo2JpP4mX8ZfHFAaeNKCUXcHIvkeXNSaWXtzIQp/LJnLd2LRXV CKueyM69r/ekhje+eVVUspwG//UVgs4iS7SHVsjOOjxu12OdsM0+hP0O6VzAZSRdGCpWYC H/GlgHX3ZI+nwNVlYsGmlkPo8qz+TubBtciQULX0ELtkN1WCX4m5Rr1FWEUCjv70Z09cYn hj6GLT9GGmYzadRmje2lquDSJQssfrk0MoKySOZ6o9XKamda0vg2INP17Krchg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701409825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kRWTQiueqrMG5xeU3rqpcurSYRZi/RyIB5XGH4U13hM=; b=M3uV8OQxZC2vu9jcUE9PIPxRr2zohfg663Y1udo2TR3Kmjcg7goN+8NAT3fAwuuJri53t+ StezzYWHomjfSlKBz6xkTXGgMgQ4N+drxf2LggMnSPdO0BQ6pddKI7jwfnJBSKHlyFwIHf 66OvzQpRkqN0p7d+LKE5B9PejJqIj4tq4IHhraNxDzqXWy/PSfJhhBHygTCWpvQvSJrwFD pGsgZ1bdnZZ5lPksxJfKkMxZJeOGaUkCKCBzmzs12gd4B7qn6seIxRZDCUnnsKM244cm4a k7wN5juwp65ebTnofSjhToB9HGQRW4mKcRDYUGQ7KE/NAFp086rJxm9Esx9trw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701409825; a=rsa-sha256; cv=none; b=JTohFYnj8d8nNg5xR/r5PMX4cYriGp7YRVkkKb8+kyXj0XxDOdRYPORzZ2G/NU2j18pn4I /XrRsAzRWaC3RbuV2mAJCTX/YpvqTZs5Bmr5ZP2xo7vAuZM0bqWYy/urcwXI0OL36LSfBF 6Ct0LjFqV7B+pp3i1nXfrJRPu6iGSKd27MrpwIEt6sHrrTkgNUY/k3kAmzBY8KzWdnlh1G lVma1eTpMQ/0gVYlTuXKBIqJTF75gjaYPl+j4pXn80z650274/+5uYGCTtlp5iT1glkYat az7sQYQ/jVTyx62mjQxOPO5Eja3jAPS2w1nTrObpx5EjyvM3rJwIgCrqp8hAQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShMbj26y7z6W0; Fri, 1 Dec 2023 05:50: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 3B15oPYW084519; Fri, 1 Dec 2023 05:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B15oPfw084516; Fri, 1 Dec 2023 05:50:25 GMT (envelope-from git) Date: Fri, 1 Dec 2023 05:50:25 GMT Message-Id: <202312010550.3B15oPfw084516@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: cd996b848944 - main - ofed: garbage collect now unused sdp_sockaddr() List-Id: Commit messages for the main 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: cd996b848944ec0d5302fea3fbe36f253470fbcc Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cd996b848944ec0d5302fea3fbe36f253470fbcc commit cd996b848944ec0d5302fea3fbe36f253470fbcc Author: Gleb Smirnoff AuthorDate: 2023-12-01 05:50:16 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-01 05:50:16 +0000 ofed: garbage collect now unused sdp_sockaddr() Submitted by: zlei --- sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c index 8def3b37bf46..95048a1dc186 100644 --- a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c +++ b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c @@ -187,24 +187,6 @@ sdp_pcbfree(struct sdp_sock *ssk) uma_zfree(sdp_zone, ssk); } -/* - * Common routines to return a socket address. - */ -static struct sockaddr * -sdp_sockaddr(in_port_t port, struct in_addr *addr_p) -{ - struct sockaddr_in *sin; - - sin = malloc(sizeof *sin, M_SONAME, - M_WAITOK | M_ZERO); - sin->sin_family = AF_INET; - sin->sin_len = sizeof(*sin); - sin->sin_addr = *addr_p; - sin->sin_port = port; - - return (struct sockaddr *)sin; -} - static int sdp_getsockaddr(struct socket *so, struct sockaddr *sa) { From nobody Fri Dec 1 09:37:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShSfD4nMDz52LJM; Fri, 1 Dec 2023 09:37: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 4ShSfD4Hcnz4NmD; Fri, 1 Dec 2023 09:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701423476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m575VDWKfpi6ogFd1nCc5+rrvwkXzzlX080+hCgrmEM=; b=XfyN8Csge7OHqv7ikTKTO1SjSxTQgfUKobB7RtgF4lyr8BZFTq9pEDcPY3DSDMOUmLZNIe 2IEjpmLkXLn56cvY2bvDwraKftn0klUqsNMrSG1dRgM4HgQeFCvglJvnvvFIfzaxxMf29w 4BJF3bCGO9Q+zqfAKc11H1m9R8mvdGe6b0KT/NjvwtDAZWOlePsyfkH7a5IPGytRjVRk2y rOa8dsZ2s+FU+kXYezr1Jpz1RomA0oTBBAONhfFz1uCnZGkRw3LXgikeqeAjyvunGCBiEU e/s1vFSi57miv9cwIkA3jHQPGeJDBxDovRgKvgItPOV5bIs3yI4y2qRyzyHUAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701423476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m575VDWKfpi6ogFd1nCc5+rrvwkXzzlX080+hCgrmEM=; b=TVcMM0zUMpk+dPprGhPreVUkS5O8NbUd5mZtk1RTyv+TZe9QYB5Inx7fUB3In33hORI6Nm 78URbSTqOa0fSnUxmmo+ai5WT2vDs5E79QNp4ofwplJHzmzJ8aiU+g3sLVU9fLjoqUTkCz RVi31H8KYZjwm3wUEEf5FUAfeybUaetFQ+EP+krt5eIeF5pSzas3dAQEcTn0a9C4WfMJsY fA69bn+rk86NeHv4MZB7HPytY5y7mGE8joyjjTMNvpdbxiQ8zu9JV+wkIMgmJv4eNQ+/vM 70x6cm2MTKlCqKRXNRuRok9iD31KqvrV70VYptHnZVGzh5asaGL+EsvfUSsAyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701423476; a=rsa-sha256; cv=none; b=EBDetluCrkFmplmxoVN2uKKfQcD9xpUTbi85dajRWnpGV4X/M/4oIx7EhfeII32vwtHLBR VgZAOD/6JVuqGktSHL5ptQpC05L4U76qrEffj7CaSVf8WzNY94bl7vZBGyihgFR+VBZ4Ev b+dUj6xL0LeakkJK8yOSeNIW5yDgYHn9IqxZwlklLQagcF6RRb+e7Lvt1RiW0Rnw1U6YBO ukPkdN2zRtKHbxm601qdksI6l0QDeJSN4gj2ecxRkPiN7BvQYsW7tZLh0utTmA50TGGidU VUaGR8T0P9B6L5/huOrUa8ol6rRD8lYmSd76uV2ToqYaSNRmK/nSRU0TqX77eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShSfD3MGfzCqk; Fri, 1 Dec 2023 09:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B19bu7W060158; Fri, 1 Dec 2023 09:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B19bupU060155; Fri, 1 Dec 2023 09:37:56 GMT (envelope-from git) Date: Fri, 1 Dec 2023 09:37:56 GMT Message-Id: <202312010937.3B19bupU060155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 4b0615e585d8 - main - stress2: Handle a define with comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b0615e585d83d2a67b4501b5bf460582556925b Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=4b0615e585d83d2a67b4501b5bf460582556925b commit 4b0615e585d83d2a67b4501b5bf460582556925b Author: Peter Holm AuthorDate: 2023-12-01 09:37:13 +0000 Commit: Peter Holm CommitDate: 2023-12-01 09:37:13 +0000 stress2: Handle a define with comments --- tools/test/stress2/misc/nlink5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/nlink5.sh b/tools/test/stress2/misc/nlink5.sh index 4e7f2d9c827d..0738bc7548bf 100755 --- a/tools/test/stress2/misc/nlink5.sh +++ b/tools/test/stress2/misc/nlink5.sh @@ -35,7 +35,7 @@ UFS_LINK_MAX=`grep UFS_LINK_MAX /usr/include/ufs/ufs/dinode.h 2>/dev/null` [ -z "$UFS_LINK_MAX" ] && exit 0 -UFS_LINK_MAX=`echo $UFS_LINK_MAX | awk '{print $NF}'` +UFS_LINK_MAX=`echo $UFS_LINK_MAX | awk '{print $3}'` cat > /tmp/nlink5.c < #include From nobody Fri Dec 1 15:01:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShbqF3j5rz52jXN; Fri, 1 Dec 2023 15:01: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 4ShbqF3FPxz3NLp; Fri, 1 Dec 2023 15:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701442873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ASXPEyhQDCSCmk4TY2G4BreLENovB5p9ZzeFW7F32t0=; b=HE4erkswctQb8AoH/T/3dG27YPz4uaswggulDm6Der+a2Sjh0DRYw5J/YW3CeADfJ1zinx TUwts9Hqmw7SL7J/oixuQ1RJ6e70TaA4blGnprAmnF9R6RNq+kLWcOS3KGuOnu5sh9ZKIM 4qIzBwKD65mwc5qx6HRPBzAMfDXxxfu4BTniUd4JR3pxlKVpDLbol5vGuT9a0ABXPCk9Ng Usz3uQ3nBqmxR+OJxcRVGZkKnsW+3ggZcmkygRVh9jngtBHC7j8F5tKu1pPlf+qwLsDJw4 51i9xT70f5qaGjR+/WjAJUm5Kfba3dIA6co397Un7RBqNJ+VJRbxwzDABrB3tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701442873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ASXPEyhQDCSCmk4TY2G4BreLENovB5p9ZzeFW7F32t0=; b=FJvYR2w/3n1my9Nu0Ev2rhEBenW+gzXbxycbXksP6h++gf7LIOT0WaQxDKgdrnIHHWS9eD FVWBhgz6g+c9aA/n9Q8tu2bHU4TsDtZfPCrgU1FrBrvsPyaExuo+ijDKEbgLfPclGp9MjI 0L/vgSCeg3hPmGLn5pdc3WRLCnrR0oWGWQvxFDI772wHqU8JYmYPNM6ANkeGvG5uO/Ny8m ntED3HQ9t0jb+BeDWiR76OYqyoDX/K5+Uu0/SX2X33f5LcTIX3rB9bdrHvbYVtE9wfNWKj Z5hkJu1Iw/lILXf6S6W3Ao1mTLpjQG4Kef1x6XBwNyzR8H0P/tRkkNxKLa99pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701442873; a=rsa-sha256; cv=none; b=ZaKWEmEtwaaR4mmkymtai8DzhxH5naPfdBhCsAIs+kNOApkaT8K+FvutoMdjO4ZlJXM0+1 ooNK25D+/gizxGBBqzcZWtBH0I5naF9C2XgHHIGfwIj1gaWaPVwmmsKO29YH1px3pAzzkf fRsGVth7RxzB9xDlA31ZLhLb4c34E5q7r/oozusEMKjzilti+ehtfBg72vdmZ7Ex+o584q GJhmkrL4Xq+39tEg6qAN0E+WnkdgWLFkllkCy3f1kJoxdvKJDNnoiT6udnD2IeH8PB0jAC FYoZ7Aajt0XLWE70V6WcODzst5aG36j8rzZIuMYMhUE2XHVl4W+ch+gYETdK2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShbqF2KHhzdJ3; Fri, 1 Dec 2023 15:01: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 3B1F1DWi006135; Fri, 1 Dec 2023 15:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1F1DDF006132; Fri, 1 Dec 2023 15:01:13 GMT (envelope-from git) Date: Fri, 1 Dec 2023 15:01:13 GMT Message-Id: <202312011501.3B1F1DDF006132@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: 1cc96501e580 - main - bhyve: Fix a leak that happens when we fail to load a hostfwd 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cc96501e58057fba62cdebd514cdc9197d6e97c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc96501e58057fba62cdebd514cdc9197d6e97c commit 1cc96501e58057fba62cdebd514cdc9197d6e97c Author: Mark Johnston AuthorDate: 2023-12-01 14:46:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-01 14:46:31 +0000 bhyve: Fix a leak that happens when we fail to load a hostfwd rule Reported by: Coverity Fixes: c5359e2af5ab ("bhyve: Add a slirp network backend") --- usr.sbin/bhyve/net_backend_slirp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/net_backend_slirp.c b/usr.sbin/bhyve/net_backend_slirp.c index 1c414f87084c..1d6ed45b90f2 100644 --- a/usr.sbin/bhyve/net_backend_slirp.c +++ b/usr.sbin/bhyve/net_backend_slirp.c @@ -502,8 +502,10 @@ _slirp_init(struct net_backend *be, const char *devname __unused, goto err; while ((rule = strsep(&rules, ";")) != NULL) { error = config_one_hostfwd(priv, rule); - if (error != 0) + if (error != 0) { + free(tofree); goto err; + } } free(tofree); } From nobody Fri Dec 1 15:38:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shcf310kdz52kxW; Fri, 1 Dec 2023 15:38:19 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 4Shcf26FT2z3RbJ; Fri, 1 Dec 2023 15:38:18 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-67a959e3afaso4213906d6.2; Fri, 01 Dec 2023 07:38:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701445097; x=1702049897; darn=freebsd.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=fYtQvkjEIikXODMfWmhBi/kXFBpZXvCWmhmUfqP9TeE=; b=QvX4cgYs2nDqMErnPnfdcTj90JEaWPTGDFttPH7G/obr8SSHmhStm7N1JurfVn1r84 mXYani2Iiqj0v/QxRdXLTP+h5aYepr6EPuvMb2VrenYnZlwaeLT8hat4TRoarp/pZ6y6 6o8EHZHwjF+H0iVrqzo7u4sAmU7JVLTCe2tmkO/c3QslinjbFaA8fRKyxr8AA/OeX7T8 g+Tut5MNIq1YxoJ1fn1JkGY6ELb27du3mQOBvmlWBe7sBZKkJSQUFNPd/Ss2cZL+4Vnq 0uGoCJFRW05z2CizMlxq/J99P15Y2sF2aOapeSBQz5aYv80As7kbvjNobNOqdtsHDUDi ky9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701445097; x=1702049897; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fYtQvkjEIikXODMfWmhBi/kXFBpZXvCWmhmUfqP9TeE=; b=sUlKRs8HHycL7aKAIfthnwyQ8IDGMwN9pfWEFqLANsFjOx5y8GaUbb1w9ySJYn3vUJ ElPoWUF0lODmObGVXbpHF2nXl8W20i9t71pYKoDVbLsqIRIFPFS+9RmJ9NY45fKdw7Av DnRelS7mH7M0xZaZg5Ud+Xy3a9XzfmLHLHIHuymbfvTui+l3Ff6ONFKX7HypfxkP7Tsh 1sMvLbJ0aFeWnaNYidOUmM26obT5eJZk3i7Psxqc54wcJu+ia4iva+P3rngmT3HVE7st o2xMM8Wk/Ur4rl9lgS4k7RU9CdumaBu025WJEh9bausT9ntVjaVLXiJwCsRvyDwRdUMX qECQ== X-Gm-Message-State: AOJu0YwO6Buq4w/LcZo3LLH+hh7B2pxpuq6mEYShbFe/hal6zc05bwE7 kLNuGIAHzaTU7voD5/2K4sW+tLe0y7U= X-Google-Smtp-Source: AGHT+IFpVzhi3O8vPxwnT6Hexqpm4fljST3zcLRTUph8UNqP8xT55At5oEpQu7kSlmwXfl2AWnw/cg== X-Received: by 2002:a05:6214:400d:b0:67a:9562:4732 with SMTP id kd13-20020a056214400d00b0067a95624732mr2840861qvb.35.1701445095202; Fri, 01 Dec 2023 07:38:15 -0800 (PST) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d29-20020a0cb2dd000000b0067a2101afadsm1606144qvf.47.2023.12.01.07.38.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 07:38:14 -0800 (PST) Date: Fri, 1 Dec 2023 10:38:12 -0500 From: Mark Johnston To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 44f8e1e8530e - main - ossl: Add support for armv7 Message-ID: References: <202311301751.3AUHp6cv081842@gitrepo.freebsd.org> <13EF2B1A-05F0-4D45-A735-7573FC94A071@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: <13EF2B1A-05F0-4D45-A735-7573FC94A071@freebsd.org> X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Shcf26FT2z3RbJ On Thu, Nov 30, 2023 at 06:00:52PM +0000, Jessica Clarke wrote: > On 30 Nov 2023, at 17:51, Mark Johnston wrote: > > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=44f8e1e8530e1d2e95e84bbbe3d22ac9cb2557fe > > > > commit 44f8e1e8530e1d2e95e84bbbe3d22ac9cb2557fe > > Author: Mark Johnston > > AuthorDate: 2023-11-30 17:46:08 +0000 > > Commit: Mark Johnston > > CommitDate: 2023-11-30 17:49:47 +0000 > > > > ossl: Add support for armv7 > > > > OpenSSL provides implementations of several AES modes which use > > bitslicing and can be accelerated on CPUs which support the NEON > > extension. This patch adds arm platform support to ossl(4) and provides > > an AES-CBC implementation, though bsaes_cbc_encrypt() only implements > > decryption. The real goal is to provide an accelerated AES-GCM > > implementation; this will be added in a subsequent patch. > > > > Initially derived from https://reviews.freebsd.org/D37420. > > > > Reviewed by: jhb > > Sponsored by: Klara, Inc. > > Sponsored by: Stormshield > > MFC after: 3 months > > Differential Revision: https://reviews.freebsd.org/D41304 > > --- > > sys/conf/files.arm | 10 +++++ > > sys/crypto/openssl/arm/arm_arch.h | 84 ++++++++++++++++++++++++++++++++++ > > Upstream has just the one copy of this in an MI directory. Can we avoid > duplicating it in sys/crypto, whether by moving it into the MI > directory (since it has an MD name already so collisions aren’t an > issue) or having a shared MD directory between armv7 and aarch64? Yes, good point: https://reviews.freebsd.org/D42866 From nobody Fri Dec 1 16:00:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shd7g6RcJz52nHK; Fri, 1 Dec 2023 16: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 4Shd7g5xYsz3THv; Fri, 1 Dec 2023 16: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=1701446431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yrBDhJwb71NNlSJztrtcNpSbwEBOZAKYbzC3n5GFKVs=; b=JFEPxqWmKUeXPHdSX3mSDl+zCViTluKzyMPnk44YmwxEhTZTdE6RPjAxpoVCkhA85c1MUS U1lFE159KjKYojPCWq4LQ78unLkhnxgZWc5Tp7Yd2g+mUWoqa1NHwCHw/IzAT6XrDee7CT /am7rFeycAIGh9votgj4by3gQoigFxCyaRDvJbMC/nPWJWSs7LDDhCVhVeflbK5ne7CxMc 5+HNCLvUYvOZLawusso1ERJM8i+L5EdNuON3VrZCtclY6Kg4Izi5600cxgQG0CldKAwk+B D4mYx/blRoXsXUCC65wVM3AqeGEoT8y+Rq+tyYcQwpE6VbgjH6hTBA6dbVhUQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701446431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yrBDhJwb71NNlSJztrtcNpSbwEBOZAKYbzC3n5GFKVs=; b=mSJ9prw3ZtP4bgdk7JhLZlzaJpFP5V81ZHmCrlC87uLZbbh9phtztfaJzkvjpB3vaIppb2 kdB6P15KYrI95ANA566aTz4wntqvRIQNxSIKmz3rTIn3wZrS2iUX5tOl9bkW75R11XLV0R 4CTifdqIkMOqJovEkKsGYcZbF9fUmlX02t9kfbZLWx1Yu+ytan+Kr74mVIZt2Yms4ipIDU tMbQ5Wc84IinkA6CguOuvbqkZFnZbKxevRZ0DpX5HNefDRRAdvZcA+R0mhZiISiIWNRrXa F9BOoQDjdyrRbSFjIzwA8/mxu5V60hPzlfnLFbTOI5AI8/LWAWe/LAuo7Lr0VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701446431; a=rsa-sha256; cv=none; b=dwPZ8YzfB0zbaepQm7k3sjvzuOVrcWWmRctl/z7ZUjMChW1jR8dQSla2nuXqfxfNuH46UT YXT7gtogaAU6C0zrBWnscKpjrMhxS7V8736KNvjf+YTUlUhmzcdAU+acqY3o7aGzqfdyl7 pguXlnI/dhpjfwo10uncoLxUmWR2bg3/Kk73N559utsKlS3YiEBWy7Vx9Dc9CZaOdqcaYX Oa1/5/NJQCErgI17QYBTd8wFtVJHt+zksQLFIlg5rmIhEJCRWqH3mj+HHLNQwYpWarTNmt 1GUy02xZGFQA0dqNeTS4bOvW5SgJrIdQunbdtZfnAryFFnPjEg6GNX2UApLKqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shd7g5136zfj3; Fri, 1 Dec 2023 16: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 3B1G0V7s005453; Fri, 1 Dec 2023 16: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 3B1G0VWm005451; Fri, 1 Dec 2023 16:00:31 GMT (envelope-from git) Date: Fri, 1 Dec 2023 16:00:31 GMT Message-Id: <202312011600.3B1G0VWm005451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: c2ed7a63604f - main - sigaction.2: clarify that fork isn't async-signal-safe, but _Fork is List-Id: Commit messages for the main 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2ed7a63604fc86244adee2966e19f8aba2a07cb Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=c2ed7a63604fc86244adee2966e19f8aba2a07cb commit c2ed7a63604fc86244adee2966e19f8aba2a07cb Author: Alan Somers AuthorDate: 2023-12-01 15:19:24 +0000 Commit: Alan Somers CommitDate: 2023-12-01 15:59:36 +0000 sigaction.2: clarify that fork isn't async-signal-safe, but _Fork is [skip ci] MFC after: 2 weeks Sponsored by: Axcient Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42865 --- lib/libc/sys/sigaction.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2 index 7f1271b89dcd..9f49fb38245a 100644 --- a/lib/libc/sys/sigaction.2 +++ b/lib/libc/sys/sigaction.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 29, 2020 +.Dd December 1, 2023 .Dt SIGACTION 2 .Os .Sh NAME @@ -390,7 +390,7 @@ Base Interfaces: .Fn fchown , .Fn fchownat , .Fn fcntl , -.Fn fork , +.Fn _Fork , .Fn fstat , .Fn fstatat , .Fn fsync , From nobody Fri Dec 1 18:35:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShhZH6gPNz52wmX; Fri, 1 Dec 2023 18:35: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 4ShhZH65X3z4F0h; Fri, 1 Dec 2023 18:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701455719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tOPyuP7XybVthJNrhbrVFRBj2xAjewsf2Ugefi4VAyY=; b=SakBuYu95gfH5ufYsdQ72EYQS2LiU97eZQ5G/4/U0JBMtKbi6d8Jx61rH7BhSbQvaz8Zd4 qjnhqdANPnMrevSHewNPA1VJ5mGvvgoOMHjPLWDzgFBIMy4bNgGkWyUZ7u5xYhj7DQxsWi aV5D1Wcff6u7dtXG9P3ORjB3wnbPqJuZ2vHZe+XdMFEq19vc9MO8GT8tas8NDDaoCRbRKY GkdsMb3jqanr+nMor5ejiDis5IB4il+yxk1W2OxkZFafIiNVXo9HO1RKPmCbRSyKEtkLGT pqmmWxvll9BSiHflnyFfX6fHcOZ6Z5Vjv8ug51+tYFuiXJlb+cKECpSfyDnRxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701455719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tOPyuP7XybVthJNrhbrVFRBj2xAjewsf2Ugefi4VAyY=; b=cYy7J6uTYhjrItMmIyr7Ere01FsYs5scoAYawnbgjSH6V6W3yesslQZeA2nRZhGcoXFH26 e0GC1GmuzMpjtUWWDCgTvgrxdvKQu35fEpyhQn4qioTWLZYFki2ZTd/ivjh0YzNZhLzH2u sdXJsqMClnUogb5lcVLslos+WBKC/mcIl0323ykkLujKA1kL0QHgsRQrGHmLpbDtD1F0V8 XOFgkNIFZPtknSi1QQy0pOLysVlJ+aehOJwNNe1QNjK91UbO4D3Mi6La6QBjV/ZsSQIv/C qiwf4chCkzHqm39c1MEm57tGFFtLd9SvwQaTVsE3JA2RCEHAX7gqwzW0mhACzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701455719; a=rsa-sha256; cv=none; b=p4LQbyxXSOHO6jvBjP5YU7Q7q5R2g1sy2iaj40aBS73Qf9bzHuhBXRrNZUxu/dnOGje/04 cVycwmolv+eygqfQJ1JbPKGnRkIimHLMbk+4b4dql9YtMSSCLBbP57slrk7xerWHUg0SUy 0gKQEdYXcLKops03XVyxJncWw6ri/d+JrBg50aiOMpk7UYbFEZ058FJBFVGy1KgWQICN0T ISaM3rZxYI4GbncDNzFRXitcULZG9T9mfyJkHXFNLIdJcMHoDiTJvzQ9FJwRtFPf9Q7hRR dXjX7QB0o7GWICT/Ktj1JKsWOkdGPZ3fckJs7eddRM7ZOZqtfiaQKKvhWkQA4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShhZH56lVzkdy; Fri, 1 Dec 2023 18:35: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 3B1IZJNV063368; Fri, 1 Dec 2023 18:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1IZJLF063365; Fri, 1 Dec 2023 18:35:19 GMT (envelope-from git) Date: Fri, 1 Dec 2023 18:35:19 GMT Message-Id: <202312011835.3B1IZJLF063365@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: 4f12883c360d - main - arm64: Add register definitions for MDCR_EL2 List-Id: Commit messages for the main 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: 4f12883c360dbb03562f11713e711e3a3a330a0f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f12883c360dbb03562f11713e711e3a3a330a0f commit 4f12883c360dbb03562f11713e711e3a3a330a0f Author: Mark Johnston AuthorDate: 2023-12-01 18:28:58 +0000 Commit: Mark Johnston CommitDate: 2023-12-01 18:31:13 +0000 arm64: Add register definitions for MDCR_EL2 This is needed to support the bhyve gdb stub implementation on arm64. Reviewed by: andrew MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D42867 --- sys/arm64/include/hypervisor.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 109169601c83..589d6e9cbdbe 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -232,4 +232,22 @@ /* Assumed to be 0 by locore.S */ #define VTTBR_HOST 0x0000000000000000 +/* MDCR_EL2 - Hyp Debug Control Register */ +#define MDCR_EL2_HPMN_MASK 0x1f +#define MDCR_EL2_HPMN_SHIFT 0 +#define MDCR_EL2_TPMCR_SHIFT 5 +#define MDCR_EL2_TPMCR (0x1UL << MDCR_EL2_TPMCR_SHIFT) +#define MDCR_EL2_TPM_SHIFT 6 +#define MDCR_EL2_TPM (0x1UL << MDCR_EL2_TPM_SHIFT) +#define MDCR_EL2_HPME_SHIFT 7 +#define MDCR_EL2_HPME (0x1UL << MDCR_EL2_HPME_SHIFT) +#define MDCR_EL2_TDE_SHIFT 8 +#define MDCR_EL2_TDE (0x1UL << MDCR_EL2_TDE_SHIFT) +#define MDCR_EL2_TDA_SHIFT 9 +#define MDCR_EL2_TDA (0x1UL << MDCR_EL2_TDA_SHIFT) +#define MDCR_EL2_TDOSA_SHIFT 10 +#define MDCR_EL2_TDOSA (0x1UL << MDCR_EL2_TDOSA_SHIFT) +#define MDCR_EL2_TDRA_SHIFT 11 +#define MDCR_EL2_TDRA (0x1UL << MDCR_EL2_TDRA_SHIFT) + #endif /* !_MACHINE_HYPERVISOR_H_ */ From nobody Fri Dec 1 20:01:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShkTK1Lf0z532Gp; Fri, 1 Dec 2023 20:01: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 4ShkTK0tfPz4NKq; Fri, 1 Dec 2023 20:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701460869; h=from:from:reply-to:subject:subject: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/ilZ9bzeRd5osdzVrsTM7NvjwYGR3uceq41SuDOmqg=; b=AofISCo96VHT/FyFULsgCVvJYRjJnVcECKp7zI4KIGoYqIhaolCntqLkoBtiIkJ9/sMBFa Wp17FvyhIObViJoXiTQ/aQA9t5MJH5x3SXCxHhdIDQ1uzskx1RhQW9nDM3hMjtugiOsx5g UiwGNuNKE+/rFimAfFe6vmVZI1y8mYcROXpilVlQMHQKquX28X4MpdLgylR/iSkLrYqdIK JDJhbK5hC7WosXcluQLBbiih7aGJ2ui1tZ/vji17eQllOXk9VnigA6x4efNNWVVd+bVapl yGdHdXqwpJ0Jyc5kjlDiOyqAU5CurR4iHVn9t1Jjk3G/vtzEi7raR32xZc02jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701460869; h=from:from:reply-to:subject:subject: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/ilZ9bzeRd5osdzVrsTM7NvjwYGR3uceq41SuDOmqg=; b=iUrSnalwj27zzkfyUyGHSpSsXpFJmIjMphCRgftSQSnE8xCMmonxdQQocWz3WYmZYUQjGj 1SDywk62sYaJ4kqp1WJFgTlZJjxb55JD4lAG/xcLSnVTrOxYrX3LOvbMM5C8RdGqxA1bQx 4djDUDudqW3NUetTutC/cPUW/XQlF5tRxy6zppY5nW3N3MFMawPipWDFUP2WfbSOaYOwZ9 rFR1iZbPIHNI7/2hM20vWDIUOq/m+mfuqURG1Mf9H5AtyUVxkTcTkYOOTIHPUbYqYjerzG 6iHJIc0txF0YkATJSelbIegYfjCddV6eUNDioPLwEGOIvShyjVzeVyQJFotCJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701460869; a=rsa-sha256; cv=none; b=Hs/mHBvzEBkz/0JcqTuXqROU2IFyeByBu3oWTd3eCrNfBbAsGhND1q6vZeksjgcaYHpBSK NyHfbqTwiW3WuvCRfgUaXjUOt8zTmMQgmryldIQ8k6Xf6RiT1ODB8MMV79A2q+7EEoKmju jNKzZ1vbKBKmPkUSsU6UMDkU4Hf6MTMdCs6jVWy+vtgaWVu8w1LI3JPScprNZGQCVbt09j GqUigo+jw56gB1O+0Cvr0Ks2BTDhmC+Urj7PeFfnp128feQ4B/FYek7o2zMP5UD0Tm6KMr SMnHflAcOZlDVD8QoVeMifihgErMFYD56gTNPfRpy30teB6D17xoKnx9QRwLpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShkTJ73v3zn7g; Fri, 1 Dec 2023 20:01: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 3B1K18GN010279; Fri, 1 Dec 2023 20:01:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1K18fL010276; Fri, 1 Dec 2023 20:01:08 GMT (envelope-from git) Date: Fri, 1 Dec 2023 20:01:08 GMT Message-Id: <202312012001.3B1K18fL010276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: c1c8afd04e34 - main - makesyscalls: add COMPAT14 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1c8afd04e34d6b545719e1e3f8bf8dd11ee3949 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c1c8afd04e34d6b545719e1e3f8bf8dd11ee3949 commit c1c8afd04e34d6b545719e1e3f8bf8dd11ee3949 Author: Brooks Davis AuthorDate: 2023-12-01 20:00:39 +0000 Commit: Brooks Davis CommitDate: 2023-12-01 20:00:39 +0000 makesyscalls: add COMPAT14 support Reviewed by: kevans, imp Fixes: 84d12f887c91f Add a COMPAT_FREEBSD14 kernel option Differential Revision: https://reviews.freebsd.org/D42861 --- sys/tools/makesyscalls.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 8a56310f0068..393fe57713aa 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -227,6 +227,7 @@ local compat_option_sets = { { stdcompat = "FREEBSD11" }, { stdcompat = "FREEBSD12" }, { stdcompat = "FREEBSD13" }, + { stdcompat = "FREEBSD14" }, }, } From nobody Fri Dec 1 20:51:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShlbC3HZYz536sZ; Fri, 1 Dec 2023 20:51: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 4ShlbC2qNpz4TJr; Fri, 1 Dec 2023 20:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701463879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kGq9zEiSDYlXDOrp2EPNhw+6a1w52SA5zRfNqgVomUU=; b=V0iTyOl4DvZQtyP8+h5Y3iYQRd2COfG2BzNP8R9OomMGDX5shD7h5WAVhg8b87Q8+thoub u/1A5y+o1639yarfYauib2GfxwCpqB+p/e7H308d0o7MbVPK69ogmUzOnlA16k6P9kimxm jbCCc6rykdLmbBq4ty3zVszN/7dG+D8UPr7wwAnJvBFthNsWzQoBo7hy0KtTZlKuJBZwYf 9RZ6pKCdaAYf6fY3to+XF7DPmjYZXkYgV0qnNf1GLZd6IHIDN4uKU0Rslme4n0jJg4FzwR PCcSw1l8DCx2yogyT1tIFp3VVmk2fPxi0LpBWNJpkcMK+4oxCdHq3pGiVGLspQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701463879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kGq9zEiSDYlXDOrp2EPNhw+6a1w52SA5zRfNqgVomUU=; b=U6wpqIXqlz1/Yn3FaISyvbL2RxKE9jllAlBgkZVESuHijvsh5IMUG+zcnl5mAD9O5rBsYW UE5Kg504JjH7hxgrkmdBdOeaxZdYob3HufSXmiDO4sfhr8Gf6XD+F9XdNVM7OUG2rllVl0 yirgPkluE0HxEsFcYLMQwo2WMZMZh/Xjjrsf7EJBBhM03PUW0RraXf04IakVl1YLSbsXWt 0IRCBc8CZ+6xLwthYuITrFTqb06VRla1zlSE8jtTGblSzJqEkjafNkaDDvfMeXNs2UoW0U 3UvyzNrZKGiF6dp7NgFAlqoZIxpJDcNGE5wVgnFacsOmV+yAdAfhTMhAcNWuEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701463879; a=rsa-sha256; cv=none; b=JUj+b4BYXOFsCRIc1Op59qEiUIkbGtmgwyWbs4M6ZGe/jcNWGHYiDtfdTd5/2zCQgiHhsJ 0iK6jyRIJkIEtZ9UR5mY4TawwD9iFUKLpaee5Sg6W678uCYC9ufy/1umembVQ67CASqVO7 is9uJ9plQ32EJFykzeZuXKYBNXIprlLHk9rjbTETW1wKo6r5Fyxoz0u81HEwiAL4fXKWZW PQhaJDAImpOD8v2GLEeWPKU0nWxeIe7iVGsvngAbrDKCma/7GNIKBueVLDu+6aUsOQ4mq1 iOKTmMrcijXY5iiFtGPvAqWY5u/HoHn7k1vg+DIJP1/Jw5yLQvavQYbSj2u4+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 4ShlbC1tnFzpPd; Fri, 1 Dec 2023 20:51: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 3B1KpJRB093755; Fri, 1 Dec 2023 20:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1KpJdF093752; Fri, 1 Dec 2023 20:51:19 GMT (envelope-from git) Date: Fri, 1 Dec 2023 20:51:19 GMT Message-Id: <202312012051.3B1KpJdF093752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 957f014dc076 - main - sysvipc: Fix 32-bit compat on !i386 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 957f014dc076a7f74ed0c8c8699e6f39b55785e7 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=957f014dc076a7f74ed0c8c8699e6f39b55785e7 commit 957f014dc076a7f74ed0c8c8699e6f39b55785e7 Author: Brooks Davis AuthorDate: 2023-12-01 20:48:29 +0000 Commit: Brooks Davis CommitDate: 2023-12-01 20:48:49 +0000 sysvipc: Fix 32-bit compat on !i386 The various time fields are time_t's which are only 32-bit on i386. Fixing the old versions is probably of little use, but it's more correct and in theory there could be powerpc binaries from 6.x. PR: 240035 Fixes: fbb273bc05bef Properly support for FreeBSD 4 32bit System V shared memory. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42870 --- sys/compat/freebsd32/freebsd32_ipc.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_ipc.h b/sys/compat/freebsd32/freebsd32_ipc.h index e74f4659247f..4ff8af359428 100644 --- a/sys/compat/freebsd32/freebsd32_ipc.h +++ b/sys/compat/freebsd32/freebsd32_ipc.h @@ -43,8 +43,8 @@ struct semid_ds32 { struct ipc_perm32 sem_perm; uint32_t __sem_base; unsigned short sem_nsems; - int32_t sem_otime; - int32_t sem_ctime; + time32_t sem_otime; + time32_t sem_ctime; }; #ifdef _KERNEL @@ -73,9 +73,9 @@ struct msqid_ds32 { uint32_t msg_qbytes; pid_t msg_lspid; pid_t msg_lrpid; - int32_t msg_stime; - int32_t msg_rtime; - int32_t msg_ctime; + time32_t msg_stime; + time32_t msg_rtime; + time32_t msg_ctime; }; #ifdef _KERNEL @@ -95,9 +95,9 @@ struct shmid_ds32 { pid_t shm_lpid; pid_t shm_cpid; unsigned int shm_nattch; - int32_t shm_atime; - int32_t shm_dtime; - int32_t shm_ctime; + time32_t shm_atime; + time32_t shm_dtime; + time32_t shm_ctime; }; #ifdef _KERNEL @@ -142,9 +142,9 @@ struct semid_ds_old32 { struct ipc_perm_old32 sem_perm; uint32_t __sem_base; unsigned short sem_nsems; - int32_t sem_otime; + time32_t sem_otime; int32_t sem_pad1; - int32_t sem_ctime; + time32_t sem_ctime; int32_t sem_pad2; int32_t sem_pad3[4]; }; @@ -158,11 +158,11 @@ struct msqid_ds_old32 { uint32_t msg_qbytes; pid_t msg_lspid; pid_t msg_lrpid; - int32_t msg_stime; + time32_t msg_stime; int32_t msg_pad1; - int32_t msg_rtime; + time32_t msg_rtime; int32_t msg_pad2; - int32_t msg_ctime; + time32_t msg_ctime; int32_t msg_pad3; int32_t msg_pad4[4]; }; @@ -173,9 +173,9 @@ struct shmid_ds_old32 { pid_t shm_lpid; pid_t shm_cpid; int16_t shm_nattch; - int32_t shm_atime; - int32_t shm_dtime; - int32_t shm_ctime; + time32_t shm_atime; + time32_t shm_dtime; + time32_t shm_ctime; uint32_t shm_internal; }; From nobody Fri Dec 1 21:46:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shmpq5BL5z53JTk; Fri, 1 Dec 2023 21:46: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 4Shmpq4fjMz4dKw; Fri, 1 Dec 2023 21:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701467187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SCk2UPevgj4Rnm0tPMG1SNrsa5Ws58KH/HS+jtuTaDU=; b=Ggd+yyxJ6RAkenlXRs0/nwpVyPMdKj4p/Moh3uU49VcVyxB3Wb/vEAV9I22XGJaPF0RAB8 YUlIGdOyqJ8ybYYJNsdfR0ceiGowr5YcEAHGw6sMVRNCzypBHLhvkl1+rAuQCAVpPi27jb cm/7p1e/NI0z+Aobr39SWNCJ5ofHaDGJQwZgHSN7wP03zFP4O59cJhx0GSeHm5iHm7KKb+ GWCsk3m4eeKdz+oAP/b2LodPHpSBPq6CF5aeXd00mOnJAHZr9yaPEnYc5js4ucx2hDp9e7 Xk4SH3rUBb9vtm9u6ovDc2uIrsOovRvYk2w/omTlWXk9HixLWtOV62LZ/OA+OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701467187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SCk2UPevgj4Rnm0tPMG1SNrsa5Ws58KH/HS+jtuTaDU=; b=oAHtsl14dBO3Cz5FIHRBL8wkZ0ARSdvyW1YUc+0cjAOTICVNkmtpLUIAuFMnaqjCjbhYV9 xlJm1NRtWq5VS5uW7L/eDLN+WLap2DXxFzB3QCcTnB9EVgHcQhJgATOUxzM1FT5UUJRbT1 X/kkr0yXRmCNrFdZSM54L9rHIYCBHNExPE6jVM6eFywa85YXUHE6xpP7cvSNTYMBhTwyhZ BoQC9rAC1tIC73zygqqMbonxc37MWDAz8QSNWeiSTtKbiK1u7VghhiLrXH64zLsgYb0jFv AXjpbwGZs6Bs9ihqR4a7aCY8N+rb/I64dloqIOYEpNMoQzCKZPVtp5ZMg2fuNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701467187; a=rsa-sha256; cv=none; b=hKOzVdoocZqUMq2BfJXw/YSHC/EDqVpn6r9q6N6A4Y1O11YWeIzAzeTw8Q4qNpUBUH1vrO dU4E2ZKfA9oGwQ/t4ncCGrk54NoNBF2veRt6VIZywDaEkIP5Iqp75/1q8ktsFgPOEKl+MT M66UlWAK/gmkoBggNDBxy176LE/VKTBqnjFAdix57vPewmbHFiSB7Ra0dKoAOggFExEI8L zwBclv/XOA+wLtUNC4VdYtYbsCBeZkXsq4NAJ+6boCha4KEJYQhwIMMeuNm4UAK/purslt M6LdszyBGx/ldVlbQQ8Qiw6UEBCXYeYRIZGpWmfYkTmFbf6Ta7H7cNumya1zlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shmpq3jhJzqsy; Fri, 1 Dec 2023 21:46: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 3B1LkRdr082237; Fri, 1 Dec 2023 21:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1LkR2B082234; Fri, 1 Dec 2023 21:46:27 GMT (envelope-from git) Date: Fri, 1 Dec 2023 21:46:27 GMT Message-Id: <202312012146.3B1LkR2B082234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ab89c5f7121f - main - sysproto.h: regen after c1c8afd04e34d List-Id: Commit messages for the main 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab89c5f7121f30c18d272a3a918c411a95daf710 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ab89c5f7121f30c18d272a3a918c411a95daf710 commit ab89c5f7121f30c18d272a3a918c411a95daf710 Author: Brooks Davis AuthorDate: 2023-12-01 21:45:42 +0000 Commit: Brooks Davis CommitDate: 2023-12-01 21:45:42 +0000 sysproto.h: regen after c1c8afd04e34d --- sys/compat/freebsd32/freebsd32_proto.h | 6 ++++++ sys/sys/sysproto.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index 50448b6dce16..c2d3a700eb6d 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -1142,6 +1142,12 @@ int freebsd11_freebsd32_fstatat(struct thread *, struct freebsd11_freebsd32_fsta #endif /* COMPAT_FREEBSD13 */ + +#ifdef COMPAT_FREEBSD14 + + +#endif /* COMPAT_FREEBSD14 */ + #define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4 #define FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat AUE_GETFSSTAT #define FREEBSD32_SYS_AUE_ofreebsd32_lseek AUE_LSEEK diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index d0eb5a43d00b..374f5c7d6065 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -2767,6 +2767,12 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #endif /* COMPAT_FREEBSD13 */ + +#ifdef COMPAT_FREEBSD14 + + +#endif /* COMPAT_FREEBSD14 */ + #define SYS_AUE_exit AUE_EXIT #define SYS_AUE_fork AUE_FORK #define SYS_AUE_read AUE_READ From nobody Fri Dec 1 22:31:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShnqC01DCz50mtg; Fri, 1 Dec 2023 22:31: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 4ShnqB6ysNz4Hjm; Fri, 1 Dec 2023 22:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701469910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWcif3y2fvYLF7QSPrxKr7eUc0W1UVYJMho/onusqXQ=; b=MO3MmlFv0m2bWaZ/DPz3kInsMQ5rBUhhdGKR1gd4qarnvHo6101cr0TDVFO+H7yyIFwRCN zoBpRRckmZ5d/xOeJBTKDRsKhX3Sv4RGAj3OmcrrCT1ysLVuvYlHbVXZnow0ANwr/FA2rX 8yrmxTx7lGJl/PaE/h8DOdve6ETHmAFeXkYhzJW3MOmrOkz0yy8v6PtLDOaMsNgmbNNdwq ij+U1A6zndj6CUUTX7M5iaWH8lKUJccVT5ulZdB1MS+uup62HjeS+bLhtyxEM6UbzcRZqJ 7tneH5Z/H2jaWckvNticWBba3vAMppX7C5o5/r7kYhCnmlVpt4gxcJB6GGQJog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701469910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWcif3y2fvYLF7QSPrxKr7eUc0W1UVYJMho/onusqXQ=; b=sXyfK4mh+D/OMlwaIO+QyAnRBD1bffsDL0o1JeswTT1dX5SfnjvfJYEF+0W/wl+/DZYKBx fq0C6UbwwU4DJ50NOeLv/b1NJzRa0DMKsPPQ6aGB/zSMh87yHEORWvocrdwofQLwfjXSxC Ta1kKY/HpOwARU9BV3oIX1zdugohKuJ/15QD9Yub/qrUeXHZoz6auop7pS+4UgiOLNTfgJ 6o2tNJDraqlPRB510MBpP6W95wd9NJRp5Ja/kdV1qInA2pGsZvTFMzMQXlEpuf1UKtwa/p BWUX0FD/EEQWAAIMZxihoCATl4bzys1xzUWHJjzRhXuNleUQu2lZ5fuVc7iSbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701469910; a=rsa-sha256; cv=none; b=VAyaVOs3Y41R95dAFhwcDZoXQNEy1KaCYhR0P2Sy1gVENWCAR6peyOA8TG42vzpIUkJrce Cn9DGZ0fXTx4Skn4SSlS9OPKJEpUZv0zZ9o6Ye6PbkJf1B1UnfrXtlbyP9iGmSSMymV3IF +YyLrPx1UU9BgtvsQwXzAJvvdjC1hR2SvP8x4uX66NUxyg9VQxv9gGWwVTbxiNuRAKEJ/y 1DF/GC1E0qOAqc1Iv9SFJMxB8c9sNf377M1KRssfhXh04uBwM8c5VsK5DhxzI03jx4hkWN iqt6lMWJ7CVUnl81UWMrvg3H5KVtNs8brL9mwI5vknkPEziKhY1vORDzCfJu2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShnqB62c9zrym; Fri, 1 Dec 2023 22:31: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 3B1MVoCN089771; Fri, 1 Dec 2023 22:31:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1MVo89089768; Fri, 1 Dec 2023 22:31:50 GMT (envelope-from git) Date: Fri, 1 Dec 2023 22:31:50 GMT Message-Id: <202312012231.3B1MVo89089768@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: 9fb914634eff - main - LinuxKPI: 802.11: bring in some HT code List-Id: Commit messages for the main 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: 9fb914634eff85b3b36bcbf39c1faf2967b0aa9e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9fb914634eff85b3b36bcbf39c1faf2967b0aa9e commit 9fb914634eff85b3b36bcbf39c1faf2967b0aa9e Author: Bjoern A. Zeeb AuthorDate: 2023-10-26 21:14:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 22:26:28 +0000 LinuxKPI: 802.11: bring in some HT code Fix defines and structures to use proper types. Bring in basic ni->sta synchronization, some channel width handling, and overload the net80211 functions so that we can talk to driver/firmware to setup parameters. We will likely not need one or two of those but it is good for tracing currently. Cover HT and bits of VHT code in LinuxKPI behind apropriate #ifdef which are currently not enabled (like LKPI_80211_HW_CRYPTO) until confirmed to work. Last, IEEE80211_AMPDU_RX_START made some firmware unhappy. This will allow others to work on it and test as well. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- .../linuxkpi/common/include/linux/ieee80211.h | 3 +- sys/compat/linuxkpi/common/include/net/mac80211.h | 11 +- sys/compat/linuxkpi/common/src/linux_80211.c | 513 +++++++++++++++++++-- sys/compat/linuxkpi/common/src/linux_80211.h | 35 ++ .../linuxkpi/common/src/linux_80211_macops.c | 22 + 5 files changed, 550 insertions(+), 34 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 4648a12ec889..5c18bb9fe3d9 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -60,8 +60,7 @@ struct ieee80211_mmie_16 { #define IEEE80211_INVAL_HW_QUEUE ((uint8_t)-1) -#define IEEE80211_MAX_AMPDU_BUF 256 /* for HE? */ -#define IEEE80211_MAX_AMPDU_BUF_HT 64 +#define IEEE80211_MAX_AMPDU_BUF_HT IEEE80211_AGGR_BAWMAX #define IEEE80211_MAX_AMPDU_BUF_HE 256 #define IEEE80211_MAX_AMPDU_BUF_EHT 1024 diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 7e6fb1bce16e..fa36bd84ac6e 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -175,11 +175,13 @@ struct ieee80211_sta; #define IEEE80211_HT_AMPDU_PARM_DENSITY (0x7 << IEEE80211_HT_AMPDU_PARM_DENSITY_SHIFT) struct ieee80211_ampdu_params { - /* TODO FIXME */ struct ieee80211_sta *sta; - uint8_t tid; + enum ieee80211_ampdu_mlme_action action; + uint16_t buf_size; + uint16_t timeout; uint16_t ssn; - int action, amsdu, buf_size, timeout; + uint8_t tid; + bool amsdu; }; struct ieee80211_bar { @@ -452,7 +454,6 @@ struct ieee80211_hw { struct wiphy *wiphy; /* TODO FIXME */ - int max_rx_aggregation_subframes, max_tx_aggregation_subframes; int extra_tx_headroom, weight_multiplier; int max_rate_tries, max_rates, max_report_rates; struct ieee80211_cipher_scheme *cipher_schemes; @@ -472,6 +473,8 @@ struct ieee80211_hw { uint16_t offchannel_tx_hw_queue; uint16_t uapsd_max_sp_len; uint16_t uapsd_queues; + uint16_t max_rx_aggregation_subframes; + uint16_t max_tx_aggregation_subframes; uint16_t max_tx_fragments; uint16_t max_listen_interval; uint32_t extra_beacon_tailroom; diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 448f417d1224..5f7528e994b6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -61,6 +61,7 @@ #include #include #include +#include #define LINUXKPI_NET80211 #include @@ -70,6 +71,11 @@ #define LKPI_80211_WME /* #define LKPI_80211_HW_CRYPTO */ +/* #define LKPI_80211_VHT */ +/* #define LKPI_80211_HT */ +#if defined(LKPI_80211_VHT) && !defined(LKPI_80211_HT) +#define LKPI_80211_HT +#endif static MALLOC_DEFINE(M_LKPI80211, "lkpi80211", "LinuxKPI 80211 compat"); @@ -143,6 +149,79 @@ static void lkpi_ieee80211_free_skb_mbuf(void *); static int lkpi_wme_update(struct lkpi_hw *, struct ieee80211vap *, bool); #endif +#if defined(LKPI_80211_HT) +static void +lkpi_sta_sync_ht_from_ni(struct ieee80211_sta *sta, struct ieee80211_node *ni, int *ht_rx_nss) +{ + struct ieee80211vap *vap; + uint8_t *ie; + struct ieee80211_ht_cap *htcap; + int i, rx_nss; + + if ((ni->ni_flags & IEEE80211_NODE_HT) == 0) + return; + + if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && + IEEE80211_IS_CHAN_HT40(ni->ni_chan)) + sta->deflink.bandwidth = IEEE80211_STA_RX_BW_40; + + sta->deflink.ht_cap.ht_supported = true; + + /* htcap->ampdu_params_info */ + vap = ni->ni_vap; + sta->deflink.ht_cap.ampdu_density = _IEEE80211_MASKSHIFT(ni->ni_htparam, IEEE80211_HTCAP_MPDUDENSITY); + if (sta->deflink.ht_cap.ampdu_density > vap->iv_ampdu_density) + sta->deflink.ht_cap.ampdu_density = vap->iv_ampdu_density; + sta->deflink.ht_cap.ampdu_factor = _IEEE80211_MASKSHIFT(ni->ni_htparam, IEEE80211_HTCAP_MAXRXAMPDU); + if (sta->deflink.ht_cap.ampdu_factor > vap->iv_ampdu_rxmax) + sta->deflink.ht_cap.ampdu_factor = vap->iv_ampdu_rxmax; + + ie = ni->ni_ies.htcap_ie; + KASSERT(ie != NULL, ("%s: HT but no htcap_ie on ni %p\n", __func__, ni)); + if (ie[0] == IEEE80211_ELEMID_VENDOR) + ie += 4; + ie += 2; + htcap = (struct ieee80211_ht_cap *)ie; + sta->deflink.ht_cap.cap = htcap->cap_info; + sta->deflink.ht_cap.mcs = htcap->mcs; + + rx_nss = 0; + for (i = 0; i < nitems(htcap->mcs.rx_mask); i++) { + if (htcap->mcs.rx_mask[i]) + rx_nss++; + } + if (ht_rx_nss != NULL) + *ht_rx_nss = rx_nss; + + IMPROVE("sta->wme, sta->deflink.agg.max*"); +} +#endif + +#if defined(LKPI_80211_VHT) +static void +lkpi_sta_sync_vht_from_ni(struct ieee80211_sta *sta, struct ieee80211_node *ni, int *vht_rx_nss) +{ + + if ((ni->ni_flags & IEEE80211_NODE_VHT) == 0) + return; + + if (IEEE80211_IS_CHAN_VHT(ni->ni_chan)) { +#ifdef __notyet__ + if (IEEE80211_IS_CHAN_VHT80P80(ni->ni_chan)) { + sta->deflink.bandwidth = IEEE80211_STA_RX_BW_160; /* XXX? */ + } else +#endif + if (IEEE80211_IS_CHAN_VHT160(ni->ni_chan)) + sta->deflink.bandwidth = IEEE80211_STA_RX_BW_160; + else if (IEEE80211_IS_CHAN_VHT80(ni->ni_chan)) + sta->deflink.bandwidth = IEEE80211_STA_RX_BW_80; + } + + IMPROVE("VHT sync ni to sta"); + return; +} +#endif + static void lkpi_lsta_dump(struct lkpi_sta *lsta, struct ieee80211_node *ni, const char *_f, int _l) @@ -197,6 +276,8 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], struct ieee80211_vif *vif; struct ieee80211_sta *sta; int band, i, tid; + int ht_rx_nss; + int vht_rx_nss; lsta = malloc(sizeof(*lsta) + hw->sta_data_size, M_LKPI80211, M_NOWAIT | M_ZERO); @@ -266,9 +347,23 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], sta->deflink.supp_rates[band] |= BIT(i); } } + sta->deflink.smps_mode = IEEE80211_SMPS_OFF; - IMPROVE("ht, vht, he, ... bandwidth, smps_mode, .."); - /* bandwidth = IEEE80211_STA_RX_... */ + sta->deflink.bandwidth = IEEE80211_STA_RX_BW_20; + sta->deflink.rx_nss = 0; + + ht_rx_nss = 0; +#if defined(LKPI_80211_HT) + lkpi_sta_sync_ht_from_ni(sta, ni, &ht_rx_nss); +#endif + vht_rx_nss = 0; +#if defined(LKPI_80211_VHT) + lkpi_sta_sync_vht_from_ni(sta, ni, &vht_rx_nss); +#endif + + sta->deflink.rx_nss = MAX(ht_rx_nss, sta->deflink.rx_nss); + sta->deflink.rx_nss = MAX(vht_rx_nss, sta->deflink.rx_nss); + IMPROVE("he, ... smps_mode, .."); /* Link configuration. */ IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); @@ -970,12 +1065,35 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int conf->def.width = NL80211_CHAN_WIDTH_20_NOHT; conf->def.center_freq1 = chan->center_freq; conf->def.center_freq2 = 0; + IMPROVE("Check vht_cap from band not just chan?"); +#ifdef LKPI_80211_HT + if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) { + if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { + conf->def.width = NL80211_CHAN_WIDTH_40; + } else + conf->def.width = NL80211_CHAN_WIDTH_20; + } +#endif +#ifdef LKPI_80211_VHT + if (IEEE80211_IS_CHAN_VHT(ni->ni_chan)) { +#ifdef __notyet__ + if (IEEE80211_IS_CHAN_VHT80P80(ni->ni_chan)) { + conf->def.width = NL80211_CHAN_WIDTH_80P80; + conf->def.center_freq2 = 0; /* XXX */ + } else +#endif + if (IEEE80211_IS_CHAN_VHT160(ni->ni_chan)) + conf->def.width = NL80211_CHAN_WIDTH_160; + else if (IEEE80211_IS_CHAN_VHT80(ni->ni_chan)) + conf->def.width = NL80211_CHAN_WIDTH_80; + } +#endif /* Responder ... */ conf->min_def.chan = chan; conf->min_def.width = NL80211_CHAN_WIDTH_20_NOHT; conf->min_def.center_freq1 = chan->center_freq; conf->min_def.center_freq2 = 0; - IMPROVE("currently 20_NOHT only"); + IMPROVE("currently 20_NOHT min_def only"); /* Set bss info (bss_info_changed). */ bss_changed = 0; @@ -1008,6 +1126,15 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int vif->bss_conf.chandef.width = conf->def.width; vif->bss_conf.chandef.center_freq1 = conf->def.center_freq1; +#ifdef LKPI_80211_HT + if (vif->bss_conf.chandef.width == NL80211_CHAN_WIDTH_40) { + /* Note: it is 10 not 20. */ + if (IEEE80211_IS_CHAN_HT40U(ni->ni_chan)) + vif->bss_conf.chandef.center_freq1 += 10; + else if (IEEE80211_IS_CHAN_HT40D(ni->ni_chan)) + vif->bss_conf.chandef.center_freq1 -= 10; + } +#endif vif->bss_conf.chandef.center_freq2 = conf->def.center_freq2; } else { @@ -1650,6 +1777,11 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int IMPROVE("net80211 does not consider node authorized"); } +#if defined(LKPI_80211_HT) + IMPROVE("Is this the right spot, has net80211 done all updates already?"); + lkpi_sta_sync_ht_from_ni(sta, ni, NULL); +#endif + /* Update sta_state (ASSOC to AUTHORIZED). */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); KASSERT(lsta->state == IEEE80211_STA_ASSOC, ("%s: lsta %p state not " @@ -2463,6 +2595,10 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], #endif } +#ifdef LKPI_80211_HT + /* Stay with the iv_ampdu_rxmax,limit / iv_ampdu_density defaults until later. */ +#endif + ieee80211_ratectl_init(vap); /* Complete setup. */ @@ -3074,6 +3210,9 @@ lkpi_ic_set_channel(struct ieee80211com *ic) hw = LHW_TO_HW(lhw); cfg80211_chandef_create(&hw->conf.chandef, chan, +#ifdef LKPI_80211_HT + (ic->ic_htcaps & IEEE80211_HTC_HT) ? 0 : +#endif NL80211_CHAN_NO_HT); error = lkpi_80211_mo_config(hw, IEEE80211_CONF_CHANGE_CHANNEL); @@ -3362,6 +3501,13 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) info->control.flags |= IEEE80211_TX_CTRL_PORT_CTRL_PROTO; info->control.vif = vif; /* XXX-BZ info->control.rates */ +#ifdef __notyet__ +#ifdef LKPI_80211_HT + info->control.rts_cts_rate_idx= + info->control.use_rts= /* RTS */ + info->control.use_cts_prot= /* RTS/CTS*/ +#endif +#endif lsta = lkpi_find_lsta_by_ni(lvif, ni); if (lsta != NULL) { @@ -3468,6 +3614,291 @@ lkpi_ic_transmit(struct ieee80211com *ic, struct mbuf *m) return (lkpi_ic_raw_xmit(ni, m, NULL)); } +#ifdef LKPI_80211_HT +static int +lkpi_ic_recv_action(struct ieee80211_node *ni, const struct ieee80211_frame *wh, + const uint8_t *frm, const uint8_t *efrm) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + IMPROVE_HT(); + + return (lhw->ic_recv_action(ni, wh, frm, efrm)); +} + +static int +lkpi_ic_send_action(struct ieee80211_node *ni, int category, int action, void *sa) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + IMPROVE_HT(); + + return (lhw->ic_send_action(ni, category, action, sa)); +} + + +static int +lkpi_ic_ampdu_enable(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + IMPROVE_HT(); + + return (lhw->ic_ampdu_enable(ni, tap)); +} + +static int +lkpi_ic_addba_request(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap, + int dialogtoken, int baparamset, int batimeout) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + IMPROVE_HT(); + + return (lhw->ic_addba_request(ni, tap, dialogtoken, baparamset, batimeout)); +} + +static int +lkpi_ic_addba_response(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap, + int status, int baparamset, int batimeout) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + IMPROVE_HT(); + + return (lhw->ic_addba_response(ni, tap, status, baparamset, batimeout)); +} + +static void +lkpi_ic_addba_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + IMPROVE_HT(); + + lhw->ic_addba_stop(ni, tap); +} + +static void +lkpi_ic_addba_response_timeout(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + IMPROVE_HT(); + + lhw->ic_addba_response_timeout(ni, tap); +} + +static void +lkpi_ic_bar_response(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap, + int status) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + IMPROVE_HT(); + + lhw->ic_bar_response(ni, tap, status); +} + +static int +lkpi_ic_ampdu_rx_start(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap, + int baparamset, int batimeout, int baseqctl) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + struct ieee80211_hw *hw; + struct ieee80211vap *vap; + struct lkpi_vif *lvif; + struct ieee80211_vif *vif; + struct lkpi_sta *lsta; + struct ieee80211_sta *sta; + struct ieee80211_ampdu_params params; + int error; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + hw = LHW_TO_HW(lhw); + vap = ni->ni_vap; + lvif = VAP_TO_LVIF(vap); + vif = LVIF_TO_VIF(lvif); + lsta = ni->ni_drv_data; + sta = LSTA_TO_STA(lsta); + + params.sta = sta; + params.action = IEEE80211_AMPDU_RX_START; + params.buf_size = _IEEE80211_MASKSHIFT(le16toh(baparamset), IEEE80211_BAPS_BUFSIZ); + if (params.buf_size == 0) + params.buf_size = IEEE80211_MAX_AMPDU_BUF_HT; + else + params.buf_size = min(params.buf_size, IEEE80211_MAX_AMPDU_BUF_HT); + if (params.buf_size > hw->max_rx_aggregation_subframes) + params.buf_size = hw->max_rx_aggregation_subframes; + params.timeout = le16toh(batimeout); + params.ssn = _IEEE80211_MASKSHIFT(le16toh(baseqctl), IEEE80211_BASEQ_START); + params.tid = _IEEE80211_MASKSHIFT(le16toh(baparamset), IEEE80211_BAPS_TID); + params.amsdu = false; + + IMPROVE_HT("Do we need to distinguish based on SUPPORTS_REORDERING_BUFFER?"); + + /* This may call kalloc. Make sure we can sleep. */ + error = lkpi_80211_mo_ampdu_action(hw, vif, ¶ms); + if (error != 0) { + ic_printf(ic, "%s: mo_ampdu_action returned %d. ni %p rap %p\n", + __func__, error, ni, rap); + return (error); + } + IMPROVE_HT("net80211 is missing the error check on return and assumes success"); + + error = lhw->ic_ampdu_rx_start(ni, rap, baparamset, batimeout, baseqctl); + return (error); +} + +static void +lkpi_ic_ampdu_rx_stop(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap) +{ + struct ieee80211com *ic; + struct lkpi_hw *lhw; + struct ieee80211_hw *hw; + struct ieee80211vap *vap; + struct lkpi_vif *lvif; + struct ieee80211_vif *vif; + struct lkpi_sta *lsta; + struct ieee80211_sta *sta; + struct ieee80211_ampdu_params params; + int error; + uint8_t tid; + + ic = ni->ni_ic; + lhw = ic->ic_softc; + + /* + * We should not (cannot) call into mac80211 ops with AMPDU_RX_STOP if + * we did not START. Some drivers pass it down to firmware which will + * simply barf and net80211 calls ieee80211_ht_node_cleanup() from + * ieee80211_ht_node_init() amongst others which will iterate over all + * tid and call ic_ampdu_rx_stop() unconditionally. + * XXX net80211 should probably be more "gentle" in these cases and + * track some state itself. + */ + if ((rap->rxa_flags & IEEE80211_AGGR_RUNNING) == 0) + goto net80211_only; + + hw = LHW_TO_HW(lhw); + vap = ni->ni_vap; + lvif = VAP_TO_LVIF(vap); + vif = LVIF_TO_VIF(lvif); + lsta = ni->ni_drv_data; + sta = LSTA_TO_STA(lsta); + + IMPROVE_HT("This really should be passed from ht_recv_action_ba_delba."); + for (tid = 0; tid < WME_NUM_TID; tid++) { + if (&ni->ni_rx_ampdu[tid] == rap) + break; + } + + params.sta = sta; + params.action = IEEE80211_AMPDU_RX_STOP; + params.buf_size = 0; + params.timeout = 0; + params.ssn = 0; + params.tid = tid; + params.amsdu = false; + + error = lkpi_80211_mo_ampdu_action(hw, vif, ¶ms); + if (error != 0) + ic_printf(ic, "%s: mo_ampdu_action returned %d. ni %p rap %p\n", + __func__, error, ni, rap); + +net80211_only: + lhw->ic_ampdu_rx_stop(ni, rap); +} +#endif + +static void +lkpi_ic_getradiocaps_ht(struct ieee80211com *ic, struct ieee80211_hw *hw, + uint8_t *bands, int *chan_flags, enum nl80211_band band) +{ +#ifdef LKPI_80211_HT + struct ieee80211_sta_ht_cap *ht_cap; + + ht_cap = &hw->wiphy->bands[band]->ht_cap; + if (!ht_cap->ht_supported) + return; + + switch (band) { + case NL80211_BAND_2GHZ: + setbit(bands, IEEE80211_MODE_11NG); + break; + case NL80211_BAND_5GHZ: + setbit(bands, IEEE80211_MODE_11NA); + break; + default: + IMPROVE("Unsupported band %d", band); + return; + } + + ic->ic_htcaps = IEEE80211_HTC_HT; /* HT operation */ + + /* + * Rather than manually checking each flag and + * translating IEEE80211_HT_CAP_ to IEEE80211_HTCAP_, + * simply copy the 16bits. + */ + ic->ic_htcaps |= ht_cap->cap; + + /* Then deal with the other flags. */ + if (ieee80211_hw_check(hw, AMPDU_AGGREGATION)) + ic->ic_htcaps |= IEEE80211_HTC_AMPDU; +#ifdef __notyet__ + if (ieee80211_hw_check(hw, TX_AMSDU)) + ic->ic_htcaps |= IEEE80211_HTC_AMSDU; + if (ieee80211_hw_check(hw, SUPPORTS_AMSDU_IN_AMPDU)) + ic->ic_htcaps |= (IEEE80211_HTC_RX_AMSDU_AMPDU | + IEEE80211_HTC_TX_AMSDU_AMPDU); +#endif + + IMPROVE("PS, ampdu_*, ht_cap.mcs.tx_params, ..."); + ic->ic_htcaps |= IEEE80211_HTCAP_SMPS_OFF; + + /* Only add HT40 channels if supported. */ + if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) != 0 && + chan_flags != NULL) + *chan_flags |= NET80211_CBW_FLAG_HT40; +#endif +} + static void lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, int *n, struct ieee80211_channel *c) @@ -3491,13 +3922,12 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, chan_flags = 0; setbit(bands, IEEE80211_MODE_11B); /* XXX-BZ unclear how to check for 11g. */ + + IMPROVE("the bitrates may have flags?"); setbit(bands, IEEE80211_MODE_11G); -#ifdef __notyet__ - if (hw->wiphy->bands[NL80211_BAND_2GHZ]->ht_cap.ht_supported) { - setbit(bands, IEEE80211_MODE_11NG); - chan_flags |= NET80211_CBW_FLAG_HT40; - } -#endif + + lkpi_ic_getradiocaps_ht(ic, hw, bands, &chan_flags, + NL80211_BAND_2GHZ); channels = hw->wiphy->bands[NL80211_BAND_2GHZ]->channels; for (i = 0; i < nchans && *n < maxchan; i++) { @@ -3547,11 +3977,11 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, memset(bands, 0, sizeof(bands)); chan_flags = 0; setbit(bands, IEEE80211_MODE_11A); -#ifdef __not_yet__ - if (hw->wiphy->bands[NL80211_BAND_5GHZ]->ht_cap.ht_supported) { - setbit(bands, IEEE80211_MODE_11NA); - chan_flags |= NET80211_CBW_FLAG_HT40; - } + + lkpi_ic_getradiocaps_ht(ic, hw, bands, &chan_flags, + NL80211_BAND_5GHZ); + +#ifdef LKPI_80211_VHT if (hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap.vht_supported){ ic->ic_flags_ext |= IEEE80211_FEXT_VHT; @@ -3792,18 +4222,6 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->scan_flags |= LKPI_LHW_SCAN_HW; } -#ifdef __notyet__ - ic->ic_htcaps = IEEE80211_HTC_HT /* HT operation */ - | IEEE80211_HTC_AMPDU /* A-MPDU tx/rx */ - | IEEE80211_HTC_AMSDU /* A-MSDU tx/rx */ - | IEEE80211_HTCAP_MAXAMSDU_3839 - /* max A-MSDU length */ - | IEEE80211_HTCAP_SMPS_OFF; /* SM power save off */ - ic->ic_htcaps |= IEEE80211_HTCAP_SHORTGI20; - ic->ic_htcaps |= IEEE80211_HTCAP_CHWIDTH40 | IEEE80211_HTCAP_SHORTGI40; - ic->ic_htcaps |= IEEE80211_HTCAP_TXSTBC; -#endif - /* * The wiphy variables report bitmasks of avail antennas. * (*get_antenna) get the current bitmask sets which can be @@ -3862,6 +4280,33 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->ic_node_free = ic->ic_node_free; ic->ic_node_free = lkpi_ic_node_free; +#ifdef LKPI_80211_HT + lhw->ic_recv_action = ic->ic_recv_action; + ic->ic_recv_action = lkpi_ic_recv_action; + lhw->ic_send_action = ic->ic_send_action; + ic->ic_send_action = lkpi_ic_send_action; + + lhw->ic_ampdu_enable = ic->ic_ampdu_enable; + ic->ic_ampdu_enable = lkpi_ic_ampdu_enable; + + lhw->ic_addba_request = ic->ic_addba_request; + ic->ic_addba_request = lkpi_ic_addba_request; + lhw->ic_addba_response = ic->ic_addba_response; + ic->ic_addba_response = lkpi_ic_addba_response; + lhw->ic_addba_stop = ic->ic_addba_stop; + ic->ic_addba_stop = lkpi_ic_addba_stop; + lhw->ic_addba_response_timeout = ic->ic_addba_response_timeout; + ic->ic_addba_response_timeout = lkpi_ic_addba_response_timeout; + + lhw->ic_bar_response = ic->ic_bar_response; + ic->ic_bar_response = lkpi_ic_bar_response; + + lhw->ic_ampdu_rx_start = ic->ic_ampdu_rx_start; + ic->ic_ampdu_rx_start = lkpi_ic_ampdu_rx_start; + lhw->ic_ampdu_rx_stop = ic->ic_ampdu_rx_stop; + ic->ic_ampdu_rx_stop = lkpi_ic_ampdu_rx_stop; +#endif + lkpi_radiotap_attach(lhw); /* @@ -3893,6 +4338,9 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) continue; cfg80211_chandef_create(&hw->conf.chandef, &channels[i], +#ifdef LKPI_80211_HT + (ic->ic_htcaps & IEEE80211_HTC_HT) ? 0 : +#endif NL80211_CHAN_NO_HT); break; } @@ -3910,7 +4358,6 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) /* * The maximum supported bitrates on any band + size for * DSSS Parameter Set give our per-band IE size. - * XXX-BZ FIXME add HT VHT ... later * SSID is the responsibility of the driver and goes on the side. * The user specified bits coming from the vap go into the * "common ies" fields. @@ -3928,6 +4375,15 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->scan_ie_len += 2 + 1; } +#if defined(LKPI_80211_HT) + if ((ic->ic_htcaps & IEEE80211_HTC_HT) != 0) + lhw->scan_ie_len += sizeof(struct ieee80211_ie_htcap); +#endif +#if defined(LKPI_80211_VHT) + if ((ic->ic_flags_ext & IEEE80211_FEXT_VHT) != 0) + lhw->scan_ie_len += 2 + sizeof(struct ieee80211_vht_cap); +#endif + /* Reduce the max_scan_ie_len "left" by the amount we consume already. */ if (hw->wiphy->max_scan_ie_len > 0) { if (lhw->scan_ie_len > hw->wiphy->max_scan_ie_len) @@ -4326,8 +4782,9 @@ no_trace_beacons: * net80211 should take care of the other information (sync_tsf, * sync_dtim_count) as otherwise we need to parse the beacon. */ - } skip_device_ts: + ; + } if (vap != NULL && vap->iv_state > IEEE80211_S_INIT && ieee80211_radiotap_active_vap(vap)) { diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 74dc3c9f9dee..ef1f841e4f22 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -62,11 +62,20 @@ #define D80211_TRACEX_DUMP (D80211_TRACE_TX_DUMP|D80211_TRACE_RX_DUMP) #define D80211_TRACE_STA 0x00010000 #define D80211_TRACE_MO 0x00100000 +#define D80211_TRACE_MODE 0x0f000000 +#define D80211_TRACE_MODE_HT 0x01000000 +#define D80211_TRACE_MODE_VHT 0x02000000 +#define D80211_TRACE_MODE_HE 0x04000000 +#define D80211_TRACE_MODE_EHT 0x08000000 #define IMPROVE_TXQ(...) \ if (linuxkpi_debug_80211 & D80211_IMPROVE_TXQ) \ printf("%s:%d: XXX LKPI80211 IMPROVE_TXQ\n", __func__, __LINE__) +#define IMPROVE_HT(...) \ + if (linuxkpi_debug_80211 & D80211_TRACE_MODE_HT) \ + printf("%s:%d: XXX LKPI80211 IMPROVE_HT\n", __func__, __LINE__) + struct lkpi_radiotap_tx_hdr { struct ieee80211_radiotap_header wt_ihdr; uint8_t wt_flags; @@ -190,6 +199,29 @@ struct lkpi_hw { /* name it mac80211_sc? */ void (*ic_node_cleanup)(struct ieee80211_node *); void (*ic_node_free)(struct ieee80211_node *); + /* HT and later functions. */ + int (*ic_recv_action)(struct ieee80211_node *, + const struct ieee80211_frame *, + const uint8_t *, const uint8_t *); + int (*ic_send_action)(struct ieee80211_node *, + int, int, void *); + int (*ic_ampdu_enable)(struct ieee80211_node *, + struct ieee80211_tx_ampdu *); + int (*ic_addba_request)(struct ieee80211_node *, + struct ieee80211_tx_ampdu *, int, int, int); + int (*ic_addba_response)(struct ieee80211_node *, + struct ieee80211_tx_ampdu *, int, int, int); + void (*ic_addba_stop)(struct ieee80211_node *, + struct ieee80211_tx_ampdu *); + void (*ic_addba_response_timeout)(struct ieee80211_node *, + struct ieee80211_tx_ampdu *); + void (*ic_bar_response)(struct ieee80211_node *, + struct ieee80211_tx_ampdu *, int); + int (*ic_ampdu_rx_start)(struct ieee80211_node *, + struct ieee80211_rx_ampdu *, int, int, int); + void (*ic_ampdu_rx_stop)(struct ieee80211_node *, + struct ieee80211_rx_ampdu *); + #define LKPI_MAC80211_DRV_STARTED 0x00000001 uint32_t sc_flags; #define LKPI_LHW_SCAN_RUNNING 0x00000001 @@ -312,5 +344,8 @@ void lkpi_80211_mo_sta_pre_rcu_remove(struct ieee80211_hw *, int lkpi_80211_mo_set_key(struct ieee80211_hw *, enum set_key_cmd, struct ieee80211_vif *, struct ieee80211_sta *, struct ieee80211_key_conf *); +int lkpi_80211_mo_ampdu_action(struct ieee80211_hw *, struct ieee80211_vif *, + struct ieee80211_ampdu_params *); + #endif /* _LKPI_SRC_LINUX_80211_H */ diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index fab0d2ccb813..8cc885c037e3 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -695,3 +695,25 @@ lkpi_80211_mo_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, out: return (error); } + +int +lkpi_80211_mo_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_ampdu_params *params) +{ + struct lkpi_hw *lhw; + int error; + + lhw = HW_TO_LHW(hw); + if (lhw->ops->ampdu_action == NULL) { + error = EOPNOTSUPP; + goto out; + } + + LKPI_80211_TRACE_MO("hw %p vif %p params %p { %p, %d, %u, %u, %u, %u, %d }", + hw, vif, params, params->sta, params->action, params->buf_size, + params->timeout, params->ssn, params->tid, params->amsdu); + error = lhw->ops->ampdu_action(hw, vif, params); + +out: + return (error); +} From nobody Fri Dec 1 23:37:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ShqHS4z1Nz52WRb; Fri, 1 Dec 2023 23:37: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 4ShqHS4N6xz4RCm; Fri, 1 Dec 2023 23:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701473876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CmZkc71kmD9XD9DSPBN4idAfzWkQM0FA97o3bqy6ido=; b=ID0/1Y5/TCQBwo+lZ2tcG+xnDD3TsASanv3Hf+brscoojv7byRBDthfT5FbpPtAeiwYo6p ZMsiziazSymFy9ln+YW3emDSyO5r9IIm22A1hD6+ZXz45oQZMaflXyLTZO3gc3lTqFoXTm DdJDndG/+R7712SV5vA2Dgc2kj6LwUzWZRWavkm3mAcsrYAXRykH83rIz25hpsEJaFOERw SnorpNV2+fTXu2RJRTctd16W8dTa5y3XXYcSpP/nRF3AvZIwwFhhp8wSXZ3eJKWvBqVblW ZP7jYNxntZLSAgD26L4hlo99aFvUlgUNbor0wUJ8h/cIMI5IN/lC0TvDNEl1CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701473876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CmZkc71kmD9XD9DSPBN4idAfzWkQM0FA97o3bqy6ido=; b=PQjrI90oZLJQoWf0LEPoiUwnu4S2HzDdMgHd5CUMv4EC68jYUNHJfaRHPozV6J6h5H5gT5 5qg8fnwoQxQSYD4p2fxIOtd71ICdbOrQwsYdDZt2X2Y+GT3KensSAF09/LYElw6o+0Bhz2 eZ5BTE77xhXjVA4A/UuX/vfAv+JLlEKWjr9MwXacAztnKyq7t6IlJiO5utlebDiTX9CWIb jydC8RBKJnLmY3tRcxngFrqym8jSaTyxHBTxlpak4zfCjfvZBPNFBqYWH2a/I32Fn72U1l rXrTQuPRXVkU11tmzLA/LCGJvYkptwld7eHVYvJ1BvB9KV/++iFQ/aa/EjvFSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701473876; a=rsa-sha256; cv=none; b=hilxng+QlwIoeI3Fp6/W4Jdte2fvoSJOzJds0bv5KkhLWEiz+H1SiXeuPNH4Wcqa8azHFg BEyBP1OTpr+mUvpdwVJRnGyTozla2Vk0IltF64lN/fW8VMfHJdU0rFGiXfV+1fcZ/BRN3V gWP4w5UMon3svm0VE9e6Ru+T51RrV3ZZ86V0pI9HYnOH/3jvHLqdQYrSC5YaUMttM4Lsx4 3aXHVVcfW6zEnArT3W7DWw96lNMm6W1+FvYsXX3HpVEisOpWElAhESOi07Q5tUOLDuk5kN JP7N6+jAOA9dDRVS2DDeAWnz1CDd7RkEsfSwt7TnHRAn43x3Jrb7U6K+azOJ1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ShqHS3Ks1ztDn; Fri, 1 Dec 2023 23:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B1Nbujk092079; Fri, 1 Dec 2023 23:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1NbuZg092076; Fri, 1 Dec 2023 23:37:56 GMT (envelope-from git) Date: Fri, 1 Dec 2023 23:37:56 GMT Message-Id: <202312012337.3B1NbuZg092076@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: be7c095ac99a - main - unix/dgram: bump maximum datagram size limit to 8k List-Id: Commit messages for the main 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: be7c095ac99ad29fd72b780c7d58949a38656c66 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=be7c095ac99ad29fd72b780c7d58949a38656c66 commit be7c095ac99ad29fd72b780c7d58949a38656c66 Author: Gleb Smirnoff AuthorDate: 2023-12-01 23:37:29 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-01 23:37:29 +0000 unix/dgram: bump maximum datagram size limit to 8k This is important for wpa_supplicant operation on a crowded network. Note: we actually need an API to increase maximum datagram size on a socket. Previously SO_SNDBUF magically acted like that, but that was an undocumented "feature". Also move the comment to the proper line. Previously it was the receive buffer that imposed the limit. Now notion of buffer size and maximum datagram are separate. Reviewed by: bz, tuexen, karels Differential Revision: https://reviews.freebsd.org/D42830 PR: 274990 --- sys/kern/uipc_usrreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 069294e1c963..8f5560e0f30b 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -154,8 +154,8 @@ static struct task unp_defer_task; #endif static u_long unpst_sendspace = PIPSIZ; static u_long unpst_recvspace = PIPSIZ; -static u_long unpdg_maxdgram = 2*1024; -static u_long unpdg_recvspace = 16*1024; /* support 8KB syslog msgs */ +static u_long unpdg_maxdgram = 8*1024; /* support 8KB syslog msgs */ +static u_long unpdg_recvspace = 16*1024; static u_long unpsp_sendspace = PIPSIZ; /* really max datagram size */ static u_long unpsp_recvspace = PIPSIZ; From nobody Fri Dec 1 23:59:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shqm36KTmz52b4q; Fri, 1 Dec 2023 23:59: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 4Shqm35qlRz4WP4; Fri, 1 Dec 2023 23:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701475155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5nT5hUKCR72+p/AZJU9UEkFDbefW9UlAz9rtUJ5Rqc=; b=N9evP+sYIFiaBnEoJ0zP+igPGNTbXuVKuHR1mgdwklFk5ChUzYju/BPZ2If+cx9OH0AGn7 nrNgYwoRwBD+dd82d1o67zaaHl4ENIZDSvhMpMFxNUucS8eP/6dV/cNsxF35buHgM6phDM u14naf3H9VMEVG50PxWnYAF6H67o9zm25XMxmGuX6lmRkqNKFb8Hhna4MaNOFwgTC3DG0T JILgMG/ShIyX+ul5mtHC0pIKeozf+URM9OgKePhqx/zkDzCZVZOqLYeIVIc+8rLQFD4xh/ lw3PHUn4lreNFlBhZmBqrISH8/3OgjnRUENZG7/W3esa3OtXOVgj8ePSfLFGKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701475155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5nT5hUKCR72+p/AZJU9UEkFDbefW9UlAz9rtUJ5Rqc=; b=g4bt0l9rkDQnPD0pHp/HqQb+YNt9d57MWqddmOx0Zes8Qb8NTxabUlNLM3nVamfHI4mKKl NvUY5ssHFlvCcte42BXiNBm2sELlaxhotKa0PxdtDu1u7nZEtN/9jLMkTrpFtplAaIGcwT 07TKow42u9DhBvP4PeS4zzYJqfAF1rBLcJa928kLgqYWOZDUIUeHDNRQwQV8rjQKbnsEXf BUAMZa21jAZEGi1kLFbAS9Hk0woIRULScoTBjSIlakCw5ZM0iLZIGEMeerg2dZQauP+hV6 Hk/LTkH5CIsR9JjdGsHE9bKQglRFhgtiAVmlFmcFCeCilqz0lGSoH0HRU7Q37Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701475155; a=rsa-sha256; cv=none; b=OrK7byVdCTpk5xFgWRZRLPY7Zboq5Ohbe7qnx1YAhtFM8SyFIHEtjiXE+nkznD6ek8bS9L +o9wgGHix4a1Y4xMpFbLxcOLDW2oRt+65sdKtBE7Z3rUrouFK2ftZfHxdhSSqAU+esD36y 8SL5geUU9G47q4m4ex899rk/+AE7bc5CWlzdJXX9Yum9RMtiR8GLHF/oGIWU1cikxcHux+ 0tsVqLaNqbXl9VehpZbySdE7LDmMWNE/svrN0Wam+uwW556x0yfFn/vamvEm15GWD6HWnJ p+SgdqUw567G5Ronps6nVkczi6C/VY9nWuAf0BSiWp5mtfWy1I5J4Mxz1uxIxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shqm34tWYztxF; Fri, 1 Dec 2023 23:59: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 3B1NxFOp024795; Fri, 1 Dec 2023 23:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1NxFWp024792; Fri, 1 Dec 2023 23:59:15 GMT (envelope-from git) Date: Fri, 1 Dec 2023 23:59:15 GMT Message-Id: <202312012359.3B1NxFWp024792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 9560ac4b638e - main - armv8rng: Don't require toolchain to support FEAT_RNG List-Id: Commit messages for the main 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9560ac4b638edf688566f576adc65d3654f2240c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9560ac4b638edf688566f576adc65d3654f2240c commit 9560ac4b638edf688566f576adc65d3654f2240c Author: Jessica Clarke AuthorDate: 2023-12-01 23:59:07 +0000 Commit: Jessica Clarke CommitDate: 2023-12-01 23:59:07 +0000 armv8rng: Don't require toolchain to support FEAT_RNG We have the mechanism in place to support encoding system registers explicitly, so use that rather than requiring LLVM 13+, which breaks our current set of GitHub CI builds. Fixes: 9eecef052155 ("Add an Armv8 rndr random number provider") --- sys/arm64/include/armreg.h | 9 +++++++++ sys/dev/random/armv8rng.c | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 953c9af220b9..c43ec1f5b97c 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1981,6 +1981,15 @@ #define PMXEVTYPER_EL0_CRm 13 #define PMXEVTYPER_EL0_op2 1 +/* RNDRRS */ +#define RNDRRS MRS_REG(RNDRRS) +#define RNDRRS_REG MRS_REG_ALT_NAME(RNDRRS) +#define RNDRRS_op0 3 +#define RNDRRS_op1 3 +#define RNDRRS_CRn 2 +#define RNDRRS_CRm 4 +#define RNDRRS_op2 1 + /* SCTLR_EL1 - System Control Register */ #define SCTLR_RES1 0x30d00800 /* Reserved ARMv8.0, write 1 */ #define SCTLR_M (UL(0x1) << 0) diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c index 3cca42a5bbf3..61698bfff820 100644 --- a/sys/dev/random/armv8rng.c +++ b/sys/dev/random/armv8rng.c @@ -59,10 +59,10 @@ random_rndr_read_one(u_long *buf) loop = 10; do { __asm __volatile( - ".arch_extension rng \n" - "mrs %0, rndrrs \n" /* Read the random number */ - "cset %w1, ne \n" /* 1 on success, 0 on failure */ - ".arch_extension norng \n" + /* Read the random number */ + "mrs %0, " __XSTRING(RNDRRS_REG) "\n" + /* 1 on success, 0 on failure */ + "cset %w1, ne\n" : "=&r" (val), "=&r"(ret) :: "cc"); } while (ret != 0 && --loop > 0); From nobody Sat Dec 2 05:56:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shzgw5FYFz52rxK; Sat, 2 Dec 2023 05:56: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 4Shzgw2XPyz4WpS; Sat, 2 Dec 2023 05:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701496572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p6YIBi+zvKYbcO/FMPYHknPyXha0lGkTu9vqrTWYBf8=; b=o6hLjDJHWGvKUVRW5Rsp2e9zyudVtBKgoUacm4FgDBiyte2aGtAuPuZVKfd9L33CUkIgpN my1UFmVPdKRWo3kRe4BVHfgxa+vQKk7uRGCIGZh1a/gZ39pwUlUoPWzO2h5KvP1w3tjftf HupulcOkKfe2M9Zf1L+KK2G0LjEqNm/qEerMb9H+sSPVzRFKMn5uFtg17v8me18WysyIs7 mxjtlh77rd2ibSGhlyEqPBXlJH2NldXN/37QJZHWDLqMqN6p2aETL1++JOcoh+ryCm/09O 65EdtHblNiKd52vFEO58mfWvmfZXiyQ2KhG8lp29Mfj4ACEcDbW2OUklSxhp7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701496572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p6YIBi+zvKYbcO/FMPYHknPyXha0lGkTu9vqrTWYBf8=; b=gQysRRx6yjMKCE3AmZFRwM9BdMDGC7Sq7RnVAU1SyA2I2GRQ6ZObTObp9uQ1P6nGRNthxp TShUjEgCu7ylcKt8WDNAjaSERgkymXfiUukUvrxS8/s5ixeHrU8hi77wIsmVpYxRfJTK7y nFqcg2KuAFeMyZdCboZTIcK/0xNMPzsCJxnjT0jMmztG4QIfU1JlrSA361kzoa1+66dwF9 rYpQwRHtLHBq0h7OtuR2tEb1BeFeQYn7InZBpbGvT27FO7rlwGwkT3+Dg9EYlAiqWiQPxZ j9Q/GZt6KZYrA7zpSv8InB/h9jb9dxf1cqVeXiQr/5jsozEwJQk8m1Mvqx3D9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701496572; a=rsa-sha256; cv=none; b=oiSojGoV08EGzP7wB0XkeMJ2KcnASj93Axl3xC3jOeFrduOiXUuUDRlZXRPTOlwCd+gTW5 pz2rEF3JxZ/nOY5X8bhzmLi7id/fs/7bKGTi59UixN9Q+YJt5CC+bdzpgiI4OTa6BehUYi W4YuYAYBvoKXJ/OgE5iibL97CumPWhoSOTOTuH1gX56yued305/R26nvqAcWfElBzYbM8L okei0zg0+pssOFb4r2qxwI666ASEktUkpY4d5y/RyerSRSCdr9pcnCyNsW/RgS+QvXj5YU mM4uZraQGNr10Fmsh1llFAzF3CObxNcODqXWe33mAr+AouzYGyj/+p5CXs57pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shzgw1bjwz14k1; Sat, 2 Dec 2023 05:56: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 3B25uCtv028440; Sat, 2 Dec 2023 05:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B25uCJJ028437; Sat, 2 Dec 2023 05:56:12 GMT (envelope-from git) Date: Sat, 2 Dec 2023 05:56:12 GMT Message-Id: <202312020556.3B25uCJJ028437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 1da7f3f6f72b - main - termcap.small: Include xterm-256color List-Id: Commit messages for the main 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1da7f3f6f72b2245e458fc7195733268ae4a1136 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=1da7f3f6f72b2245e458fc7195733268ae4a1136 commit 1da7f3f6f72b2245e458fc7195733268ae4a1136 Author: Ka Ho Ng AuthorDate: 2023-12-02 05:55:56 +0000 Commit: Ka Ho Ng CommitDate: 2023-12-02 05:55:56 +0000 termcap.small: Include xterm-256color MFC after: 7 days Reviewed by: imp, jhb Differential Revision: https://reviews.freebsd.org/D42784 --- etc/termcap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/termcap/Makefile b/etc/termcap/Makefile index 4b403c446359..cd5516f3e04b 100644 --- a/etc/termcap/Makefile +++ b/etc/termcap/Makefile @@ -14,8 +14,8 @@ TERMCAP_SMALL_ENTS?= SC cons25 cons25-m cons25-w cons25l1 cons25l1-m \ cons50l1-w cons50l2 cons50l2-m cons50l7 cons50l7-m cons50r cons50r-m \ cons50r-mv cons50r-v cons60 cons60-m cons60-w cons60l1 cons60l1-m \ cons60l1-w cons60l2 cons60l2-m cons60l7 cons60l7-m cons60r cons60r-m \ - cons60r-mv cons60r-v ecma[+]italics vt100 xterm xterm-basic xterm-clear \ - xterm-color xterm-new xterm-r6 xterm-r6-clear + cons60r-mv cons60r-v ecma[+]italics vt100 xterm xterm-256color xterm-basic \ + xterm-clear xterm-color xterm-new xterm-r6 xterm-r6-clear termcap.small: termcap set -e; \ From nobody Sat Dec 2 09:19:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj4By2NY8z52bl5; Sat, 2 Dec 2023 09:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sj4By1vlvz3VYD; Sat, 2 Dec 2023 09:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701508794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0CedfvBBlxsgzi9qp/3wVdt9MJ6wBd+e+IgrJAT7hI=; b=nhuwQBZnSFSd9ATgVbnBuLXf534QaUHRCObP+JOdI/5QfeMtVQDh2+ySDOv2azmgBWnPwG lX/ybiBpd16krSMpZrpRqAadFQSI73oStxn/A4sGLyIb01V3tax567/wONCZVbo9amosZ6 2WXNaBJMc8zCm8Jx0IiYV7zWzhEVvYXDY10KeA+tEAIrQfJIP+pZMMkTL6aZWw89r7iDkj YdvtszqK3ym+uOOxqkhzBkEL7QYcSp/02sukZ6/FBRdMEm8d4Xo7oI3gnuekhqLXxzv92n VE2XDEfIkLPVPbMgX1etVgIpohRNtaBss4cj6yK0bzh6XuNK6w6DSbSPbGn/bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701508794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0CedfvBBlxsgzi9qp/3wVdt9MJ6wBd+e+IgrJAT7hI=; b=emAHFxdNGInrOySAX7GxTh2Wkg6iAXkI8gzPitOeagBZNSiJpCwtSqQvjJjbkWLjYW6Xc5 Ux6Z70+apCru0x6M7orDJtRV/auZNqX1tFuO3rPtzxTYMOdLvOhZ1pQw/JdqafHNKQWQBS hbxwRNayegtfQgG0/J7RryVtMfu56q2aI7fAcGXFo2llr3qDM42LlDqKF998oVLB/jnWwA AqJv7JJFv+gNkuaUnYbyQ4OkDeUuRJVNEeSswl/8G4+F5St9/wcisHRbLCbzOSC5kK5lbH uXT74/RjZhzF993xtdoEdjUwFYujGhGQbKiIku9CYDcxZQYmPkR22154LW5iQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701508794; a=rsa-sha256; cv=none; b=ECxfM+D2oQ2g7jnAG+QRPa8hbQA+KS1Bgk4MLssg6Jzc1k+EnMvw5p5+8QAOmu6VtXTbwK rFbnfxG/a+BCcnj2g++Fh1ZFzG18dk7Q6Foc/AG+sRe0n/Xcg/A0hUJ44ni4F3Gu6CWKvT dmhk5ou+3LHeNsctUvYGIGzBHzsAJ67TJve2JqDLksu/PvAYx+E4Lb5peT5LdWRqXLdrqo CIhIj7Np075PTAvEwIiS8bJcy03JuzXVWKSsfwecoW0AR6KSgxWx0jy5wjbDYKnJJTDBBc XPwEEBz+xodpb4X5YsN7vrvaQeVfcVE7jgwyORsvTHEkKaRul08us4lNRlL/NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj4By0ynPz19cf; Sat, 2 Dec 2023 09:19: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 3B29JsUC062264; Sat, 2 Dec 2023 09:19:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29Jsar062261; Sat, 2 Dec 2023 09:19:54 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:19:54 GMT Message-Id: <202312020919.3B29Jsar062261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: ebb1e0f19332 - main - libclang_rt: Update Makefile.depend List-Id: Commit messages for the main 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebb1e0f19332043ac7e75e22a8541a49fab869af Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=ebb1e0f19332043ac7e75e22a8541a49fab869af commit ebb1e0f19332043ac7e75e22a8541a49fab869af Author: Ka Ho Ng AuthorDate: 2023-12-02 09:15:53 +0000 Commit: Ka Ho Ng CommitDate: 2023-12-02 09:18:54 +0000 libclang_rt: Update Makefile.depend MFC after: 3 days --- lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend b/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend index 993ab0638f4a..e57fef3d9b24 100644 --- a/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend +++ b/lib/libclang_rt/ubsan_standalone_cxx/Makefile.depend @@ -2,6 +2,7 @@ DIRDEPS = \ include \ + lib/libc++ \ .include From nobody Sat Dec 2 11:51:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj7Yg2ywbz538wW; Sat, 2 Dec 2023 11:51: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 4Sj7Yg2XjFz4QHM; Sat, 2 Dec 2023 11:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701517879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0dBgVZuhRZfL9X/J2rcg2xA7KLlGoJCpRBEVvm/T7sY=; b=wY40Qbakr1GDos+oE5NpvT85DnBLAb06DRBVMjvejpitBmRYCI9hJ9c8B/ZfB7IMCRgFCz FdSMddbwoiDnUcnbtMjuDYM910hvGVSC5/Pf/ASxFLjPjwUfkxUQJ739L9eGXYwKddq9oH SGVsiEJqy98KAyoFjPOynfMqAZMM9wyaab5fUeCjcmjy3mCrArk7T+quSSS7RwmWCwE9Na 0y37qsk2dcOJgqQpNUVDNlEywpYnckouuMsmWoslaA4zBNFS5MiKKve/2G/DcV4tknNnjY EShMpCdK+MF1goBuBY7l9e1xUGtE6civVE7d1afiaEyK12xuqv/M2NBHuebONA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701517879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0dBgVZuhRZfL9X/J2rcg2xA7KLlGoJCpRBEVvm/T7sY=; b=CEfxCPOVLZf2gHz2EsVz1/4AaXZ5SlB/AioT/5nHH9eEsySdrCA84bSvMx1SNjNFwqSpNu gGbIG6J5Vj85lyP1sZhF8pGGo4Y84q45oHUgewr6b9pasLNVnxIPG9OOHEeI4qpzJR9Urk 1I81gKIq1VcHj1v55Zi8vFI12WA8KOfTKnl9iYnk0Wu9nfwbXA31ROwIRmyg+8PbMMk6ar vtIPJTTCxB8UbClX1NlLHeynmhs9n9CPFVNX88MUWfdoNm4PB0r9mRfo/cI7o2TrMGDX+V DgOw9Ga1cyR4dgjewTtrkGBOPkkEmypj0UU2Ff6b+OrvIuqphEs1M0q502eVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701517879; a=rsa-sha256; cv=none; b=fw03zzTiJQmEkfyIftkkzY/hN8rbOmSPkfHq9KrdIY446Kqg5wYzwmVKuR39H5oVOaC2uZ EKuO0Od4LmkygdyMG5dpNKkIa2XUcRgC/bKM6JQzxNTb3LzI/mzmDnzU34vxA07UTQaNAZ QWXlFNGkqR4g0K9o7VEdjnjcTK5gIIR0VJ88lgSJfsLWVRyjzzRbZQp25zZZnnI0Ctqhyf sGydaqhKhNaSsHl+r+7tG2cH2bttbOG7b5SAhpbu4IlfDD0NsXcZc7kgT6BE5VK5VJ9HMB vQHqtv1GPwYCodA+A+1NoWPNzBipsPjAlquGOFtWou6LKfEAK3NgFlFdlW1MrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sj7Yg1bccz15Y; Sat, 2 Dec 2023 11:51: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 3B2BpJGF025592; Sat, 2 Dec 2023 11:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2BpJH5025589; Sat, 2 Dec 2023 11:51:19 GMT (envelope-from git) Date: Sat, 2 Dec 2023 11:51:19 GMT Message-Id: <202312021151.3B2BpJH5025589@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: f071abd92e72 - main - tcp: properly initialize LRD while accepting session in syncache List-Id: Commit messages for the main 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: f071abd92e726fc12e9256662e1f286f364252ee Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=f071abd92e726fc12e9256662e1f286f364252ee commit f071abd92e726fc12e9256662e1f286f364252ee Author: Richard Scheffenegger AuthorDate: 2023-12-02 11:15:37 +0000 Commit: Richard Scheffenegger CommitDate: 2023-12-02 11:17:01 +0000 tcp: properly initialize LRD while accepting session in syncache Inherit the setting from the listener socket in syncache_socket. MFC after: 2 weeks Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42874 --- sys/netinet/tcp_syncache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index ffde6a4b88c9..2c381ef600d6 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -952,7 +952,8 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) tp->rcv_adv += tp->rcv_wnd; tp->last_ack_sent = tp->rcv_nxt; - tp->t_flags = sototcpcb(lso)->t_flags & (TF_NOPUSH|TF_NODELAY); + tp->t_flags = sototcpcb(lso)->t_flags & + (TF_LRD|TF_NOPUSH|TF_NODELAY); if (sc->sc_flags & SCF_NOOPT) tp->t_flags |= TF_NOOPT; else { From nobody Sat Dec 2 11:53:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sj7c53JBlz539YT; Sat, 2 Dec 2023 11:53:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sj7c52kgjz4Qb9; Sat, 2 Dec 2023 11:53:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701518005; 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=8Q/geZ4c65oOTPI8I1OKr06SAghOSCmLGMKsYPKEquw=; b=stIlcLfyq9Wie46UfWUiQ0xKeVdk25AVsAvq+W6F3HefTP559/zxKhMUwsdQP0XbIaxPRj Igi+scft7RfFa1x6XDFPGtnQA52goAdpNg3r222Lng9FOMnIlRlwQ+s37XVGxuwq1NkFp2 K866Y3LYyr65JJn1ZZkQi59jp3CPukdY+6WyzohE9gTkhKg/GBVnELBu+J44Fc78tsdaSV pIgRMARjPEhaEN8QSesMJO6KMubI/H0t4P6nFLPnkrlsnFP/fAMkAdCbZUno07QNcwbxp3 +6CuU4azgHhxe1Ruiqen3vfqn1EEVJ+RWD0/IISJxcqzlGrZXL/TbPvM74H5vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701518005; 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=8Q/geZ4c65oOTPI8I1OKr06SAghOSCmLGMKsYPKEquw=; b=rMThplhCPJgMGbofWR+Iv6DEhrbtfy6RU+701TPjQW9is2CL3ugwxfuArSnANhnFOsq8V6 VzC/H0k/TM7LxT8gG0UlG5oeu5rHgYwRP4sJaXd7sRSewLswGSNntziNG7GNgNx7z+r5HJ 6YjaKWNOjHBWT9X7UlWTYQQqsjkoqkWMlI+HBo/maHA22m2mkQiDH4/GHzmEQ0BV8DNVTw 1VVBcn8Tgi9xUUWhpesvMnIIk233/DuKVSg/9dlqQrokgqA4gBGX3LF5HZjePDqrlJnYA9 96f09S6pOHFCswLTFFha+aJn+G5k4TbrwcbnjtaRiCTdHjjwShZgY171matLTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701518005; a=rsa-sha256; cv=none; b=fMqH0XXKJora4Dt0yDZIDb0a7rpoqmCf2lnj5b6dPFKTpWfzILnxd+UMmXmEVvGWR7V0k+ PeaFG68hL9vgADzlVuJS8jPNVPZnNMW5A1Z7oo/eW9nWwAU8ERp/OV5s4ZI/kRJf0hsZ9/ v8EBoERJM/koXQ7wikfhj9GnV3fm7dM+srt6pHdMu5yGfzEvSYT/vwqMh1KqPj2NxcgLbC k7j0sdnQxWpZdYmTZO+mmXMMSau11qNB5PVT4sB1eZ7CKFerju3gdPcF645peACQ4jONn5 9ujF3hXMumbEKdGGo2wDYW/bH6UjNnBM/3U6qZBUXsl7McSv6IiXWNukj8OWdQ== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Sj7c50bdNz1B3Z; Sat, 2 Dec 2023 11:53:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id B37228D4A162; Sat, 2 Dec 2023 11:53:23 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 29DFE2D029D7; Sat, 2 Dec 2023 11:53:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id cJMxDJZPviTv; Sat, 2 Dec 2023 11:53:22 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 12A4B2D029D2; Sat, 2 Dec 2023 11:53:22 +0000 (UTC) Date: Sat, 2 Dec 2023 11:53:21 +0000 (UTC) From: "Bjoern A. Zeeb" To: Gleb Smirnoff cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: be7c095ac99a - main - unix/dgram: bump maximum datagram size limit to 8k In-Reply-To: <202312012337.3B1NbuZg092076@gitrepo.freebsd.org> Message-ID: References: <202312012337.3B1NbuZg092076@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII On Fri, 1 Dec 2023, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=be7c095ac99ad29fd72b780c7d58949a38656c66 > > commit be7c095ac99ad29fd72b780c7d58949a38656c66 > Author: Gleb Smirnoff > AuthorDate: 2023-12-01 23:37:29 +0000 > Commit: Gleb Smirnoff > CommitDate: 2023-12-01 23:37:29 +0000 > > unix/dgram: bump maximum datagram size limit to 8k > > This is important for wpa_supplicant operation on a crowded network. This also unbreaks syslogd again as previously fixed based on https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260126 > Note: we actually need an API to increase maximum datagram size on a > socket. Previously SO_SNDBUF magically acted like that, but that was > an undocumented "feature". > > Also move the comment to the proper line. Previously it was the receive > buffer that imposed the limit. Now notion of buffer size and maximum > datagram are separate. > > Reviewed by: bz, tuexen, karels I discussed this but not approved this change. We seem to be likely the only OS now enforcing (the slightly increasesd) 1988s limits after everyone else got the behaviour from us that we were running on for 34 years. I still think that is not the right direction. > Differential Revision: https://reviews.freebsd.org/D42830 > PR: 274990 > --- > sys/kern/uipc_usrreq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c > index 069294e1c963..8f5560e0f30b 100644 > --- a/sys/kern/uipc_usrreq.c > +++ b/sys/kern/uipc_usrreq.c > @@ -154,8 +154,8 @@ static struct task unp_defer_task; > #endif > static u_long unpst_sendspace = PIPSIZ; > static u_long unpst_recvspace = PIPSIZ; > -static u_long unpdg_maxdgram = 2*1024; > -static u_long unpdg_recvspace = 16*1024; /* support 8KB syslog msgs */ > +static u_long unpdg_maxdgram = 8*1024; /* support 8KB syslog msgs */ > +static u_long unpdg_recvspace = 16*1024; > static u_long unpsp_sendspace = PIPSIZ; /* really max datagram size */ > static u_long unpsp_recvspace = PIPSIZ; > > -- Bjoern A. Zeeb r15:7 From nobody Sat Dec 2 20:38:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjMFy6Qjnz52VwB; Sat, 2 Dec 2023 20:38: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 4SjMFy60Nlz4dh8; Sat, 2 Dec 2023 20:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701549510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cGF8cVUa76wbmLcMjwXX0JC9bD4Ezl0WFKvxpNqhkGQ=; b=Y1SFmt/dhKbz2IGRFwPjc2nmFfWNM6b4IwSO+yv/owAVB3OsAbLtF7MwzsmeXjUzF2+wre B4ATh/ULwSiXlMqRO3NtCcdgqHHtT4f/k00TE715R3TVmSt4XZ7wqhkeOK9nEPOcID96hs swjUNdgyp13/fNySVaY8/1XWrwVvYBtxhlCPbbj9Z8MDxrtOV2hMbdrMYw9Phh+TVaqjvg Hv51UvQlrB3Rg2htqJcUEhdKNmk2ucbUcsCr6cQ7LjmuqAqRr/ADDbqEgbdBUwoaUwEZVj /ttJhpWvovzoABDrwlvb8jW7FzpMd1M4zcrv3R297Ylad1VVJUPAwzeYlqRfdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701549510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cGF8cVUa76wbmLcMjwXX0JC9bD4Ezl0WFKvxpNqhkGQ=; b=QtoeEbYFzz5dHTwdL9zZ1+8AQj94EB9UM4548ylmC1wkOX7QUx2ippyQHls3gYPnLqrhO/ hSgprx28TIe0s0WdDxvpH2RTVnzeB1PGxUBirwNlKKSRO0ESCYpZWKQKm0CrLqPAn65hOe 8HbA+nQ87hdFHZfHUHB11bMtV6NSTjIdmdr6Hzps7HzqVYUVS/bUrT7yPHQW/OmESWhU18 R0UfSPc1ToCFrkqc/scR3PyaBeMWNrAnA88H1WixtxFCxk0PhzYXk+LFgaDgJ57cM+WedE dnuXpc2kBR+gXiJ44wND22oVNPY7uDM8iz60Z/LT2Ww94ZrjNYI6k4XYhd8Hrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701549510; a=rsa-sha256; cv=none; b=Xi/21nWiHYuWL+mVjP4BECGWFOXk53rOV5xcN8+byzUcNXPtYyiSqKnsl5gzXGAe7B9t59 XhqzYKGVFmAe1H4q8Erl+vAQ3nFP8lXXHkmLOCDS9VogZ9iiaKIJSlh1+DDJNbFWnxtUe+ AG1v7LBmuO3fWZilNIckIh6uzmJvZZ1rl2DJ8yNC80Q11nPwJO7JIVnDbhSqFqT66NzrL1 r+9ClvNLp+RbtqApw0bvPyUIVKTI1VEyrrpDY/9W2G7T0eg4fgYNxFLgQeWc+y0wsOJ9iV kzsY+OiBoXVBeEbMby+CLjxSFMSpzpxib/a2WtKBaeYhp6mnfF19bw2dlY5JXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjMFy4wQdzX7D; Sat, 2 Dec 2023 20:38: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 3B2KcUm8001429; Sat, 2 Dec 2023 20:38:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2KcUPJ001426; Sat, 2 Dec 2023 20:38:30 GMT (envelope-from git) Date: Sat, 2 Dec 2023 20:38:30 GMT Message-Id: <202312022038.3B2KcUPJ001426@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: 1edc20b76953 - main - wpa: ctrl_iface set sendbuf size List-Id: Commit messages for the main 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: 1edc20b76953d9ef571b0bcf89b206b98ed13d9b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1edc20b76953d9ef571b0bcf89b206b98ed13d9b commit 1edc20b76953d9ef571b0bcf89b206b98ed13d9b Author: Bjoern A. Zeeb AuthorDate: 2023-11-12 20:33:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-02 20:37:36 +0000 wpa: ctrl_iface set sendbuf size In order to avoid running into the default net.local.dgram.maxdgram of 2K currently when calling sendto(2) try to set the sndbuf size to the maximum ctrl message size. While on 14 and 15 this does not actually raise the limit anymore (and be7c095ac99ad29fd72b780c7d58949a38656c66 raised it for syslogd and this), FreeBSD 13 still requires this change and it will work as expected there. In addition we always ensure a large enough send buffer this way independent of kernel defaults. The problem occured, e.g., when the scan_list result had enough BSSIDs so the text output would exceed 2048 bytes. Sponsored by: The FreeBSD Foundation MFC after: 3 days PR: 274990 Reviewed by: cy, adrian (with previous comment) Differential Revision: https://reviews.freebsd.org/D42558 --- contrib/wpa/wpa_supplicant/ctrl_iface_unix.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c b/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c index 639573dae75e..deeed2b11833 100644 --- a/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c +++ b/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c @@ -506,6 +506,10 @@ static int wpas_ctrl_iface_open_sock(struct wpa_supplicant *wpa_s, struct group *grp; char *endp; int flags; +#if defined(__FreeBSD__) + int optval, rc; + socklen_t optlen; +#endif buf = os_strdup(wpa_s->conf->ctrl_interface); if (buf == NULL) @@ -679,6 +683,22 @@ havesock: } } +#if defined(__FreeBSD__) + /* Ensure we can send a full length message atomically. */ + optval = 0; + optlen = sizeof(optval); + if (getsockopt(priv->sock, SOL_SOCKET, SO_SNDBUF, &optval, &optlen) == -1) { + wpa_printf(MSG_INFO, "failed to get sndbuf for sock=%d: %s", + priv->sock, strerror(errno)); + } else if (optval < CTRL_IFACE_MAX_LEN) { + optval = CTRL_IFACE_MAX_LEN; + if (setsockopt(priv->sock, SOL_SOCKET, SO_SNDBUF, &optval, + sizeof(optval)) == -1) + wpa_printf(MSG_ERROR, "failed to set sndbuf for " + "sock=%d: %s", priv->sock, strerror(errno)); + } +#endif + eloop_register_read_sock(priv->sock, wpa_supplicant_ctrl_iface_receive, wpa_s, priv); wpa_msg_register_cb(wpa_supplicant_ctrl_iface_msg_cb); From nobody Sat Dec 2 21:12:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjN124kzKz52dNV; Sat, 2 Dec 2023 21:12: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 4SjN124G6sz4jLs; Sat, 2 Dec 2023 21:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701551542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vdWIy7+NjyHgPvdNb9TE6xJ/x7ErhkcoYNUUnqLHCPU=; b=GAL9eaWLUDrnR4KT2msYBByBciHNJ9PbblsK6K3QgARkx8ZHAikiXKtuopskU55bJvT6Wm iUwjtQbBTSwuOY4Xml/LNhCt3QQzBCbbdKbDmQX2JhT0iUohmFN9mgoEzyio1nWLa8UnjK QDPPjVK1B77XoC98Unt4RvUQr/7dHP5okGfApzq0pkr5+hHF1Fxsj/0Ej/7fohxXp0otJl /rFpfxkjkucUGEDCfKDy3+gI+tAhP/hd/MIbQWGIah6nJoXRnGwG6vWoL1xNKfPYrzdjAO bj1lB1gSzJ4oXPyKRvgPojhWp8c6fOvK7x8YViQf3V/4uyc04ZU/7pH8PXW8/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701551542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vdWIy7+NjyHgPvdNb9TE6xJ/x7ErhkcoYNUUnqLHCPU=; b=doTauBjVXd5+KXD6yt7QmbBKiMNDuueyN0aOjVpAUgOyI6+Z144Jq4YtXpqiSuWReFhQUZ VBDJtFLp2rKe2XATjt3Cr4CD3FXbTB1FItjJu6RzV6FBVhS9LBTew4soyVAUy3ot5uxBdO BGxK5kSakzFYPvRe2m5kvxCeVbEPJibsXH6xr6wxKwD5KPd5LvHcOOEe8mTxiWfrQUC2tG ltHZ0Ml6bOrVspCkFNq6l4R742poqI/JXOqTybxFIZLxXK3UkZdybH4NMIS/loklKtBfrZ Y/3NM+FIDCWpYVA3dBn3+CMM2xZi3wZgR3Ly7ivtmNkjQqU6euKks1csOUwTrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701551542; a=rsa-sha256; cv=none; b=Cv4DnUj/QM0Cce8gbBFgzkfdj+XeDrZp1OPUsdFtp94pOgIwPPSugMX8gEIis4D3AEqA5v Hfb6NVAkoa5Yb31/xH5rV2TNa2R/5kP2da3DjTcEmtpZEYqz7+eOkRqwKcD3xB0VWjrkXS JkOz7azomL/cPmNCZl9gy0XmGZZryhglRD/BBRWVMGxafnUFOhm0LB7UlMNPPUCfSkiItq 1YAODfXlFoaHRRSJ34Ws2HU/5JREUjqrWfF4YAk/AP73387sHCf6/XV4K+kaqIsmQTJvmr GEULfvjx8j/rSftkmLYLGkUDksYmN1wC/KAv2st6M0rJ9AflCaDqMXC7XMXR7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjN123JpdzXlg; Sat, 2 Dec 2023 21:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B2LCMxt067827; Sat, 2 Dec 2023 21:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2LCMU8067824; Sat, 2 Dec 2023 21:12:22 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:12:22 GMT Message-Id: <202312022112.3B2LCMU8067824@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: 06c083f79dd7 - main - sound: remove Legacy Hardware section from man page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: 06c083f79dd74ba2fcadccbc1b338b8db7f35ef8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=06c083f79dd74ba2fcadccbc1b338b8db7f35ef8 commit 06c083f79dd74ba2fcadccbc1b338b8db7f35ef8 Author: Ed Maste AuthorDate: 2023-12-02 21:10:16 +0000 Commit: Ed Maste CommitDate: 2023-12-02 21:12:06 +0000 sound: remove Legacy Hardware section from man page Support for "old legacy ISA cards" was removed in 9054e296819f and preceeding commits. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- share/man/man4/pcm.4 | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 95ac7f71688f..1803eaca42eb 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 26, 2020 +.Dd December 2, 2023 .Dt SOUND 4 .Os .Sh NAME @@ -124,33 +124,6 @@ The following bridge device drivers are available: .Pp Refer to the manual page for each bridge device driver for driver specific settings and information. -.Ss Legacy Hardware -For old legacy -.Tn ISA -cards, the driver looks for -.Tn MSS -cards at addresses -.Dv 0x530 -and -.Dv 0x604 . -These values can be overridden in -.Pa /boot/device.hints . -Non-PnP sound cards require the following lines in -.Xr device.hints 5 : -.Bd -literal -offset indent -hint.pcm.0.at="isa" -hint.pcm.0.irq="5" -hint.pcm.0.drq="1" -hint.pcm.0.flags="0x0" -.Ed -.Pp -Apart from the usual parameters, the flags field is used to specify -the secondary -.Tn DMA -channel (generally used for capture in full duplex cards). -Flags are set to 0 for cards not using a secondary -.Tn DMA -channel, or to 0x10 + C to specify channel C. .Ss Boot Variables In general, the module .Pa snd_foo